Adds more clothing from Polaris and various sources (#11546)

* Base Commit * Secondary Commit * Small Addition * Small Fix * Yet another Commit * small fix * Small Fix * Small Addition * More Commit * I don't know how to stop * ushanka * Small Fix * *aaaaaaa* * another add-on * Small Fix * Revert "Small Fix" This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a. * Conflict Fixes * Revert "Conflict Fixes" This reverts commit 1af644bdca. * Conflict Fix 2
2026-08-25 21:19:44 +01:00 · 2021-09-27 14:31:10 -04:00
parent f1417f9455
commit 0085a5bd10
69 changed files with 919 additions and 334 deletions
@@ -51,7 +51,7 @@
 	open_icon.Blend(icon(base_icon, "open"), ICON_OVERLAY)
 	open_icon.Blend(color, BLEND_ADD)
 	open_icon.Blend(icon(base_icon, "interior"), ICON_OVERLAY)
-	
+
 	door_back_icon = icon(base_icon, "door_back")
 	door_back_icon.Blend(color, BLEND_ADD)

@@ -74,7 +74,7 @@
 			this_decal_icon.Blend(decals[thing], BLEND_ADD)
 			closed_emagged_icon.Blend(this_decal_icon, ICON_OVERLAY)
 			door_front_icon.Blend(this_decal_icon, ICON_OVERLAY)
-	
+
 	door_front_icon.AddAlphaMask(icon(base_icon, "door_front")) // Remove pesky 'more than just door' decals

 	closed_locked_icon =   icon(closed_emagged_icon)
@@ -622,6 +622,13 @@
 		"vertical_stripe_simple" = COLOR_OFF_WHITE,
 	)

+/decl/closet_appearance/oxygen/fire/atmos
+	color = COLOR_YELLOW_GRAY
+	extra_decals = list(
+		"extinguisher" = COLOR_TEAL,
+		"vertical_stripe_simple" = COLOR_TEAL,
+	)
+
 /decl/closet_appearance/alien
 	color = COLOR_PURPLE

@@ -41,7 +41,6 @@
 		/obj/item/device/radio/headset/headset_qm/alt, //VOREStation Edit,
 		/obj/item/clothing/gloves/black,
 		/obj/item/clothing/gloves/fingerless,
-		/obj/item/clothing/suit/fire/firefighter,
 		/obj/item/weapon/tank/emergency/oxygen,
 		/obj/item/clothing/mask/gas,
 		/obj/item/clothing/glasses/meson,
@@ -101,10 +101,10 @@

 	starts_with = list(
 		/obj/item/clothing/accessory/storage/brown_vest,
-		/obj/item/clothing/suit/fire/firefighter,
-		/obj/item/clothing/head/hardhat/red,
+		/obj/item/clothing/suit/fire/heavy,
+		/obj/item/clothing/head/hardhat/firefighter/atmos,
 		/obj/item/device/flashlight,
-		/obj/item/weapon/extinguisher,
+		/obj/item/weapon/extinguisher/atmo,
 		///obj/item/clamp,	//VOREStation Removal: without leaks those are pointless,
 		/obj/item/device/radio/headset/headset_eng,
 		/obj/item/device/radio/headset/headset_eng/alt,
@@ -58,8 +58,8 @@
 		/obj/item/clothing/shoes/white,
 		/obj/item/clothing/under/rank/head_of_personnel_whimsy,
 		/obj/item/clothing/head/caphat/hop,
-		/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit,
-		/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt,
+		/obj/item/clothing/under/suit_jacket/teal,
+		/obj/item/clothing/under/suit_jacket/teal/skirt,
 		/obj/item/clothing/glasses/sunglasses,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/hop)

