upd + fixes

code/modules/antagonists/devil/devil_helpers.dm

@@ -18,7 +18,7 @@
 						/obj/item/clothing/under/rank/medical/virologist = 1,
 						/obj/item/clothing/under/rank/medical/nursesuit = 1,
 						/obj/item/clothing/under/rank/medical = 1,
-						/obj/item/clothing/under/rank/det = 1,
+						/obj/item/clothing/under/rank/security/detective = 1,
 						/obj/item/clothing/under/suit/white = 0.5,
 						/obj/item/clothing/under/rank/civilian/chaplain/burial = 1
 					)

code/modules/clothing/outfits/standard.dm

@@ -27,7 +27,7 @@
 /datum/outfit/tournament/gangster
 	name = "tournament gangster"
 
-	uniform = /obj/item/clothing/under/rank/det
+	uniform = /obj/item/clothing/under/rank/security/detective
 	suit = /obj/item/clothing/suit/det_suit
 	glasses = /obj/item/clothing/glasses/thermal/monocle
 	head = /obj/item/clothing/head/fedora/det_hat

code/modules/clothing/under/accessories.dm

@@ -295,7 +295,7 @@
 
 /obj/item/clothing/accessory/armband/medblue
 	name = "medical guard armband"
-	desc = "An armband, worn by engineers and security members to display which department they're assigned to. This one is white and blue."
+	desc = "An armband, worn by engineers and security members to display which department they're assigned to. This one is white and green."
 	icon_state = "medblueband"
 
 

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

@@ -115,6 +115,7 @@
 /obj/item/clothing/under/rank/security/head_of_security
 	name = "head of security's jumpsuit"
 	desc = "A security jumpsuit decorated for those few with the dedication to achieve the position of Head of Security."
+
 	icon_state = "rhos"
 	item_state = "r_suit"
 	armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50, WOUND = 10)

code/modules/jobs/job_types/detective.dm

@@ -65,7 +65,7 @@
 	pda_type = /obj/item/modular_computer/tablet/pda/preset/security/detective
 
 	ears = /obj/item/radio/headset/headset_sec/alt
-	uniform = /obj/item/clothing/under/rank/det
+	uniform = /obj/item/clothing/under/rank/security/detective
 	uniform_skirt = /obj/item/clothing/under/rank/security/detective/skirt
 	neck = /obj/item/clothing/neck/tie/detective
 	shoes = /obj/item/clothing/shoes/sneakers/brown

modular_dripstation/code/game/objects/items/storage/garment.dm

@@ -74,14 +74,14 @@
 // 5. gloves
 
 /obj/item/storage/bag/garment/captain/PopulateContents()
-	new /obj/item/clothing/under/rank/captain(src)
-	new /obj/item/clothing/under/rank/captain/skirt(src)
-	new /obj/item/clothing/under/rank/captain/formal(src)
-	new /obj/item/clothing/under/rank/captain/formal/skirt(src)
+	new /obj/item/clothing/under/rank/command/captain(src)
+	new /obj/item/clothing/under/rank/command/captain/skirt(src)
+	new /obj/item/clothing/under/rank/command/captain/formal(src)
+	new /obj/item/clothing/under/rank/command/captain/formal/skirt(src)
 	new /obj/item/clothing/under/yogs/victoriouscaptainuniform(src)
 	new /obj/item/clothing/under/captainparade(src)
