PFB Gasmask

- Combines UPP gasmasks into singular item - Restyles UPP gasmask as PFB - fixes UPP LT rank
cmss13-devs · Sep 9, 2024 · 86d6b9a · 86d6b9a
1 parent 09ad9d2
commit 86d6b9a
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 45 deletions.
diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm
@@ -70,8 +70,8 @@ OverrideTimelock(/datum/job/command/bridge, list(
 
 /datum/job/command/bridge/ai/upp
 	title = JOB_SO_UPP
-	gear_preset = /datum/equipment_preset/uscm_ship/so/upp/equipped
-	gear_preset_secondary = /datum/equipment_preset/uscm_ship/so/upp
+	gear_preset = /datum/equipment_preset/uscm_ship/so/upp
+	gear_preset_secondary = /datum/equipment_preset/uscm_ship/so/upp/lesser_rank
 
 /obj/effect/landmark/start/bridge/upp
 	name = JOB_SO_UPP

diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -217,7 +217,6 @@
 
 		list("MASK", -1, null, null, null),
 		list("PMK-63 Gas Mask", round(scale * 15), /obj/item/clothing/mask/gas/upp, VENDOR_ITEM_REGULAR),
-		list("PMK-63N Integrated Gas Mask", round(scale * 10), /obj/item/prop/helmetgarb/helmet_gasmask/upp, VENDOR_ITEM_REGULAR),
 		list("Heat Absorbent Coif", round(scale * 10), /obj/item/clothing/mask/rebreather/scarf/tan, VENDOR_ITEM_REGULAR),
 		list("Rebreather", round(scale * 10), /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
 

diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm
@@ -529,11 +529,6 @@
 	helmet_item.flags_inventory &= ~(BLOCKGASEFFECT)
 	helmet_item.flags_inv_hide &= ~(HIDEFACE)
 
-/obj/item/prop/helmetgarb/helmet_gasmask/upp
-	name = "\improper PMK-63N integrated gasmask"
-	desc = "The frontline variant of the PMK-63 produced to be compatible with in service helmets."
-	icon_state = "helmet_uppgasmask"
-
 /obj/item/prop/helmetgarb/trimmed_wire
 	name = "trimmed barbed wire"
 	desc = "It is a length of barbed wire that's had most of the sharp points filed down so that it is safe to handle."

diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
@@ -260,6 +260,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	/obj/item/clothing/glasses/eyepatch = "eyepatch",
 	/obj/item/clothing/glasses/regular/hipster = "persc-glasses",
 
+	// GASMASK
+	/obj/item/clothing/mask/gas/upp = HELMET_GARB_RELAY_ICON_STATE,
+
 	// WALKMAN AND CASSETTES
 	/obj/item/device/walkman = HELMET_GARB_RELAY_ICON_STATE,
 	/obj/item/device/cassette_tape/pop1 = "cassette_blue",
@@ -295,7 +298,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	/obj/item/prop/helmetgarb/helmet_nvg/cosmetic = HELMET_GARB_RELAY_ICON_STATE,
 	/obj/item/prop/helmetgarb/helmet_nvg/marsoc = HELMET_GARB_RELAY_ICON_STATE,
 	/obj/item/prop/helmetgarb/helmet_gasmask = "helmet_gasmask",
-	/obj/item/prop/helmetgarb/helmet_gasmask/upp = "helmet_uppgasmask",
 	/obj/item/prop/helmetgarb/flair_initech = "flair_initech",
 	/obj/item/prop/helmetgarb/flair_io = "flair_io",
 	/obj/item/prop/helmetgarb/flair_peace ="flair_peace_smiley",

diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
@@ -39,9 +39,35 @@
 
 /obj/item/clothing/mask/gas/upp
 	name = "\improper PMK-63 gasmask"
-	desc = "The Union service mask issued to backline troops not prepared for combat."
-	icon_state = "upp_gasmask"
-	item_state = "upp_gasmask"
+	desc = "The standard issue gasmask utilized by the UPP Armed Collective and many UPP civilian organizations."
+	flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR
+	flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB
+	icon_state = "pfb"
+	item_state = "pfb"
+
+/obj/item/clothing/mask/gas/upp/on_enter_storage(obj/item/storage/internal/helmet_internal_inventory)
+	..()
+	if(!istype(helmet_internal_inventory))
+		return
+	var/obj/item/clothing/head/helmet/helmet_item = helmet_internal_inventory.master_object
+
+	if(!istype(helmet_item))
+		return
+
+	helmet_item.flags_inventory |= BLOCKGASEFFECT
+	helmet_item.flags_inv_hide |= HIDEFACE
+
+/obj/item/clothing/mask/gas/upp/on_exit_storage(obj/item/storage/internal/helmet_internal_inventory)
+	..()
+	if(!istype(helmet_internal_inventory))
+		return
+	var/obj/item/clothing/head/helmet/helmet_item = helmet_internal_inventory.master_object
+
+	if(!istype(helmet_item))
+		return
+
+	helmet_item.flags_inventory &= ~(BLOCKGASEFFECT)
+	helmet_item.flags_inv_hide &= ~(HIDEFACE)
 
 /obj/item/clothing/mask/gas/pve_mopp
 	name = "\improper M2 MOPP mask"

diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi
diff --git a/icons/mob/humans/onmob/mask.dmi b/icons/mob/humans/onmob/mask.dmi
diff --git a/icons/obj/items/clothing/masks.dmi b/icons/obj/items/clothing/masks.dmi
diff --git a/icons/obj/items/helmet_garb.dmi b/icons/obj/items/helmet_garb.dmi
diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm
@@ -219,15 +219,15 @@
 	layer = 3.5;
 	pixel_y = 13
 	},
-/obj/item/bedsheet/brown{
-	pixel_y = 13;
-	color = "#8B9490"
-	},
 /obj/item/bedsheet/brown{
 	layer = 3.4;
 	color = "#8B9490";
 	anchored = 1
 	},
+/obj/item/bedsheet/brown{
+	pixel_y = 13;
+	color = "#8B9490"
+	},
 /turf/open/floor/strata{
 	icon_state = "floor2"
 	},
@@ -1510,6 +1510,16 @@
 	icon_state = "floor3"
 	},
 /area/golden_arrow/prep_hallway)
