Custodial Uniform Tweaks (#13979)

code/game/jobs/faction/idris.dm

@@ -109,7 +109,7 @@
 	name = "Janitor - Idris"
 
 	uniform = /obj/item/clothing/under/rank/janitor/idris
-	head = /obj/item/clothing/head/softcap/idris
+	head = /obj/item/clothing/head/softcap/idris/custodian
 	id = /obj/item/card/id/idris
 
 /datum/outfit/job/librarian/idris

code/game/jobs/job/civilian.dm

@@ -162,7 +162,7 @@
 	jobtype = /datum/job/janitor
 
 	uniform = /obj/item/clothing/under/rank/janitor
-	head = /obj/item/clothing/head/softcap/janitor
+	head = /obj/item/clothing/head/softcap/nt/custodian
 	shoes = /obj/item/clothing/shoes/black
 
 	tab_pda = /obj/item/modular_computer/handheld/pda/civilian/janitor

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -65,11 +65,13 @@
 	icon_door = "mixed"
 
 /obj/structure/closet/jcloset/fill()
+	new /obj/item/clothing/head/softcap/nt/custodian(src)
 	new /obj/item/clothing/under/rank/janitor(src)
+	new /obj/item/clothing/head/softcap/idris/custodian(src)
 	new /obj/item/clothing/under/rank/janitor/idris(src)
 	new /obj/item/device/radio/headset/headset_service(src)
 	new /obj/item/clothing/gloves/black(src)
-	new /obj/item/clothing/head/softcap/janitor(src)
+	new /obj/item/clothing/head/softcap/custodian(src)
 	new /obj/item/clothing/head/bandana/janitor(src)
 	new /obj/item/clothing/head/beret/janitor(src)
 	new /obj/item/gun/energy/mousegun(src)

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

@@ -241,3 +241,19 @@
 	path = /obj/item/clothing/accessory/badge/passcard/burzsia
 	slot = slot_tie
 	faction = "Hephaestus Industries"
+
+/datum/gear/faction/nt_custodialjumpsuit
+	display_name = "nanotrasen custodial jumpsuit, alternative"
+	path = /obj/item/clothing/under/rank/janitor/alt
+	slot = slot_w_uniform
+	cost = 0
+	faction = "NanoTrasen"
+	allowed_roles = list("Janitor")
+
+/datum/gear/faction/idris_custodialjumpsuit
+	display_name = "idris custodial jumpsuit, alternative"
+	path = /obj/item/clothing/under/rank/janitor/idris/alt
+	slot = slot_w_uniform
+	cost = 0
+	faction = "Idris Incorporated"
+	allowed_roles = list("Janitor")

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

@@ -62,7 +62,7 @@
 	softcaps["softcap, hydroponics"] = /obj/item/clothing/head/softcap/hydro
 	softcaps["softcap, cargo"] = /obj/item/clothing/head/softcap/cargo
 	softcaps["softcap, mining"] = /obj/item/clothing/head/softcap/miner
-	softcaps["softcap, janitor"] = /obj/item/clothing/head/softcap/janitor
+	softcaps["softcap, janitor"] = /obj/item/clothing/head/softcap/custodian
 	softcaps["softcap, tcfl"] = /obj/item/clothing/head/softcap/tcfl
 
 	gear_tweaks += new /datum/gear_tweak/path(softcaps)

code/modules/clothing/head/soft_caps.dm

@@ -27,7 +27,7 @@
 	icon_state = "[initial(icon_state)][flipped ? "_flipped" : ""]"
 	item_state = icon_state
 	to_chat(usr, "You flip the hat [flipped ? "backwards" : "forwards"].")
-	update_clothing_icon()	//so our mob-overlays update
+	update_clothing_icon()	// So our mob-overlays update.
 
 /obj/item/clothing/head/softcap/colorable
 	icon_state = "softcap_colorable"
@@ -55,8 +55,7 @@
 	icon_state = "tcfl"
 	item_state = "tcfl"
 
-// Departmental softcaps. By Wowzewow (Wezzy).
-
+// Departmental Softcaps (By Wowzewow (Wezzy))
 /obj/item/clothing/head/softcap/captain
 	name = "captain's softcap"
 	desc = "It's a peaked cap in a authoritative blue and yellow."
@@ -111,16 +110,13 @@
 	icon_state = "softcap_miner"
 	item_state = "softcap_miner"
 
-/obj/item/clothing/head/softcap/janitor
-	name = "janitor softcap"
-	desc = "It's a peaked cap, freshly sanitized and ready for a day of viscera cleanup."
-	icon = 'icons/obj/clothing/hats/soft_caps.dmi'
-	contained_sprite = TRUE
-	icon_state = "softcap_janitor"
-	item_state = "softcap_janitor"
-
-// Corporate.
+/obj/item/clothing/head/softcap/custodian
+	name = "custodial softcap"
+	desc = "A peaked cap in a purple colour with a yellow brim."
+	icon_state = "custodian"
+	item_state = "custodian"
 
+// Corporate
 /obj/item/clothing/head/softcap/iac
 	name = "IAC cap"
 	desc = "An IAC cap. Standard issue and utilitarian."
@@ -162,3 +158,16 @@
 	desc = "A company-issue NanoTrasen cap. Smells of phoron."
 	icon_state = "nt"
 	item_state = "nt"
+
+// Departmental Corporate Softcaps
+/obj/item/clothing/head/softcap/nt/custodian
+	name = "nt custodial softcap"
+	desc = "A peaked cap in a blue colour with a purple brim."
+	icon_state = "custodian_nt"
+	item_state = "custodian_nt"
+
+/obj/item/clothing/head/softcap/idris/custodian
+	name = "idris custodial softcap"
+	desc = "A peaked cap in a teal colour with a purple brim."
+	icon_state = "custodian_idris"
+	item_state = "custodian_idris"

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

@@ -95,10 +95,18 @@
 		bio = ARMOR_BIO_MINOR
 	)
 
+/obj/item/clothing/under/rank/janitor/alt
+	icon_state = "nt_janitor_alt"
+	item_state = "nt_janitor_alt"
+
 /obj/item/clothing/under/rank/janitor/idris
 	icon_state = "idris_janitor"
 	item_state = "idris_janitor"
 
+/obj/item/clothing/under/rank/janitor/idris/alt
+	icon_state = "idris_janitor_alt"
+	item_state = "idris_janitor_alt"
+
 // Lawyer (to be replaced by modularization)
 
 /obj/item/clothing/under/lawyer

html/changelogs/custodial_uniform_stripe.yml

@@ -0,0 +1,8 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - rscadd: "Re-adds the old custodial uniform with the purple sleeves."
+  - rscadd: "Adds an alternative custodial uniform with a purple vertical stripe for both factions."
+  - rscadd: "Adds faction-based custodial softcaps."