@@ -65,7 +65,7 @@
 	closet_appearance = /decl/closet_appearance/oxygen/fire

 	starts_with = list(
-		/obj/item/clothing/suit/fire/firefighter,
+		/obj/item/clothing/suit/fire,
 		/obj/item/clothing/mask/gas,
 		/obj/item/weapon/tank/oxygen/red,
 		/obj/item/weapon/extinguisher,
@@ -73,7 +73,7 @@

 /obj/structure/closet/firecloset/full
 	starts_with = list(
-		/obj/item/clothing/suit/fire/firefighter,
+		/obj/item/clothing/suit/fire,
 		/obj/item/clothing/mask/gas,
 		/obj/item/device/flashlight,
 		/obj/item/weapon/tank/oxygen/red,
@@ -82,13 +82,24 @@

 /obj/structure/closet/firecloset/full/double
 	starts_with = list(
-		/obj/item/clothing/suit/fire/firefighter = 2,
+		/obj/item/clothing/suit/fire = 2,
 		/obj/item/clothing/mask/gas = 2,
 		/obj/item/device/flashlight = 2,
 		/obj/item/weapon/tank/oxygen/red = 2,
 		/obj/item/weapon/extinguisher = 2,
 		/obj/item/clothing/head/hardhat/red = 2)

+/obj/structure/closet/firecloset/full/atmos
+	name = "atmos fire-safety closet"
+	desc = "It's a storage unit for atmospheric fire-fighting supplies."
+	closet_appearance = /decl/closet_appearance/oxygen/fire/atmos
+
+	starts_with = list(
+		/obj/item/clothing/suit/fire/heavy,
+		/obj/item/weapon/tank/oxygen/red,
+		/obj/item/weapon/extinguisher/atmo,
+		/obj/item/clothing/head/hardhat/firefighter/atmos)
+
 /*
 * Tool Closet
 */
@@ -131,7 +131,7 @@
 /obj/structure/closet/walllocker_double/kitchen/east
 	pixel_x = 32
 	dir = EAST
-	
+
 /obj/structure/closet/walllocker_double/medical
 	name = "Medical Cabinet"
 	desc = "A wall mounted medical supply cabinet. Probably full of drugs!"	//not actually full of drugs, sorry!
@@ -152,7 +152,7 @@
 /obj/structure/closet/walllocker_double/medical/east
 	pixel_x = 32
 	dir = EAST
-	
+
 /obj/structure/closet/walllocker_double/hydrant
 	name = "fire-safety closet"
 	desc = "It's a storage cabinet packed with fire-fighting supplies."
@@ -161,7 +161,7 @@
 	density = FALSE

 	starts_with = list(
-		/obj/item/clothing/suit/fire/firefighter,
+		/obj/item/clothing/suit/fire,
 		/obj/item/clothing/mask/gas,
 		/obj/item/device/flashlight,
 		/obj/item/weapon/tank/oxygen/red,
@@ -461,7 +461,7 @@
 		/obj/item/clothing/suit/storage/hooded/wintercoat/captain,
 		/obj/item/clothing/shoes/boots/winter/command,
 		/obj/item/clothing/head/beret/centcom/captain,
-		/obj/item/clothing/under/gimmick/rank/captain/suit,
-		/obj/item/clothing/under/gimmick/rank/captain/suit/skirt,
+		/obj/item/clothing/under/suit_jacket/green,
+		/obj/item/clothing/under/suit_jacket/green/skirt,
 		/obj/item/clothing/glasses/sunglasses,
 		/obj/item/clothing/head/caphat)
@@ -17,7 +17,7 @@
 		pixel_y = (dir & 3)? (dir ==1 ? -27 : 27) : 0
 	else
 		has_extinguisher = new/obj/item/weapon/extinguisher(src)
-	
+
 	update_icon()

 /obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user)
@@ -80,9 +80,11 @@
 	if(has_extinguisher)
 		if(istype(has_extinguisher, /obj/item/weapon/extinguisher/mini))
 			suffix = "mini"
+		if(istype(has_extinguisher, /obj/item/weapon/extinguisher/atmo))
+			suffix = "advanced"
 		else
 			suffix = "standard"
-	
+
 	icon_state = "[initial(icon_state)][opened ? "" : "_closed"]_[suffix]"

 /obj/structure/extinguisher_cabinet/old