-	new /obj/item/clothing/under/rank/captain/dress(src)
-	new /obj/item/clothing/under/rank/captain/kilt(src)
+	new /obj/item/clothing/under/rank/command/captain/dress(src)
+	new /obj/item/clothing/under/rank/command/captain/kilt(src)
 	new /obj/item/clothing/suit/toggle/capformal(src)
 	new /obj/item/clothing/suit/captunic(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/captain/alt(src)	
@@ -95,14 +95,14 @@
 	new /obj/item/clothing/gloves/color/captain(src)
 
 /obj/item/storage/bag/garment/hop/PopulateContents()
-	new /obj/item/clothing/under/rank/head_of_personnel(src)
-	new /obj/item/clothing/under/rank/head_of_personnel/skirt(src)
-	new /obj/item/clothing/under/rank/head_of_personnel/dress(src)
-	new /obj/item/clothing/under/rank/head_of_personnel/parade(src)
-	new /obj/item/clothing/under/rank/head_of_personnel/parade/skirt(src)
-	new /obj/item/clothing/under/rank/head_of_personnel/turtleneck(src)
-	new /obj/item/clothing/under/rank/head_of_personnel/skirt/turtleneck(src)
-	new /obj/item/clothing/under/rank/head_of_personnel/paradefancy(src)
+	new /obj/item/clothing/under/rank/command/head_of_personnel(src)
+	new /obj/item/clothing/under/rank/command/head_of_personnel/skirt(src)
+	new /obj/item/clothing/under/rank/command/head_of_personnel/dress(src)
+	new /obj/item/clothing/under/rank/command/head_of_personnel/parade(src)
+	new /obj/item/clothing/under/rank/command/head_of_personnel/parade/skirt(src)
+	new /obj/item/clothing/under/rank/command/head_of_personnel/turtleneck(src)
+	new /obj/item/clothing/under/rank/command/head_of_personnel/skirt/turtleneck(src)
+	new /obj/item/clothing/under/rank/command/head_of_personnel/paradefancy(src)
 	new /obj/item/clothing/under/yogs/hopcasual(src)
 	new /obj/item/clothing/suit/toggle/capformal/hop(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/hop/formal(src)
@@ -115,10 +115,10 @@
 	new /obj/item/clothing/gloves/color/black(src)
 
 /obj/item/storage/bag/garment/hos/PopulateContents()
-	new /obj/item/clothing/under/rank/head_of_security(src)
-	new /obj/item/clothing/under/rank/head_of_security/skirt(src)
-	new /obj/item/clothing/under/rank/head_of_security/corporate(src)
-	new /obj/item/clothing/under/rank/head_of_security/corporate/skirt(src)
+	new /obj/item/clothing/under/rank/security/head_of_security(src)
+	new /obj/item/clothing/under/rank/security/head_of_security/skirt(src)
+	new /obj/item/clothing/under/rank/security/head_of_security/corporate(src)
+	new /obj/item/clothing/under/rank/security/head_of_security/corporate/skirt(src)
 	new /obj/item/clothing/under/rank/security/head_of_security/alt(src)
 	new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src)
 	new /obj/item/clothing/under/rank/security/head_of_security/grey(src)	
@@ -138,13 +138,13 @@
 	new /obj/item/clothing/mask/gas/sechailer/swat/hos(src)
 
 /obj/item/storage/bag/garment/warden/PopulateContents()
-	new /obj/item/clothing/under/rank/warden(src)
-	new /obj/item/clothing/under/rank/warden/skirt(src)
-	new /obj/item/clothing/under/rank/warden/corporate(src)
-	new /obj/item/clothing/under/rank/warden/corporate/skirt(src)
+	new /obj/item/clothing/under/rank/security/warden(src)
+	new /obj/item/clothing/under/rank/security/warden/skirt(src)
+	new /obj/item/clothing/under/rank/security/warden/corporate(src)
+	new /obj/item/clothing/under/rank/security/warden/corporate/skirt(src)
 	new /obj/item/clothing/under/yogs/ocelot(src)
-	new /obj/item/clothing/under/rank/warden/navyblue(src)
-	new /obj/item/clothing/under/rank/warden/classic(src)
+	new /obj/item/clothing/under/rank/security/warden/navyblue(src)
+	new /obj/item/clothing/under/rank/security/warden/classic(src)
 	new /obj/item/clothing/suit/armor/wardenjacket(src)
 	new /obj/item/clothing/suit/armor/vest/wardenjacket(src)
 	new /obj/item/clothing/suit/armor/vest/warden/alt(src)
@@ -159,7 +159,7 @@
 
 /obj/item/storage/bag/garment/physician/PopulateContents()
 	new /obj/item/clothing/under/yogs/rank/physician(src)
-	new /obj/item/clothing/under/rank/medical/purple(src)
+	new /obj/item/clothing/under/rank/medical/doctor/purple(src)
 	new /obj/item/clothing/under/yogs/rank/physician/white(src)
 	new /obj/item/clothing/under/yogs/rank/physician/white/skirt(src)
 	new /obj/item/clothing/under/yogs/rank/physician/turtle(src)
@@ -174,13 +174,13 @@
 	new /obj/item/clothing/glasses/hud/health(src)
 
 /obj/item/storage/bag/garment/research_director/PopulateContents()
-	new /obj/item/clothing/under/rank/research_director(src)
-	new /obj/item/clothing/under/rank/research_director/skirt(src)
-	new /obj/item/clothing/under/rank/research_director/dark(src)
-	new /obj/item/clothing/under/rank/research_director/alt(src)
-	new /obj/item/clothing/under/rank/research_director/alt/skirt(src)
-	new /obj/item/clothing/under/rank/research_director/turtleneck(src)
-	new /obj/item/clothing/under/rank/research_director/turtleneck/skirt(src)
+	new /obj/item/clothing/under/rank/rnd/research_director(src)
+	new /obj/item/clothing/under/rank/rnd/research_director/skirt(src)
+	new /obj/item/clothing/under/rank/rnd/research_director/dark(src)
+	new /obj/item/clothing/under/rank/rnd/research_director/alt(src)
+	new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src)
+	new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src)
+	new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src)
 	new /obj/item/clothing/suit/toggle/labcoat/science/rd(src)
 	new /obj/item/clothing/suit/toggle/labcoat/science/brown(src)
 	new /obj/item/clothing/suit/toggle/labcoat/science/purple(src)
