Merge branch 'ss220-space:master220' into master220

captainnelly · May 1, 2024 · 82caeb9 · 82caeb9
2 parents 5dfaa34 + 167ad19
commit 82caeb9
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 18 deletions.
diff --git a/code/datums/syndiesupplypacks.dm b/code/datums/syndiesupplypacks.dm
@@ -206,18 +206,18 @@ GLOBAL_LIST_INIT(all_syndie_supply_groups, list(SYNDIE_SUPPLY_EMERGENCY,SYNDIE_S
 	containername = "security supply crate"
 
 /datum/syndie_supply_packs/security/stechkin
-	name = "FK-69 Pistol 'Stechkin' Crate"
+	name = "Syndicate Stechkin Pistol Crate"
 	contains = list(/obj/item/gun/projectile/automatic/pistol,
 					/obj/item/gun/projectile/automatic/pistol,
 					/obj/item/gun/projectile/automatic/pistol,
 					/obj/item/suppressor,
 					/obj/item/suppressor,
 					/obj/item/suppressor)
 	cost = 2500
-	containername = "FK-69 Pistol 'Stechkin' crate"
+	containername = "Stechkin Pistol Crate"
 
 /datum/syndie_supply_packs/security/stechkin_ammo
-	name = "Stechkin - 10mm Magazine"
+	name = "Syndicate Stechkin - 10mm Magazine"
 	contains = list(/obj/item/ammo_box/magazine/m10mm,
 					/obj/item/ammo_box/magazine/m10mm,
 					/obj/item/ammo_box/magazine/m10mm,

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
@@ -634,7 +634,7 @@
 	surplus = 0
 
 /datum/uplink_item/dangerous/pistol
-	name = "FK-69 Pistol"
+	name = "Stechkin Pistol"
 	desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible with suppressors."
 	item = /obj/item/gun/projectile/automatic/pistol
 	cost = 20

diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
@@ -981,19 +981,25 @@ BLIND     // can't see anything
 	set name = "Roll Down Jumpsuit"
 	set category = "Object"
 	set src in usr
-	if(!isliving(usr)) return
-	if(usr.stat) return
+	if(!ishuman(usr))
+		return
+	var/mob/living/carbon/human/owner = usr
+	if(owner.stat != CONSCIOUS)
+		return
 
-	if(!usr.incapacitated())
+	if(!owner.incapacitated())
 		if(copytext(item_color,-2) != "_d")
 			basecolor = item_color
-		if((basecolor + "_d_s") in icon_states(onmob_sheets[ITEM_SLOT_CLOTH_INNER]))
+		var/icon/file = onmob_sheets[ITEM_SLOT_CLOTH_INNER_STRING]
+		if(sprite_sheets && sprite_sheets[owner.dna.species.name])
+			file = sprite_sheets[owner.dna.species.name]
+		if((basecolor + "_d_s") in icon_states(file))
 			item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]"
-			usr.update_inv_w_uniform()
+			owner.update_inv_w_uniform()
 		else
-			to_chat(usr, "<span class='notice'>You cannot roll down this uniform!</span>")
+			to_chat(owner, "<span class='notice'>You cannot roll down this uniform!</span>")
 	else
-		to_chat(usr, "<span class='notice'>You cannot roll down the uniform!</span>")
+		to_chat(owner, "<span class='notice'>You cannot roll down the uniform!</span>")
 
 /obj/item/clothing/under/verb/removetie()
 	set name = "Remove Accessory"

diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
@@ -5,10 +5,9 @@
 	desc = "A hood that protects the head and face from biological comtaminants."
 	permeability_coefficient = 0.01
 	flags = THICKMATERIAL
-	flags_inv = HIDEHAIR
+	flags_inv = HIDEHAIR|HIDEMASK|HIDEHEADSETS|HIDEGLASSES
 	flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 80, "fire" = 30, "acid" = 100)
-	flags_inv = HIDEMASK|HIDEHEADSETS|HIDEGLASSES
 	resistance_flags = ACID_PROOF
 
 	sprite_sheets = list(

diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
@@ -917,10 +917,9 @@
 	icon_state = "mercy_hood"
 	item_state = "mercy_hood"
 	permeability_coefficient = 0.01
-	flags_inv = HIDEHAIR
+	flags_inv = HIDEHAIR|HIDEMASK|HIDEHEADSETS|HIDEGLASSES
 	flags_cover = HEADCOVERSEYES
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20, fire = 50, acid = 50)
-	flags_inv = HIDEMASK|HIDEHEADSETS|HIDEGLASSES
 
 /obj/item/clothing/suit/jacket
 	name = "bomber jacket"

diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
@@ -88,9 +88,8 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	icon_state = "bombsuit"
 	flags = THICKMATERIAL
-	flags_inv = HIDEHAIR
+	flags_inv = HIDEHAIR|HIDEMASK|HIDEHEADSETS|HIDEGLASSES
 	armor = list("melee" = 20, "bullet" = 0, "laser" = 20,"energy" = 10, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
-	flags_inv = HIDEMASK|HIDEHEADSETS|HIDEGLASSES
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	cold_protection = HEAD
 	min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
@@ -172,7 +171,7 @@
 	icon_state = "rad"
 	desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
 	flags = THICKMATERIAL
-	flags_inv = HIDEHAIR
+	flags_inv = HIDEHAIR|HIDEMASK|HIDEHEADSETS|HIDEGLASSES
 	flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 60, "rad" = 100, "fire" = 30, "acid" = 30)
 	strip_delay = 60

diff --git a/icons/obj/machines/vending.dmi b/icons/obj/machines/vending.dmi