Update from upstream dev, August 10 2024

.github/workflows/test.yml

@@ -17,7 +17,7 @@ on:
 
 env:
   BYOND_MAJOR: "515"
-  BYOND_MINOR: "1633"
+  BYOND_MINOR: "1643"
   SPACEMAN_DMM_VERSION: suite-1.8
 
 jobs:

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/_planes+layers.dm

@@ -124,6 +124,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

@@ -10,9 +10,9 @@
 
 // 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)

code/__defines/chemistry.dm

@@ -55,6 +55,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 +78,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"

code/__defines/flags.dm

@@ -67,6 +67,7 @@ The latter will result in a linter warning and will not work correctly.
 #define OBJ_FLAG_HOLLOW                     BITFLAG(5)  // Modifies initial matter values to be lower than w_class normally sets.
 #define OBJ_FLAG_SUPPORT_MOB                BITFLAG(6)  // Object can be used to prop up a mob with stance damage (broken legs)
 #define OBJ_FLAG_INSULATED_HANDLE           BITFLAG(7)  // Object skips burn checks when held by unprotected hands.
+#define OBJ_FLAG_NO_STORAGE                 BITFLAG(8)  // Object cannot be placed into storage.
 
 // 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.
@@ -84,7 +85,7 @@ The latter will result in a linter warning and will not work correctly.
 #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_CAN_TAPE                  BITFLAG(14) // Whether the item can be be taped onto something using tape
-#define ITEM_FLAG_IS_WEAPON               BITFLAG(15) // Item is considered a weapon. Currently only used for force-based worth calculation.
+#define ITEM_FLAG_IS_WEAPON                 BITFLAG(15) // Item is considered a weapon. Currently only used for force-based worth calculation.
 
 // Flags for pass_flags (/atom/var/pass_flags)
 #define PASS_FLAG_TABLE                     BITFLAG(0)

code/__defines/fluids.dm

@@ -1,6 +1,7 @@
 #define FLUID_QDEL_POINT 1           // Depth a fluid begins self-deleting
 #define FLUID_MINIMUM_TRANSFER 5     // Minimum amount that a flowing fluid will transfer from one turf to another.
 #define FLUID_PUDDLE 25              // Minimum total depth that a fluid needs before it will start spreading.
+#define FLUID_SLURRY 50              // Mimimum depth before fluids will move solids as reagents.
 #define FLUID_SHALLOW 200            // Depth shallow icon is used
 #define FLUID_OVER_MOB_HEAD 300      // Depth icon layers over mobs.
 #define FLUID_DEEP 800               // Depth deep icon is used

code/__defines/inventory_sizes.dm

@@ -22,7 +22,6 @@
 #define ITEM_SIZE_LARGE          4
 #define ITEM_SIZE_HUGE           5
 #define ITEM_SIZE_GARGANTUAN     6
-#define ITEM_SIZE_NO_CONTAINER   10 // Use this to forbid item from being placed in a container.
 #define ITEM_SIZE_STRUCTURE      20
 
 #define ITEM_SIZE_MIN            ITEM_SIZE_TINY

code/__defines/items_clothing.dm

@@ -2,23 +2,25 @@
 
 #define CANDLE_LUM 3 // For how bright candles are.
 
