Force pushed updates

modular_citadel/code/modules/client/loadout/uniform.dm

@@ -1,136 +1,136 @@
 /datum/gear/suitblack
 	name = "Black suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket
+	path = /obj/item/clothing/under/suit/black
 
 /datum/gear/suitgreen
 	name = "Green suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/green
+	path = /obj/item/clothing/under/suit/green
 
 /datum/gear/suitred
 	name = "Red suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/red
+	path = /obj/item/clothing/under/suit/red
 
 /datum/gear/suitcharcoal
 	name = "Charcoal suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/charcoal
+	path = /obj/item/clothing/under/suit/charcoal
 
 /datum/gear/suitnavy
 	name = "Navy suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/navy
+	path = /obj/item/clothing/under/suit/navy
 
 /datum/gear/suitburgundy
 	name = "Burgundy suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/burgundy
+	path = /obj/item/clothing/under/suit/burgundy
 
 /datum/gear/suittan
 	name = "Tan suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/tan
+	path = /obj/item/clothing/under/suit/tan
 
 /datum/gear/suitwhite
 	name = "White suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/white
+	path = /obj/item/clothing/under/suit/white
 
 /datum/gear/assistantformal
 	name = "Assistant's formal uniform"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/assistantformal
+	path = /obj/item/clothing/under/misc/assistantformal
 
 /datum/gear/maidcostume
 	name = "Maid costume"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/maid
+	path = /obj/item/clothing/under/costume/maid
 
 /datum/gear/mailmanuniform
 	name = "Mailman's jumpsuit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/mailman
+	path = /obj/item/clothing/under/misc/mailman
 
 /datum/gear/skirtblack
 	name = "Black skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/skirt/black
+	path = /obj/item/clothing/under/dress/skirt
 
 /datum/gear/skirtblue
 	name = "Blue skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/skirt/blue
+	path = /obj/item/clothing/under/dress/skirt/blue
 
 /datum/gear/skirtred
 	name = "Red skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/skirt/red
+	path = /obj/item/clothing/under/dress/skirt/red
 
 /datum/gear/skirtpurple
 	name = "Purple skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/skirt/purple
+	path = /obj/item/clothing/under/dress/skirt/purple
 
 /datum/gear/skirtplaid
 	name = "Plaid skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/plaid_skirt
+	path = /obj/item/clothing/under/dress/skirt/plaid
 
 /datum/gear/schoolgirlblue
 	name = "Blue Schoolgirl Uniform"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/schoolgirl
+	path = /obj/item/clothing/under/costume/schoolgirl
 
 /datum/gear/schoolgirlred
 	name = "Red Schoolgirl Uniform"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/schoolgirl/red
+	path = /obj/item/clothing/under/costume/schoolgirl/red
 
 /datum/gear/schoolgirlgreen
 	name = "Green Schoolgirl Uniform"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/schoolgirl/green
+	path = /obj/item/clothing/under/costume/schoolgirl/green
 
 /datum/gear/schoolgirlorange
 	name = "Orange Schoolgirl Uniform"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/schoolgirl/orange
+	path = /obj/item/clothing/under/costume/schoolgirl/orange
 
 /datum/gear/stripeddress
 	name = "Striped Dress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/stripeddress
+	path = /obj/item/clothing/under/dress/striped
 
 /datum/gear/sundresswhite
 	name = "White Sundress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/sundresswhite
+	path = /obj/item/clothing/under/dress/sundress/white
 
 /datum/gear/sundress
 	name = "Sundress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/sundress
+	path = /obj/item/clothing/under/dress/sundress
 
 /datum/gear/greendress
 	name = "Green Dress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/greendress
+	path = /obj/item/clothing/under/dress/green
 
 /datum/gear/pinkdress
 	name = "Pink Dress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/pinkdress
+	path = /obj/item/clothing/under/dress/pink
 /datum/gear/flowerdress
 	name = "Flower Dress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/flowerdress
+	path = /obj/item/clothing/under/dress/flower
 
 /datum/gear/sweptskirt
 	name = "Swept skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/sweptskirt
+	path = /obj/item/clothing/under/dress/skirt/swept
 
 /datum/gear/croptop
 	name = "Croptop"
@@ -145,7 +145,7 @@
 /datum/gear/kilt
 	name = "Kilt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/kilt
+	path = /obj/item/clothing/under/costume/kilt
 
 /datum/gear/camoshorts
 	name = "Camo Pants"
@@ -222,54 +222,54 @@
 /datum/gear/creamsweater
 	name = "Cream Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater
+	path = /obj/item/clothing/under/sweater
 
 /datum/gear/blacksweater
 	name = "Black Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/black
+	path = /obj/item/clothing/under/sweater/black
 
 /datum/gear/purpsweater
 	name = "Purple Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/purple
+	path = /obj/item/clothing/under/sweater/purple
 
 /datum/gear/greensweater
 	name = "Green Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/green
+	path = /obj/item/clothing/under/sweater/green
 
 /datum/gear/redsweater
 	name = "Red Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/red
+	path = /obj/item/clothing/under/sweater/red
 
 /datum/gear/bluesweater
 	name =  "Navy Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/blue
+	path = /obj/item/clothing/under/sweater/blue
 
 /datum/gear/keyholesweater
 	name =  "Keyhole Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/keyholesweater
+	path = /obj/item/clothing/under/misc/keyholesweater
 
 /datum/gear/polykilt
 	name = "Polychromic Kilt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/polychromic/kilt
