a new era

code/modules/client/preference_setup/loadout/items/head.dm

@@ -508,12 +508,25 @@
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
 /datum/gear/head/peakedcap
-	display_name = "colorable peaked cap"
+	display_name = "corporate peaked cap selection"
+	description = "A selection of corporate-colored peaked caps. Note that the cap should align with your character's chosen faction."
 	path = /obj/item/clothing/head/peaked_cap
-	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
 	allowed_roles = list("Head of Security", "Security Officer", "Warden", "Investigator", "Security Personnel",
-	"Captain", "Executive Officer", "Chief Engineer", "Research Director", "Chief Medical Officer", "Operations Manager",
-	"Corporate Liaison", "Consular Officer", "Bridge Crew")
+	"Captain", "Executive Officer")
+
+/datum/gear/head/peakedcap/New()
+	..()
+	var/list/caps = list()
+	caps["peaked cap, Zavodskoi Interstellar"] = /obj/item/clothing/head/peaked_cap/zavodskoi
+	caps["peaked cap, Zavodskoi Interstellar, no logo"] = /obj/item/clothing/head/peaked_cap/zavodskoi/no_logo
+	caps["peaked cap, Zavodskoi Interstellar, alt"] = /obj/item/clothing/head/peaked_cap/zavodskoi/alt
+	caps["peaked cap, Zavodskoi Interstellar, alt, no logo"] = /obj/item/clothing/head/peaked_cap/zavodskoi/alt/no_logo
+	caps["peaked cap, Idris Incorporated"] = /obj/item/clothing/head/peaked_cap/idris
+	caps["peaked cap, Idris Incorporated, no logo"] = /obj/item/clothing/head/peaked_cap/idris/no_logo
+	caps["peaked cap, Private Military Contracting Group"] = /obj/item/clothing/head/peaked_cap/pmcg
+	caps["peaked cap, Private Military Contracting Group, no logo"] = /obj/item/clothing/head/peaked_cap/pmcg/no_logo
+	gear_tweaks += new /datum/gear_tweak/path(caps)
 
 /*
 	Block Hair Adjustment

code/modules/clothing/head/misc.dm

@@ -765,11 +765,53 @@
 	item_state = "amapola_ute_hat"
 
 /obj/item/clothing/head/peaked_cap
-	name = "peaked cap"
-	desc = "A military-style peaked cap."
-	icon_state = "peaked_cap"
-	item_state = "peaked_cap"
-	icon = 'icons/clothing/head/peaked_cap.dmi'
+	name = "corporate peaked cap"
+	desc = "A military-style corporate peaked cap. This one bears the emblem of NanoTrasen Incorporated."
+	icon_state = "nt_warden_hat"
+	item_state = "nt_warden_hat"
+	icon = 'icons/obj/item/clothing/department_uniforms/security.dmi'
 	contained_sprite = TRUE
-	build_from_parts = TRUE
-	worn_overlay = "visor"
+
+/obj/item/clothing/head/peaked_cap/no_logo
+	desc = "A military-style corporate peaked cap. This one bears the colors of NanoTrasen Incorporated."
+	icon_state = "nt_warden_hat_nologo"
+	item_state = "nt_warden_hat_nologo"
+
+/obj/item/clothing/head/peaked_cap/zavodskoi
+	desc = "A military-style corporate peaked cap. This one bears the emblem of Zavodskoi Interstellar."
+	icon_state = "zav_warden_hat"
+	item_state = "zav_warden_hat"
+
+/obj/item/clothing/head/peaked_cap/zavodskoi/no_logo
+	desc = "A military-style corporate peaked cap. This one bears the colors of Zavodskoi Interstellar."
+	icon_state = "zav_warden_hat_nologo"
+	item_state = "zav_warden_hat_nologo"
+
+/obj/item/clothing/head/peaked_cap/zavodskoi/alt
+	icon_state = "zav_warden_hat_alt"
+	item_state = "zav_warden_hat_alt"
+
+/obj/item/clothing/head/peaked_cap/zavodskoi/alt/no_logo
+	desc = "A military-style corporate peaked cap. This one bears the colors of Zavodskoi Interstellar."
+	icon_state = "zav_warden_hat_alt_nologo"
+	item_state = "zav_warden_hat_alt_nologo"
+
+/obj/item/clothing/head/peaked_cap/idris
+	desc = "A military-style corporate peaked cap. This one bears the emblem of Idris Incorporated."
+	icon_state = "idris_warden_hat"
+	item_state = "idris_warden_hat"
+
+/obj/item/clothing/head/peaked_cap/idris/no_logo
+	desc = "A military-style corporate peaked cap. This one bears the colors of Idris Incorporated."
+	icon_state = "idris_warden_hat_nologo"
+	item_state = "idris_warden_hat_nologo"
+
+/obj/item/clothing/head/peaked_cap/pmcg
+	desc = "A military-style corporate peaked cap. This one bears the emblem of the Private Military Contracting Group."
+	icon_state = "pmc_warden_hat"
+	item_state = "pmc_warden_hat"
+
+/obj/item/clothing/head/peaked_cap/pmcg/no_logo
+	desc = "A military-style corporate peaked cap. This one bears the colors of the Private Military Contracting Group."
+	icon_state = "pmc_warden_hat_nologo"
+	item_state = "pmc_warden_hat_nologo"

html/changelogs/SimpleMaroon-itspeak(edcap).yml

@@ -55,4 +55,4 @@ delete-after: True
 # Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
 # Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
 changes:
-  - rscadd: "Added a colorable peaked cap to the loadout, available for Security, Command, and Command Support roles."
+  - rscadd: "Added a corporate peaked cap selection to the loadout for Security, the Captain, and the XO. They look like the Warden's hat, but also come in options with no logo for more customization."