[IDB IGNORE] Update from upstream staging, Feb 5 2025

.github/workflows/generate_documentation.yml

@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 env:
-  SPACEMAN_DMM_VERSION: suite-1.7.2
+  SPACEMAN_DMM_VERSION: suite-1.9
 
 jobs:
   generate_documentation:

.github/workflows/test.yml

@@ -17,12 +17,12 @@ on:
 
 env:
   BYOND_MAJOR: "515"
-  BYOND_MINOR: "1633"
+  BYOND_MINOR: "1643"
   SPACEMAN_DMM_VERSION: suite-1.8
 
 jobs:
   DreamChecker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Setup Cache
@@ -53,7 +53,7 @@ jobs:
           chmod +x send.sh
           ./send.sh failure $WEBHOOK_URL
   OpenDream:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Python setup
@@ -75,7 +75,7 @@ jobs:
       - name: Run OpenDream
         run: ./DMCompiler_linux-x64/DMCompiler nebula.dme --suppress-unimplemented --skip-anything-typecheck --version=${BYOND_MAJOR}.${BYOND_MINOR} | python tools/od_annotator/__main__.py "$@"
   Code:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Setup Cache
@@ -101,7 +101,7 @@ jobs:
           chmod +x send.sh
           ./send.sh failure $WEBHOOK_URL
   Maps:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         map_path: [example, tether, tradeship, exodus, ministation, shaded_hills, away_sites_testing, modpack_testing, planets_testing]

CONTRIBUTING.md

@@ -30,3 +30,14 @@ This is a quick and dirty set of agreed-upon standards for contributions to the
 - If there's a personal dislike of the PR, post about it for discussion. Maybe have an 'on hold for discussion' label. Try to reach a consensus/compromise. Failing a compromise, a majority maintainer vote will decide.
 - First person to review approves the PR, second person to review can merge it. If 24 hours pass with no objections, first person can merge the PR themselves.
 - PRs can have a 24 hour grace period applied by maintainers if it seems important for discussion and responses to be involved. Don't merge for the grace period if applied (reviews are fine).
+
+### Footguns
+A footgun is a pattern, function, assumption etc. that stands a strong chance to shoot you in the foot. They are documented here for ease of reference by new contributors.
+
+#### List footguns
+- Adding lists to lists will actually perform a merge, rather than inserting the list as a new record. If you want to insert a list into a list, you need to either:
+    - double-wrap it, ex. `my_list += list(list("some_new_data" = 25))`
+    - set the index directly, ex. `my_list[my_list.len] = list("some_new_data" = 25)`
+- Using variables and macros as associative list keys have some notable behavior.
+    - If declaring an associative list using a macro as a key, in a case where the macro does not exist (due to misspelling, etc.), that macro name will be treated as a string value for the associative list. You can guard against this by wrapping the macro in parens, ex. `list( (MY_MACRO_NAME) = "some_value" )`, which will fail to compile instead in cases where the macro doesn't exist.
+    - If a variable is used as the associative key, it *must* be wrapped in parens, or it will be used as a string key.

SpacemanDMM.toml

@@ -56,6 +56,9 @@ override_precedes_definition = "error"
 hide_invisible = [
 	"/obj/effect/step_trigger",
 	"/obj/abstract",
+	"/turf/unsimulated/mask",
+	"/obj/effect/shuttle_landmark",
+	"/obj/effect/overmap",
 ]
 
 [map_renderer.render_passes]

code/___opendream_linting.dm

@@ -31,4 +31,5 @@
 #pragma UnsafeClientAccess disabled
 #pragma SuspiciousSwitchCase error
 #pragma AssignmentInConditional error
+#pragma AmbiguousInOrder error
 #endif

code/__datastructures/priority_queue.dm

@@ -54,7 +54,7 @@
 /datum/priority_queue/proc/Length()
 	. = L.len
 
