[MIRROR] Gorka Suit Refactor + Accessory Feature Addon (#9862)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -48,7 +48,7 @@
 		/obj/item/clothing/under/rank/neo_qm_white_skirt,
 		/obj/item/clothing/under/rank/neo_qm_turtle,
 		/obj/item/clothing/under/rank/neo_qm_turtle_skirt,
-		/obj/item/clothing/under/rank/neo_qm_gorka,
+		/obj/item/clothing/under/rank/neo_gorka/qm,
 		/obj/item/clothing/gloves/black,
 		/obj/item/clothing/gloves/fingerless,
 		/obj/item/tank/emergency/oxygen,

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -13,7 +13,7 @@
 		/obj/item/clothing/under/rank/chief_engineer/skirt,
 		/obj/item/clothing/under/rank/neo_chiefengi,
 		/obj/item/clothing/under/rank/neo_chiefengi_skirt,
-		/obj/item/clothing/under/rank/neo_ce_gorka,
+		/obj/item/clothing/under/rank/neo_gorka/ce,
 		/obj/item/clothing/head/hardhat/white,
 		///obj/item/clothing/head/welding,	//VOREStation Removal: Locker bloat, grr. They get fancy goggles or can raid the welding supplies locker for one of these.
 		/obj/item/clothing/gloves/heavy_engineer,	//VOREStation Edit: chief gets the good shit

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -143,7 +143,7 @@
 		/obj/item/clothing/under/rank/neo_cmo_skirt,
 		/obj/item/clothing/under/rank/neo_cmo_turtle,
 		/obj/item/clothing/under/rank/neo_cmo_turtle_skirt,
-		/obj/item/clothing/under/rank/neo_cmo_gorka,
+		/obj/item/clothing/under/rank/neo_gorka/cmo,
 		/obj/item/radio/headset/heads/cmo,
 		/obj/item/radio/headset/alt/heads/cmo,
 		/obj/item/radio/headset/earbud/heads/cmo,

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -39,7 +39,7 @@
 		/obj/item/clothing/under/rank/neo_rd_turtle_skirt,
 		/obj/item/clothing/under/rank/neo_rd_suit,
 		/obj/item/clothing/under/rank/neo_rd_suit_skirt,
-		/obj/item/clothing/under/rank/neo_rd_gorka,
+		/obj/item/clothing/under/rank/neo_gorka/rd,
 		/obj/item/cartridge/rd,
 		/obj/item/clothing/shoes/white,
 		/obj/item/clothing/shoes/laceup/brown,

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -57,7 +57,7 @@
 		/obj/item/clothing/under/rank/neo_hop_parade_fem,
 		/obj/item/clothing/under/rank/neo_hop_turtle,
 		/obj/item/clothing/under/rank/neo_hop_turtle_skirt,
-		/obj/item/clothing/under/rank/neo_cmd_gorka,
+		/obj/item/clothing/under/rank/neo_gorka/command,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_hopformal,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep,
 		/obj/item/clothing/shoes/brown,
@@ -153,7 +153,7 @@
 		/obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench,
 		/obj/item/clothing/suit/storage/vest/wardencoat/neo_bluewarden,
 		/obj/item/clothing/suit/storage/vest/wardencoat/neo_warden_heavy,
-		/obj/item/clothing/under/rank/neo_sec_gorka,
+		/obj/item/clothing/under/rank/neo_gorka/sec,
 		/obj/item/cartridge/security,
 		/obj/item/radio/headset/headset_sec,
 		/obj/item/radio/headset/alt/headset_sec,

code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm

@@ -24,7 +24,7 @@
 		/obj/item/clothing/under/rank/neo_hos_blackblue_skirt,
 		/obj/item/clothing/under/rank/neo_hos_parade_blue,
 		/obj/item/clothing/under/rank/neo_hos_parade_blue_fem,
-		/obj/item/clothing/under/rank/neo_hos_gorka,
+		/obj/item/clothing/under/rank/neo_gorka/hos,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_hos_parade,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_hosformal_blue,
 		/obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench,

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

@@ -46,7 +46,8 @@
 		"TG&C black suit"=/obj/item/clothing/under/rank/neo_captain_blacksuit,
 		"TG&C parade uniform"=/obj/item/clothing/under/rank/neo_captain_parade,
 		"TG&C jumpkilt"=/obj/item/clothing/under/rank/neo_captain_kilt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_cmd_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/command,
+		"TG&C black command gorka"=/obj/item/clothing/under/rank/neo_gorka/black_command
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -78,7 +79,8 @@
 		"TG&C parade dress"=/obj/item/clothing/under/rank/neo_hop_parade_fem,
 		"TG&C turtleneck"=/obj/item/clothing/under/rank/neo_hop_turtle,
 		"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_hop_turtle_skirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_cmd_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/command,
+		"TG&C black command gorka"=/obj/item/clothing/under/rank/neo_gorka/black_command
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -99,7 +101,7 @@
 		"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_pilot,
 		"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_pilot_skirt,
 		"Major Bill's flightsuit"=/obj/item/clothing/under/mbill_flight,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_pilot_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/pilot
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -116,7 +118,8 @@
 	..()
 	var/list/selector_uniforms = list(
 		"TG&C janitor's uniform"=/obj/item/clothing/under/rank/neo_janitor,
-		"TG&C janitor's uniform w/ skirt"=/obj/item/clothing/under/rank/neo_janitor_skirt
+		"TG&C janitor's uniform w/ skirt"=/obj/item/clothing/under/rank/neo_janitor_skirt,
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/janitor
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -160,7 +163,9 @@
 		"Utility uniform, grey"=/obj/item/clothing/under/utility/grey,
 		"Utility uniform, tan"=/obj/item/clothing/under/utility/tan,
 		"Utility uniform, green"=/obj/item/clothing/under/utility/green,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_civvie_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka,
+		"TG&C gorka suit (service)"=/obj/item/clothing/under/rank/neo_gorka/service,
+		"TG&C gorka suit (civilian)"=/obj/item/clothing/under/rank/neo_gorka/civilian
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -229,7 +234,7 @@
 		"TG&C bodyguard's skirt"=/obj/item/clothing/under/rank/bodyguard_skirt,
 		"TG&C bodyguard's turtleneck"=/obj/item/clothing/under/rank/bodyguard_turtleneck,
 		"TG&C bodyguard's turtleneck w/ skirt"=/obj/item/clothing/under/rank/bodyguard_turtleskirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_sec_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/sec
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -306,7 +311,7 @@
 		"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
 		"ST: DS9 Command"=/obj/item/clothing/under/rank/trek/command/ds9,
 		"ST: Enterprise Command"=/obj/item/clothing/under/rank/trek/command/ent,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_hos_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/hos
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -335,7 +340,7 @@
 		"TG&C button-up w/ skirt"=/obj/item/clothing/under/rank/neo_qm_white_skirt,
 		"TG&C turtleneck"=/obj/item/clothing/under/rank/neo_qm_turtle,
 		"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_qm_turtle_skirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_qm_gorka,
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/qm,
 		"ST: Original Series Command"=/obj/item/clothing/under/rank/trek/command,
 		"ST: Next Generation Command"=/obj/item/clothing/under/rank/trek/command/next,
 		"ST: Voyager Command"=/obj/item/clothing/under/rank/trek/command/voy,
@@ -368,7 +373,7 @@
 		"TG&C casual"=/obj/item/clothing/under/rank/neo_cargo_casual,
 		"TG&C turtleneck"=/obj/item/clothing/under/rank/neo_cargo_turtle,
 		"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_cargo_turtle_skirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_cargo_gorka,
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/cargo,
 		"customs officer"=/obj/item/clothing/under/rank/neo_cargo_customs
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -413,7 +418,7 @@
 		"ST: Enterprise Command"=/obj/item/clothing/under/rank/trek/command/ent,
 		"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_chiefengi,
 		"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_chiefengi_skirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_ce_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/ce
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -440,7 +445,7 @@
 		"voidsuit underlayer"=/obj/item/clothing/under/undersuit/hazard,
 		"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_engi,
 		"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_engi_skirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_engi_gorka,
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/engi,
 		"hazard jumpsuit"=/obj/item/clothing/under/hazard
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -493,7 +498,7 @@
 		"TG&C virology jumpskirt"=/obj/item/clothing/under/rank/neo_viro_skirt,
 		"TG&C dark jumpsuit"=/obj/item/clothing/under/rank/neo_med_dark,
 		"TG&C dark jumpskirt"=/obj/item/clothing/under/rank/neo_med_dark_skirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_med_gorka,
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/med,
 		"sterile jumpsuit"=/obj/item/clothing/under/sterile
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -564,7 +569,7 @@
 		"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_cmo_skirt,
 		"TG&C turtleneck"=/obj/item/clothing/under/rank/neo_cmo_turtle,
 		"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_cmo_turtle_skirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_cmo_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/cmo
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -592,7 +597,7 @@
 		"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_rd_suit_skirt,
 		"TG&C turtleneck"=/obj/item/clothing/under/rank/neo_rd_turtle,
 		"TG&C turtleneck w/ skirt"=/obj/item/clothing/under/rank/neo_rd_turtle_skirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_rd_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/rd
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 
@@ -617,7 +622,7 @@
 		"ST: Voyager Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/voy,
 		"ST: DS9 Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/ds9,
 		"ST: Enterprise Med-Sci"=/obj/item/clothing/under/rank/trek/medsci/ent,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_sci_gorka
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/sci
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 

code/modules/clothing/accessories/accessory.dm

@@ -8,6 +8,7 @@
 	slot_flags = SLOT_TIE
 	w_class = ITEMSIZE_SMALL
 	var/slot = ACCESSORY_SLOT_DECOR
+	var/can_remove = TRUE						// Can it be taken off once attached?
 	var/obj/item/clothing/has_suit = null		// The suit the tie may be attached to
 	var/image/inv_overlay = null				// Overlay used when attached to clothing.
 	var/image/mob_overlay = null

code/modules/clothing/accessories/torch.dm

@@ -457,6 +457,65 @@ department tags
 	icon_state = "dept_army"
 	on_rolled = list("down" = "none")
 
+/obj/item/clothing/accessory/gorka/department
+	name = "gorka insignia"
+	desc = "Coloured panelling denoting assignment to a specific department."
+	icon_state = "gorka_dept"
+	on_rolled = list("down" = "none")
+	can_remove = FALSE
+
+/obj/item/clothing/accessory/gorka/department/civilian
+	name = "civilian insignia"
+	desc = "Coloured panelling denoting assignment to no department in particular."
+	color = "#bbbbbb"
+
+/obj/item/clothing/accessory/gorka/department/command
+	name = "command insignia"
+	desc = "Coloured panelling denoting assignment to the command department."
+	color = "#3066bf"
+
+/obj/item/clothing/accessory/gorka/department/sec
+	name = "security insignia"
+	desc = "Coloured panelling denoting assignment to the security department."
+	color = "#bf3032"
+
+/obj/item/clothing/accessory/gorka/department/cargo
+	name = "cargo insignia"
+	desc = "Coloured panelling denoting assignment to the cargo department."
+	color = "#815b20"
+
+/obj/item/clothing/accessory/gorka/department/engi
+	name = "engineering insignia"
+	desc = "Coloured panelling denoting assignment to the engineering department."
+	color = "#bf8d30"
+
+/obj/item/clothing/accessory/gorka/department/sci
+	name = "research insignia"
+	desc = "Coloured panelling denoting assignment to the research department."
+	color = "#9b1688"
+
+/obj/item/clothing/accessory/gorka/department/med
+	name = "medical insignia"
+	desc = "Coloured panelling denoting assignment to the medical department."
+	color = "#609ebf"
+
+/obj/item/clothing/accessory/gorka/department/service
+	name = "service insignia"
+	desc = "Coloured panelling denoting assignment to the service department."
+	color = "#90bf60"
+
+/obj/item/clothing/accessory/gorka/department/janitor
+	name = "janitorial insignia"
+	desc = "Coloured panelling denoting assignment to the janitorial department."
+	color = "#bf60b3"
+
+/obj/item/clothing/accessory/gorka/rank
+	name = "gorka command trim"
+	desc = "Silver trim denoting a higher rank within one's department."
+	icon_state = "gorka_rank"
+	on_rolled = list("down" = "none")
+	can_remove = FALSE
+
 /*********
 ranks - ec
 *********/

code/modules/clothing/clothing_accessories.dm

@@ -148,7 +148,11 @@
 			A = tgui_input_list(usr, "Select an accessory to remove from \the [src]", "Accessory Choice", accessories)
 
 	if(A)
-		remove_accessory(usr,A)
+		if(A.can_remove)
+			remove_accessory(usr,A)
+		else
+			to_chat(usr, span_warning("It doesn't look like \the [A] can be taken off \the [src]."))
+
 
 	if(!LAZYLEN(accessories))
 		src.verbs -= /obj/item/clothing/proc/removetie_verb

code/modules/clothing/under/neounder.dm

@@ -95,13 +95,6 @@ this file deals with uniforms/under. */
 	rolled_sleeves = -1
 	rolled_down = -1
 
-/obj/item/clothing/under/rank/neo_civvie_gorka
-	name = "civilan gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. For those who appreciate durable clothing. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_civvie_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-
 // Command
 
 /obj/item/clothing/under/rank/neo_captain
@@ -202,20 +195,6 @@ this file deals with uniforms/under. */
 	rolled_sleeves = -1
 	rolled_down = -1
 
-/obj/item/clothing/under/rank/neo_cmd_gorka
-	name = "CO's gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. Who said command-wear can't look slick? It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_cmd_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-
-/obj/item/clothing/under/rank/neo_pilot_gorka
-	name = "pilot's gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. In the pipe, five by five. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_pilot_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-
 //'Suspicious'
 
 /obj/item/clothing/under/rank/neo_suspect_turtleneck
@@ -596,24 +575,6 @@ this file deals with uniforms/under. */
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0.9
 
-/obj/item/clothing/under/rank/neo_hos_gorka
-	name = "head of security's gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. Favoured by the Head of Security who wants to stay dry no matter what. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_hos_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	siemens_coefficient = 0.9
-
-/obj/item/clothing/under/rank/neo_sec_gorka
-	name = "security officer's gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. For officers who expect to be patrolling in harsh conditions. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_sec_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	siemens_coefficient = 0.9
-
 // Cargo
 
 
@@ -694,13 +655,6 @@ this file deals with uniforms/under. */
 	rolled_sleeves = -1
 	rolled_down = -1
 
-/obj/item/clothing/under/rank/neo_qm_gorka
-	name = "QM's gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. Preferred by quartermasters who do heavy lifting as well as paperwork. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_qm_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-
 /obj/item/clothing/under/rank/neo_cargo
 	name = "cargo tech's jumpsuit"
 	desc = "it has a tag denoting it's made by Total Gear & Co."
@@ -743,13 +697,6 @@ this file deals with uniforms/under. */
 	rolled_sleeves = -1
 	rolled_down = -1
 
-/obj/item/clothing/under/rank/neo_cargo_gorka
-	name = "cargo tech's gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. No need to worry about improperly packaged goods ripping your jumpsuit with this. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_cargo_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-
 /obj/item/clothing/under/rank/neo_cargo_customs
 	name = "customs uniform"
 	desc = "it has a tag denoting it's made by Total Gear & Co."
@@ -806,22 +753,6 @@ this file deals with uniforms/under. */
 	rolled_down = -1
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
 
-/obj/item/clothing/under/rank/neo_ce_gorka
-	name = "chief engineer's gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. For the chief engineer who values style <i>and</i> safety. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_ce_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
-
-/obj/item/clothing/under/rank/neo_engi_gorka
-	name = "engineer's gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. Not rated for high-power electrical shocks. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_engi_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
-
 // Sci
 
 /obj/item/clothing/under/rank/neo_rd_turtle
@@ -901,20 +832,6 @@ this file deals with uniforms/under. */
 	rolled_sleeves = -1
 	rolled_down = -1
 
-/obj/item/clothing/under/rank/neo_rd_gorka
-	name = "research director's gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. For research directors who like to get their hands dirty. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_rd_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-
-/obj/item/clothing/under/rank/neo_sci_gorka
-	name = "scientist's gorka"
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. A favourite of mountaineering archaeologists. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_sci_gorka"
-	rolled_sleeves = -1
-	rolled_down = -1
-
 // Med
 
 /obj/item/clothing/under/rank/neo_med
@@ -1079,20 +996,135 @@ this file deals with uniforms/under. */
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 
-/obj/item/clothing/under/rank/neo_cmo_gorka
+// Neo Gorkas
-	name = "chief medical officer's gorka"
+
-	desc = "A rugged weather-resistant uniform made of ripstop fabric. Why worry about stains when everything slides right off? It has a tag denoting it's made by Total Gear & Co."
+/obj/item/clothing/under/rank/neo_gorka
-	icon_state = "neo_cmo_gorka"
+	name = "plain black gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. For those who appreciate durable clothing. It has a tag denoting it's made by Total Gear & Co."
+	icon_state = "neo_gorka"
 	rolled_sleeves = -1
 	rolled_down = -1
-	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
 
-/obj/item/clothing/under/rank/neo_med_gorka
+/obj/item/clothing/under/rank/neo_gorka/civilian
+	name = "civilian gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. For those who appreciate durable clothing. It has a tag denoting it's made by Total Gear & Co."
+	icon_state = "neo_gorka"
+	rolled_sleeves = -1
+	rolled_down = -1
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/civilian)
+
+/obj/item/clothing/under/rank/neo_gorka/black_command
+	name = "plain command gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. For those who appreciate durable clothing. It has a tag denoting it's made by Total Gear & Co."
+	icon_state = "neo_gorka"
+	rolled_sleeves = -1
+	rolled_down = -1
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/rank)
+
+/obj/item/clothing/under/rank/neo_gorka/service
+	name = "service gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. No thorns will be ripping these! It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/service)
+
+/obj/item/clothing/under/rank/neo_gorka/janitor
+	name = "janitor's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. Stainproof! Probably. It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/janitor)
+
+/obj/item/clothing/under/rank/neo_gorka/pilot
+	name = "pilot's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. In the pipe, five by five. It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/command)
+
+/obj/item/clothing/under/rank/neo_gorka/command
+	name = "CO's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. Who said command-wear can't look slick? It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/command,/obj/item/clothing/accessory/gorka/rank)
+
+/obj/item/clothing/under/rank/neo_gorka/sec
+	name = "security officer's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. For officers who expect to be patrolling in harsh conditions. It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0.9
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/sec)
+
+/obj/item/clothing/under/rank/neo_gorka/hos
+	name = "head of security's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. Favoured by the Head of Security who wants to stay dry no matter what. It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0.9
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/sec,/obj/item/clothing/accessory/gorka/rank)
+
+/obj/item/clothing/under/rank/neo_gorka/cargo
+	name = "cargo tech's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. No need to worry about improperly packaged goods ripping your jumpsuit with this. It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/cargo)
+
+/obj/item/clothing/under/rank/neo_gorka/qm
+	name = "QM's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. Preferred by quartermasters who do heavy lifting as well as paperwork. It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/cargo,/obj/item/clothing/accessory/gorka/rank)
+
+/obj/item/clothing/under/rank/neo_gorka/engi
+	name = "engineer's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. Not rated for high-power electrical shocks. It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/engi)
+
+/obj/item/clothing/under/rank/neo_gorka/ce
+	name = "chief engineer's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. For the chief engineer who values style <i>and</i> safety. It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/engi,/obj/item/clothing/accessory/gorka/rank)
+
+/obj/item/clothing/under/rank/neo_gorka/sci
+	name = "scientist's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. A favourite of mountaineering archaeologists. It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/sci)
+
+/obj/item/clothing/under/rank/neo_gorka/rd
+	name = "research director's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. For research directors who like to get their hands dirty. It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/sci,/obj/item/clothing/accessory/gorka/rank)
+
+/obj/item/clothing/under/rank/neo_gorka/med
 	name = "medical staff gorka"
 	desc = "A rugged weather-resistant uniform made of ripstop fabric. A popular choice among paramedical personnel. It has a tag denoting it's made by Total Gear & Co."