@@ -207,25 +207,25 @@
 	new /obj/item/clothing/suit/hooded/wintercoat/medical/cmo/long(src)
 	new /obj/item/clothing/gloves/color/latex/nitrile/advanced(src)
 	new /obj/item/clothing/glasses/hud/health/sunglasses/cmo(src)
-	new /obj/item/clothing/under/rank/chief_medical_officer(src)
-	new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src)
-	new /obj/item/clothing/under/rank/chief_medical_officer/alt(src)
-	new /obj/item/clothing/under/rank/chief_medical_officer/skirt/alt(src)
-	new /obj/item/clothing/under/rank/chief_medical_officer/turtleneck(src)
-	new /obj/item/clothing/under/rank/chief_medical_officer/turtleneck/alt(src)
-	new /obj/item/clothing/under/rank/chief_medical_officer/scrcmo(src)
-	new /obj/item/clothing/under/rank/medical/black(src)
+	new /obj/item/clothing/under/rank/medical/chief_medical_officer(src)
+	new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
+	new /obj/item/clothing/under/rank/medical/chief_medical_officer/alt(src)
+	new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt/alt(src)
+	new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck(src)
+	new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck/alt(src)
+	new /obj/item/clothing/under/rank/medical/chief_medical_officer/scrcmo(src)
+	new /obj/item/clothing/under/rank/medical/doctor/black(src)
 
 
 /obj/item/storage/bag/garment/engineering_chief/PopulateContents()
-	new /obj/item/clothing/under/rank/chief_engineer(src)
-	new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
-	new /obj/item/clothing/under/rank/chief_engineer/alt(src)
-	new /obj/item/clothing/under/rank/chief_engineer/gorka(src)
-	new /obj/item/clothing/under/rank/chief_engineer/turtle(src)
-	new /obj/item/clothing/under/rank/chief_engineer/casual(src)
-	new /obj/item/clothing/under/rank/chief_engineer/formal(src)
-	new /obj/item/clothing/under/rank/chief_engineer/skirt/formal(src)
+	new /obj/item/clothing/under/rank/engineering/chief_engineer(src)
+	new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
+	new /obj/item/clothing/under/rank/engineering/chief_engineer/alt(src)
+	new /obj/item/clothing/under/rank/engineering/chief_engineer/gorka(src)
+	new /obj/item/clothing/under/rank/engineering/chief_engineer/turtle(src)
+	new /obj/item/clothing/under/rank/engineering/chief_engineer/casual(src)
+	new /obj/item/clothing/under/rank/engineering/chief_engineer/formal(src)
+	new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt/formal(src)
 	new /obj/item/clothing/neck/cloak/ce(src)
 	new /obj/item/clothing/neck/cloak/ce/alt(src)
 	new /obj/item/clothing/neck/mantle/cemantle(src)
@@ -240,17 +240,17 @@
 	new /obj/item/clothing/glasses/meson/sunglasses/ce(src)
 
 /obj/item/storage/bag/garment/quartermaster/PopulateContents()
-	new /obj/item/clothing/under/rank/cargo(src)
-	new /obj/item/clothing/under/rank/cargo/turtleneck(src)
-	new /obj/item/clothing/under/rank/cargo/turtleneck/alt(src)
-	new /obj/item/clothing/under/rank/cargo/qmc(src)
-	new /obj/item/clothing/under/rank/cargo/official(src)
-	new /obj/item/clothing/under/rank/cargo/supply_chief(src)
-	new /obj/item/clothing/under/rank/cargo/supply_chief/alt(src)
-	new /obj/item/clothing/under/rank/cargo/skirt(src)
+	new /obj/item/clothing/under/rank/cargo/qm(src)
+	new /obj/item/clothing/under/rank/cargo/qm/turtleneck(src)
+	new /obj/item/clothing/under/rank/cargo/qm/turtleneck/alt(src)
+	new /obj/item/clothing/under/rank/cargo/qm/qmc(src)
+	new /obj/item/clothing/under/rank/cargo/qm/official(src)
+	new /obj/item/clothing/under/rank/cargo/qm/supply_chief(src)
+	new /obj/item/clothing/under/rank/cargo/qm/supply_chief/alt(src)
+	new /obj/item/clothing/under/rank/cargo/qm/skirt(src)
 	new /obj/item/clothing/under/rank/cargo/qm/skirt/turtleneck(src)