-/// Resorts the `item` to it's correct position in the queue.
+/// Resorts the `item` to its correct position in the queue.
 /// * For example: The queue is sorted based on weight and atom A changes weight after being added
 /datum/priority_queue/proc/ReSort(item)
 	var/i = Seek(item)

code/__defines/MC.dm

@@ -96,6 +96,15 @@ if(Datum.is_processing) {\
 #define TIMER_NO_HASH_WAIT BITFLAG(4) // For unique timers: don't distinguish timers by wait.
 #define TIMER_LOOP         BITFLAG(5) // Repeat the timer until it's deleted or the parent is destroyed.
 
+// TIMER_OVERRIDE is impossible to support because we don't track that for DPC queued calls, and adding a third list for that would be a lot of overhead for no real benefit
+// TIMER_STOPPABLE can't work because it uses timer IDs instead of hashes, and DPC queued calls don't have IDs.
+// TIMER_LOOP doesn't work because it needs to be a timer that can re-insert in the list, and a zero-wait looping timer should really be a ticker subsystem instead.
+// Update these defines if any of those change.
+/// These are the flags forbidden when putting zero-wait timers on SSdpc instead of SStimer.
+#define DPC_FORBID_FLAGS   TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE | TIMER_LOOP
+/// These are the flags forbidden when putting zero-wait TIMER_UNIQUE timers on SSdpc instead of SStimer.
+#define UDPC_FORBID_FLAGS  TIMER_OVERRIDE | TIMER_STOPPABLE | TIMER_LOOP
+
 #define TIMER_ID_NULL -1
 
 /**

code/__defines/ZAS.dm

@@ -110,3 +110,5 @@ var/global/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
 	}
 
 #endif
+
+#define GAS_STANDARD_AIRMIX "STANDARD_AIRMIX"

code/__defines/_compile_options.dm

@@ -1,3 +1,4 @@
+#define UNIT_TEST
 // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
 // 1 will enable set background. 0 will disable set background.
 #define BACKGROUND_ENABLED 0

code/__defines/_planes+layers.dm

@@ -91,31 +91,32 @@ What is the naming convention for planes or layers?
 	#define ABOVE_WIRE_LAYER            1.58
 	//TURF PLANE
 	//TURF_LAYER = 2
-	#define TURF_DETAIL_LAYER           2.01
-	#define TURF_SHADOW_LAYER           2.02
+	#define TURF_OVER_EDGE_LAYER        TURF_LAYER + (FLOOR_LAYER_CONSTANT*100)
+	#define TURF_DETAIL_LAYER           TURF_OVER_EDGE_LAYER + 0.01
+	#define TURF_SHADOW_LAYER           TURF_OVER_EDGE_LAYER + 0.02
 	//ABOVE TURF
-	#define DECAL_LAYER                 2.03
-	#define RUNE_LAYER                  2.04
-	#define AO_LAYER                    2.045
-	#define ABOVE_TILE_LAYER            2.05
-	#define EXPOSED_PIPE_LAYER          2.06
-	#define EXPOSED_WIRE_LAYER          2.07
-	#define EXPOSED_WIRE_TERMINAL_LAYER 2.08
-	#define CATWALK_LAYER               2.09
-	#define BLOOD_LAYER                 2.10
-	#define MOUSETRAP_LAYER             2.11
-	#define PLANT_LAYER                 2.12
+	#define DECAL_LAYER                 TURF_OVER_EDGE_LAYER + 0.03
+	#define RUNE_LAYER                  TURF_OVER_EDGE_LAYER + 0.04
+	#define AO_LAYER                    TURF_OVER_EDGE_LAYER + 0.045
+	#define ABOVE_TILE_LAYER            TURF_OVER_EDGE_LAYER + 0.05
+	#define EXPOSED_PIPE_LAYER          TURF_OVER_EDGE_LAYER + 0.06
+	#define EXPOSED_WIRE_LAYER          TURF_OVER_EDGE_LAYER + 0.07
+	#define EXPOSED_WIRE_TERMINAL_LAYER TURF_OVER_EDGE_LAYER + 0.08
+	#define CATWALK_LAYER               TURF_OVER_EDGE_LAYER + 0.09
+	#define BLOOD_LAYER                 TURF_OVER_EDGE_LAYER + 0.10
+	#define MOUSETRAP_LAYER             TURF_OVER_EDGE_LAYER + 0.11
+	#define PLANT_LAYER                 TURF_OVER_EDGE_LAYER + 0.12
 	//HIDING MOB
-	#define HIDING_MOB_LAYER            2.14
-	#define SHALLOW_FLUID_LAYER         2.15
-	#define MOB_SHADOW_LAYER            2.16
+	#define HIDING_MOB_LAYER            TURF_OVER_EDGE_LAYER + 0.14
+	#define SHALLOW_FLUID_LAYER         TURF_OVER_EDGE_LAYER + 0.15
+	#define MOB_SHADOW_LAYER            TURF_OVER_EDGE_LAYER + 0.16
 	//OBJ
-	#define BELOW_DOOR_LAYER            2.17
-	#define OPEN_DOOR_LAYER             2.18
-	#define BELOW_TABLE_LAYER           2.19
-	#define TABLE_LAYER                 2.20
-	#define BELOW_OBJ_LAYER             2.21
-	#define STRUCTURE_LAYER             2.22
+	#define BELOW_DOOR_LAYER            TURF_OVER_EDGE_LAYER + 0.17
+	#define OPEN_DOOR_LAYER             TURF_OVER_EDGE_LAYER + 0.18
+	#define BELOW_TABLE_LAYER           TURF_OVER_EDGE_LAYER + 0.19
+	#define TABLE_LAYER                 TURF_OVER_EDGE_LAYER + 0.20
+	#define BELOW_OBJ_LAYER             TURF_OVER_EDGE_LAYER + 0.21
+	#define STRUCTURE_LAYER             TURF_OVER_EDGE_LAYER + 0.22
 	// OBJ_LAYER                        3
 	#define ABOVE_OBJ_LAYER             3.01
 	#define CLOSED_DOOR_LAYER           3.02
@@ -124,6 +125,7 @@ What is the naming convention for planes or layers?
 	#define FULL_WINDOW_LAYER           3.05
 	#define ABOVE_WINDOW_LAYER          3.06
 	//LYING MOB AND HUMAN
+	#define UNDER_MOB_LAYER             3.065
 	#define LYING_MOB_LAYER             3.07
 	#define LYING_HUMAN_LAYER           3.08
 	#define BASE_ABOVE_OBJ_LAYER        3.09

code/__defines/ambience.dm

@@ -0,0 +1,11 @@
+#define AMBIENCE_QUEUE_TURF(T) \
+	if(!T.ambience_queued) { \
+		T.ambience_queued = TRUE; \
+		SSambience.queued += T; \
+	}
+
+#define AMBIENCE_DEQUEUE_TURF(T) \
+	if(T.ambience_queued) { \
+		T.ambience_queued = FALSE; \
+		SSambience.queued -= T; \
+	}

code/__defines/backgrounds.dm

@@ -0,0 +1,7 @@
+#define BACKGROUND_FLAG_NAMING      BITFLAG(0)
+#define BACKGROUND_FLAG_CITIZENSHIP BITFLAG(1)
+#define BACKGROUND_FLAG_IDEOLOGY    BITFLAG(2)
+#define BACKGROUND_FLAG_RELIGION    BITFLAG(3)
+#define BACKGROUND_FLAG_LOCATION    BITFLAG(4)
+#define BACKGROUND_FLAG_RESIDENCE   BITFLAG(5)
+#define BACKGROUND_FLAG_HOMEWORLD   BITFLAG(6)

code/__defines/bodytype.dm

@@ -1,7 +1,3 @@
-#define BODY_FLAG_EXCLUDE        BITFLAG(0)
-#define BODY_FLAG_HUMANOID       BITFLAG(1)
-#define BODY_FLAG_MONKEY         BITFLAG(2)
-#define BODY_FLAG_QUADRUPED      BITFLAG(3)
 
 #define BODYTYPE_HUMANOID        "humanoid body"
 #define BODYTYPE_QUADRUPED       "quadruped body"
@@ -10,19 +6,31 @@
 
 // Bodytype appearance flags
 #define HAS_SKIN_TONE_NORMAL  BITFLAG(0)  // Skin tone selectable in chargen for baseline humans (0-220)
-#define HAS_SKIN_COLOR        BITFLAG(1)  // Skin colour selectable in chargen. (RGB)
+#define HAS_SKIN_COLOR        BITFLAG(1)  // Skin color selectable in chargen. (RGB)
 #define HAS_UNDERWEAR         BITFLAG(3)  // Underwear is drawn onto the mob icon.
-#define HAS_EYE_COLOR         BITFLAG(4)  // Eye colour selectable in chargen. (RGB)
+#define HAS_EYE_COLOR         BITFLAG(4)  // Eye color selectable in chargen. (RGB)
 #define RADIATION_GLOWS       BITFLAG(6)  // Radiation causes this character to glow.
 #define HAS_SKIN_TONE_GRAV    BITFLAG(7)  // Skin tone selectable in chargen for grav-adapted humans (0-100)
 #define HAS_SKIN_TONE_SPCR    BITFLAG(8)  // Skin tone selectable in chargen for spacer humans (0-165)
 #define HAS_SKIN_TONE_TRITON  BITFLAG(9)
 #define HAS_A_SKIN_TONE (HAS_SKIN_TONE_NORMAL | HAS_SKIN_TONE_GRAV | HAS_SKIN_TONE_SPCR | HAS_SKIN_TONE_TRITON) // Bodytype has a numeric skintone
 
 // Bodytype feature flags
-#define BODY_FLAG_NO_DNA              BITFLAG(0) // Does not create DNA. Replaces SPECIES_FLAG_NO_SCAN.
-#define BODY_FLAG_NO_PAIN             BITFLAG(1) // Cannot suffer halloss/recieves deceptive health indicator.
-#define BODY_FLAG_NO_EAT              BITFLAG(2) // Cannot eat food/drink drinks even if a stomach organ is present.
-#define BODY_FLAG_CRYSTAL_REFORM      BITFLAG(3) // Can regenerate missing limbs from mineral baths.
-#define BODY_FLAG_NO_STASIS           BITFLAG(4) // Does not experience stasis effects (sleeper, cryo)
-#define BODY_FLAG_NO_DEFIB            BITFLAG(5) // Cannot be revived with a defibrilator.
+/// Does not create DNA. Replaces SPECIES_FLAG_NO_SCAN.
+#define BODY_FLAG_NO_DNA          BITFLAG(0)
+/// Cannot suffer halloss/recieves deceptive health indicator.
+#define BODY_FLAG_NO_PAIN         BITFLAG(1)
+/// Cannot eat food/drink drinks even if a stomach organ is present.
+#define BODY_FLAG_NO_EAT          BITFLAG(2)
+/// Can regenerate missing limbs from mineral baths.
+#define BODY_FLAG_CRYSTAL_REFORM  BITFLAG(3)
+/// Does not experience stasis effects (sleeper, cryo)
+#define BODY_FLAG_NO_STASIS       BITFLAG(4)
+/// Cannot be revived with a defibrilator.
+#define BODY_FLAG_NO_DEFIB        BITFLAG(5)
+
+// Equipment flags for gear and accessory restrictions
+#define BODY_EQUIP_FLAG_EXCLUDE   BITFLAG(0)
+#define BODY_EQUIP_FLAG_HUMANOID  BITFLAG(1)
+#define BODY_EQUIP_FLAG_MONKEY    BITFLAG(2)
+#define BODY_EQUIP_FLAG_QUADRUPED BITFLAG(3)

code/__defines/chemistry.dm

@@ -14,33 +14,60 @@
 
 #define CHEM_SYNTH_ENERGY 500 // How much energy does it take to synthesize 1 unit of chemical, in Joules.
 
-#define CE_STABLE        "stable"       // Stabilizing brain, pulse and breathing
-#define CE_ANTIBIOTIC    "antibiotic"   // Spaceacilin
-#define CE_BLOODRESTORE  "bloodrestore" // Iron/nutriment
-#define CE_PAINKILLER    "painkiller"   // Reduces the impact of shock/pain
-#define CE_ALCOHOL       "alcohol"      // Liver filtering
-#define CE_ALCOHOL_TOXIC "alcotoxic"    // Liver damage
-#define CE_SPEEDBOOST    "gofast"       // Stimulants
-#define CE_SLOWDOWN      "goslow"       // Slowdown
-#define CE_PULSE         "xcardic"      // increases or decreases heart rate
-#define CE_NOPULSE       "heartstop"    // stops heartbeat
-#define CE_ANTITOX       "antitox"      // Removes toxins
-#define CE_OXYGENATED    "oxygen"       // Helps oxygenate the brain.
-#define CE_BRAIN_REGEN   "brainfix"     // Allows the brain to recover after injury
-#define CE_TOXIN         "toxins"       // Generic toxins, stops autoheal.
-#define CE_BREATHLOSS    "breathloss"   // Breathing depression, makes you need more air
-#define CE_MIND    		 "mindbending"  // Stabilizes or wrecks mind. Used for hallucinations
-#define CE_CRYO 	     "cryogenic"    // Prevents damage from being frozen
-#define CE_BLOCKAGE	     "blockage"     // Gets in the way of blood circulation, higher the worse
-#define CE_SQUEAKY		 "squeaky"      // Helium voice. Squeak squeak.
-#define CE_THIRDEYE      "thirdeye"     // Gives xray vision.
-#define CE_SEDATE        "sedate"       // Applies sedation effects, i.e. paralysis, inability to use items, etc.
-#define CE_ENERGETIC     "energetic"    // Speeds up stamina recovery.
-#define	CE_VOICELOSS     "whispers"     // Lowers the subject's voice to a whisper
-#define CE_GLOWINGEYES   "eyeglow"      // Causes eyes to glow.
-
-#define CE_REGEN_BRUTE   "bruteheal"    // Causes brute damage to regenerate.
-#define CE_REGEN_BURN    "burnheal"     // Causes burn damage to regenerate.
+/// Stabilizing brain, pulse and breathing
+#define CE_STABLE        "stable"
+/// Spaceacilin
+#define CE_ANTIBIOTIC    "antibiotic"
+/// Iron/nutriment
+#define CE_BLOODRESTORE  "bloodrestore"
+/// Reduces the impact of shock/pain
+#define CE_PAINKILLER    "painkiller"
+/// Liver filtering
+#define CE_ALCOHOL       "alcohol"
+/// Liver damage
+#define CE_ALCOHOL_TOXIC "alcotoxic"
+/// Stimulants
+#define CE_SPEEDBOOST    "gofast"
+/// Slowdown
+#define CE_SLOWDOWN      "goslow"
+/// increases or decreases heart rate
+#define CE_PULSE         "xcardic"
+/// stops heartbeat
+#define CE_NOPULSE       "heartstop"
+/// Removes toxins
+#define CE_ANTITOX       "antitox"
+/// Helps oxygenate the brain.
+#define CE_OXYGENATED    "oxygen"
+/// Allows the brain to recover after injury
+#define CE_BRAIN_REGEN   "brainfix"
+/// Generic toxins, stops autoheal.
+#define CE_TOXIN         "toxins"
+/// Breathing depression, makes you need more air
+#define CE_BREATHLOSS    "breathloss"
+/// Stabilizes or wrecks mind. Used for hallucinations
+#define CE_MIND    		 "mindbending"
+/// Prevents damage from being frozen
+#define CE_CRYO 	     "cryogenic"
+/// Gets in the way of blood circulation, higher the worse
+#define CE_BLOCKAGE	     "blockage"
+/// Helium voice. Squeak squeak.
+#define CE_SQUEAKY		 "squeaky"
+/// Gives xray vision.
+#define CE_THIRDEYE      "thirdeye"
+/// Applies sedation effects, i.e. paralysis, inability to use items, etc.
+#define CE_SEDATE        "sedate"
+/// Speeds up stamina recovery.
+#define CE_ENERGETIC     "energetic"
+/// Lowers the subject's voice to a whisper
+#define	CE_VOICELOSS     "whispers"
+/// Causes eyes to glow.
+#define CE_GLOWINGEYES   "eyeglow"
+/// Causes brute damage to regenerate.
+#define CE_REGEN_BRUTE   "bruteheal"
+/// Causes burn damage to regenerate.
+#define CE_REGEN_BURN    "burnheal"
+/// Anaphylaxis etc.
+#define CE_ALLERGEN      "allergyreaction"
 
 #define GET_CHEMICAL_EFFECT(X, C) (LAZYACCESS(X.chem_effects, C) || 0)
 
@@ -55,6 +82,10 @@
 
 #define REAGENTS_FREE_SPACE(R) (R?.maximum_volume - R?.total_volume)
 #define REAGENT_VOLUME(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.reagent_volumes && REAGENT_HOLDER.reagent_volumes[REAGENT_TYPE])
+
+#define LIQUID_VOLUME(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.liquid_volumes && REAGENT_HOLDER.liquid_volumes[REAGENT_TYPE])
+#define SOLID_VOLUME(REAGENT_HOLDER, REAGENT_TYPE) (REAGENT_HOLDER?.solid_volumes && REAGENT_HOLDER.solid_volumes[REAGENT_TYPE])
+
 #define REAGENT_DATA(REAGENT_HOLDER, REAGENT_TYPE)   (REAGENT_HOLDER?.reagent_data    && REAGENT_HOLDER.reagent_data[REAGENT_TYPE])
 
 #define MAT_SOLVENT_NONE        0
@@ -74,3 +105,5 @@
 #define DEFAULT_GAS_OXIDIZER   /decl/material/gas/oxygen
 
 #define CHEM_REACTION_FLAG_OVERFLOW_CONTAINER BITFLAG(0)
+
+#define MAX_SCRAP_MATTER (SHEET_MATERIAL_AMOUNT * 5) // Maximum amount of matter in chemical scraps

code/__defines/colors.dm

@@ -1,7 +1,7 @@
-#define HEX_RED(COLOUR)   hex2num(copytext(COLOUR,2,4))
-#define HEX_GREEN(COLOUR) hex2num(copytext(COLOUR,4,6))
-#define HEX_BLUE(COLOUR)  hex2num(copytext(COLOUR,6,8))
-#define HEX_ALPHA(COLOUR) hex2num(copytext(COLOUR,8,10))
+#define HEX_RED(COLOR)   hex2num(copytext(COLOR,2,4))
+#define HEX_GREEN(COLOR) hex2num(copytext(COLOR,4,6))
+#define HEX_BLUE(COLOR)  hex2num(copytext(COLOR,6,8))
+#define HEX_ALPHA(COLOR) hex2num(copytext(COLOR,8,10))
 
 // BYOND lower-cases color values, and thus we do so as well to ensure atom.color == COLOR_X will work correctly
 #define COLOR_BLACK            "#000000"
@@ -99,6 +99,7 @@
 #define COLOR_VERDANT_GREEN    "#287d00"
 #define COLOR_SCIENCE_PURPLE   "#6633cc"
 #define COLOR_DAYLIGHT         "#f3e6ca"
+#define COLOR_CHERRY_RED       "#902630"
 
 #define PIPE_COLOR_GREY        "#808080"
 #define PIPE_COLOR_RED         "#ff0000"