Merge pull request #14787 from WanderingFox95/WanderingFox95-ORV-Revamp

ORV Uniform Revamp

code/modules/clothing/under/trek.dm

@@ -102,9 +102,14 @@
 	desc = "An uniform worn by command officers since 2420s."
 	icon_state = "orv_com"
 
-/obj/item/clothing/under/trek/engsec/orv
+/obj/item/clothing/under/trek/eng/orv
 	desc = "An uniform worn by operations officers since 2420s."
-	icon_state = "orv_ops"
+	icon_state = "orv_eng"
+
+/obj/item/clothing/under/trek/sec/orv
+	desc = "An uniform worn by security officers since 2420s."
+	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30, "wound" = 10)
+	icon_state = "orv_sec"
 
 /obj/item/clothing/under/trek/medsci/orv
 	desc = "An uniform worn by medsci officers since 2420s."
@@ -114,13 +119,20 @@
 //honestly no idea why i added specified comm. uniforms but w/e
 /obj/item/clothing/under/trek/command/orv/captain
 	name = "captain uniform"
-	desc = "An uniform worn by captains since 2550s."
+	desc = "An uniform worn by captains and commanders since 2550s."
 	icon_state = "orv_com_capt"
 
-/obj/item/clothing/under/trek/command/orv/engsec
-	name = "operations command uniform"
-	desc = "An uniform worn by operations command officers since 2550s."
-	icon_state = "orv_com_ops"
+/obj/item/clothing/under/trek/command/orv/eng
+	name = "engineering command uniform"
+	desc = "An uniform worn by Chief Engineers since 2550s."
+	icon_state = "orv_com_eng"
+
+/obj/item/clothing/under/trek/command/orv/sec
+	name = "security command uniform"
+	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 10)
+	desc = "An uniform worn by Heads of Security since 2550s."
+	icon_state = "orv_com_sec"
+
 
 /obj/item/clothing/under/trek/command/orv/medsci
 	name = "medsci command uniform"
@@ -131,13 +143,11 @@
 	name = "adjutant uniform"
 	desc = "An uniform worn by adjutants <i>(assistants)</i> since 2550s."
 	icon_state = "orv_ass"
-	item_state = "gy_suit"
 
 /obj/item/clothing/under/trek/orv/service
 	name = "service uniform"
 	desc = "An uniform worn by service officers since 2550s."
 	icon_state = "orv_srv"
-	item_state = "g_suit"
 
 //The Motion Picture
 /obj/item/clothing/under/trek/fedutil

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"

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

modular_citadel/code/modules/clothing/trek.dm

@@ -172,8 +172,11 @@
 /obj/item/clothing/head/kepi/orvi/command
 	icon_state = "kepi_com"
 
-/obj/item/clothing/head/kepi/orvi/engsec
-	icon_state = "kepi_ops"
+/obj/item/clothing/head/kepi/orvi/sec
+	icon_state = "kepi_sec"
+
+/obj/item/clothing/head/kepi/orvi/eng
+	icon_state = "kepi_eng"
 
 /obj/item/clothing/head/kepi/orvi/medsci
 	icon_state = "kepi_medsci"