Neb dev update

.github/workflows/generate_documentation.yml

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

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

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/_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/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)
 

code/__defines/cooking.dm

@@ -6,9 +6,19 @@
 #define FOOD_PREPARED         0
 #define FOOD_COOKED           1
 
-#define INGREDIENT_FLAG_PLAIN     0
-#define INGREDIENT_FLAG_MEAT      BITFLAG(0)
-#define INGREDIENT_FLAG_FISH      BITFLAG(1)
-#define INGREDIENT_FLAG_VEGETABLE BITFLAG(2)
-#define INGREDIENT_FLAG_DAIRY     BITFLAG(3)
-#define INGREDIENT_FLAG_EGG       BITFLAG(4)
+#define ALLERGEN_NONE      0
+#define ALLERGEN_MEAT      BITFLAG(0)
+#define ALLERGEN_FISH      BITFLAG(1)
+#define ALLERGEN_VEGETABLE BITFLAG(2)
+#define ALLERGEN_DAIRY     BITFLAG(3)
+#define ALLERGEN_EGG       BITFLAG(4)
+#define ALLERGEN_FRUIT     BITFLAG(5)
+#define ALLERGEN_GLUTEN    BITFLAG(6)
+#define ALLERGEN_SOY       BITFLAG(7)
+#define ALLERGEN_CAFFEINE  BITFLAG(8)
+#define ALLERGEN_FUNGI     BITFLAG(9)
+#define ALLERGEN_NUTS      BITFLAG(10)
+#define ALLERGEN_ALLIUM    BITFLAG(11)
+#define ALLERGEN_STIMULANT BITFLAG(12)
+
+#define INGREDIENT_FLAGS_ALL      (ALLERGEN_MEAT|ALLERGEN_FISH|ALLERGEN_VEGETABLE|ALLERGEN_DAIRY|ALLERGEN_EGG|ALLERGEN_FRUIT|ALLERGEN_GLUTEN|ALLERGEN_SOY|ALLERGEN_CAFFEINE|ALLERGEN_NUTS|ALLERGEN_ALLIUM|ALLERGEN_STIMULANT)

code/__defines/flags.dm

@@ -85,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/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.
 

code/__defines/maths.dm

@@ -20,3 +20,6 @@
 
 #define IS_POWER_OF_TWO(VAL) ((VAL & (VAL-1)) == 0)
 #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

@@ -361,4 +361,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

code/__defines/mobs.dm

