New Corporate Coats (#15315)

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

@@ -90,6 +90,10 @@
 	idris_labcoats["idris letterman labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris/letterman/alt
 	idris_labcoats["idris labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/idris
 	idris_labcoats["idris windbreaker"] = /obj/item/clothing/suit/storage/toggle/idris
+	idris_labcoats["idris corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/idris
+	idris_labcoats["idris corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/idris/alt
+	idris_labcoats["idris winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/idris
+	idris_labcoats["idris winter coat, alt"] = /obj/item/clothing/suit/storage/hooded/wintercoat/idris/alt
 	gear_tweaks += new /datum/gear_tweak/path(idris_labcoats)
 
 /datum/gear/faction/idris_sec_coat
@@ -161,6 +165,10 @@
 	zavodskoi_labcoats["zavodskoi letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/letterman
 	zavodskoi_labcoats["zavodskoi letterman labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/letterman/alt
 	zavodskoi_labcoats["zavodskoi labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/zavodskoi
+	zavodskoi_labcoats["zavodskoi corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/zavod
+	zavodskoi_labcoats["zavodskoi corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/zavod/alt
+	zavodskoi_labcoats["zavodskoi winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/zavod
+	zavodskoi_labcoats["zavodskoi winter coat, alt"] = /obj/item/clothing/suit/storage/hooded/wintercoat/zavod/alt
 	gear_tweaks += new /datum/gear_tweak/path(zavodskoi_labcoats)
 
 /datum/gear/faction/zavod_sec_coat
@@ -256,6 +264,10 @@
 	pmc_labcoats["PMCG labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc/alt
 	pmc_labcoats["PMCG labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/pmc
 	pmc_labcoats["EPMC labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc
+	pmc_labcoats["PMCG corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/pmc
+	pmc_labcoats["EPMC corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/pmc/alt
+	pmc_labcoats["PMCG winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/pmc
+	pmc_labcoats["EPMC winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/pmc/alt
 	gear_tweaks += new /datum/gear_tweak/path(pmc_labcoats)
 
 /datum/gear/faction/pmc_sec_coat
@@ -408,6 +420,10 @@
 	zenghu_labcoats["zeng-hu letterman labcoat, classic"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt2
 	zenghu_labcoats["zeng-hu labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/zeng
 	zenghu_labcoats["zeng-hu first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng
+	zenghu_labcoats["zeng-hu corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/zeng
+	zenghu_labcoats["zeng-hu corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/zeng/alt
+	zenghu_labcoats["zeng-hu winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/zeng
+	zenghu_labcoats["zeng-hu winter coat, alt"] = /obj/item/clothing/suit/storage/hooded/wintercoat/zeng/alt
 	gear_tweaks += new /datum/gear_tweak/path(zenghu_labcoats)
 
 /datum/gear/faction/zenghu_apron
@@ -442,6 +458,9 @@
 	heph_labcoats["hephaestus labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/heph
 	heph_labcoats["hephaestus letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/heph/letterman
 	heph_labcoats["hephaestus labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/heph
+	heph_labcoats["hephaestus corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/heph
+	heph_labcoats["hephaestus winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/heph
+	heph_labcoats["hephaestus winter coat, alt"] = /obj/item/clothing/suit/storage/hooded/wintercoat/heph/alt
 	gear_tweaks += new /datum/gear_tweak/path(heph_labcoats)
 
 /datum/gear/faction/heph_beret
@@ -458,11 +477,23 @@
 
 //NanoTrasen
 /datum/gear/faction/nanotrasen_labcoat
-	display_name = "nanotrasen labcoat, long"
-	path = /obj/item/clothing/suit/storage/toggle/longcoat/nt
+	display_name = "nanotrasen coat selection"
+	description = "A selection of NanoTrasen coats"
+	path = /obj/item/clothing/suit/storage/toggle/labcoat/nt
 	slot = slot_wear_suit
 	faction = "NanoTrasen"
 
+/datum/gear/faction/nanotrasen_labcoat/New()
+	..()
+	var/list/nt_labcoats = list()
+	nt_labcoats["nanotrasen labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/nt
+	nt_labcoats["nanotrasen letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/nt/letterman
+	nt_labcoats["nanotrasen labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/nt
+	nt_labcoats["nanotrasen corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/nt
+	nt_labcoats["nanotrasen winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/nt
+	nt_labcoats["nanotrasen winter coat, alt"] = /obj/item/clothing/suit/storage/hooded/wintercoat/nt/alt
+	gear_tweaks += new /datum/gear_tweak/path(nt_labcoats)
+
 /datum/gear/faction/nt_custodialjumpsuit
 	display_name = "nanotrasen custodial jumpsuit, alternative"
 	path = /obj/item/clothing/under/rank/janitor/alt
@@ -471,6 +502,8 @@
 	faction = "NanoTrasen"
 	allowed_roles = list("Janitor")
 
+//SCC
+
 /datum/gear/faction/scc_armband
 	display_name = "SCC armband"
 	path = /obj/item/clothing/accessory/armband/scc
@@ -488,13 +521,24 @@
 	faction = null
 
 /datum/gear/faction/scc_jacket
-	display_name = "SCC jacket"
+	display_name = "SCC coat selection"
+	description = "A selection of SCC coats"
 	path = /obj/item/clothing/suit/storage/toggle/brown_jacket/scc
 	slot = slot_wear_suit
 	sort_category = "Factions"
 	cost = 1
 	faction = null
 
+/datum/gear/faction/scc_jacket/New()
+	..()
+	var/list/scc_jackets = list()
+	scc_jackets["SCC jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/scc
+	scc_jackets["SCC corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/scc
+	scc_jackets["SCC corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/scc/alt
+	scc_jackets["SCC winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/scc
+	scc_jackets["SCC winter coat, alt"] = /obj/item/clothing/suit/storage/hooded/wintercoat/scc/alt
+	gear_tweaks += new /datum/gear_tweak/path(scc_jackets)
+
 /datum/gear/faction/scc_beret
 	display_name = "SCC beret"
 	path = /obj/item/clothing/head/beret/scc
@@ -502,3 +546,23 @@
 	sort_category = "Factions"
 	cost = 1
 	faction = null
+
+//Orion
+/datum/gear/faction/orion_coat
+	display_name = "orion coat selection"
+	description = "A selection of Orion coats"
+	path = /obj/item/clothing/suit/storage/toggle/labcoat/orion
+	slot = slot_wear_suit
+	faction = "Orion Express"
+
+/datum/gear/faction/orion_coat/New()
+	..()
+	var/list/orion_labcoats = list()
+	orion_labcoats["orion labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/orion
+	orion_labcoats["orion letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/orion/letterman
+	orion_labcoats["orion labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/orion
+	orion_labcoats["orion corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/orion
+	orion_labcoats["orion corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/orion/alt
+	orion_labcoats["orion winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/orion
+	orion_labcoats["orion winter coat, alt"] = /obj/item/clothing/suit/storage/hooded/wintercoat/orion/alt
+	gear_tweaks += new /datum/gear_tweak/path(orion_labcoats)

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

@@ -30,7 +30,7 @@
 	bandanas["bandana, engineering"] = /obj/item/clothing/head/bandana/engineering
 	bandanas["bandana, atmospherics"] = /obj/item/clothing/head/bandana/atmos
 	bandanas["bandana, hydroponics"] = /obj/item/clothing/head/bandana/hydro
-	bandanas["bandana, cargo"] = /obj/item/clothing/head/bandana/cargo
+	bandanas["bandana, operations"] = /obj/item/clothing/head/bandana/cargo
 	bandanas["bandana, mining"] = /obj/item/clothing/head/bandana/miner
 	bandanas["bandana, janitor"] = /obj/item/clothing/head/bandana/janitor
 
@@ -60,7 +60,7 @@
 	softcaps["softcap, engineering"] = /obj/item/clothing/head/softcap/engineering
 	softcaps["softcap, atmospherics"] = /obj/item/clothing/head/softcap/atmos
 	softcaps["softcap, hydroponics"] = /obj/item/clothing/head/softcap/hydro
-	softcaps["softcap, cargo"] = /obj/item/clothing/head/softcap/cargo
+	softcaps["softcap, operations"] = /obj/item/clothing/head/softcap/cargo
 	softcaps["softcap, mining"] = /obj/item/clothing/head/softcap/miner
 	softcaps["softcap, janitor"] = /obj/item/clothing/head/softcap/custodian
 	softcaps["softcap, tcfl"] = /obj/item/clothing/head/softcap/tcfl
@@ -90,7 +90,7 @@
 	berets["beret, engineering"] = /obj/item/clothing/head/beret/engineering
 	berets["beret, atmospherics"] = /obj/item/clothing/head/beret/atmos
 	berets["beret, hydroponics"] = /obj/item/clothing/head/beret/hydro
-	berets["beret, cargo"] = /obj/item/clothing/head/beret/cargo
+	berets["beret, operations"] = /obj/item/clothing/head/beret/cargo
 	berets["beret, mining"] = /obj/item/clothing/head/beret/miner
 	berets["beret, janitor"] = /obj/item/clothing/head/beret/janitor
 

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

@@ -224,7 +224,7 @@ datum/gear/suit/colorvest
 	wintercoat["winter coat, engineering"] = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering
 	wintercoat["winter coat, atmospherics"] = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
 	wintercoat["winter coat, hydroponics"] = /obj/item/clothing/suit/storage/hooded/wintercoat/hydro
-	wintercoat["winter coat, cargo"] = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
+	wintercoat["winter coat, operations"] = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
 	wintercoat["winter coat, mining"] = /obj/item/clothing/suit/storage/hooded/wintercoat/miner
 	gear_tweaks += new /datum/gear_tweak/path(wintercoat)
 

code/modules/clothing/suits/hoodies.dm

@@ -184,6 +184,79 @@
 	icon_state = "coatminer"
 	item_state = "coatminer"
 
+/obj/item/clothing/suit/storage/hooded/wintercoat/idris
+	name = "idris winter coat"
+	icon_state = "coatidris"
+	item_state = "coatidris"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/idris/alt
+	icon_state = "coatidris_alt"
+	item_state = "coatidris_alt"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/zavod
+	name = "zavodskoi winter coat"
+	icon_state = "coatzavod"
+	item_state = "coatzavod"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/zavod/alt
+	icon_state = "coatzavod_alt"
+	item_state = "coatzavod_alt"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/pmc
+	name = "pmcg winter coat"
+	icon_state = "coatpmc"
+	item_state = "coatpmc"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/pmc/alt
+	name = "epmc winter coat"
+	icon_state = "coatepmc"
+	item_state = "coatepmc"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/heph
+	name = "hephaestus winter coat"
+	icon_state = "coatheph"
+	item_state = "coatheph"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/heph/alt
+	icon_state = "coatheph_alt"
+	item_state = "coatheph_alt"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/nt
+	name = "nanotrasen winter coat"
+	icon_state = "coatnt"
+	item_state = "coatnt"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/nt/alt
+	icon_state = "coatnt_alt"
+	item_state = "coatnt_alt"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/zeng
+	name = "zeng-hu winter coat"
+	icon_state = "coatzeng"
+	item_state = "coatzeng"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/zeng/alt
+	icon_state = "coatzeng_alt"
+	item_state = "coatzeng_alt"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/orion
+	name = "orion winter coat"
+	icon_state = "coatorion"
+	item_state = "coatorion"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/orion/alt
+	icon_state = "coatorion_alt"
+	item_state = "coatorion_alt"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/scc
+	name = "scc winter coat"
+	icon_state = "coatscc"
+	item_state = "coatscc"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/scc/alt
+	icon_state = "coatscc_alt"
+	item_state = "coatscc_alt"
+
 /obj/item/clothing/suit/storage/hooded/wintercoat/corgi
 	name = "corgi costume"
 	desc = "A corgi costume made of legit corgi hide."

code/modules/clothing/suits/labcoat.dm

@@ -52,6 +52,9 @@
 	name = "nanotrasen labcoat"
 	icon_state = "labcoat_nt"
 
+/obj/item/clothing/suit/storage/toggle/labcoat/nt/letterman
+	icon_state = "labcoat_letterman_nt"
+
 /obj/item/clothing/suit/storage/toggle/longcoat/nt
 	name = "nanotrasen long labcoat"
 	icon_state = "labcoat_long_nt"
@@ -151,6 +154,19 @@
 	icon_state = "labcoat_long_idris"
 	item_state = "labcoat_long_idris"
 
+//Orion
+/obj/item/clothing/suit/storage/toggle/labcoat/orion
+	name = "orion labcoat"
+	icon_state = "labcoat_orion"
+
+/obj/item/clothing/suit/storage/toggle/labcoat/orion/letterman
+	icon_state = "labcoat_letterman_orion"
+
+/obj/item/clothing/suit/storage/toggle/longcoat/orion
+	name = "orion long labcoat"
+	icon_state = "labcoat_long_orion"
+	item_state = "labcoat_long_orion"
+
 //IAC
 /obj/item/clothing/suit/storage/toggle/labcoat/iac
 	name = "iac labcoat"

code/modules/clothing/suits/miscellaneous.dm

@@ -514,36 +514,48 @@
 	desc = "A cozy jacket in engineering's colors, featuring spacious pockets you won't even use."
 	icon_state = "engi_dep_jacket"
 	item_state = "engi_dep_jacket"
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi'
+	contained_sprite = TRUE
 
 /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
 	name = "operations department jacket"
 	desc = "A cozy jacket in operations' colors, perfect for folding up and forgetting bounty lists."
 	icon_state = "supply_dep_jacket"
 	item_state = "supply_dep_jacket"
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi'
+	contained_sprite = TRUE
 
 /obj/item/clothing/suit/storage/toggle/sci_dep_jacket
 	name = "science department jacket"
 	desc = "A cozy jacket in science's colors, offering the latest in a complete lack of protection against chemical spills."
 	icon_state = "sci_dep_jacket"
 	item_state = "sci_dep_jacket"
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi'
+	contained_sprite = TRUE
 
 /obj/item/clothing/suit/storage/toggle/med_dep_jacket
 	name = "medical department jacket"
 	desc = "A cozy jacket in medical's colors, guaranteed not to leak the latest gossip."
 	icon_state = "med_dep_jacket"
 	item_state = "med_dep_jacket"
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi'
+	contained_sprite = TRUE
 
 /obj/item/clothing/suit/storage/toggle/sec_dep_jacket
 	name = "security department jacket"
 	desc = "A cozy jacket in security's colors, luckily able to be easily cleaned of blood stains"
 	icon_state = "sec_dep_jacket"
 	item_state = "sec_dep_jacket"
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi'
+	contained_sprite = TRUE
 
 /obj/item/clothing/suit/storage/toggle/serv_dep_jacket
 	name = "service department jacket"
 	desc = "A cozy jacket in service's colors, reminding many employees that even service has colors."
 	icon_state = "serv_dep_jacket"
 	item_state = "serv_dep_jacket"
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi'
+	contained_sprite = TRUE
 
 /obj/item/clothing/suit/storage/toggle/fib
 	name = "\improper FIB agent jacket"

code/modules/clothing/suits/storage.dm

@@ -97,3 +97,81 @@
 			to_chat(usr, "\The [src] does not have a vest badge.")
 			return
 		update_clothing_icon()
+
+// Corporate Jackets
+
+/obj/item/clothing/suit/storage/toggle/corp
+	icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi'
+	contained_sprite = TRUE
+
+/obj/item/clothing/suit/storage/toggle/corp/idris
+	name = "idris corporate jacket"
+	desc = "A cozy jacket in Idris' colors, for those who need more merchandise in their life."
+	icon_state = "idris_corp_jacket"
+	item_state = "idris_corp_jacket"
+
+/obj/item/clothing/suit/storage/toggle/corp/idris/alt
+	icon_state = "idris_corp_jacket_alt"
+	item_state = "idris_corp_jacket_alt"
+
+/obj/item/clothing/suit/storage/toggle/corp/zavod
+	name = "zavodskoi corporate jacket"
+	desc = "A cozy jacket in Zavodskoi's colors, professional and intimidating."
+	icon_state = "zavod_corp_jacket"
+	item_state = "zavod_corp_jacket"
+
+/obj/item/clothing/suit/storage/toggle/corp/zavod/alt
+	icon_state = "zavod_corp_jacket_alt"
+	item_state = "zavod_corp_jacket_alt"
+
+/obj/item/clothing/suit/storage/toggle/corp/pmc
+	name = "pmcg corporate jacket"
+	desc = "A cozy jacket in PMCG's colors, made out of military grade material."
+	icon_state = "pmc_corp_jacket"
+	item_state = "pmc_corp_jacket"
+
+/obj/item/clothing/suit/storage/toggle/corp/pmc/alt
+	icon_state = "epmc_corp_jacket"
+	item_state = "epmc_corp_jacket"
+
+/obj/item/clothing/suit/storage/toggle/corp/heph
+	name = "hephaestus corporate jacket"
+	desc = "A cozy jacket in Hepheastus' colors, as heavy duty as they come."
+	icon_state = "heph_corp_jacket"
+	item_state = "heph_corp_jacket"
+
+/obj/item/clothing/suit/storage/toggle/corp/nt
+	name = "nanotrasen corporate jacket"
+	desc = "A cozy jacket in NanoTrasen's colors, perfect if you live for a phoron company."
+	icon_state = "nt_corp_jacket"
+	item_state = "nt_corp_jacket"
+
+/obj/item/clothing/suit/storage/toggle/corp/zeng
+	name = "zeng-hu corporate jacket"
+	desc = "A cozy jacket in Zeng-Hu's colors, optional augmentations not included."
+	icon_state = "zeng_corp_jacket"
+	item_state = "zeng_corp_jacket"
+
+/obj/item/clothing/suit/storage/toggle/corp/zeng/alt
+	icon_state = "zeng_corp_jacket_alt"
+	item_state = "zeng_corp_jacket_alt"
+
+/obj/item/clothing/suit/storage/toggle/corp/orion
+	name = "orion corporate jacket"
+	desc = "A cozy jacket in Orion's colors, perfect for hauling freight day and night."
+	icon_state = "orion_corp_jacket"
+	item_state = "orion_corp_jacket"
+
+/obj/item/clothing/suit/storage/toggle/corp/orion/alt
+	icon_state = "orion_corp_jacket_alt"
+	item_state = "orion_corp_jacket_alt"
+
+/obj/item/clothing/suit/storage/toggle/corp/scc
+	name = "scc corporate jacket"
+	desc = "A cozy jacket in the SCC's colors, the finest jacket of them all."
+	icon_state = "scc_corp_jacket"
+	item_state = "scc_corp_jacket"
+
+/obj/item/clothing/suit/storage/toggle/corp/scc/alt
+	icon_state = "scc_corp_jacket_alt"
+	item_state = "scc_corp_jacket_alt"

html/changelogs/morecorpocoats.yml

@@ -0,0 +1,9 @@
+author: Sparky_hotdog
+
+delete-after: True
+
+changes:
+  - rscadd: "Added corporation themed jackets, available in faction loadout."
+  - rscadd: "Added corporation themed winter coats, available in faction loadout."
+  - rscadd: "Added NanoTrasen and Orion coat loadout selections."
+  - tweak: "Changed a few loadout items from cargo to operations."