Jan 2023 merge [IDB IGNORE] [MDB IGNORE]

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@ add: Added more things
 del: Removed old things
 tweak: tweaked a few things
 balance: rebalanced something
-fix: fixed a few things
+bugfix: fixed a few things
 soundadd: added a new sound thingy
 sounddel: removed an old sound thingy
 imageadd: added some icons and images

SpacemanDMM.toml

@@ -10,3 +10,44 @@ disallow_relative_proc_definitions = true
 
 [debugger]
 engine = "auxtools"
+
+[diagnostics]
+# Raised by DreamChecker
+disabled_directive = "error"
+sets_directive_twice = "error"
+invalid_lint_directive_value = "error"
+invalid_set_value = "error"
+unknown_linter_setting = "error"
+override_missing_keyword_arg = "error"
+must_not_override = "error"
+must_call_parent = "error"
+final_var = "error"
+private_proc = "error"
+protected_proc = "error"
+private_var = "error"
+protected_var = "error"
+must_be_pure = "error"
+must_not_sleep = "error"
+redefined_proc = "off"
+ambiguous_in_lhs = "error"
+ambiguous_not_bitwise = "error"
+no_typehint_implicit_new = "error"
+field_access_static_type = "error"
+proc_call_static_type = "error"
+proc_has_no_parent = "error"
+no_operator_overload = "error"
+unreachable_code = "error"
+control_condition_static = "error"
+if_condition_determinate = "error"
+loop_condition_determinate = "error"
+
+# Raised by Lexer
+integer_precision_loss = "error"
+
+# Raised by Parser
+duplicate_include = "error"
+macro_redefined = "error"
+macro_undefined_no_definition = "error"
+
+# Raised by Object Tree
+override_precedes_definition = "error"

code/__defines/ZAS.dm

@@ -1,3 +1,18 @@
+
+/*
+	Uncomment this to enable ZAS debugging tools. While ghosted, you will see a visualization of the atmos status of turfs.
+	Green turfs are zones that are existing happily.
+	Yellow-orange turfs are a zone that has recently been merged into another zone.
+	Red turfs are turfs are an invalidated zone. Invalid zones are zones that were destroyed.
+	White/overlay-less turfs are turfs that are the origin point of a zone. This is completely useless information.
+	Purple outlines indicate the turf was marked for an update by SSair, and is in its processing list.
+	In addition, all ZAS-related datums and turfs will have a "verbose" var. Set this to 1 using View Variables to get robust to_chat()s about activity.
+	Finally, this is a friendly reminder that using Debug Verbs gives access to the Zone Info and Test ZAS Connection verbs when you right click a turf.
+
+	Addendum:
+		There are additional debug overlays that use ZAS_ZONE_BLOCKER and ZAS_DIRECTIONAL_BLOCKER.
+		They take priority over standard overlays, displaying directional airflow, and are generally not needed so they are commented out by default.
+*/
 //#define ZASDBG
 #define MULTIZAS
 

code/__defines/_tick.dm

@@ -20,6 +20,8 @@
 /// runs stoplag if tick_usage is above the limit
 #define CHECK_TICK ( TICK_CHECK ? stoplag() : 0 )
 
+#define UNTIL(X) while(!(X)) stoplag()
+
 //"fancy" math for calculating time in ms from tick_usage percentage and the length of ticks
 //percent_of_tick_used * (ticklag * 100(to convert to ms)) / 100(percent ratio)
 //collapsed to percent_of_tick_used * tick_lag

code/__defines/armor.dm

@@ -45,3 +45,6 @@
 #define  ARMOR_ENERGY_RESISTANT		40
 #define  ARMOR_ENERGY_STRONG		75
 #define  ARMOR_ENERGY_SHIELDED		100
+
+/**Armor piercing value that will bypass any armors completely */
+#define  ARMOR_PIERCING_BYPASSED	INFINITY

code/__defines/aspects.dm

@@ -11,52 +11,61 @@
 #define ASPECTS_PHYSICAL  BITFLAG(0)
 #define ASPECTS_MENTAL    BITFLAG(1)
 