+"mD" = (
+/obj/structure/pipes/vents/pump{
+	dir = 4
+	},
+/obj/effect/landmark/start/bridge/upp,
+/turf/open/floor/strata{
+	dir = 4;
+	icon_state = "floor3"
+	},
+/area/golden_arrow/cryo_cells)
 "mN" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/reagent_container/food/condiment/saltshaker{
@@ -3130,14 +3140,19 @@
 	stuff = list(/obj/item/stack/sandbags/large_stack);
 	parts_type = /obj/item/stack/sheet/metal
 	},
-/obj/item/folded_tent/big,
-/obj/item/folded_tent/big{
-	pixel_y = 5;
-	pixel_x = -3
-	},
 /obj/structure/machinery/light/small{
 	dir = 1
 	},
+/obj/item/folded_tent/big{
+	desc = "A standard Tent. This one is just a bigger, general purpose version. Unfold in a suitable location for maximum FOB vibes. Mess Tech not included. ENTRANCE TO THE SOUTH.";
+	name = "folded Big Tent"
+	},
+/obj/item/folded_tent/big{
+	pixel_y = 5;
+	pixel_x = -3;
+	name = "folded Big Tent";
+	desc = "A standard Tent. This one is just a bigger, general purpose version. Unfold in a suitable location for maximum FOB vibes. Mess Tech not included. ENTRANCE TO THE SOUTH."
+	},
 /turf/open/floor/strata{
 	dir = 4;
 	icon_state = "floor3"
@@ -4079,15 +4094,15 @@
 	layer = 3.5;
 	pixel_y = 13
 	},
+/obj/item/bedsheet/brown{
+	pixel_y = 13;
+	color = "#8B9490"
+	},
 /obj/item/bedsheet/brown{
 	layer = 3.4;
 	color = "#8B9490";
 	anchored = 1
 	},
-/obj/item/bedsheet/brown{
-	pixel_y = 13;
-	color = "#8B9490"
-	},
 /turf/open/floor/strata{
 	icon_state = "floor2"
 	},
@@ -6373,16 +6388,6 @@
 	icon_state = "multi_tiles"
 	},
 /area/golden_arrow/dorms)
-"Xv" = (
-/obj/structure/pipes/vents/pump{
-	dir = 4
-	},
-/obj/effect/landmark/start/bridge/upp,
-/turf/open/floor/strata{
-	dir = 4;
-	icon_state = "floor3"
-	},
-/area/golden_arrow/cryo_cells)
 "XL" = (
 /obj/structure/pipes/vents/pump{
 	dir = 4
@@ -14033,7 +14038,7 @@ uE
 CM
 ab
 zT
-FS
+bt
 Nz
 Yo
 IS
@@ -14185,9 +14190,9 @@ VE
 CM
 Cf
 Qr
-bt
+FS
 oH
-bt
+FS
 IS
 mV
 mV
@@ -14489,7 +14494,7 @@ Qj
 CM
 Ag
 ZM
-bt
+FS
 pH
 kq
 CM
@@ -14641,9 +14646,9 @@ NU
 CM
 CM
 oH
-bt
+FS
 pH
-bt
+FS
 CM
 fJ
 CM
@@ -14945,9 +14950,9 @@ bK
 kl
 CM
 oH
-bt
+FS
 oH
-bt
+FS
 CM
 BE
 ns
@@ -15097,7 +15102,7 @@ mB
 CO
 CM
 dS
-bt
+FS
 EW
 my
 iO
@@ -15710,7 +15715,7 @@ ce
 Zb
 xe
 Ez
-Xv
+mD
 sp
 cR
 us