-	new /obj/item/clothing/under/rank/cargo/skirt/supply_chief(src)
-	new /obj/item/clothing/under/rank/cargo/skirt/supply_chief/alt(src)
+	new /obj/item/clothing/under/rank/cargo/qm/skirt/supply_chief(src)
+	new /obj/item/clothing/under/rank/cargo/qm/skirt/supply_chief/alt(src)
 	new /obj/item/clothing/gloves/fingerless/tactifool/qm(src)
 	new /obj/item/clothing/gloves/cargo_gauntlet/qm(src)
 	new /obj/item/clothing/suit/hazardvest(src)

modular_dripstation/code/modules/cargo/packs.dm

@@ -171,7 +171,7 @@
 					/obj/item/clothing/suit/armor/officerjacket,
 					/obj/item/clothing/head/beret/sec/navyofficer,
 					/obj/item/clothing/head/beret/sec/navyofficer,
-					/obj/item/clothing/under/rank/warden/navyblue,
+					/obj/item/clothing/under/rank/security/warden/navyblue,
 					/obj/item/clothing/suit/armor/wardenjacket,
 					/obj/item/clothing/head/beret/sec/navywarden)
 
@@ -209,4 +209,4 @@
 	contains = list(/obj/item/gun/energy/laser,
 					/obj/item/gun/energy/laser,
 					/obj/item/gun/energy/laser)
-	crate_name = "laser crate"
+	crate_name = "laser crate"

modular_dripstation/code/modules/clothing/_neck.dm

@@ -71,6 +71,10 @@
 	icon = 'modular_dripstation/icons/obj/clothing/neck.dmi'
 	worn_icon = 'modular_dripstation/icons/mob/clothing/neck.dmi'
 
+/obj/item/clothing/neck/cloak/ce/alt
+	name = "chief engineer's green cloak"
+	icon_state = "cecloak_green"
+
 /obj/item/clothing/neck/cloak/rd
 	icon = 'modular_dripstation/icons/obj/clothing/neck.dmi'
 	worn_icon = 'modular_dripstation/icons/mob/clothing/neck.dmi'	

modular_dripstation/code/modules/clothing/department/command.dm

@@ -1,61 +1,61 @@
 // ###### HOP ######
-/obj/item/clothing/under/rank/head_of_personnel
+/obj/item/clothing/under/rank/command/head_of_personnel
 	icon = 'modular_dripstation/icons/obj/clothing/uniform/command/hop.dmi'
 	worn_icon = 'modular_dripstation/icons/mob/clothing/uniform/command/hop.dmi'
 	alt_covers_chest = TRUE
 
-/obj/item/clothing/under/rank/head_of_personnel/skirt
+/obj/item/clothing/under/rank/command/head_of_personnel/skirt
 	can_adjust = TRUE
 	mutantrace_variation = DIGITIGRADE_VARIATION	
 	fitted = NO_FEMALE_UNIFORM
 	alt_covers_chest = FALSE
 
-/obj/item/clothing/under/rank/head_of_personnel/dress
+/obj/item/clothing/under/rank/command/head_of_personnel/dress
 	name = "head of personnel's dress"
 	icon_state = "hop_dress"
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP	
 	body_parts_covered = CHEST|GROIN|ARMS	
 	mutantrace_variation = NONE	
 
-/obj/item/clothing/under/rank/head_of_personnel/paradefancy
+/obj/item/clothing/under/rank/command/head_of_personnel/paradefancy
 	name = "head of personnel's fancy uniform"
 	desc = "For these special occasions when paperwork can wait."
 	icon_state = "hopwhimsy"
 	item_state = "hopwhimsy"
 	can_adjust = FALSE
 	mutantrace_variation = NONE	
 
-/obj/item/clothing/under/rank/head_of_personnel/parade
+/obj/item/clothing/under/rank/command/head_of_personnel/parade
 	name = "head of personnel's parade uniform"
 	desc = "A luxurious uniform for the head of personnel, woven in a deep blue. On the lapel is a small pin in the shape of a corgi's head."
 	icon_state = "hop_parade_male"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/rank/head_of_personnel/parade/skirt