-	icon_state = "neo_med_gorka"
 	rolled_sleeves = -1
 	rolled_down = -1
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/med)
+
+/obj/item/clothing/under/rank/neo_gorka/cmo
+	name = "chief medical officer's gorka"
+	desc = "A rugged weather-resistant uniform made of ripstop fabric. Why worry about stains when everything slides right off? It has a tag denoting it's made by Total Gear & Co."
+	rolled_sleeves = -1
+	rolled_down = -1
+	permeability_coefficient = 0.50
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+	starting_accessories = list(/obj/item/clothing/accessory/gorka/department/med,/obj/item/clothing/accessory/gorka/rank)

code/modules/economy/vending_machines.dm

@@ -1302,7 +1302,7 @@
 		/obj/item/clothing/under/rank/neo_corrections = 5,
 		/obj/item/clothing/under/rank/neo_corrections_skirt = 5,
 		/obj/item/clothing/under/rank/neo_runner = 5,
-		/obj/item/clothing/under/rank/neo_sec_gorka = 5,
+		/obj/item/clothing/under/rank/neo_gorka/sec = 5,
 		/obj/item/clothing/suit/neo_runner_coat = 5,
 		/obj/item/clothing/shoes/boots/jackboots/silver = 5,
 		/obj/item/clothing/shoes/boots/jackboots/white = 5,
