PR of the day, a day late | I HATE THE ANTICHRIST!! | Upgrades the So…

…lFed response outfits (except the engineering one) (#25490) (#1221)

* everything

* puts  the right item paths there

* fixes the gas masks

* fixes outfit sanity

* Adds trailing commas to multi-line lists.

---------

Co-authored-by: Paxilmaniac <[email protected]>
Co-authored-by: GoldenAlpharex <[email protected]>

modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm

@@ -2,6 +2,18 @@
 	category = SOL_DEFENSE_DEFENSE_NAME
 	company_bitflag = CARGO_COMPANY_SOL_DEFENSE
 
+// Beautiful SolFed clothing
+
+/datum/armament_entry/company_import/sol_defense/clothing
+	subcategory = "Surplus Clothing"
+	cost = PAYCHECK_CREW
+
+/datum/armament_entry/company_import/sol_defense/clothing/peacekeeper
+	item_type = /obj/item/clothing/under/sol_peacekeeper
+
+/datum/armament_entry/company_import/sol_defense/clothing/emt
+	item_type = /obj/item/clothing/under/sol_emt
+
 // Armor vests for protecting against bullets
 
 /datum/armament_entry/company_import/sol_defense/armor
@@ -20,12 +32,11 @@
 /datum/armament_entry/company_import/sol_defense/armor/sf_soft_vest
 	item_type = /obj/item/clothing/suit/armor/sf_peacekeeper
 
-/datum/armament_entry/company_import/sol_defense/armor/normal_vest
-	name = "type I vest - normal"
-	item_type = /obj/item/clothing/suit/armor/vest/alt
+/datum/armament_entry/company_import/sol_defense/armor/flak_jacket
+	item_type = /obj/item/clothing/suit/armor/vest/det_suit/sol
 
 /datum/armament_entry/company_import/sol_defense/armor/slim_vest
-	name = "type I vest - slim"
+	name = "type I vest"
 	item_type = /obj/item/clothing/suit/armor/vest
 
 /datum/armament_entry/company_import/sol_defense/armor_hardened
@@ -35,7 +46,6 @@
 /datum/armament_entry/company_import/sol_defense/armor_hardened/enclosed_helmet
 	item_type = /obj/item/clothing/head/helmet/toggleable/sf_hardened
 
-
 /datum/armament_entry/company_import/sol_defense/armor_hardened/emt_enclosed_helmet
 	item_type = /obj/item/clothing/head/helmet/toggleable/sf_hardened/emt
 

modular_skyrat/modules/goofsec/code/sol_fed.dm

@@ -321,21 +321,24 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 
 /datum/outfit/request_911/police
 	name = "911 Response: Marshal"
-	back = /obj/item/storage/backpack/duffelbag/cops
-	uniform = /obj/item/clothing/under/rank/security/detective/cowboy
-	shoes = /obj/item/clothing/shoes/cowboy
+	back = /obj/item/storage/backpack/satchel
+	uniform = /obj/item/clothing/under/sol_peacekeeper
+	suit = /obj/item/clothing/suit/armor/vest/det_suit/sol
+	shoes = /obj/item/clothing/shoes/jackboots
 	glasses = /obj/item/clothing/glasses/sunglasses
 	ears = /obj/item/radio/headset/headset_sec/alt
-	head = /obj/item/clothing/head/cowboy
-	belt = /obj/item/gun/energy/disabler
-	r_pocket = /obj/item/lighter
+	head = /obj/item/clothing/head/soft/black
+	suit_store = /obj/item/gun/energy/disabler
+	belt = /obj/item/melee/baton/security/loaded
+	r_pocket = /obj/item/flashlight/seclite
 	l_pocket = /obj/item/restraints/handcuffs
 	id = /obj/item/card/id/advanced/solfed
-	backpack_contents = list(/obj/item/storage/box/survival = 1,
+	backpack_contents = list(
+		/obj/item/storage/box/survival = 1,
 		/obj/item/storage/box/handcuffs = 1,
-		/obj/item/melee/baton/security/loaded = 1,
 		/obj/item/solfed_reporter/swat_caller = 1,
-		/obj/item/beamout_tool = 1)
+		/obj/item/beamout_tool = 1,
+	)
 
 	id_trim = /datum/id_trim/solfed
 
@@ -366,7 +369,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 		/obj/item/rwd/loaded = 1,
 		/obj/item/beamout_tool = 1,
 		/obj/item/solfed_reporter/swat_caller = 1,
-		)
+	)
 	id_trim = /datum/id_trim/solfed/atmos
 
 /obj/item/radio/headset/headset_solfed/atmos