@@ -414,3 +414,21 @@ var/global/list/dexterity_levels = list(
 
 // Used in death() to skip message broadcast.
 #define SKIP_DEATH_MESSAGE "no message"
+
+// Used in organ stance calc.
+#define LIMB_UNUSABLE 2
+#define LIMB_DAMAGED  1
+#define LIMB_IMPAIRED 0.5
+
+// Used by allergy effects.
+#define ALLERGEN_REACTION_NONE     0
+#define ALLERGEN_REACTION_PHYS_DMG BITFLAG(0)
+#define ALLERGEN_REACTION_BURN_DMG BITFLAG(1)
+#define ALLERGEN_REACTION_TOX_DMG  BITFLAG(2)
+#define ALLERGEN_REACTION_OXY_DMG  BITFLAG(3)
+#define ALLERGEN_REACTION_EMOTE    BITFLAG(4)
+#define ALLERGEN_REACTION_PAIN     BITFLAG(5)
+#define ALLERGEN_REACTION_WEAKEN   BITFLAG(6)
+#define ALLERGEN_REACTION_BLURRY   BITFLAG(7)
+#define ALLERGEN_REACTION_SLEEPY   BITFLAG(8)
+#define ALLERGEN_REACTION_CONFUSE  BITFLAG(9)

code/__defines/research.dm

@@ -19,8 +19,9 @@
 #define HOLLOW_OBJECT_MATTER_MULTIPLIER 0.05
 #define BASE_OBJECT_MATTER_MULTPLIER    0.25
 
-#define GENERIC_SMELTING_HEAT_POINT 1000 CELSIUS
+#define GENERIC_SMELTING_HEAT_POINT 1350 CELSIUS
 #define HIGH_SMELTING_HEAT_POINT    4000 CELSIUS // must be at least 4074K (3800 C) to melt graphite
+
 #define TECH_MATERIAL      "materials"
 #define TECH_ENGINEERING   "engineering"
 #define TECH_EXOTIC_MATTER "exoticmatter"

code/__defines/shuttle.dm

@@ -1,16 +1,17 @@
 #define SHUTTLE_FLAGS_NONE    0
-#define SHUTTLE_FLAGS_PROCESS 1
-#define SHUTTLE_FLAGS_SUPPLY  2
-#define SHUTTLE_FLAGS_ZERO_G  4
-#define SHUTTLE_FLAGS_NO_CODE 8  // Essentially bypasses docking codes by extracting them from the target docking controller. Only relevant on /autodock.
+#define SHUTTLE_FLAGS_PROCESS BITFLAG(0)
+#define SHUTTLE_FLAGS_SUPPLY  BITFLAG(1)
+#define SHUTTLE_FLAGS_ZERO_G  BITFLAG(2)
+#define SHUTTLE_FLAGS_NO_CODE BITFLAG(3)  // Essentially bypasses docking codes by extracting them from the target docking controller. Only relevant on /autodock.
 #define SHUTTLE_FLAGS_ALL (~SHUTTLE_FLAGS_NONE)
 
-#define SLANDMARK_FLAG_AUTOSET      1 // If set, will set base area and turf type to same as where it was spawned at.
-#define SLANDMARK_FLAG_ZERO_G       2 // Zero-G shuttles moved here will lose gravity unless the area has ambient gravity.
-#define SLANDMARK_FLAG_DISCONNECTED 4 // Landable ships that land here will be forceably removed if the sector moves out of range.
+#define SLANDMARK_FLAG_AUTOSET      BITFLAG(0) // If set, will set base area and turf type to same as where it was spawned at.
+#define SLANDMARK_FLAG_ZERO_G       BITFLAG(1) // Zero-G shuttles moved here will lose gravity unless the area has ambient gravity.
+#define SLANDMARK_FLAG_DISCONNECTED BITFLAG(2) // Landable ships that land here will be forceably removed if the sector moves out of range.
+#define SLANDMARK_FLAG_REORIENT     BITFLAG(3) // Shuttles that land here will be reoriented to face the correct dir for docking.
 
 //Overmap landable shuttles
-#define SHIP_STATUS_LANDED    1
-#define SHIP_STATUS_TRANSIT   2
-#define SHIP_STATUS_OVERMAP   3
-#define SHIP_STATUS_ENCOUNTER 4
+#define SHIP_STATUS_LANDED    BITFLAG(0)
+#define SHIP_STATUS_TRANSIT   BITFLAG(1)
+#define SHIP_STATUS_OVERMAP   BITFLAG(2)
+#define SHIP_STATUS_ENCOUNTER BITFLAG(3)

code/__defines/tools.dm

@@ -15,6 +15,8 @@
 
 // Misc tools.
 #define TOOL_PEN            /decl/tool_archetype/pen
+#define TOOL_STAMP          /decl/tool_archetype/stamp
+#define TOOL_SHEARS         /decl/tool_archetype/shears
 
 // Surgical tools.
 #define TOOL_SCALPEL        /decl/tool_archetype/scalpel

code/_helpers/_global_objects.dm

@@ -2,3 +2,8 @@ var/global/datum/gear_tweak/color/gear_tweak_free_color_choice_
 /proc/gear_tweak_free_color_choice()
 	if(!gear_tweak_free_color_choice_) gear_tweak_free_color_choice_ = new()
 	return gear_tweak_free_color_choice_
+
+var/global/datum/gear_tweak/color/markings/gear_tweek_free_markings_color_choice_
+/proc/gear_tweak_free_markings_color_choice()
+	if(!gear_tweek_free_markings_color_choice_) gear_tweek_free_markings_color_choice_ = new()
+	return gear_tweek_free_markings_color_choice_

code/_helpers/icons.dm

@@ -630,15 +630,15 @@ The _flatIcons list is a cache for generated icon files.
 */
 
 // Creates a single icon from a given /atom or /image.  Only the first argument is required.
-/proc/getFlatIcon(image/A, defdir=2, deficon=null, defstate="", defblend=BLEND_DEFAULT, always_use_defdir = 0)
+/proc/getFlatIcon(image/A, defdir = SOUTH, deficon = null, defstate = "", defblend = BLEND_DEFAULT, always_use_defdir = FALSE)
 	// We start with a blank canvas, otherwise some icon procs crash silently
 	var/icon/flat = icon('icons/effects/effects.dmi', "icon_state"="nothing") // Final flattened icon
 	if(!A || A.alpha <= 0)
 		return flat
 
 	var/curicon =  A.icon || deficon
 	var/curstate = A.icon_state || defstate
-	var/curdir =   (A.dir != SOUTH && !always_use_defdir) ? A.dir : defdir
+	var/curdir =   (A.dir != defdir && !always_use_defdir) ? A.dir : defdir
 	var/curblend = (A.blend_mode == BLEND_DEFAULT) ? defblend : A.blend_mode
 
 	if(curicon && !check_state_in_icon(curstate, curicon))
@@ -719,7 +719,7 @@ The _flatIcons list is a cache for generated icon files.
 			add = icon(I.icon, I.icon_state, I.dir)
 			// This checks for a silent failure mode of the icon routine. If the requested dir
 			// doesn't exist in this icon state it returns a 32x32 icon with 0 alpha.
-			if (I.dir != SOUTH && add.Width() == 32 && add.Height() == 32)
+			if (I.dir != defdir && add.Width() == 32 && add.Height() == 32)
 				// Check every pixel for blank (computationally expensive, but the process is limited
 				// by the amount of film on the station, only happens when we hit something that's
 				// turned, and bails at the very first pixel it sees.
@@ -735,19 +735,18 @@ The _flatIcons list is a cache for generated icon files.
 				if (blankpixel)
 					// Pull the default direction.
 					add = icon(I.icon, I.icon_state)
-		else // 'I' is an appearance object.
-			if(istype(A,/obj/machinery/atmospherics) && (I in A.underlays))
-				add = getFlatIcon(new /image(I), I.dir, curicon, null, curblend, 1)
-			else
-				/*
-				The state var is null so that it uses the appearance's state, not ours or the default
-				Falling back to our state if state is null would be incorrect overlay logic (overlay with null state does not inherit it from parent to which it is attached)
-
-				If icon is null on an overlay it will inherit the icon from the attached parent, so we _do_ pass curicon ...
-				but it does not do so if its icon_state is ""/null, so we check beforehand to exclude this
-				*/
-				var/icon_to_pass = (!I.icon_state && !I.icon) ? null : curicon
-				add = getFlatIcon(new/image(I), curdir, icon_to_pass, null, curblend, always_use_defdir)
+		// 'I' is an appearance object.
+		else if(istype(A,/obj/machinery/atmospherics) && (I in A.underlays))
+			add = getFlatIcon(new /image(I), I.dir, curicon, null, curblend, 1)
+		else
+			/*
+			The state var is null so that it uses the appearance's state, not ours or the default
+			Falling back to our state if state is null would be incorrect overlay logic (overlay with null state does not inherit it from parent to which it is attached)
+
+			If icon is null on an overlay it will inherit the icon from the attached parent, so we _do_ pass curicon ...
+			but it does not do so if its icon_state is ""/null, so we check beforehand to exclude this
+			*/
+			add = getFlatIcon(new/image(I), curdir, (!I.icon_state && !I.icon) ? null : curicon, null, curblend, always_use_defdir)
 
 		// Find the new dimensions of the flat icon to fit the added overlay
 		addX1 = min(flatX1, I.pixel_x + 1)