@@ -1374,7 +1374,7 @@
 		/obj/item/clothing/under/rank/neo_para_light_skirt = 5,
 		/obj/item/clothing/under/rank/neo_med_dark = 5,
 		/obj/item/clothing/under/rank/neo_med_dark_skirt = 5,
-		/obj/item/clothing/under/rank/neo_med_gorka = 5,
+		/obj/item/clothing/under/rank/neo_gorka/med = 5,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_emt = 5,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_labcoat = 5,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_highvis = 5,
@@ -1481,7 +1481,7 @@
 		/obj/item/clothing/under/rank/neo_science = 5,
 		/obj/item/clothing/under/rank/neo_science_skirt = 5,
 		/obj/item/clothing/under/rank/neo_util_sci = 5,
-		/obj/item/clothing/under/rank/neo_sci_gorka = 5,
+		/obj/item/clothing/under/rank/neo_gorka/sci = 5,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_sci_dep = 5,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_labcoat = 5,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/science = 5,
@@ -1562,7 +1562,7 @@
 		/obj/item/clothing/mask/bandana/gold = 5,
 		/obj/item/clothing/under/rank/neo_engi = 5,
 		/obj/item/clothing/under/rank/neo_engi_skirt = 5,
-		/obj/item/clothing/under/rank/neo_engi_gorka = 5,
+		/obj/item/clothing/under/rank/neo_gorka/engi = 5,
 		/obj/item/clothing/accessory/armband/engine = 5,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_engi_dep = 5,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/engineering = 5,