-#define DEFINE_ROBOLIMB_MODEL_ASPECTS(MODEL_PATH, MODEL_ID, COST) \
-/decl/aspect/prosthetic_limb/left_hand/##MODEL_ID {                           \
-	model = MODEL_PATH;                                                       \
-	parent = /decl/aspect/prosthetic_limb/left_hand;                          \
-	aspect_cost = COST;                                                       \
-	base_type = /decl/aspect/prosthetic_limb/left_hand;                       \
-}                                                                             \
-/decl/aspect/prosthetic_limb/left_arm/##MODEL_ID {                            \
-	model = MODEL_PATH;                                                       \
-	parent = /decl/aspect/prosthetic_limb/left_arm;                           \
-	aspect_cost = COST;                                                       \
-	base_type = /decl/aspect/prosthetic_limb/left_arm;                        \
-}                                                                             \
-/decl/aspect/prosthetic_limb/right_hand/##MODEL_ID {                          \
-	model = MODEL_PATH;                                                       \
-	parent = /decl/aspect/prosthetic_limb/right_hand;                         \
-	aspect_cost = COST;                                                       \
-	base_type = /decl/aspect/prosthetic_limb/right_hand;                      \
-}                                                                             \
-/decl/aspect/prosthetic_limb/right_arm/##MODEL_ID {                           \
-	model = MODEL_PATH;                                                       \
-	parent = /decl/aspect/prosthetic_limb/right_arm;                          \
-	aspect_cost = COST;                                                       \
-	base_type = /decl/aspect/prosthetic_limb/right_arm;                       \
-}                                                                             \
-/decl/aspect/prosthetic_limb/left_foot/##MODEL_ID {                           \
-	model = MODEL_PATH;                                                       \
-	parent = /decl/aspect/prosthetic_limb/left_foot;                          \
-	aspect_cost = COST;                                                       \
-	base_type = /decl/aspect/prosthetic_limb/left_foot;                       \
-}                                                                             \
-/decl/aspect/prosthetic_limb/left_leg/##MODEL_ID {                            \
-	model = MODEL_PATH;                                                       \
-	parent = /decl/aspect/prosthetic_limb/left_leg;                           \
-	base_type = /decl/aspect/prosthetic_limb/left_leg;                        \
-	aspect_cost = COST;                                                       \
-}                                                                             \
-/decl/aspect/prosthetic_limb/right_foot/##MODEL_ID {                          \
-	model = MODEL_PATH;                                                       \
-	parent = /decl/aspect/prosthetic_limb/right_foot;                         \
-	base_type = /decl/aspect/prosthetic_limb/right_foot;                      \
-	aspect_cost = COST;                                                       \
-}                                                                             \
-/decl/aspect/prosthetic_limb/right_leg/##MODEL_ID {                           \
-	model = MODEL_PATH;                                                       \
-	parent = /decl/aspect/prosthetic_limb/right_leg;                          \
-	base_type = /decl/aspect/prosthetic_limb/right_leg;                       \
-	aspect_cost = COST;                                                       \
-}
+#define DEFINE_ROBOLIMB_MODEL_ASPECTS_WITH_SPECIES_BODYTYPE(MODEL_PATH, MODEL_ID, COST, SPECIES, BODYTYPE) \
+/decl/aspect/prosthetic_limb/left_hand/##MODEL_ID {                                                        \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/left_hand;                                                       \
+	aspect_cost = COST * 0.5;                                                                              \
+	check_bodytype = BODYTYPE;                                                                             \
+	check_species = SPECIES;                                                                               \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/left_arm/##MODEL_ID {                                                         \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/left_arm;                                                        \
+	aspect_cost = COST;                                                                                    \
+	check_bodytype = BODYTYPE;                                                                             \
+	check_species = SPECIES;                                                                               \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/right_hand/##MODEL_ID {                                                       \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/right_hand;                                                      \
+	aspect_cost = COST * 0.5;                                                                              \
+	check_bodytype = BODYTYPE;                                                                             \
+	check_species = SPECIES;                                                                               \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/right_arm/##MODEL_ID {                                                        \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/right_arm;                                                       \
+	aspect_cost = COST;                                                                                    \
+	check_bodytype = BODYTYPE;                                                                             \
+	check_species = SPECIES;                                                                               \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/left_foot/##MODEL_ID {                                                        \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/left_foot;                                                       \
+	aspect_cost = COST * 0.5;                                                                              \
+	check_bodytype = BODYTYPE;                                                                             \
+	check_species = SPECIES;                                                                               \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/left_leg/##MODEL_ID {                                                         \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/left_leg;                                                        \
+	aspect_cost = COST;                                                                                    \
+	check_bodytype = BODYTYPE;                                                                             \
+	check_species = SPECIES;                                                                               \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/right_foot/##MODEL_ID {                                                       \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/right_foot;                                                      \
+	aspect_cost = COST * 0.5;                                                                              \
+	check_bodytype = BODYTYPE;                                                                             \
+	check_species = SPECIES;                                                                               \
+}                                                                                                          \
+/decl/aspect/prosthetic_limb/right_leg/##MODEL_ID {                                                        \
+	model = MODEL_PATH;                                                                                    \
+	parent = /decl/aspect/prosthetic_limb/right_leg;                                                       \
+	aspect_cost = COST;                                                                                    \
+	check_bodytype = BODYTYPE;                                                                             \
+	check_species = SPECIES;                                                                               \
+}
+#define DEFINE_ROBOLIMB_MODEL_ASPECTS(MODEL_PATH, MODEL_ID, COST) DEFINE_ROBOLIMB_MODEL_ASPECTS_WITH_SPECIES_BODYTYPE(MODEL_PATH, MODEL_ID, COST, null, null)