@@ -396,21 +399,25 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 
 /datum/outfit/request_911/emt
 	name = "911 Response: EMT"
-	back = /obj/item/storage/backpack/duffelbag/cops
-	uniform = /obj/item/clothing/under/rank/medical/paramedic
-	shoes = /obj/item/clothing/shoes/sneakers/white
+	back = /obj/item/storage/backpack/medic
+	uniform = /obj/item/clothing/under/sol_emt
+	shoes = /obj/item/clothing/shoes/jackboots
 	ears = /obj/item/radio/headset/headset_med
-	head = /obj/item/clothing/head/soft/paramedic
+	mask = /obj/item/clothing/mask/gas/alt
+	head = /obj/item/clothing/head/helmet/toggleable/sf_hardened/emt
 	id = /obj/item/card/id/advanced/solfed
-	suit =  /obj/item/clothing/suit/toggle/labcoat/paramedic
+	suit = /obj/item/clothing/suit/armor/sf_hardened/emt
 	gloves = /obj/item/clothing/gloves/latex/nitrile
-	belt = /obj/item/storage/belt/medical/paramedic
-	suit_store = /obj/item/flashlight/pen/paramedic
-	backpack_contents = list(/obj/item/storage/box/survival = 1,
+	belt = /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked
+	suit_store = /obj/item/tank/internals/emergency_oxygen/engi
+	r_pocket = /obj/item/flashlight/seclite
+	l_pocket = /obj/item/storage/medkit/civil_defense
+	backpack_contents = list(
+		/obj/item/storage/box/survival = 1,
 		/obj/item/emergency_bed = 1,
-		/obj/item/storage/medkit/surgery = 1,
 		/obj/item/solfed_reporter/swat_caller = 1,
-		/obj/item/beamout_tool = 1)
+		/obj/item/beamout_tool = 1,
+	)
 
 	id_trim = /datum/id_trim/solfed
 
@@ -438,24 +445,26 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 
 /datum/outfit/request_911/condom_destroyer
 	name = "911 Response: Armed S.W.A.T. Officer"
-	back = /obj/item/storage/backpack/duffelbag/cops
-	uniform = /obj/item/clothing/under/rank/security/officer/beatcop
+	back = /obj/item/storage/backpack
+	uniform = /obj/item/clothing/under/sol_peacekeeper
 	shoes = /obj/item/clothing/shoes/jackboots
 	glasses = /obj/item/clothing/glasses/sunglasses
 	ears = /obj/item/radio/headset/headset_sec/alt
-	head = /obj/item/clothing/head/helmet/toggleable/riot
+	head = /obj/item/clothing/head/helmet/sf_peacekeeper
 	belt = /obj/item/gun/energy/disabler
-	suit = /obj/item/clothing/suit/armor/riot
-	r_pocket = /obj/item/lighter
+	suit = /obj/item/clothing/suit/armor/sf_peacekeeper
+	r_pocket = /obj/item/flashlight/seclite
 	l_pocket = /obj/item/restraints/handcuffs
 	id = /obj/item/card/id/advanced/solfed
-	l_hand = /obj/item/gun/ballistic/shotgun/riot
-	backpack_contents = list(/obj/item/storage/box/survival = 1,
+	l_hand = /obj/item/gun/ballistic/shotgun/riot/sol
+	backpack_contents = list(
+		/obj/item/storage/box/survival = 1,
 		/obj/item/storage/box/handcuffs = 1,
 		/obj/item/melee/baton/security/loaded = 1,
 		/obj/item/storage/box/lethalshot = 2,
 		/obj/item/solfed_reporter/treason_reporter = 1,
-		/obj/item/beamout_tool = 1)
+		/obj/item/beamout_tool = 1,
+	)
 
 	id_trim = /datum/id_trim/solfed
 
@@ -482,22 +491,25 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 /datum/outfit/request_911/treason_destroyer
 	name = "911 Response: SolFed Military"
 
-	uniform = /obj/item/clothing/under/rank/security/officer/hecu
-	head = /obj/item/clothing/head/helmet
-	mask = /obj/item/clothing/mask/gas/hecu2
+	uniform = /obj/item/clothing/under/sol_peacekeeper
+	head = /obj/item/clothing/head/helmet/sf_sacrificial
+	mask = /obj/item/clothing/mask/gas/alt
 	gloves = /obj/item/clothing/gloves/combat
