From b563e6c2e0f430e344101ed39d8293bdb8d09433 Mon Sep 17 00:00:00 2001
From: WanderingFox95 <75953558+WanderingFox95@users.noreply.github.com>
Date: Wed, 2 Jun 2021 15:25:50 +0200
Subject: [PATCH] Splits Engineering and Security ORV Suits

---
 .../code/modules/client/loadout/head.dm       | 22 +++++++----
 .../code/modules/client/loadout/uniform.dm    | 37 +++++++++++++------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index d1c2c69b99..6d6c803ef1 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -114,13 +114,21 @@
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
 
-/datum/gear/head/orvkepiops
-	name = "Federation Kepi, ops/sec"
+/datum/gear/head/orvkepieng
+	name = "Federation Kepi, eng"
 	description = "A visored cap. Intended to be used with ORV uniform."
-	path = /obj/item/clothing/head/kepi/orvi/engsec
+	path = /obj/item/clothing/head/kepi/orvi/eng
 	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
-	restricted_desc = "Engineering, Security and Cargo"
-	restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster")
+	restricted_desc = "Engineering"
+	restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer")
+
+/datum/gear/head/orvkepisec
+	name = "Federation Kepi, sec"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	path = /obj/item/clothing/head/kepi/orvi/sec
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
+	restricted_desc = "Security"
+	restricted_roles = list("Warden", "Detective", "Security Officer", "Head of Security")
 
 /datum/gear/head/orvkepimedsci
 	name = "Federation Kepi, medsci"
@@ -135,8 +143,8 @@
 	description = "A visored cap. Intended to be used with ORV uniform."
 	path = /obj/item/clothing/head/kepi/orvi/service
 	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
-	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
-	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
+	restricted_desc = "Service, Cargo and Civilian, barring Clown, Mime and Lawyer"
+	restricted_roles = list("Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain", "Cargo Technician", "Shaft Miner")
 
 /datum/gear/head/orvkepiass
 	name = "Federation Kepi, assistant"
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index 945e0dfe12..86fcc867a3 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -588,18 +588,31 @@
 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Chief Medical Officer", "Research Director")
 
-/datum/gear/uniform/orvops
-	name = "ORV uniform, ops/sec"
-	path = /obj/item/clothing/under/trek/engsec/orv
+/datum/gear/uniform/orvsec
+	name = "ORV uniform, sec"
+	path = /obj/item/clothing/under/trek/sec/orv
 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
-	restricted_desc = "Engineering, Security and Cargo"
-	restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster")
+	restricted_desc = "Security"
+	restricted_roles = list("Warden", "Detective", "Security Officer", "Head of Security")
 
-/datum/gear/uniform/orvcmd_ops
-	name = "ORV uniform, ops/sec, cmd"
-	path = /obj/item/clothing/under/trek/command/orv/engsec
+/datum/gear/uniform/orveng
+	name = "ORV uniform, eng"
+	path = /obj/item/clothing/under/trek/eng/orv
 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
-	restricted_roles = list("Chief Engineer", "Head of Security")
+	restricted_desc = "Engineering"
+	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer")
+
+/datum/gear/uniform/orvcmd_sec
+	name = "ORV uniform, sec, cmd"
+	path = /obj/item/clothing/under/trek/command/orv/sec
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+	restricted_roles = list("Head of Security")
+
+/datum/gear/uniform/orvcmd_eng
+	name = "ORV uniform, eng, cmd"
+	path = /obj/item/clothing/under/trek/command/orv/eng
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
+	restricted_roles = list("Chief Engineer")
 
 /datum/gear/uniform/orvass
 	name = "ORV uniform, assistant"
@@ -608,11 +621,11 @@
 	restricted_roles = list("Assistant")
 
 /datum/gear/uniform/orvsrv
-	name = "ORV uniform, service"
+	name = "ORV uniform, other"
 	path = /obj/item/clothing/under/trek/orv/service
 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
-	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
-	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
+	restricted_roles = list("Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain", "Cargo Technician", "Shaft Miner")
+	restricted_desc = "Service, Cargo and Civilian, barring Clown, Mime and Lawyer"
 
 //Memes
 /datum/gear/uniform/gear_harnesses