code/__defines/chemistry.dm

@@ -6,6 +6,7 @@
 #define CHEM_TOUCH 1
 #define CHEM_INGEST 2
 #define CHEM_INJECT 3
+#define CHEM_INHALE 4
 
 #define MINIMUM_CHEMICAL_VOLUME 0.01
 

code/__defines/colors.dm

@@ -93,15 +93,16 @@
 #define COLOR_ASTEROID_ROCK    "#735555"
 #define COLOR_DIAMOND          "#d8d4ea"
 
-#define	PIPE_COLOR_GREY        "#808080"
-#define	PIPE_COLOR_RED         "#ff0000"
-#define	PIPE_COLOR_BLUE        "#0000ff"
-#define	PIPE_COLOR_CYAN        "#00ffff"
-#define	PIPE_COLOR_GREEN       "#00ff00"
-#define	PIPE_COLOR_YELLOW      "#ffcc00"
-#define	PIPE_COLOR_BLACK       "#444444"
-#define	PIPE_COLOR_ORANGE      "#b95a00"
+#define PIPE_COLOR_GREY        "#808080"
+#define PIPE_COLOR_RED         "#ff0000"
+#define PIPE_COLOR_BLUE        "#0000ff"
+#define PIPE_COLOR_CYAN        "#00ffff"
+#define PIPE_COLOR_GREEN       "#00ff00"
+#define PIPE_COLOR_YELLOW      "#ffcc00"
+#define PIPE_COLOR_BLACK       "#444444"
+#define PIPE_COLOR_ORANGE      "#b95a00"
 #define PIPE_COLOR_WHITE       "#ffffff"
+#define PIPE_COLOR_PURPLE      "#880088"
 
 #define	COMMS_COLOR_DEFAULT    "#ff00ff"
 #define	COMMS_COLOR_ENTERTAIN  "#666666"
@@ -198,14 +199,14 @@
 #define RANDOM_RGB rgb(rand(0,255), rand(0,255), rand(0,255))
 
 // Codex category colours.
-#define CODEX_COLOR_LORE      "#abdb9b"
-#define CODEX_COLOR_MECHANICS "#9ebcd8"
-#define CODEX_COLOR_ANTAG     "#e5a2a2"
-
 #define COLOR_WEBHOOK_DEFAULT 0x8bbbd5
 
 // Colors for input/hotkey panel.
 #define COLOR_INPUT_DISABLED "#f0f0f0"
 #define COLOR_INPUT_ENABLED "#d3b5b5"
 
+#define COLOR_DARKMODE_BACKGROUND "#202020"
+#define COLOR_DARKMODE_DARKBACKGROUND "#171717"
+#define COLOR_DARKMODE_TEXT "#a4bad6"
+
 #define COLORED_SQUARE(COLOR) "<span style='font-face: fixedsys; font-size: 14px; background-color: [COLOR]; color: [COLOR]'>___</span>"

code/__defines/computers.dm

@@ -33,6 +33,7 @@
 #define PROGRAM_STATE_KILLED 0
 #define PROGRAM_STATE_BACKGROUND 1
 #define PROGRAM_STATE_ACTIVE 2
+#define PROGRAM_STATE_BROWSER 3
 
 #define PROG_MISC  		"Miscellaneous"
 #define PROG_ENG  		"Engineering"
@@ -54,4 +55,23 @@
 
 // Caps for network logging. Less than 10 would make logging useless anyway, more than 500 may make the log browser too laggy. Defaults to 100 unless user changes it.
 #define MAX_NETWORK_LOGS 100
-#define MIN_NETWORK_LOGS 10
+#define MIN_NETWORK_LOGS 10
+
+// Default directories referenced by the OS or programs.
+#define OS_PROGRAMS_DIR  "programs"
+#define OS_RECORDS_DIR   "records"
+#define OS_ACCOUNTS_DIR  "accounts"
+#define OS_DOCUMENTS_DIR "documents"
+#define OS_LOGS_DIR      "logs"
+
+// Return codes for file storage.
+#define OS_FILE_SUCCESS     1
+#define OS_HARDDRIVE_ERROR  0
+#define OS_FILE_NOT_FOUND  -1
+#define OS_DIR_NOT_FOUND   -2
+#define OS_FILE_EXISTS     -3
+#define OS_FILE_NO_READ    -4
+#define OS_FILE_NO_WRITE   -5
+#define OS_HARDDRIVE_SPACE -6
+#define OS_NETWORK_ERROR   -7
+#define OS_BAD_NAME        -8 