-#define ACCESSORY_SLOT_UTILITY  "Utility"
-#define ACCESSORY_SLOT_HOLSTER	"Holster"
-#define ACCESSORY_SLOT_ARMBAND  "Armband"
-#define ACCESSORY_SLOT_RANK     "Rank"
-#define ACCESSORY_SLOT_DEPT		"Department"
-#define ACCESSORY_SLOT_DECOR    "Decor"
-#define ACCESSORY_SLOT_NECK     "Neck"
-#define ACCESSORY_SLOT_MEDAL    "Medal"
-#define ACCESSORY_SLOT_INSIGNIA "Insignia"
-#define ACCESSORY_SLOT_ARMOR_C  "Chest armor"
-#define ACCESSORY_SLOT_ARMOR_A  "Arm armor"
-#define ACCESSORY_SLOT_ARMOR_L  "Leg armor"
-#define ACCESSORY_SLOT_ARMOR_S  "Armor storage"
-#define ACCESSORY_SLOT_ARMOR_M  "Misc armor"
-#define ACCESSORY_SLOT_HELM_C	"Helmet cover"
-#define ACCESSORY_SLOT_OVER     "Over"
-#define ACCESSORY_SLOT_SENSORS  "Suit Sensors"
+#define ACCESSORY_SLOT_UTILITY   "Utility"
+#define ACCESSORY_SLOT_HOLSTER	 "Holster"
+#define ACCESSORY_SLOT_ARMBAND   "Armband"
+#define ACCESSORY_SLOT_RANK      "Rank"
+#define ACCESSORY_SLOT_DEPT		 "Department"
+#define ACCESSORY_SLOT_DECOR     "Decor"
+#define ACCESSORY_SLOT_NECK      "Neck"
+#define ACCESSORY_SLOT_MEDAL     "Medal"
+#define ACCESSORY_SLOT_INSIGNIA  "Insignia"
+#define ACCESSORY_SLOT_ARMOR_C   "Chest armor"
+#define ACCESSORY_SLOT_ARMOR_A   "Arm armor"
+#define ACCESSORY_SLOT_ARMOR_L   "Leg armor"
+#define ACCESSORY_SLOT_ARMOR_S   "Armor storage"
+#define ACCESSORY_SLOT_ARMOR_M   "Misc armor"
+#define ACCESSORY_SLOT_HELM_C	 "Helmet cover"
+#define ACCESSORY_SLOT_OVER      "Over"
+#define ACCESSORY_SLOT_SENSORS   "Suit Sensors"
+#define ACCESSORY_SLOT_GREAVES   "Greaves"
+#define ACCESSORY_SLOT_GAUNTLETS "Gauntlets"
 
 // Accessory will be shown as part of the name of the item when examined.
 #define ACCESSORY_VISIBILITY_ENSEMBLE   0
@@ -173,7 +175,7 @@
 #define FIRE_MAX_FIRESUIT_STACKS  20 // If the number of stacks goes above this firesuits won't protect you anymore. If not, you can walk around while on fire like a badass.
 
 #define THROWFORCE_GIBS 3              // Throw speed for gibbed or dismembered organs.
-#define THROWFORCE_SPEED_DIVISOR    12 // The throwing speed value at which the throwforce multiplier is exactly 1.
+#define THROWFORCE_SPEED_DIVISOR    12 // The throwing speed value at which the thrown force multiplier is exactly 1.
 #define THROWNOBJ_KNOCKBACK_SPEED   15 // The minumum speed of a w_class 2 thrown object that will cause living mobs it hits to be knocked back. Heavier objects can cause knockback at lower speeds.
 #define THROWNOBJ_KNOCKBACK_DIVISOR 2  // Affects how much speed the mob is knocked back with.
 
@@ -184,7 +186,7 @@
 #define VITALS_SENSOR_TRACKING 3
 
 // Hair Flags
-#define VERY_SHORT           BITFLAG(0)
+#define HAIR_VERY_SHORT      BITFLAG(0)
 #define HAIR_TIEABLE         BITFLAG(1)
 #define HAIR_BALD            BITFLAG(2)
 #define HAIR_LOSS_VULNERABLE BITFLAG(3)

code/__defines/materials.dm

@@ -29,10 +29,12 @@
 #define MAT_VALUE_VERY_HEAVY         80		// uranium tier
 
 //Construction difficulty
-#define MAT_VALUE_EASY_DIY          0
-#define MAT_VALUE_NORMAL_DIY        1
-#define MAT_VALUE_HARD_DIY          2
-#define MAT_VALUE_VERY_HARD_DIY     3
+#define MAT_VALUE_TRIVIAL_DIY       0 // Does not have any difficulty component at all
+#define MAT_VALUE_EASY_DIY          1 // SKILL_NONE (Unskilled)
+#define MAT_VALUE_NORMAL_DIY        2 // SKILL_BASIC (Basic)
+#define MAT_VALUE_HARD_DIY          3 // SKILL_ADEPT (Trained)
+#define MAT_VALUE_VERY_HARD_DIY     4 // SKILL_EXPERT (Experienced)
+#define MAT_VALUE_EXTREME_DIY       5 // SKILL_PROF (Master)
 
 //Arbitrary hardness thresholds
 #define MAT_VALUE_MALLEABLE          0
