Merge branch 'master' into 5-prob-pizza-galaxy

code/__DEFINES/__game.dm

@@ -283,7 +283,7 @@ block( \
 
 // Helpers
 /// Only use the CEILING_PROTECTION_TIER_X defines for `protection_level`
-#define CEILING_IS_PROTECTED(ceiling, protection_level) (ceiling >= protection_level)
+#define CEILING_IS_PROTECTED(ceiling, protection_level) ((ceiling) >= (protection_level))
 
 // Default font settings
 #define FONT_SIZE "5pt"
@@ -536,7 +536,7 @@ block( \
 /// `amount` - The number to get per time
 /// `time` - The time period in which to gain this amount
 /// To be used with delta_time. Multiplied by 10 to convert from deciseconds to seconds
-#define AMOUNT_PER_TIME(amount, time) ((amount / (time))*10)
+#define AMOUNT_PER_TIME(amount, time) (((amount) / (time))*10)
 
 // Local message mode. Used to decide wheter message should be dispatched on the radio.
 #define MESSAGE_MODE_LOCAL 1

code/__DEFINES/_math.dm

@@ -21,10 +21,10 @@
 #define MODULUS(x, y) ( (x) - (y) * round((x) / (y)) )
 
 // Returns true if val is from min to max, inclusive.
-#define ISINRANGE(val, min, max) (min <= val && val <= max)
+#define ISINRANGE(val, min, max) ((min) <= (val) && (val) <= (max))
 
 // Same as above, exclusive.
-#define ISINRANGE_EX(val, min, max) (min < val && val < max)
+#define ISINRANGE_EX(val, min, max) ((min) < (val) && (val) < (max))
 
 // Will filter out extra rotations and negative rotations
 // E.g: 540 becomes 180. -180 becomes 180.
@@ -34,4 +34,4 @@
 #define SIGN(x) ( ((x) > 0) - ((x) < 0) )
 
 /// Performs a linear interpolation between a and b. Note that amount=0 returns a, amount=1 returns b, and amount=0.5 returns the mean of a and b.
-#define LERP(a, b, amount) ( amount ? ((a) + ((b) - (a)) * (amount)) : a )
+#define LERP(a, b, amount) ( (amount) ? ((a) + ((b) - (a)) * (amount)) : (a) )

code/__DEFINES/dcs/signals/atom/mob/living/signals_xeno.dm

@@ -71,3 +71,6 @@
 
 /// From /obj/effect/alien/resin/special/eggmorph/attack_alien: (mob/living/carbon/xenomorph/M)
 #define COMSIG_XENO_TAKE_HUGGER_FROM_MORPHER "xeno_take_hugger_from_morpher"
+
+/// From /mob/living/carbon/xenomorph/proc/handle_crit()
+#define COMSIG_XENO_ENTER_CRIT "xeno_entering_critical"

code/__DEFINES/xeno.dm

@@ -660,7 +660,7 @@
 // PARAMETERS:
 // source_hive integer  the hive to check the alliance of
 // target_hive  integer  the target hive to see if the source_hive is allied to it.
-#define HIVE_ALLIED_TO_HIVE(source_hive, target_hive) (source_hive == target_hive || GLOB.hive_datum[source_hive]?.faction_is_ally(GLOB.hive_datum[target_hive]?.internal_faction))
+#define HIVE_ALLIED_TO_HIVE(source_hive, target_hive) ((source_hive) == (target_hive) || GLOB.hive_datum[source_hive]?.faction_is_ally(GLOB.hive_datum[target_hive]?.internal_faction))
 
 #define QUEEN_SPAWN_TIMEOUT (2 MINUTES)
 

code/__HELPERS/#maths.dm

@@ -9,44 +9,44 @@ GLOBAL_LIST_INIT(sqrtTable, list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4,
 // MATH DEFINES
 
 #define Ceiling(x) (-round(-(x)))
-#define CLAMP01(x) (clamp(x, 0, 1))
+#define CLAMP01(x) (clamp((x), 0, 1))
 
 // cotangent
 #define Cot(x) (1 / tan(x))
 
 // cosecant
 #define Csc(x) (1 / sin(x))
 
-#define Default(a, b) (a ? a : b)
+#define Default(a, b) ((a) ? (a) : (b))
 #define Floor(x) (round(x))
 
 // Greatest Common Divisor - Euclid's algorithm
-#define Gcd(a, b) (b ? Gcd(b, a % b) : a)
+#define Gcd(a, b) ((b) ? Gcd((b), (a) % (b)) : (a))
 
-#define Inverse(x) (1 / x)
-#define IsEven(x) (x % 2 == 0)
+#define Inverse(x) (1 / (x))
+#define IsEven(x) ((x) % 2 == 0)
 
-#define IsInteger(x) (Floor(x) == x)
+#define IsInteger(x) (Floor(x) == (x))
 #define IsOdd(x) (!IsEven(x))
-#define IsMultiple(x, y) (x % y == 0)
+#define IsMultiple(x, y) ((x) % (y) == 0)
 
 // Least Common Multiple
-#define Lcm(a, b) (abs(a) / Gcd(a, b) * abs(b))
+#define Lcm(a, b) (abs(a) / Gcd((a), (b)) * abs(b))
 
 // Returns the nth root of x.
-#define NRoot(n, x) (x ** (1 / n))
+#define NRoot(n, x) ((x) ** (1 / (n)))
 
 // secant
 #define Sec(x) (1 / cos(x))
 
 // 57.2957795 = 180 / Pi
-#define ToDegrees(radians) (radians * 57.2957795)
+#define ToDegrees(radians) ((radians) * 57.2957795)
 
 // 0.0174532925 = Pi / 180
-#define ToRadians(degrees) (degrees * 0.0174532925)
+#define ToRadians(degrees) ((degrees) * 0.0174532925)
 
 // min is inclusive, max is exclusive
-#define WRAP(val, min, max) clamp(( min == max ? min : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) ),min,max)
+#define WRAP(val, min, max) clamp(( (min) == (max) ? (min) : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) ),(min),(max))
 
 
 // MATH PROCS

code/__HELPERS/unsorted.dm

@@ -21,23 +21,23 @@
 #define between(low, middle, high) (max(min(middle, high), low))
 
 //Offuscate x for coord system
-#define obfuscate_x(x) (x + GLOB.obfs_x)
+#define obfuscate_x(x) ((x) + GLOB.obfs_x)
 
 //Offuscate y for coord system
-#define obfuscate_y(y) (y + GLOB.obfs_y)
+#define obfuscate_y(y) ((y) + GLOB.obfs_y)
 
 //Deoffuscate x for coord system
-#define deobfuscate_x(x) (x - GLOB.obfs_x)
+#define deobfuscate_x(x) ((x) - GLOB.obfs_x)
 
 //Deoffuscate y for coord system
-#define deobfuscate_y(y) (y - GLOB.obfs_y)
+#define deobfuscate_y(y) ((y) - GLOB.obfs_y)
 
 #define can_xeno_build(T) (!T.density && !(locate(/obj/structure/fence) in T) && !(locate(/obj/structure/tunnel) in T) && (locate(/obj/effect/alien/weeds) in T))
 
 // For the purpose of a skillcheck, not having a skillset counts as being skilled in everything (!user.skills check)
 // Note that is_skilled() checks if the skillset contains the skill internally, so a has_skill check is unnecessary
-#define skillcheck(user, skill, req_level) ((!user.skills || user.skills.is_skilled(skill, req_level)))
-#define skillcheckexplicit(user, skill, req_level) ((!user.skills || user.skills.is_skilled(skill, req_level, TRUE)))
+#define skillcheck(user, skill, req_level) ((!user.skills || user.skills.is_skilled((skill), (req_level))))
+#define skillcheckexplicit(user, skill, req_level) ((!user.skills || user.skills.is_skilled((skill), (req_level), TRUE)))
 
 // Ensure the frequency is within bounds of what it should be sending/receiving at
 // Sets f within bounds via `clamp(round(f), 1441, 1489)`
@@ -48,7 +48,7 @@
 								)
 
 //Turns 1479 into 147.9
-#define format_frequency(f) "[round(f / 10)].[f % 10]"
+#define format_frequency(f) "[round((f) / 10)].[(f) % 10]"
 
 #define reverse_direction(direction) ( \
 											( dir & (NORTH|SOUTH) ? ~dir & (NORTH|SOUTH) : 0 ) | \

code/_macros.dm

@@ -78,14 +78,14 @@
 // Spawns multiple objects of the same type
 #define cast_new(type, num, args...) if((num) == 1) { new type(args) } else { for(var/i=0;i<(num),i++) { new type(args) } }
 
-#define FLAGS_EQUALS(flag, flags) ((flag & (flags)) == (flags))
+#define FLAGS_EQUALS(flag, flags) (((flag) & (flags)) == (flags))
 
 #define IS_DIAGONAL_DIR(dir) (dir & ~(NORTH|SOUTH))
 
 // Inverse direction, taking into account UP|DOWN if necessary.
-#define REVERSE_DIR(dir) ( ((dir & 85) << 1) | ((dir & 170) >> 1) )
+#define REVERSE_DIR(dir) ( (((dir) & 85) << 1) | (((dir) & 170) >> 1) )
 
-#define POSITIVE(val) max(val, 0)
+#define POSITIVE(val) max((val), 0)
 
 #define GENERATE_DEBUG_ID "[rand(0, 9)][rand(0, 9)][rand(0, 9)][rand(0, 9)][pick(alphabet_lowercase)][pick(alphabet_lowercase)][pick(alphabet_lowercase)][pick(alphabet_lowercase)]"
 

code/datums/supply_packs/spec_ammo.dm

@@ -157,27 +157,23 @@
 	group = "Weapons Specialist Ammo"
 
 /datum/supply_packs/ammo_scout_incendiary
-	name = "M4RA Scout Incendiary Magazine Crate (x5)"
+	name = "M4RA Scout Incendiary Magazine Crate (x3)"
 	contains = list(
 		/obj/item/ammo_magazine/rifle/m4ra/custom/incendiary,
 		/obj/item/ammo_magazine/rifle/m4ra/custom/incendiary,
 		/obj/item/ammo_magazine/rifle/m4ra/custom/incendiary,
-		/obj/item/ammo_magazine/rifle/m4ra/custom/incendiary,
-		/obj/item/ammo_magazine/rifle/m4ra/custom/incendiary,
 	)
 	cost = 30
 	containertype = /obj/structure/closet/crate/ammo
 	containername = "M4RA Scout Incendiary Magazine"
 	group = "Weapons Specialist Ammo"
 
 /datum/supply_packs/ammo_scout_impact
-	name = "M4RA Scout Impact Magazine Crate (x5)"
+	name = "M4RA Scout Impact Magazine Crate (x3)"
 	contains = list(
 		/obj/item/ammo_magazine/rifle/m4ra/custom/impact,
 		/obj/item/ammo_magazine/rifle/m4ra/custom/impact,
 		/obj/item/ammo_magazine/rifle/m4ra/custom/impact,
-		/obj/item/ammo_magazine/rifle/m4ra/custom/impact,
-		/obj/item/ammo_magazine/rifle/m4ra/custom/impact,
 	)
 	cost = 30
 	containertype = /obj/structure/closet/crate/ammo

code/game/machinery/vending/vendor_types/crew/medical.dm

@@ -43,6 +43,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_doctor, list(
 		list("UNIFORM (CHOOSE 1)", 0, null, null, null),
 		list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
 		list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+		list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
 		list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
 
 		list("SUIT (CHOOSE 1)", 0, null, null, null),
@@ -106,7 +107,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_nurse, list(
 		list("Prescription Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health/prescription, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY),
 
 		list("UNIFORM (CHOOSE 1)", 0, null, null, null),
-		list("Medical Nurse Scrubs", 0, /obj/item/clothing/under/rank/medical/nurse, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+		list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
 		list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
 		list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
 		list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
@@ -178,6 +179,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list(
 		list("Researcher Uniform", 0, /obj/item/clothing/under/marine/officer/researcher, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
 		list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
 		list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+		list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
 		list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
 
 		list("SUIT (CHOOSE 1)", 0, null, null, null),

code/game/machinery/vending/vendor_types/crew/senior_officers.dm

@@ -228,6 +228,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list(
 		list("Doctor Uniform", 0, /obj/item/clothing/under/rank/medical, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
 		list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
 		list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+		list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
 		list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
 
 		list("SUIT (CHOOSE 1)", 0, null, null, null),

code/game/machinery/vending/vendor_types/crew/synthetic.dm

@@ -183,6 +183,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
 GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
 	list("USCM UNIFORMS", 0, null, null, null),
 	list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/rank/medical/blue, null, VENDOR_ITEM_REGULAR),
+	list("Medical Scrubs, Light Blue", 0, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR),
 	list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR),
 	list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR),
 	list("Medical Scrubs, White", 12, /obj/item/clothing/under/rank/medical, null, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm

@@ -130,6 +130,7 @@
 		list("Technician Backpack", round(scale * 15), /obj/item/storage/backpack/marine/tech, VENDOR_ITEM_REGULAR),
 		list("Medical Backpack", round(scale * 15), /obj/item/storage/backpack/marine/medic, VENDOR_ITEM_REGULAR),
 		list("USCM Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR),
+		list("USCM Chestrig", round(scale * 15), /obj/item/storage/backpack/marine/satchel/chestrig, VENDOR_ITEM_REGULAR),
 		list("USCM Technical Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel/tech, VENDOR_ITEM_REGULAR),
 		list("USCM Technical Chestrig", round(scale * 15), /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, VENDOR_ITEM_REGULAR),
 		list("Medical Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel/medic, VENDOR_ITEM_REGULAR),

code/game/objects/items/storage/backpack.dm

@@ -494,6 +494,11 @@
 	desc = "A heavy-duty chestrig used by some USCM technicians."
 	icon_state = "marinesatch_techi"
 
+/obj/item/storage/backpack/marine/satchel/chestrig
+	name = "\improper USCM chestrig"
+	desc = "A chestrig used by some USCM personnel."
+	icon_state = "chestrig"
+
 GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/rto)
 
 /obj/item/storage/backpack/marine/satchel/rto

code/game/objects/items/tools/surgery_tools.dm

@@ -201,6 +201,8 @@
 	icon_state = "bone-gel"
 	w_class = SIZE_SMALL
 	matter = list("plastic" = 7500)
+	///base icon state for update_icon() to reference, fixes bonegel/empty
+	var/base_icon_state = "bone-gel"
 	///percent of gel remaining in container
 	var/remaining_gel = 100
 	///If gel is used when doing bone surgery
@@ -215,6 +217,22 @@
 	///How much bone gel is needed to mend bones
 	var/mend_bones_fix_cost = 5
 
+/obj/item/tool/surgery/bonegel/update_icon()
+	. = ..()
+	if(remaining_gel >= 100)
+		icon_state = base_icon_state
+		return
+	if(remaining_gel > 50)
+		icon_state = "[base_icon_state]_75"
+		return
+	if(remaining_gel > 25)
+		icon_state = "[base_icon_state]_50"
+		return
+	if(remaining_gel > 0)
+		icon_state = "[base_icon_state]_25"
+		return
+	icon_state = "[base_icon_state]_0"
+
 /obj/item/tool/surgery/bonegel/get_examine_text(mob/user)
 	. = ..()
 	if(unlimited_gel) //Only show how much gel is left if it actually uses bone gel
@@ -244,6 +262,7 @@
 		if(!do_after(user, time_per_refill, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, refilling_obj))
 			break
 		remaining_gel = clamp(remaining_gel + 10, 0, 100)
+		update_icon()
 		to_chat(user, SPAN_NOTICE("[refilling_obj] chimes, and displays \"[remaining_gel]% filled\"."))
 
 	refilling = FALSE
@@ -257,14 +276,17 @@
 	if(remaining_gel < gel_cost)
 		return FALSE
 	remaining_gel -= gel_cost
+	update_icon()
 	return TRUE
 
 /obj/item/tool/surgery/bonegel/empty
 	remaining_gel = 0
+	icon_state = "bone-gel_0"
 
 /obj/item/tool/surgery/bonegel/predatorbonegel
 	name = "gel gun"
 	desc = "Inside is a liquid that is similar in effect to bone gel, but requires much smaller quantities, allowing near infinite use from a single capsule."
+	base_icon_state = "predator_bone-gel"
 	icon_state = "predator_bone-gel"
 	unlimited_gel = TRUE
 

code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm

@@ -254,6 +254,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
 	new /obj/item/storage/belt/medical/full(src)
 	new /obj/item/clothing/under/rank/medical/green(src)
 	new /obj/item/clothing/under/rank/medical/blue(src)
+	new /obj/item/clothing/under/rank/medical/lightblue(src)
 	new /obj/item/clothing/under/rank/medical/purple(src)
 	new /obj/item/clothing/mask/surgical(src)
 	new /obj/item/clothing/head/surgery/green(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -93,6 +93,7 @@
 	new /obj/item/clothing/gloves/latex(src)
 	new /obj/item/clothing/under/rank/medical/green(src)
 	new /obj/item/clothing/under/rank/medical/blue(src)
+	new /obj/item/clothing/under/rank/medical/lightblue(src)
 	new /obj/item/clothing/under/rank/medical/purple(src)
 	new /obj/item/clothing/head/surgery/green(src)
 	new /obj/item/clothing/head/surgery/blue(src)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -297,6 +297,7 @@
 	new /obj/item/clothing/under/rank/medical(src)
 	new /obj/item/clothing/under/rank/medical(src)
 	new /obj/item/clothing/under/rank/medical/blue(src)
+	new /obj/item/clothing/under/rank/medical/lightblue(src)
 	new /obj/item/clothing/under/rank/medical/green(src)
 	new /obj/item/clothing/under/rank/medical/purple(src)
 	new /obj/item/clothing/shoes/white(src)

code/modules/clothing/head/soft_caps.dm

@@ -89,6 +89,18 @@
 	cap_color = "ferret"
 	black_market_value = 25
 
+/obj/item/clothing/head/soft/trucker
+	name = "\improper blue trucker hat"
+	desc = "It's a blue trucker hat."
+	icon_state = "truckercap_bluesoft"
+	cap_color = "truckercap_blue"
+
+/obj/item/clothing/head/soft/trucker/red
+	name = "\improper red trucker hat"
+	desc = "It's a red trucker hat."
+	icon_state = "truckercap_redsoft"
+	cap_color = "truckercap_red"
+
 /obj/item/clothing/head/soft/sec
 	name = "security cap"
 	desc = "It's baseball hat in tasteful red color."

code/modules/clothing/shoes/miscellaneous.dm

@@ -72,7 +72,7 @@
 /obj/item/clothing/shoes/sandal
 	desc = "A pair of rather plain, wooden sandals."
 	name = "sandals"
-	icon_state = "wizard"
+	icon_state = "sandals"
 	flags_armor_protection = 0
 
 /obj/item/clothing/shoes/sandal/marisa

code/modules/clothing/suits/marine_armor.dm

@@ -358,7 +358,7 @@
 	storage_slots = 3
 	flags_atom = null
 	uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/under/marine/dress)
-	specialty = "M2 pattern officer"
+	specialty = "M3 pattern officer"
 	item_state_slots = list(WEAR_JACKET = "officer")
 
 //Making a new object because we might want to edit armor values and such.