NBT Uniform Fixes (#13936)

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

@@ -248,11 +248,11 @@
 /datum/gear/head/surgical/New()
 	..()
 	var/list/surgical = list()
-	surgical["surgical cap, nanotrasen navy blue"] = /obj/item/clothing/under/rank/medical/surgeon/zeng
-	surgical["surgical cap, zeng-hu purple"] = /obj/item/clothing/under/rank/medical/surgeon/zeng
+	surgical["surgical cap, nanotrasen navy blue"] = /obj/item/clothing/head/surgery
+	surgical["surgical cap, zeng-hu purple"] = /obj/item/clothing/head/surgery/zeng
 	surgical["surgical cap, PMCG blue"] = /obj/item/clothing/head/surgery/pmc
-	surgical["surgical cap, zavodskoi black"] = /obj/item/clothing/under/rank/medical/surgeon/zavod
-	surgical["surgical cap, idris green"] = /obj/item/clothing/under/rank/medical/surgeon/idris
+	surgical["surgical cap, zavodskoi black"] = /obj/item/clothing/head/surgery/zavod
+	surgical["surgical cap, idris green"] = /obj/item/clothing/head/surgery/idris
 	gear_tweaks += new /datum/gear_tweak/path(surgical)
 
 /datum/gear/head/headbando

code/modules/clothing/glasses/glasses.dm

@@ -662,12 +662,12 @@ BLIND     // can't see anything
 
 /obj/item/clothing/glasses/sunglasses/sechud/pmc
 	name = "PMCG HUDsunglasses"
-	desc = "Sunglasses in the colours of the Eridani PMC organisation. They come with a blue-tinted HUD and a chrome finish."
+	desc = "Sunglasses in the colours of the Private Military Contracting Group. They come with a blue-tinted HUD and a chrome finish."
 	icon_state = "sunhud_pmc"
 
 /obj/item/clothing/glasses/sunglasses/sechud/big/pmc
 	name = "fat PMCG HUDsunglasses"
-	desc = "Fat sunglasses in the colours of the Eridani PMC organisation. They come with a blue-tinted HUD and a chrome finish."
+	desc = "Fat sunglasses in the colours of the Private Military Contracting Group. They come with a blue-tinted HUD and a chrome finish."
 	icon_state = "bigsunglasses_hud_pmc"
 
 /obj/item/clothing/glasses/sunglasses/sechud/idris

code/modules/clothing/head/jobs.dm

@@ -95,10 +95,6 @@
 	icon_state = "surgcap_pmc"
 	item_state = "surgcap_pmc"
 
-/obj/item/clothing/head/surgery/pmc
-	icon_state = "surgcap_pmc"
-	item_state = "surgcap_pmc"
-
 // Zavodskoi and Idris don't have medical jobs, but jobs like xenobiologist and investigators use them ancilliarily.
 
 /obj/item/clothing/head/surgery/zavod

code/modules/clothing/head/soft_caps.dm

@@ -116,12 +116,8 @@
 	desc = "It's a peaked cap, freshly sanitized and ready for a day of viscera cleanup."
 	icon = 'icons/obj/contained_items/department_uniforms/service.dmi'
 	contained_sprite = TRUE
-	icon_state = "nt_janitor_cap"
-	item_state = "nt_janitor_cap"
-
-/obj/item/clothing/head/softcap/janitor/idris
-	icon_state = "idris_janitor_cap"
-	item_state = "idris_janitor_cap"
+	icon_state = "softcap_janitor"
+	item_state = "softcap_janitor"
 
 // Corporate.
 
@@ -133,19 +129,23 @@
 
 /obj/item/clothing/head/softcap/idris
 	name = "idris cap"
-	desc = "It's a company-issue Idris cap. Comes with flagrant corporate branding."
+	desc = "A company-issue Idris cap. Comes with flagrant corporate branding. There's a liability waiver written on the inside, somehow."
 	icon_state = "idris"
 	item_state = "idris"
 
 /obj/item/clothing/head/softcap/pmc
-	name = "eridani cap"
-	desc = "A grey PMCG fatigue cap with the symbol of the Eridani Corporate Federation on its front. For amoral mercenaries that prefer style over protection."
+	name = "PMCG cap"
+	desc = "A company-issue PMCG cap. For amoral mercenaries that prefer style over protection."
 	icon_state = "pmc"
 	item_state = "pmc"
 
+/obj/item/clothing/head/softcap/pmc/alt
+	icon_state = "pmcalt"
+	item_state = "pmcalt"
+
 /obj/item/clothing/head/softcap/zavod
 	name = "zavodskoi cap"
-	desc = "A tan company-issue Zavokdskoi cap with the symbol of the corporation at its front."
+	desc = "A company-issue Zavokdskoi cap with the symbol of the corporation at its front. It seems to be immaculately starched; maybe it's just the material it's made out of."
 	icon_state = "zav"
 	item_state = "zav"
 
@@ -153,20 +153,12 @@
 	icon_state = "zavalt"
 	item_state = "zavalt"
 
-/obj/item/clothing/head/softcap/medical/zeng
-	desc = "A medical cap in Zeng-Hu colors."
-	icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
-	icon_state = "zeng_emt_cap"
-	item_state = "zeng_emt_cap"
+/obj/item/clothing/head/softcap/zeng
+	desc = "A company-issue Zeng-Hu cap. It feels synthetic to the touch."
+	icon_state = "zeng"
+	item_state = "zeng"
 
-/obj/item/clothing/head/softcap/medical/nt
-	desc = "A medical cap in NanoTrasen colors."
-	icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
-	icon_state = "nt_emt_cap"
-	item_state = "nt_emt_cap"
-
-/obj/item/clothing/head/softcap/medical/pmc
-	desc = "A medical cap in PMC colors."
-	icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
-	icon_state = "pmc_emt_cap"
-	item_state = "pmc_emt_cap"
+/obj/item/clothing/head/softcap/nt
+	desc = "A company-issue NanoTrasen cap. Smells of phoron."
+	icon_state = "nt"
+	item_state = "nt"

code/modules/clothing/suits/jobs.dm

@@ -172,6 +172,7 @@ obj/item/clothing/suit/apron/overalls/blue
 /obj/item/clothing/suit/storage/det_jacket/idris
 	icon_state = "idris_invest_coat"
 	item_state = "idris_invest_coat"
+
 /obj/item/clothing/suit/storage/toggle/det_trench
 	name = "brown trenchcoat"
 	desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Perfect for your next act of autodefenestration!"
@@ -211,6 +212,7 @@ obj/item/clothing/suit/apron/overalls/blue
 	icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
 	icon_state = "nt_warden_coat"
 	item_state = "nt_warden_coat"
+	opened = TRUE
 	contained_sprite = TRUE
 
 /obj/item/clothing/suit/storage/toggle/warden/zavod

code/modules/clothing/under/jobs/medsci.dm

@@ -195,8 +195,8 @@
 // Zavodskoi and Idris don't have medical jobs, but jobs like xenobiologist and investigators use them ancilliarily.
 
 /obj/item/clothing/under/rank/medical/surgeon/zavod
-	icon_state = "zavod_surgeon"
-	item_state = "zavod_surgeon"
+	icon_state = "zav_surgeon"
+	item_state = "zav_surgeon"
 
 /obj/item/clothing/under/rank/medical/surgeon/idris
 	icon_state = "idris_surgeon"