@@ -64,10 +66,10 @@
 #define ORE_EXOTIC   "exotic matter"
 
 //Phase of matter placeholders
-#define MAT_PHASE_SOLID     "solid"
-#define MAT_PHASE_LIQUID    "liquid"
-#define MAT_PHASE_GAS       "gas"
-#define MAT_PHASE_PLASMA    "plasma"
+#define MAT_PHASE_SOLID     BITFLAG(0)
+#define MAT_PHASE_LIQUID    BITFLAG(1)
+#define MAT_PHASE_GAS       BITFLAG(2)
+#define MAT_PHASE_PLASMA    BITFLAG(3)
 
 // Fission interactions.
 // For these, associated value is ideal neutron energy for reaction.

code/__defines/maths.dm

@@ -1,15 +1,15 @@
 // Macro functions.
 #define RAND_F(LOW, HIGH) (rand() * (HIGH - LOW) + LOW)
-#define CEILING(x) (-round(-(x)))
 
 // Float-aware floor and ceiling since round() will round upwards when given a second arg.
-#define NONUNIT_FLOOR(x, y)    (round( (x) / (y)) * (y))
-#define NONUNIT_CEILING(x, y) (-round(-(x) / (y)) * (y))
+#define NONUNIT_FLOOR(x, y)    (floor((x) / (y)) * (y))
+#define NONUNIT_CEILING(x, y) (ceil((x) / (y)) * (y))
+
+// Special two-step rounding for reagents, to avoid floating point errors.
+#define CHEMS_QUANTIZE(x) NONUNIT_FLOOR(round(x, MINIMUM_CHEMICAL_VOLUME * 0.1), MINIMUM_CHEMICAL_VOLUME)
 
 #define MULT_BY_RANDOM_COEF(VAR,LO,HI) VAR =  round((VAR * rand(LO * 100, HI * 100))/100, 0.1)
 
-#define ROUND(x) (((x) >= 0) ? round((x)) : -round(-(x)))
-#define FLOOR(x) (round(x))
 #define EULER 2.7182818285
 
 #define MODULUS_FLOAT(X, Y) ( (X) - (Y) * round((X) / (Y)) )
@@ -19,4 +19,7 @@
 #define SIMPLIFY_DEGREES(degrees) (MODULUS_FLOAT((degrees), 360))
 
 #define IS_POWER_OF_TWO(VAL) ((VAL & (VAL-1)) == 0)
-#define ROUND_UP_TO_POWER_OF_TWO(VAL) (2 ** CEILING(log(2,VAL)))
+#define ROUND_UP_TO_POWER_OF_TWO(VAL) (2 ** ceil(log(2,VAL)))
+
+// turn(0, angle) returns a random dir. This macro will instead do nothing if dir is already 0.
+#define SAFE_TURN(DIR, ANGLE) (DIR && turn(DIR, ANGLE))

code/__defines/misc.dm

@@ -261,8 +261,6 @@
 /// Returns the hex value of a number given a value assumed to be a base-ten value, padded to a supplied minimum length.
 #define num2hex_padded(num, len) num2text(num, len, 16)
 
-#define Z_ALL_TURFS(Z) block(locate(1, 1, Z), locate(world.maxx, world.maxy, Z))
-
 //NOTE: INTENT_HOTKEY_* defines are not actual intents!
 //they are here to support hotkeys
 #define INTENT_HOTKEY_LEFT  "left"
@@ -376,4 +374,8 @@
 #define TYPE_VERB_REF(TYPE, X) (nameof(##TYPE.verb/##X))
 
 /// Call by name proc reference, checks if the proc is an existing global proc
-#define GLOBAL_PROC_REF(X) (/proc/##X)
+#define GLOBAL_PROC_REF(X) (/proc/##X)
+
+#define RADIAL_LABELS_NONE     0
+#define RADIAL_LABELS_OFFSET   1
+#define RADIAL_LABELS_CENTERED 2