@@ -1636,7 +1636,7 @@
 		/obj/item/clothing/under/rank/neo_cargo_casual = 5,
 		/obj/item/clothing/under/rank/neo_cargo_turtle = 5,
 		/obj/item/clothing/under/rank/neo_cargo_turtle_skirt = 5,
-		/obj/item/clothing/under/rank/neo_cargo_gorka = 5,
+		/obj/item/clothing/under/rank/neo_gorka/cargo = 5,
 		/obj/item/clothing/under/rank/neo_cargo_customs = 5,
 		/obj/item/clothing/suit/storage/toggle/labcoat/neo_cargo_dep = 5,
 		/obj/item/clothing/suit/neo_gorka_cargo = 5,

code/modules/economy/vending_machines_vr.dm

@@ -938,7 +938,7 @@
 					/obj/item/clothing/under/suit_jacket/checkered/skirt = 5,
 					/obj/item/clothing/under/suit_jacket/tan = 5,
 					/obj/item/clothing/under/suit_jacket/tan/skirt = 5,
-					/obj/item/clothing/under/rank/neo_civvie_gorka = 5,
+					/obj/item/clothing/under/rank/neo_gorka = 5,
 					/obj/item/clothing/suit/storage/toggle/labcoat/neo_leather = 5,
 					/obj/item/clothing/suit/neo_gorka = 5,
 					/obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep = 5,