Updating from Neb dev

.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:

code/___opendream_linting.dm

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

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/mobs.dm

@@ -418,4 +418,17 @@ var/global/list/dexterity_levels = list(
 // Used in organ stance calc.
 #define LIMB_UNUSABLE 2
 #define LIMB_DAMAGED  1
-#define LIMB_IMPAIRED 0.5
+#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/tools.dm

@@ -16,6 +16,7 @@
 // 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/turfs.dm

@@ -211,3 +211,48 @@
 		return list(new_turf, source)
 
 	return new_turf
+
+/proc/get_dir_z_text(turf/origin, turf/target)
+
+	origin = get_turf(origin)
+	target = get_turf(target)
+
+	if(!istype(origin) || !istype(target) || !(origin.z in SSmapping.get_connected_levels(target.z, include_lateral = TRUE)))
+		return "somewhere"
+	if(origin == target)
+		return "right next to you"
+
+	var/datum/level_data/origin_level = SSmapping.levels_by_z[origin.z]
+	var/datum/level_data/target_level = SSmapping.levels_by_z[target.z]
+
+	if(origin_level.z_volume_level_z < target_level.z_volume_level_z)
+		. += "above and to"
+	else if(origin_level.z_volume_level_z > target_level.z_volume_level_z)
+		. += "below and to"
+
+	var/origin_x = origin.x + origin_level.z_volume_level_x
+	var/origin_y = origin.y + origin_level.z_volume_level_y
+	var/target_x = target.x + target_level.z_volume_level_x
+	var/target_y = target.y + target_level.z_volume_level_y
+
+	if(origin_x == target_x)
+		if(origin_y > target_y)
+			. += "the south"
+		else
+			. += "the north"
+	else if(origin_y == target_y)
+		if(origin_x > target_x)
+			. += "the west"
+		else
+			. += "the east"
+	else
+		if(origin_x > target_x)
+			if(origin_y > target_y)
+				. += "the southwest"
+			else
+				. += "the northwest"
+		else
+			if(origin_y > target_y)
+				. += "the southeast"
+			else
+				. += "the northeast"

code/_onclick/item_attack.dm

@@ -29,14 +29,14 @@ avoid code duplication. This includes items that may sometimes act as a standard
 		add_fingerprint(user)
 	return A.attackby(src, user, click_params)
 
-/atom/proc/attackby(obj/item/W, mob/user, var/click_params)
+/atom/proc/attackby(obj/item/used_item, mob/user, var/click_params)
 	if(storage)
-		if(isrobot(user) && (W == user.get_active_held_item()))
+		if(isrobot(user) && (used_item == user.get_active_held_item()))
 			return //Robots can't store their modules.
-		if(!storage.can_be_inserted(W, user))
+		if(!storage.can_be_inserted(used_item, user))
 			return
-		W.add_fingerprint(user)
-		return storage.handle_item_insertion(user, W)
+		used_item.add_fingerprint(user)
+		return storage.handle_item_insertion(user, used_item, click_params = click_params)
 	return FALSE
 
 /atom/movable/attackby(obj/item/W, mob/user)
@@ -57,36 +57,42 @@ avoid code duplication. This includes items that may sometimes act as a standard
 /mob/living/attackby(obj/item/used_item, mob/user)
 	if(!ismob(user))
 		return TRUE
+
+	if(!QDELETED(used_item) && user.a_intent == I_HELP)
+		var/obj/item/organ/external/E = GET_EXTERNAL_ORGAN(src, user.get_target_zone())
+		if(length(E?.ailments))
+			for(var/datum/ailment/ailment in E.ailments)
+				if(ailment.treated_by_item(used_item))
+					ailment.was_treated_by_item(used_item, user, src)
+					return TRUE
+
 	if(user.a_intent != I_HURT)
 		if(can_operate(src, user) != OPERATE_DENY && used_item.do_surgery(src,user)) //Surgery
 			return TRUE
 		if(try_butcher_in_place(user, used_item))
 			return TRUE
+
+	if(istype(used_item, /obj/item/chems) && ATOM_IS_OPEN_CONTAINER(used_item) && has_extension(src, /datum/extension/milkable))
+		var/datum/extension/milkable/milkable = get_extension(src, /datum/extension/milkable)
+		if(milkable.handle_milked(used_item, user))
+			return TRUE
+
+	if(used_item.edge && has_extension(src, /datum/extension/shearable))
+		var/datum/extension/shearable/shearable = get_extension(src, /datum/extension/shearable)
+		if(shearable.handle_sheared(used_item, user))
+			return TRUE
+
 	var/oldhealth = current_health
 	. = used_item.use_on_mob(src, user)
 	if(used_item.get_attack_force(user) && istype(ai) && current_health < oldhealth)
 		ai.retaliate(user)
 
-/mob/living/human/attackby(obj/item/I, mob/user)
-
-	. = ..()
-	if(.)
-		if(user.a_intent != I_HELP)
-			return
-		var/obj/item/organ/external/E = GET_EXTERNAL_ORGAN(src, user.get_target_zone())
-		if(!E)
-			return
-		for(var/datum/ailment/ailment in E.ailments)
-			if(ailment.treated_by_item(I))
-				ailment.was_treated_by_item(I, user, src)
-				return
-
-	else if(user == src && user.get_target_zone() == BP_MOUTH && can_devour(I, silent = TRUE))
+	if(!. && user == src && user.get_target_zone() == BP_MOUTH && can_devour(used_item, silent = TRUE))
 		var/obj/item/blocked = src.check_mouth_coverage()
 		if(blocked)
 			to_chat(user, SPAN_WARNING("\The [blocked] is in the way!"))
 		else
-			devour(I)
+			devour(used_item)
 		return TRUE