code/__defines/damage_organs.dm

@@ -33,6 +33,15 @@
 #define FIRE_DAMAGE_MODIFIER 0.0215 // Higher values result in more external fire damage to the skin. (default 0.0215)
 #define  AIR_DAMAGE_MODIFIER 2.025  // More means less damage from hot air scalding lungs, less = more damage. (default 2.025)
 
+//Armor Resistance Types
+#define ARMOR_MELEE  "melee"   //Blunt and cutting weapons
+#define ARMOR_BULLET "bullet"  //Kinectic projectiles
+#define ARMOR_BOMB   "bomb"    //Explosions
+#define ARMOR_LASER  "laser"   //Laser weapons
+#define ARMOR_ENERGY "energy"  //Intense heat, electricity
+#define ARMOR_RAD    "rad"     //Ionizing radiation
+#define ARMOR_BIO    "bio"     //Biohazards toxin damage
+
 // Organ defines.
 #define ORGAN_CUT_AWAY   BITFLAG(0)  // The organ is in the process of being surgically removed.
 #define ORGAN_BLEEDING   BITFLAG(1)  // The organ is currently bleeding.

code/__defines/flags.dm

@@ -63,6 +63,7 @@ The latter will result in a linter warning and will not work correctly.
 #define OBJ_FLAG_ROTATABLE                BITFLAG(2) // Can be rotated with alt-click
 #define OBJ_FLAG_NOFALL                   BITFLAG(3) // Will prevent mobs from falling
 #define OBJ_FLAG_MOVES_UNSUPPORTED        BITFLAG(4) // Object moves with shuttle transition even if turf below is a background turf.
+#define OBJ_FLAG_HOLLOW                   BITFLAG(5) // Modifies initial matter values to be lower than w_class normally sets.
 
 // Item-level flags (/obj/item/item_flags)
 #define ITEM_FLAG_NO_BLUDGEON             BITFLAG(0) // When an item has this it produces no "X has been hit by Y with Z" message with the default handler.
@@ -79,7 +80,7 @@ The latter will result in a linter warning and will not work correctly.
 #define ITEM_FLAG_NOCUFFS                 BITFLAG(11) // Gloves that have this flag prevent cuffs being applied
 #define ITEM_FLAG_CAN_HIDE_IN_SHOES       BITFLAG(12) // Items that can be hidden in shoes that permit it
 #define ITEM_FLAG_PADDED                  BITFLAG(13) // When set on gloves, will act like pulling punches in unarmed combat.
-#define ITEM_FLAG_HOLLOW                  BITFLAG(14) // Modifies initial matter values to be lower than w_class normally sets.
+#define ITEM_FLAG_CAN_TAPE                BITFLAG(14) //Whether the item can be be taped onto something using tape
 
 // Flags for pass_flags (/atom/var/pass_flags)
 #define PASS_FLAG_TABLE                   BITFLAG(0)
@@ -91,4 +92,12 @@ The latter will result in a linter warning and will not work correctly.
 #define OVERMAP_SECTOR_BASE               BITFLAG(0) // Whether or not this sector is a starting sector. Z levels contained in this sector are added to station_levels
 #define OVERMAP_SECTOR_KNOWN              BITFLAG(1) // Makes the sector show up on nav computers
 #define OVERMAP_SECTOR_IN_SPACE           BITFLAG(2) // If the sector can be accessed by drifting off the map edge
-#define OVERMAP_SECTOR_UNTARGETABLE       BITFLAG(3) // If the sector is untargetable by missiles.
+#define OVERMAP_SECTOR_UNTARGETABLE       BITFLAG(3) // If the sector is untargetable by missiles.
+
+// Flags for reagent presentation (/obj/item/chems/var/presentation_flags)
+#define PRESENTATION_FLAG_NAME            BITFLAG(0) // This chems subtype presents the name of its main reagent/cocktail.
+#define PRESENTATION_FLAG_DESC            BITFLAG(1) // This chems subtype presents the description of its main reagent/cocktail.
+
+// Decl-level flags (/decl/var/decl_flags)
+#define DECL_FLAG_ALLOW_ABSTRACT_INIT     BITFLAG(0) // Abstract subtypes without this set will CRASH() if fetched with GET_DECL().
+#define DECL_FLAG_MANDATORY_UID           BITFLAG(1) // Requires uid to be non-null.