Condenses Medical Outerwear Into Its Own Selection + A First Responder Jacket Change (#12450)

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

@@ -124,7 +124,7 @@
 	new /obj/item/clothing/mask/gas/alt(src)
 	new /obj/item/clothing/mask/gas/half(src)
 	new /obj/item/auto_cpr(src)
-	new /obj/item/clothing/suit/storage/toggle/first_responder_jacket(src)
+	new /obj/item/clothing/suit/storage/toggle/fr_jacket/alt(src)
 
 /obj/structure/closet/secure_closet/CMO
 	name = "chief medical officer's locker"

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -108,32 +108,33 @@ datum/gear/suit/colorvest
 	cost = 1
 	allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Roboticist", "Research Director", "Investigator")
 
-/datum/gear/suit/medical_chest_rig
-	display_name = "medic chest-rig"
-	description = "A white chest-rig with pouches worn by medical first responders, meant to carry their equipment."
-	path = /obj/item/clothing/suit/storage/medical_chest_rig
+/datum/gear/suit/medical_outerwear
+	display_name = "medical outerwear (jackets, vests, rigs)"
+	path = /obj/item/clothing/suit/storage/toggle/fr_jacket
 	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
 
-/datum/gear/suit/first_responder_vest
-	display_name = "first responder vest"
-	description = "A dark green vest adorned with high-visibility stripes. Has pouches to carry equipment with."
-	path = /obj/item/clothing/suit/storage/medical_chest_rig/first_responder
-	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
+/datum/gear/suit/medical_outerwear/New()
+	..()
+	var/list/medical_outerwear = list()
+	medical_outerwear["medical chest-rig"] = /obj/item/clothing/suit/storage/medical_chest_rig
+	medical_outerwear["first responder vest"] = /obj/item/clothing/suit/storage/medical_chest_rig/first_responder
+	medical_outerwear["first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/alt
+	medical_outerwear["first responder jacket, alt"] = /obj/item/clothing/suit/storage/toggle/fr_jacket // this variant is the old bright green one and doesn't go with the NT medic uniform
+	gear_tweaks += new /datum/gear_tweak/path(medical_outerwear)
 
-/datum/gear/suit/iacvest
-	display_name = "IAC vest"
-	description = "It's a lightweight vest. Made of a dark, navy mesh with highly-reflective white material, designed to be worn by the Interstellar Aid Corps."
+/datum/gear/suit/iac_outerwear
+	display_name = "IAC outerwear (jackets, vests, rigs)"
 	path = /obj/item/clothing/suit/storage/iacvest
 	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
 	flags = GEAR_HAS_DESC_SELECTION
 
-/datum/gear/suit/iaclabcoat
-	display_name = "IAC labcoat"
-	description = "It's a standard medical labcoat designed to be worn by the Interstellar Aid Corps."
-	path = /obj/item/clothing/suit/storage/toggle/labcoat/iac
-	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
-	flags = GEAR_HAS_DESC_SELECTION
-
+/datum/gear/suit/iac_outerwear/New()
+	..()
+	var/list/iac_outerwear = list()
+	iac_outerwear["IAC vest"] = /obj/item/clothing/suit/storage/iacvest
+	iac_outerwear["IAC labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/iac
+	gear_tweaks += new /datum/gear_tweak/path(iac_outerwear)
+	
 /datum/gear/suit/poncho
 	display_name = "poncho selection"
 	path = /obj/item/clothing/accessory/poncho

code/modules/clothing/suits/jobs.dm

@@ -295,10 +295,17 @@ obj/item/clothing/suit/apron/overalls/blue
 	item_state = "fr_jacket"
 	blood_overlay_type = "armor"
 	allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \
-	/obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/reagent_containers/blood)
+	/obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/reagent_containers/blood, /obj/item/clothing/head/hardhat/first_responder)
 	body_parts_covered = UPPER_TORSO|ARMS
 	opened = TRUE
 
+/obj/item/clothing/suit/storage/toggle/fr_jacket/alt
+	desc = "A dark green first responder jacket."
+	icon = 'icons/clothing/kit/first_responder.dmi'
+	contained_sprite = TRUE
+	icon_state = "firstresponderjacket"
+	item_state = "firstresponderjacket"
+
 /obj/item/clothing/suit/storage/toggle/fr_jacket/ems
 	name = "\improper EMS jacket"
 	desc = "A dark blue, martian-pattern, EMS jacket. It sports high-visibility reflective stripes and a star of life on the back."
@@ -331,11 +338,3 @@ obj/item/clothing/suit/apron/overalls/blue
 	icon_state = "suspenders"
 	blood_overlay_type = "armor" //it's the less thing that I can put here
 	body_parts_covered = 0
-
-/obj/item/clothing/suit/storage/toggle/first_responder_jacket
-	name = "first responder jacket"
-	desc = "A dark green first responder jacket."
-	icon = 'icons/clothing/kit/first_responder.dmi'
-	contained_sprite = TRUE
-	icon_state = "firstresponderjacket"
-	item_state = "firstresponderjacket"

html/changelogs/wickedcybs_emtjacket.yml

@@ -0,0 +1,9 @@
+author: WickedCybs
+
+delete-after: True
+
+changes:
+  - tweak: "The dark green first responder jacket can now hold medical equipment in its suit slot. Both responder jackets can hold a helmet in the suit slot like the chest rig can, too."
+  - tweak: "Tweaked the side sprites of the open dark green first responder jacket as it was identical to how it looked when closed."
+  - tweak: "Condenses a lot of the common first responder suit wear, like the chest rig and vest into its own selection to tidy up the loadout a bit. Look for the medical outerwear selection to reselect stuff or browse the more expanded options. You will have to reselect your gear from the new selection."
+  - tweak: "Condenses the IAC suit gear into its own outwear catagory too. You will have to reselect your gear from the new selection."