+	path = /obj/item/clothing/under/costume/kilt/polychromic
 	cost = 3
 
 /datum/gear/polyshorts
 	name = "Polychromic Shorts"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/polychromic/shorts
+	path = /obj/item/clothing/under/misc/polyshorts
 	cost = 3
 
 /datum/gear/polyshortpants
 	name = "Polychromic Athletic Shorts"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/polychromic/shortpants
+	path = /obj/item/clothing/under/shorts/polychromic
 	cost = 2
 
 // Trekie things
@@ -277,21 +277,21 @@
 /datum/gear/trekcmdtos
 	name = "TOS uniform, cmd"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/command
+	path = /obj/item/clothing/under/trek/command
 	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/trekmedscitos
 	name = "TOS uniform, med/sci"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/medsci
+	path = /obj/item/clothing/under/trek/medsci
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/trekengtos
 	name = "TOS uniform, ops/sec"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/engsec
+	path = /obj/item/clothing/under/trek/engsec
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -299,21 +299,21 @@
 /datum/gear/trekcmdtng
 	name = "TNG uniform, cmd"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/command/next
+	path = /obj/item/clothing/under/trek/command/next
 	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/trekmedscitng
 	name = "TNG uniform, med/sci"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/medsci/next
+	path = /obj/item/clothing/under/trek/medsci/next
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/trekengtng
 	name = "TNG uniform, ops/sec"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/engsec/next
+	path = /obj/item/clothing/under/trek/engsec/next
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -321,21 +321,21 @@
 /datum/gear/trekcmdvoy
 	name = "VOY uniform, cmd"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/command/voy
+	path = /obj/item/clothing/under/trek/command/voy
 	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/trekmedscivoy
 	name = "VOY uniform, med/sci"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/medsci/voy
+	path = /obj/item/clothing/under/trek/medsci/voy
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/trekengvoy
 	name = "VOY uniform, ops/sec"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/engsec/voy
+	path = /obj/item/clothing/under/trek/engsec/voy
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -343,21 +343,21 @@
 /datum/gear/trekcmdds9
 	name = "DS9 uniform, cmd"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/command/ds9
+	path = /obj/item/clothing/under/trek/command/ds9
 	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/trekmedscids9
 	name = "DS9 uniform, med/sci"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/medsci/ds9
+	path = /obj/item/clothing/under/trek/medsci/ds9
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/trekengds9
 	name = "DS9 uniform, ops/sec"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/engsec/ds9
+	path = /obj/item/clothing/under/trek/engsec/ds9
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -365,21 +365,21 @@
 /datum/gear/trekcmdent
 	name = "ENT uniform, cmd"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/command/ent
+	path = /obj/item/clothing/under/trek/command/ent
 	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/trekmedscient
 	name = "ENT uniform, med/sci"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/medsci/ent
+	path = /obj/item/clothing/under/trek/medsci/ent
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/trekengent
 	name = "ENT uniform, ops/sec"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/engsec/ent
+	path = /obj/item/clothing/under/trek/engsec/ent
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -387,75 +387,75 @@
 /datum/gear/gear_harnesses
 	name = "Gear Harness"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/gear_harness
+	path = /obj/item/clothing/under/misc/gear_harness
 
 //Christmas
 /*Commenting out Until next Christmas or made automatic
 /datum/gear/christmasmaler
 	name = "Red Masculine Christmas Suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/christmas/christmasmaler
+	path = /obj/item/clothing/under/costume/christmas
 
 /datum/gear/christmasmaleg
 	name = "Green Masculine Christmas Suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/christmas/christmasmaleg
+	path = /obj/item/clothing/under/costume/christmas/green
 
 /datum/gear/christmasfemaler
 	name = "Red Feminine Christmas Suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/christmas/christmasfemaler
+	path = /obj/item/clothing/under/costume/christmas/croptop
 
 /datum/gear/christmasfemaleg
 	name = "Green Feminine Christmas Suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/christmas/christmasfemaleg
+	path = /obj/item/clothing/under/costume/christmas/croptop/green
 
 /datum/gear/pinkstripper
 	name = "Pink stripper outfit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/stripper_pink
+	path = /obj/item/clothing/under/misc/stripper
 	cost = 3
 */
 
 /datum/gear/greenstripper
 	name = "Green stripper outfit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/stripper_green
+	path = /obj/item/clothing/under/misc/stripper/green
 	cost = 3
 
 /datum/gear/qipao
 	name = "Qipao, Black"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/qipao
+	path = /obj/item/clothing/under/costume/qipao
 	cost = 3
 
 /datum/gear/qipao/white
 	name = "Qipao, White"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/qipao/white
+	path = /obj/item/clothing/under/costume/qipao/white
 	cost = 3
 
 /datum/gear/qipao/red
 	name = "Qipao, Red"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/qipao/red
+	path = /obj/item/clothing/under/costume/qipao/red
 	cost = 3
 
 /datum/gear/cheongsam
 	name = "Cheongsam, Black"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/cheongsam
+	path = /obj/item/clothing/under/costume/cheongsam
 	cost = 3
 
 /datum/gear/cheongsam/white
 	name = "Cheongsam, White"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/cheongsam/white
+	path = /obj/item/clothing/under/costume/cheongsam/white
 	cost = 3
 
 /datum/gear/cheongsam/red
 	name = "Cheongsam, Red"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/cheongsam/red
+	path = /obj/item/clothing/under/costume/cheongsam/red
 	cost = 3