+/obj/item/clothing/under/rank/command/head_of_personnel/parade/skirt
 	name = "head of personnel's parade skirt"
 	icon_state = "hop_parade_female"	
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 
-/obj/item/clothing/under/rank/head_of_personnel/turtleneck
+/obj/item/clothing/under/rank/command/head_of_personnel/turtleneck
 	name = "head of personnel's turtleneck"
 	desc = "A dark teal turtleneck and black khakis, for a second with a superior sense of style."
 	icon_state = "hopturtle"
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
 
-/obj/item/clothing/under/rank/head_of_personnel/turtleneck/alt
+/obj/item/clothing/under/rank/command/head_of_personnel/turtleneck/alt
 	icon_state = "hopturtle_alt"
 
-/obj/item/clothing/under/rank/head_of_personnel/skirt/turtleneck
+/obj/item/clothing/under/rank/command/head_of_personnel/skirt/turtleneck
 	name = "head of personnel's turtleneck skirt"
 	desc = "A dark teal turtleneck and tanblack khaki skirt, for a second with a superior sense of style."
 	icon_state = "hopturtle_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = NO_FEMALE_UNIFORM
 
-/obj/item/clothing/under/rank/head_of_personnel/skirt/secretary
+/obj/item/clothing/under/rank/command/head_of_personnel/skirt/secretary
 	name = "head of personnel's secretary skirt"
 	icon_state = "hop_secretary"
 	fitted = NO_FEMALE_UNIFORM
@@ -107,24 +107,24 @@
 	item_state = "sunhudskill"
 
 // ###### CAPTAIN ######
-/obj/item/clothing/under/rank/captain
+/obj/item/clothing/under/rank/command/captain
 	icon = 'modular_dripstation/icons/obj/clothing/uniform/command/captain.dmi'
 	worn_icon = 'modular_dripstation/icons/mob/clothing/uniform/command/captain.dmi'
 	alt_covers_chest = FALSE
 
-/obj/item/clothing/under/rank/captain/skirt
+/obj/item/clothing/under/rank/command/captain/skirt
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
 	fitted = NO_FEMALE_UNIFORM
 
-/obj/item/clothing/under/rank/captain/formal
+/obj/item/clothing/under/rank/command/captain/formal
 	name = "captain's formal uniform"
 	desc = "Parade version of station captain`s uniform."
 	icon_state = "station_captain"
 	item_state = "station_captain"
 	alt_covers_chest = TRUE
 
-/obj/item/clothing/under/rank/captain/formal/skirt
+/obj/item/clothing/under/rank/command/captain/formal/skirt
 	name = "captain's formal skirt"
 	desc = "Parade version of station captain`s skirt."
 	icon_state = "station_captain_skirt"
@@ -135,14 +135,14 @@
 /obj/item/clothing/under/yogs/victoriouscaptainuniform 
 	can_adjust = FALSE
 
-/obj/item/clothing/under/rank/captain/kilt
+/obj/item/clothing/under/rank/command/captain/kilt
 	desc = "Not a skirt, it is, however, armoured and decorated with a tartan sash."
 	name = "captain's kilt"
 	icon_state = "capkilt"
 	item_state = "kilt"
 	alt_covers_chest = TRUE
 
-/obj/item/clothing/under/rank/captain/dress
+/obj/item/clothing/under/rank/command/captain/dress
 	name = "captain's dress"
 	icon_state = "cap_secretary"
 	can_adjust = FALSE
@@ -152,6 +152,7 @@
 
 /obj/item/clothing/under/captainparade
 	icon = 'modular_dripstation/icons/obj/clothing/uniform/command/captain.dmi'
+	icon_state = "captain_parade"
 	worn_icon = 'modular_dripstation/icons/mob/clothing/uniform/command/captain.dmi'
 
 /obj/item/clothing/suit/armor/vest/capcarapace
@@ -238,11 +239,11 @@
 
 /obj/item/clothing/head/caphat/parade
 	icon = 'modular_dripstation/icons/obj/clothing/hats.dmi'
-	mworn_icon = = 'modular_dripstation/icons/mob/clothing/hats.dmi'	
+	worn_icon = 'modular_dripstation/icons/mob/clothing/hats.dmi'	
 
 /obj/item/clothing/head/caphat/parade/white
 	icon_state = "cap_parade"
-	worn_icon = 'icons/mob/clothing/head/head.dmi'
+	worn_icon = 'modular_dripstation/icons/mob/clothing/hats.dmi'
 
 /obj/item/clothing/head/beret/captain
 	name = "captain's formal beret"