-	suit = /obj/item/clothing/suit/armor/vest
-	shoes = /obj/item/clothing/shoes/combat
+	suit = /obj/item/clothing/suit/armor/sf_sacrificial
+	shoes = /obj/item/clothing/shoes/jackboots
 
-	back = /obj/item/storage/backpack/duffelbag/cops
+	back = /obj/item/storage/backpack
 	glasses = /obj/item/clothing/glasses/sunglasses
 	ears = /obj/item/radio/headset/headset_sec/alt
 	l_pocket = /obj/item/restraints/handcuffs
+	r_pocket = /obj/item/flashlight/seclite
 	id = /obj/item/card/id/advanced/solfed
 	r_hand = /obj/item/gun/ballistic/automatic/sol_rifle
-	backpack_contents = list(/obj/item/storage/box/handcuffs = 1,
+	backpack_contents = list(
+		/obj/item/storage/box/handcuffs = 1,
+		/obj/item/sacrificial_face_shield = 1,
 		/obj/item/melee/baton/security/loaded = 1,
-		/obj/item/ammo_box/magazine/c40sol_rifle/standard = 4
+		/obj/item/ammo_box/magazine/c40sol_rifle/standard = 4,
 	)
 
 	id_trim = /datum/id_trim/solfed

modular_skyrat/modules/goofsec/code/solfed_clothing.dm

@@ -0,0 +1,42 @@
+// Peacekeeper jumpsuit
+
+/obj/item/clothing/under/sol_peacekeeper
+	name = "sol peacekeeper uniform"
+	desc = "A military-grade uniform with military grade comfort (none at all), often seen on \
+		SolFed's various peacekeeping forces, and usually alongside a blue helmet."
+	icon = 'modular_skyrat/modules/goofsec/icons/uniforms.dmi'
+	icon_state = "peacekeeper"
+	worn_icon = 'modular_skyrat/modules/goofsec/icons/uniforms_worn.dmi'
+	worn_icon_digi = 'modular_skyrat/modules/goofsec/icons/uniforms_worn_digi.dmi'
+	worn_icon_state = "peacekeeper"
+	armor_type = /datum/armor/clothing_under/rank_security
+	inhand_icon_state = null
+	has_sensor = SENSOR_COORDS
+	random_sensor = FALSE
+
+// EMT jumpsuit
+
+/obj/item/clothing/under/sol_emt
+	name = "sol emergency medical uniform"
+	desc = "A copy of SolFed's peacekeeping uniform, recolored and re-built paramedics in mind."
+	icon = 'modular_skyrat/modules/goofsec/icons/uniforms.dmi'
+	icon_state = "emt"
+	worn_icon = 'modular_skyrat/modules/goofsec/icons/uniforms_worn.dmi'
+	worn_icon_digi = 'modular_skyrat/modules/goofsec/icons/uniforms_worn_digi.dmi'
+	worn_icon_state = "emt"
+	armor_type = /datum/armor/clothing_under/rank_medical
+	inhand_icon_state = null
+	has_sensor = SENSOR_COORDS
+	random_sensor = FALSE
+
+// Solfed flak jacket, for marshals
+
+/obj/item/clothing/suit/armor/vest/det_suit/sol
+	name = "'Gordyn' flak vest"
+	desc = "A light armored jacket common on SolFed personnel who need armor, but find a full vest \
+		too impractical or uneeded."
+	icon = 'modular_skyrat/modules/goofsec/icons/uniforms.dmi'
+	icon_state = "flak"
+	worn_icon = 'modular_skyrat/modules/goofsec/icons/uniforms_worn.dmi'
+	worn_icon_state = "flak"
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

tgstation.dme

@@ -7213,6 +7213,7 @@
 #include "modular_skyrat\modules\goofsec\code\hud.dm"
 #include "modular_skyrat\modules\goofsec\code\sec_clothing_overrides.dm"
 #include "modular_skyrat\modules\goofsec\code\sol_fed.dm"
+#include "modular_skyrat\modules\goofsec\code\solfed_clothing.dm"
 #include "modular_skyrat\modules\gun_safety\code\keybinding.dm"
 #include "modular_skyrat\modules\gun_safety\code\safety_additions.dm"
 #include "modular_skyrat\modules\gun_safety\code\safety_component.dm"