diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index fe3f33ad527e..4ed3fec5ba5d 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -563,7 +563,7 @@
/obj/structure/closet/cabinet,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/shoes/winterboots,
-/obj/item/clothing/under/suit_jacket/tan,
+/obj/item/clothing/under/suit/tan,
/turf/open/floor/wood,
/area/ruin/powered)
diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index a903817bd476..d5d5cfa4580a 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -1273,7 +1273,7 @@
},
/obj/structure/closet/crate,
/obj/item/clothing/head/centhat/admiral,
-/obj/item/clothing/under/rank/centcom_admiral,
+/obj/item/clothing/under/rank/centcom/admiral,
/obj/item/clothing/gloves/color/captain/centcom/admiral,
/obj/item/paper/fluff/ruins/caravanambush/admiral,
/turf/open/floor/plasteel/airless/dark,
diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index 9e17af871595..867b824227a7 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -2272,7 +2272,7 @@
/area/awaymission/BMPship/Aft)
"gP" = (
/obj/structure/closet,
-/obj/item/clothing/under/lawyer/bluesuit,
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
/obj/item/clothing/suit/apron,
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
index 2b2eea4d3c0d..7110952eda34 100644
--- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
@@ -572,7 +572,7 @@
"bU" = (
/obj/effect/decal/cleanable/blood,
/obj/structure/chair,
-/obj/item/clothing/under/rank/centcom_officer,
+/obj/item/clothing/under/rank/centcom/officer,
/obj/item/restraints/handcuffs,
/obj/effect/decal/remains/human,
/turf/open/floor/plating/airless,
diff --git a/_maps/RandomRuins/SpaceRuins/pubby_monastery.dmm b/_maps/RandomRuins/SpaceRuins/pubby_monastery.dmm
index a8a35471c2ff..3170c150354c 100644
--- a/_maps/RandomRuins/SpaceRuins/pubby_monastery.dmm
+++ b/_maps/RandomRuins/SpaceRuins/pubby_monastery.dmm
@@ -1521,10 +1521,10 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/monastery)
"tj" = (
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
/obj/structure/table/wood,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/monastery)
diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm
index c7f044e5f0f1..9b50498b0870 100644
--- a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm
+++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm
@@ -70,12 +70,12 @@
"dG" = (
/obj/structure/table/wood,
/obj/item/toy/figure/chaplain,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"fv" = (
diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm
index de7ba9b49b65..efa926487759 100644
--- a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm
+++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm
@@ -723,12 +723,12 @@
/area/chapel/office)
"Kc" = (
/obj/item/toy/figure/chaplain,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
/obj/structure/table/wood/fancy,
/turf/open/floor/carpet/red,
/area/chapel/office)
diff --git a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_halloween.dmm b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_halloween.dmm
index 4e556ec08bde..c6bf2b77a15c 100644
--- a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_halloween.dmm
+++ b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_halloween.dmm
@@ -199,7 +199,7 @@
/obj/item/clothing/suit/yogs/tailcoat{
pixel_x = -4
},
-/obj/item/clothing/under/lawyer/black,
+/obj/item/clothing/under/rank/civilian/lawyer/black,
/obj/effect/decal/cleanable/glitter/pink,
/obj/item/reagent_containers/food/snacks/candy_corn,
/turf/open/floor/light/colour_cycle/dancefloor_a,
@@ -242,7 +242,7 @@
pixel_x = -2;
pixel_y = 4
},
-/obj/item/clothing/under/suit_jacket/navy{
+/obj/item/clothing/under/suit/navy{
pixel_x = 8;
pixel_y = -4
},
diff --git a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_pubbybar.dmm b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_pubbybar.dmm
index 8de2bacaa4a2..39b4844c0f91 100644
--- a/_maps/RandomRuins/StationRuins/maint/10x10/10x10_pubbybar.dmm
+++ b/_maps/RandomRuins/StationRuins/maint/10x10/10x10_pubbybar.dmm
@@ -176,7 +176,7 @@
"E" = (
/obj/structure/table,
/obj/item/grenade/chem_grenade/cleaner,
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/costume/maid,
/turf/open/floor/plating,
/area/template_noop)
"F" = (
diff --git a/_maps/RandomRuins/StationRuins/maint/3x3/3x3_kilolustymaid.dmm b/_maps/RandomRuins/StationRuins/maint/3x3/3x3_kilolustymaid.dmm
index 079a46b228a3..c011413ade39 100644
--- a/_maps/RandomRuins/StationRuins/maint/3x3/3x3_kilolustymaid.dmm
+++ b/_maps/RandomRuins/StationRuins/maint/3x3/3x3_kilolustymaid.dmm
@@ -51,7 +51,7 @@
pixel_x = -4;
pixel_y = -4
},
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/costume/maid,
/turf/open/floor/plasteel/dark,
/area/template_noop)
"J" = (
diff --git a/_maps/RandomRuins/StationRuins/maint/3x5/3x5_churchroach.dmm b/_maps/RandomRuins/StationRuins/maint/3x5/3x5_churchroach.dmm
index f32b43229f65..2b193c7f2d65 100644
--- a/_maps/RandomRuins/StationRuins/maint/3x5/3x5_churchroach.dmm
+++ b/_maps/RandomRuins/StationRuins/maint/3x5/3x5_churchroach.dmm
@@ -61,7 +61,7 @@
/area/template_noop)
"U" = (
/mob/living/simple_animal/cockroach,
-/obj/item/clothing/under/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
/obj/structure/table/wood,
/turf/open/floor/plating,
/area/template_noop)
diff --git a/_maps/RandomZLevels/VR/syndicate_trainer.dmm b/_maps/RandomZLevels/VR/syndicate_trainer.dmm
index 1c1201056032..0bb1e92c6c5c 100644
--- a/_maps/RandomZLevels/VR/syndicate_trainer.dmm
+++ b/_maps/RandomZLevels/VR/syndicate_trainer.dmm
@@ -2250,7 +2250,7 @@
/area/awaymission/centcomAway/hangar)
"mQ" = (
/obj/structure/safe/floor,
-/obj/item/clothing/under/rank/centcom_officer,
+/obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/suit/det_suit,
/obj/item/gun/ballistic/revolver/mateba,
/turf/open/indestructible,
diff --git a/_maps/RandomZLevels/VR/vrhub.dmm b/_maps/RandomZLevels/VR/vrhub.dmm
index 713df89db081..66a9cfb6b0c4 100644
--- a/_maps/RandomZLevels/VR/vrhub.dmm
+++ b/_maps/RandomZLevels/VR/vrhub.dmm
@@ -1974,7 +1974,7 @@
/area/awaymission/vr/syndicate)
"BO" = (
/obj/structure/safe/floor,
-/obj/item/clothing/under/rank/centcom_officer,
+/obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/suit/det_suit,
/obj/item/gun/ballistic/revolver/mateba,
/turf/open/indestructible,
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index b2faff225898..f1256a899029 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -5632,7 +5632,7 @@
locked = 0;
req_access_txt = "201"
},
-/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit/navy,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
@@ -6731,7 +6731,7 @@
/obj/structure/table,
/obj/structure/bedsheetbin,
/obj/item/clothing/neck/tie/black,
-/obj/item/clothing/under/lawyer/blacksuit,
+/obj/item/clothing/under/rank/civilian/lawyer/blacksuit,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
@@ -6973,7 +6973,7 @@
locked = 0;
req_access_txt = "201"
},
-/obj/item/clothing/under/suit_jacket/burgundy,
+/obj/item/clothing/under/suit/burgundy,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 0d42897eb659..b352a8cc4672 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -347,7 +347,7 @@
locked = 0;
req_access_txt = "201"
},
-/obj/item/clothing/under/suit_jacket/female,
+/obj/item/clothing/under/suit/female,
/turf/open/floor/carpet{
heat_capacity = 1e+006
},
@@ -5212,7 +5212,7 @@
},
/area/awaymission/undergroundoutpost45/gateway)
"km" = (
-/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit/navy,
/obj/structure/closet/secure_closet/personal/cabinet{
locked = 0;
req_access_txt = "201"
diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm
index ee645dea19bb..744a6088f569 100644
--- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm
+++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm
@@ -3650,10 +3650,10 @@
dir = 8
},
/obj/structure/closet,
-/obj/item/clothing/under/suit_jacket/really_black{
+/obj/item/clothing/under/suit/really_black{
pixel_x = -2
},
-/obj/item/clothing/under/suit_jacket/female{
+/obj/item/clothing/under/suit/female{
pixel_x = 3;
pixel_y = 1
},
diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm
index f816d59dcd5c..17f47119144d 100644
--- a/_maps/map_files/DonutStation/DonutStation.dmm
+++ b/_maps/map_files/DonutStation/DonutStation.dmm
@@ -25971,10 +25971,10 @@
name = "Surplus Genetics Supplies"
},
/obj/item/storage/pill_bottle/mutadone,
-/obj/item/clothing/under/pj/blue,
-/obj/item/clothing/under/pj/blue,
-/obj/item/clothing/under/pj/red,
-/obj/item/clothing/under/pj/red,
+/obj/item/clothing/under/rank/medical/pj/blue,
+/obj/item/clothing/under/rank/medical/pj/blue,
+/obj/item/clothing/under/rank/medical/pj/red,
+/obj/item/clothing/under/rank/medical/pj/red,
/obj/item/clothing/shoes/sneakers/white,
/obj/item/clothing/shoes/sneakers/white,
/obj/item/clothing/shoes/sneakers/white,
diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm
index 4ae285284691..e00dab137ce1 100644
--- a/_maps/map_files/GaxStation/GaxStation.dmm
+++ b/_maps/map_files/GaxStation/GaxStation.dmm
@@ -21379,11 +21379,11 @@
/area/quartermaster/miningdock)
"kkY" = (
/obj/structure/table/wood,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"kkZ" = (
@@ -26659,11 +26659,11 @@
/area/science/robotics/lab)
"mRq" = (
/obj/structure/closet,
-/obj/item/clothing/under/suit_jacket/female{
+/obj/item/clothing/under/suit/female{
pixel_x = 3;
pixel_y = 1
},
-/obj/item/clothing/under/suit_jacket/really_black{
+/obj/item/clothing/under/suit/really_black{
pixel_x = -2
},
/obj/machinery/light,
diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm
index 0f017845efdf..207251e34e1d 100644
--- a/_maps/map_files/IceMeta/IceMeta.dmm
+++ b/_maps/map_files/IceMeta/IceMeta.dmm
@@ -1801,8 +1801,8 @@
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
/obj/item/clothing/under/rank/security/navyblue,
-/obj/item/clothing/under/rank/warden/navyblue,
-/obj/item/clothing/under/rank/head_of_security/navyblue,
+/obj/item/clothing/under/rank/security/warden/navyblue,
+/obj/item/clothing/under/rank/security/head_of_security/navyblue,
/obj/item/clothing/head/beret/sec/navyofficer,
/obj/item/clothing/head/beret/sec/navyofficer,
/obj/item/clothing/head/beret/sec/navyofficer,
@@ -5501,7 +5501,7 @@
/area/crew_quarters/toilet/restrooms)
"bFK" = (
/obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/rank/civilian/assistantformal,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"bFO" = (
@@ -12480,7 +12480,7 @@
/obj/machinery/airalarm{
pixel_y = 24
},
-/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit/navy,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"dIH" = (
@@ -24958,7 +24958,7 @@
},
/obj/structure/table/wood,
/obj/item/clothing/shoes/laceup,
-/obj/item/clothing/under/suit_jacket/really_black,
+/obj/item/clothing/under/suit/really_black,
/obj/machinery/camera{
c_tag = "Corporate Showroom"
},
@@ -26244,7 +26244,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"hIZ" = (
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/costume/maid,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/neck/petcollar,
/obj/item/clothing/head/kitty,
@@ -29850,7 +29850,7 @@
/obj/machinery/newscaster{
pixel_x = -30
},
-/obj/item/clothing/under/suit_jacket/red,
+/obj/item/clothing/under/suit/red,
/obj/item/book/codex_gigas,
/turf/open/floor/engine/cult,
/area/library)
@@ -43358,7 +43358,7 @@
/area/hallway/primary/starboard)
"mCk" = (
/obj/structure/closet/secure_closet/personal,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/rank/civilian/assistantformal,
/obj/structure/sign/map/right{
desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
icon_state = "map-right-MS";
@@ -51828,7 +51828,7 @@
/area/tcommsat/server)
"oWc" = (
/obj/structure/closet/secure_closet/personal,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/rank/civilian/assistantformal,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/shoes/winterboots,
/turf/open/floor/plasteel/dark,
@@ -57247,7 +57247,7 @@
/obj/machinery/airalarm{
pixel_y = 24
},
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/rank/civilian/assistantformal,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"qAP" = (
@@ -67842,7 +67842,7 @@
/obj/machinery/airalarm{
pixel_y = 24
},
-/obj/item/clothing/under/suit_jacket/tan,
+/obj/item/clothing/under/suit/tan,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"tzi" = (
@@ -68001,7 +68001,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/rank/civilian/assistantformal,
/obj/structure/sign/map/left{
desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown).";
icon_state = "map-left-MS";
@@ -68394,7 +68394,7 @@
/obj/machinery/airalarm{
pixel_y = 24
},
-/obj/item/clothing/under/suit_jacket/burgundy,
+/obj/item/clothing/under/suit/burgundy,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"tIm" = (
@@ -72293,12 +72293,12 @@
pixel_y = 25
},
/obj/structure/table/wood,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
/obj/machinery/firealarm{
dir = 4;
pixel_x = -26
@@ -76755,11 +76755,11 @@
/area/mine/living_quarters)
"vYy" = (
/obj/structure/table,
-/obj/item/clothing/under/suit_jacket/female{
+/obj/item/clothing/under/suit/female{
pixel_x = 3;
pixel_y = 1
},
-/obj/item/clothing/under/suit_jacket/really_black{
+/obj/item/clothing/under/suit/really_black{
pixel_x = -2
},
/obj/machinery/light/small{
@@ -76770,9 +76770,9 @@
},
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/suit/toggle/lawyer/black,
-/obj/item/clothing/under/suit_jacket/red,
+/obj/item/clothing/under/suit/red,
/obj/item/clothing/neck/tie/black,
-/obj/item/clothing/under/lawyer/blacksuit,
+/obj/item/clothing/under/rank/civilian/lawyer/blacksuit,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/dorms)
"vYE" = (
@@ -80840,7 +80840,7 @@
dir = 8
},
/obj/structure/table,
-/obj/item/clothing/under/sl_suit{
+/obj/item/clothing/under/suit/sl_suit{
desc = "Whoever wears this makes the rules.";
name = "referee suit"
},
@@ -83767,7 +83767,7 @@
/area/hydroponics)
"xPL" = (
/obj/structure/closet/secure_closet/personal,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/rank/civilian/assistantformal,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/shoes/winterboots,
/obj/effect/turf_decal/trimline/yellow/filled/corner/lower{
diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm
index 5f50b14be40e..aa473841a3ae 100644
--- a/_maps/map_files/YogStation/YogStation.dmm
+++ b/_maps/map_files/YogStation/YogStation.dmm
@@ -5939,7 +5939,7 @@
/area/library)
"aQs" = (
/obj/structure/destructible/cult/tome,
-/obj/item/clothing/under/suit_jacket/red,
+/obj/item/clothing/under/suit/red,
/obj/item/book/codex_gigas,
/turf/open/floor/plasteel/cult,
/area/library)
@@ -10635,11 +10635,11 @@
/area/maintenance/port/fore)
"bEb" = (
/obj/structure/closet,
-/obj/item/clothing/under/suit_jacket/female{
+/obj/item/clothing/under/suit/female{
pixel_x = 3;
pixel_y = 1
},
-/obj/item/clothing/under/suit_jacket/really_black{
+/obj/item/clothing/under/suit/really_black{
pixel_x = -2
},
/obj/structure/window{
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index d5ad739c246c..1024eb39317c 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -4942,7 +4942,7 @@
"apN" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/under/rank/curator/treasure_hunter,
-/obj/item/clothing/under/skirt/black,
+/obj/item/clothing/under/dress/skirt/black,
/obj/item/clothing/under/shorts/black,
/obj/item/clothing/under/pants/track,
/obj/item/clothing/accessory/armband/deputy,
@@ -16973,11 +16973,11 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"aOU" = (
-/obj/item/clothing/under/jabroni,
-/obj/item/clothing/under/geisha,
-/obj/item/clothing/under/kilt,
+/obj/item/clothing/under/costume/jabroni,
+/obj/item/clothing/under/costume/geisha,
+/obj/item/clothing/under/costume/kilt,
/obj/structure/closet,
-/obj/item/clothing/under/roman,
+/obj/item/clothing/under/costume/roman,
/turf/open/floor/wood,
/area/centcom/holding)
"aOV" = (
diff --git a/_maps/shuttles/whiteship_3.dmm b/_maps/shuttles/whiteship_3.dmm
index 48ee607eafcd..9916f7ab15d9 100644
--- a/_maps/shuttles/whiteship_3.dmm
+++ b/_maps/shuttles/whiteship_3.dmm
@@ -1694,11 +1694,11 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/wardrobe/mixed,
/obj/item/storage/wallet/random,
-/obj/item/clothing/under/rank/centcom_officer{
+/obj/item/clothing/under/rank/centcom/officer{
desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old CentCom jumpsuit"
},
-/obj/item/clothing/under/rank/centcom_commander{
+/obj/item/clothing/under/rank/centcom/commander{
desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old CentCom jumpsuit"
},
diff --git a/_maps/templates/lazy_templates/chapel1.dmm b/_maps/templates/lazy_templates/chapel1.dmm
index cd8d019e4070..eb24c365d12d 100644
--- a/_maps/templates/lazy_templates/chapel1.dmm
+++ b/_maps/templates/lazy_templates/chapel1.dmm
@@ -70,12 +70,12 @@
"dG" = (
/obj/structure/table/wood,
/obj/item/toy/figure/chaplain,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"fv" = (
diff --git a/_maps/templates/lazy_templates/chapel2.dmm b/_maps/templates/lazy_templates/chapel2.dmm
index 4b7ac1a5176e..34bf2e658ad4 100644
--- a/_maps/templates/lazy_templates/chapel2.dmm
+++ b/_maps/templates/lazy_templates/chapel2.dmm
@@ -729,12 +729,12 @@
/area/chapel/office)
"Kc" = (
/obj/item/toy/figure/chaplain,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
+/obj/item/clothing/under/rank/civilian/chaplain/burial,
/obj/structure/table/wood/fancy,
/turf/open/floor/carpet/red,
/area/chapel/office)
diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
index 543f51b78113..f465bcbf1294 100644
--- a/code/__DEFINES/inventory.dm
+++ b/code/__DEFINES/inventory.dm
@@ -121,8 +121,7 @@
#define YES_DIGIT 2
//flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts
-#define NO_MUTANTRACE_VARIATION 0
-#define MUTANTRACE_VARIATION 1
+#define DIGITIGRADE_VARIATION (1<<0)
#define NOT_DIGITIGRADE 0
#define FULL_DIGITIGRADE 1
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index d9c2309a0600..5f3f0c4c1f0f 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -59,12 +59,12 @@ SUBSYSTEM_DEF(traumas)
"spiders" = typecacheof(list(/obj/structure/spider)),
- "security" = typecacheof(list(/obj/item/clothing/under/rank/security, /obj/item/clothing/under/rank/warden,
- /obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/rank/det,
+ "security" = typecacheof(list(/obj/item/clothing/under/rank/security/officer, /obj/item/clothing/under/rank/security/warden,
+ /obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/security/detective,
/obj/item/melee/baton, /obj/item/gun/energy/taser, /obj/item/restraints/handcuffs,
/obj/machinery/door/airlock/security, /obj/effect/hallucination/simple/securitron)),
- "clowns" = typecacheof(list(/obj/item/clothing/under/rank/clown, /obj/item/clothing/shoes/clown_shoes,
+ "clowns" = typecacheof(list(/obj/item/clothing/under/rank/civilian/clown, /obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/mask/gas/clown_hat, /obj/item/instrument/bikehorn,
/obj/item/pda/clown, /obj/item/grown/bananapeel, /obj/item/reagent_containers/food/snacks/cheesiehonkers,
/obj/item/trash/cheesie)),
@@ -78,15 +78,16 @@ SUBSYSTEM_DEF(traumas)
"skeletons" = typecacheof(list(/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton,
/obj/effect/decal/remains/human)),
- "conspiracies" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/head_of_security,
- /obj/item/clothing/under/rank/chief_engineer, /obj/item/clothing/under/rank/chief_medical_officer,
- /obj/item/clothing/under/rank/head_of_personnel, /obj/item/clothing/under/rank/research_director,
- /obj/item/clothing/under/rank/head_of_security/grey, /obj/item/clothing/under/rank/head_of_security/alt,
- /obj/item/clothing/under/rank/research_director/alt, /obj/item/clothing/under/rank/research_director/turtleneck,
- /obj/item/clothing/under/captainparade, /obj/item/clothing/under/hosparademale, /obj/item/clothing/under/hosparadefem,
+ "conspiracies" = typecacheof(list(/obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/security/head_of_security,
+ /obj/item/clothing/under/rank/engineering/chief_engineer, /obj/item/clothing/under/rank/medical/chief_medical_officer,
+ /obj/item/clothing/under/rank/command/head_of_personnel, /obj/item/clothing/under/rank/rnd/research_director,
+ /obj/item/clothing/under/rank/security/head_of_security/grey, /obj/item/clothing/under/rank/security/head_of_security/alt,
+ /obj/item/clothing/under/rank/rnd/research_director/alt, /obj/item/clothing/under/rank/rnd/research_director/turtleneck,
+ /obj/item/clothing/under/rank/command/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/hosparademale,
+ /obj/item/clothing/under/rank/security/head_of_security/hosparadefem,
/obj/item/clothing/head/helmet/abductor, /obj/item/clothing/suit/armor/abductor/vest, /obj/item/abductor/baton,
/obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/abductor/silencer,
- /obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom_officer,
+ /obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/suit/space/hardsuit/ert, /obj/item/clothing/suit/space/hardsuit/ert/sec,
/obj/item/clothing/suit/space/hardsuit/ert/engi, /obj/item/clothing/suit/space/hardsuit/ert/med,
/obj/item/clothing/suit/space/hardsuit/deathsquad, /obj/item/clothing/head/helmet/space/hardsuit/deathsquad,
@@ -94,8 +95,8 @@ SUBSYSTEM_DEF(traumas)
"robots" = typecacheof(list(/obj/machinery/computer/upload, /obj/item/aiModule, /obj/machinery/recharge_station,
/obj/item/aicard, /obj/structure/swarmer_beacon)),
- "doctors" = typecacheof(list(/obj/item/clothing/under/rank/medical, /obj/item/clothing/under/rank/chemist,
- /obj/item/clothing/under/rank/nursesuit, /obj/item/clothing/under/rank/chief_medical_officer,
+ "doctors" = typecacheof(list(/obj/item/clothing/under/rank/medical/doctor, /obj/item/clothing/under/rank/medical/chemist,
+ /obj/item/clothing/under/rank/medical/nursesuit, /obj/item/clothing/under/rank/medical/chief_medical_officer,
/obj/item/reagent_containers/syringe, /obj/item/reagent_containers/pill/, /obj/item/reagent_containers/autoinjector,
/obj/item/storage/firstaid, /obj/item/storage/pill_bottle, /obj/item/healthanalyzer,
/obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper, /obj/machinery/stasis,
@@ -103,10 +104,10 @@ SUBSYSTEM_DEF(traumas)
/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/plaguedoctorhat, /obj/item/clothing/mask/gas/plaguedoctor)),
- "authority" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/head_of_personnel,
- /obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/rank/research_director,
- /obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/under/rank/chief_engineer,
- /obj/item/clothing/under/rank/centcom_officer, /obj/item/clothing/under/rank/centcom_commander,
+ "authority" = typecacheof(list(/obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/command/head_of_personnel,
+ /obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/rnd/research_director,
+ /obj/item/clothing/under/rank/medical/chief_medical_officer, /obj/item/clothing/under/rank/engineering/chief_engineer,
+ /obj/item/clothing/under/rank/centcom/officer, /obj/item/clothing/under/rank/centcom/commander,
/obj/item/melee/classic_baton/telescopic, /obj/item/card/id/silver, /obj/item/card/id/gold,
/obj/item/card/id/captains_spare, /obj/item/card/id/centcom, /obj/machinery/door/airlock/command)),
@@ -122,7 +123,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard, /obj/item/spellbook, /obj/item/staff,
/obj/item/clothing/head/wizard/armor, /obj/item/clothing/suit/space/hardsuit/wizard,
/obj/item/gun/magic/staff, /obj/item/gun/magic/wand,
- /obj/item/nullrod, /obj/item/clothing/under/rank/chaplain)),
+ /obj/item/nullrod, /obj/item/clothing/under/rank/civilian/chaplain)),
"aliens" = typecacheof(list(/obj/item/clothing/mask/facehugger, /obj/item/organ/body_egg/alien_embryo,
/obj/structure/alien, /obj/item/toy/toy_xeno,
@@ -136,11 +137,11 @@ SUBSYSTEM_DEF(traumas)
"birds" = typecacheof(list(/obj/item/clothing/mask/gas/plaguedoctor, /obj/item/reagent_containers/food/snacks/cracker,
/obj/item/clothing/suit/chickensuit, /obj/item/clothing/head/chicken,
- /obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/owl, /obj/item/clothing/mask/gas/owl_mask,
- /obj/item/clothing/under/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin,
+ /obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/costume/owl, /obj/item/clothing/mask/gas/owl_mask,
+ /obj/item/clothing/under/costume/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin,
/obj/item/clothing/head/helmet/space/freedom, /obj/item/clothing/suit/space/freedom)),
- "anime" = typecacheof(list(/obj/item/clothing/under/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
+ "anime" = typecacheof(list(/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
/obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
/obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/vibro_weapon, /obj/item/horrortentacle,
/obj/item/nullrod/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))
diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
index d09725d96dc8..9e1e65b8b152 100644
--- a/code/datums/components/crafting/tailoring.dm
+++ b/code/datums/components/crafting/tailoring.dm
@@ -18,7 +18,7 @@
/datum/crafting_recipe/durathread_jumpsuit
name = "Durathread Jumpsuit"
- result = /obj/item/clothing/under/durathread
+ result = /obj/item/clothing/under/rank/civilian/hydroponics/durathread
reqs = list(/obj/item/stack/sheet/cloth/durathread = 4)
time = 4 SECONDS
category = CAT_CLOTHING // Can be technically considered armor since it gives protection (similar-ish to security jumpsuit).
@@ -119,19 +119,19 @@
/datum/crafting_recipe/mummy/body
name = "Mummification Bandages (Body)"
- result = /obj/item/clothing/under/mummy
+ result = /obj/item/clothing/under/costume/mummy
reqs = list(/obj/item/stack/sheet/cloth = 5)
/datum/crafting_recipe/chestwrap
name = "Loincloth and Chestwrap"
- result = /obj/item/clothing/under/chestwrap
+ result = /obj/item/clothing/under/tribal/chestwrap
time = 3 SECONDS
reqs = list(/obj/item/stack/sheet/leather = 1)
category = CAT_CLOTHING
/datum/crafting_recipe/raider_leather
name = "Scavenged Rags"
- result = /obj/item/clothing/under/raider_leather
+ result = /obj/item/clothing/under/tribal/raider_leather
time = 3 SECONDS
reqs = list(/obj/item/stack/sheet/metal = 1,
/obj/item/stack/rods = 2,
@@ -141,7 +141,7 @@
/datum/crafting_recipe/tribal_wraps
name = "Metal Plated Rags"
- result = /obj/item/clothing/under/tribal
+ result = /obj/item/clothing/under/tribal/plated
time = 3 SECONDS
reqs = list(/obj/item/stack/sheet/metal = 1,
/obj/item/stack/sheet/leather = 2)
@@ -150,7 +150,7 @@
/datum/crafting_recipe/ash_robe
name = "Tribal Robes"
- result = /obj/item/clothing/under/ash_robe
+ result = /obj/item/clothing/under/tribal/ash_robe
time = 3 SECONDS
reqs = list(/obj/item/stack/sheet/cloth = 2)
category = CAT_CLOTHING
@@ -158,29 +158,29 @@
/datum/crafting_recipe/ash_robe/young
name = "Tribal Rags"
- result = /obj/item/clothing/under/ash_robe/young
+ result = /obj/item/clothing/under/tribal/ash_robe/young
/datum/crafting_recipe/ash_robe/hunter
name = "Hunter Tribal Rags"
- result = /obj/item/clothing/under/ash_robe/hunter
+ result = /obj/item/clothing/under/tribal/ash_robe/hunter
/datum/crafting_recipe/ash_robe/chief
name = "Chief Tribal Rags"
- result = /obj/item/clothing/under/ash_robe/chief
+ result = /obj/item/clothing/under/tribal/ash_robe/chief
/datum/crafting_recipe/ash_robe/shaman
name = "Shaman Tribal Rags"
- result = /obj/item/clothing/under/ash_robe/shaman
+ result = /obj/item/clothing/under/tribal/ash_robe/shaman
/datum/crafting_recipe/ash_robe/tunic
name = "Tribal Tunic"
- result = /obj/item/clothing/under/ash_robe/tunic
+ result = /obj/item/clothing/under/tribal/ash_robe/tunic
reqs = list(/obj/item/stack/sheet/cloth = 2,
/obj/item/stack/sheet/leather = 1)
/datum/crafting_recipe/ash_robe/dress
name = "Tribal Dress"
- result = /obj/item/clothing/under/ash_robe/dress
+ result = /obj/item/clothing/under/tribal/ash_robe/dress
reqs = list(/obj/item/stack/sheet/cloth = 3)
/datum/crafting_recipe/shamanash
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index aac4647240aa..bdfdd5ff63a9 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -217,7 +217,7 @@ GLOBAL_VAR(changeling_team_objective_type)
new_flesh_item.lefthand_file = chosen_prof.lefthand_file_list[slot]
new_flesh_item.righthand_file = chosen_prof.righthand_file_list[slot]
new_flesh_item.item_state = chosen_prof.inhand_icon_state_list[slot]
- new_flesh_item.mob_overlay_icon = chosen_prof.worn_icon_list[slot]
+ new_flesh_item.worn_icon = chosen_prof.worn_icon_list[slot]
new_flesh_item.worn_icon_state = chosen_prof.worn_icon_state_list[slot]
if(equip)
diff --git a/code/game/gamemodes/clown_ops/bananium_bomb.dm b/code/game/gamemodes/clown_ops/bananium_bomb.dm
index 250e53fd6fe2..38dbb4ad2516 100644
--- a/code/game/gamemodes/clown_ops/bananium_bomb.dm
+++ b/code/game/gamemodes/clown_ops/bananium_bomb.dm
@@ -53,7 +53,7 @@
H.Stun(10)
var/obj/item/clothing/C
if(!H.w_uniform || H.dropItemToGround(H.w_uniform))
- C = new /obj/item/clothing/under/rank/clown(H)
+ C = new /obj/item/clothing/under/rank/civilian/clown(H)
ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
H.equip_to_slot_or_del(C, ITEM_SLOT_ICLOTHING)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 79acdba64a32..ae4a7085aa61 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -10,19 +10,19 @@ GLOBAL_LIST_INIT(dye_registry, list(
DYE_BLACK = /obj/item/clothing/under/color/black,
DYE_WHITE = /obj/item/clothing/under/color/white,
DYE_RAINBOW = /obj/item/clothing/under/color/rainbow,
- DYE_MIME = /obj/item/clothing/under/rank/mime,
- DYE_CLOWN = /obj/item/clothing/under/rank/clown,
- DYE_LAW = /obj/item/clothing/under/lawyer/blacksuit,
- DYE_CAPTAIN = /obj/item/clothing/under/rank/captain,
- DYE_HOP = /obj/item/clothing/under/rank/head_of_personnel,
- DYE_HOS = /obj/item/clothing/under/rank/head_of_security,
- DYE_CE = /obj/item/clothing/under/rank/chief_engineer,
- DYE_RD = /obj/item/clothing/under/rank/research_director,
- DYE_CMO = /obj/item/clothing/under/rank/chief_medical_officer,
- DYE_REDCOAT = /obj/item/clothing/under/redcoat,
+ DYE_MIME = /obj/item/clothing/under/rank/civilian/mime,
+ DYE_CLOWN = /obj/item/clothing/under/rank/civilian/clown,
+ DYE_LAW = /obj/item/clothing/under/rank/civilian/lawyer/blacksuit,
+ DYE_CAPTAIN = /obj/item/clothing/under/rank/command/captain,
+ DYE_HOP = /obj/item/clothing/under/rank/command/head_of_personnel,
+ DYE_HOS = /obj/item/clothing/under/rank/security/head_of_security,
+ DYE_CE = /obj/item/clothing/under/rank/engineering/chief_engineer,
+ DYE_RD = /obj/item/clothing/under/rank/rnd/research_director,
+ DYE_CMO = /obj/item/clothing/under/rank/medical/chief_medical_officer,
+ DYE_REDCOAT = /obj/item/clothing/under/costume/redcoat,
DYE_SYNDI = /obj/item/clothing/under/syndicate/tacticool,
- DYE_CENT = /obj/item/clothing/under/rank/centcom_officer,
- DYE_QM = /obj/item/clothing/under/rank/cargo
+ DYE_CENT = /obj/item/clothing/under/rank/centcom/officer,
+ DYE_QM = /obj/item/clothing/under/rank/cargo/qm
),
DYE_REGISTRY_JUMPSKIRT = list(
DYE_RED = /obj/item/clothing/under/skirt/color/red,
@@ -33,15 +33,15 @@ GLOBAL_LIST_INIT(dye_registry, list(
DYE_PURPLE = /obj/item/clothing/under/skirt/color/lightpurple,
DYE_BLACK = /obj/item/clothing/under/skirt/color/black,
DYE_WHITE = /obj/item/clothing/under/skirt/color/white,
- DYE_MIME = /obj/item/clothing/under/rank/mime/skirt,
- DYE_LAW = /obj/item/clothing/under/lawyer/blacksuit/skirt,
- DYE_CAPTAIN = /obj/item/clothing/under/rank/captain/skirt,
- DYE_HOP = /obj/item/clothing/under/rank/head_of_personnel/skirt,
- DYE_HOS = /obj/item/clothing/under/rank/head_of_security/skirt,
- DYE_CE = /obj/item/clothing/under/rank/chief_engineer/skirt,
- DYE_RD = /obj/item/clothing/under/rank/research_director/skirt,
- DYE_CMO = /obj/item/clothing/under/rank/chief_medical_officer/skirt,
- DYE_QM = /obj/item/clothing/under/rank/cargo/skirt
+ DYE_MIME = /obj/item/clothing/under/rank/civilian/mime/skirt,
+ DYE_LAW = /obj/item/clothing/under/rank/civilian/lawyer/blacksuit/skirt,
+ DYE_CAPTAIN = /obj/item/clothing/under/rank/command/captain/skirt,
+ DYE_HOP = /obj/item/clothing/under/rank/command/head_of_personnel/skirt,
+ DYE_HOS = /obj/item/clothing/under/rank/security/head_of_security/skirt,
+ DYE_CE = /obj/item/clothing/under/rank/engineering/chief_engineer/skirt,
+ DYE_RD = /obj/item/clothing/under/rank/rnd/research_director/skirt,
+ DYE_CMO = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt,
+ DYE_QM = /obj/item/clothing/under/rank/cargo/qm/skirt
),
DYE_REGISTRY_GLOVES = list(
DYE_RED = /obj/item/clothing/gloves/color/red,
@@ -201,7 +201,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
lefthand_file = initial(target_type.lefthand_file)
righthand_file = initial(target_type.righthand_file)
item_state = initial(target_type.item_state)
- mob_overlay_icon = initial(target_type.mob_overlay_icon)
+ worn_icon = initial(target_type.worn_icon)
worn_icon_state = initial(target_type.worn_icon_state)
inhand_x_dimension = initial(target_type.inhand_x_dimension)
inhand_y_dimension = initial(target_type.inhand_y_dimension)
diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm
index 3781a3820287..44fbd0515ed5 100644
--- a/code/game/objects/effects/spawners/bundle.dm
+++ b/code/game/objects/effects/spawners/bundle.dm
@@ -24,20 +24,20 @@
/obj/effect/spawner/bundle/costume/gladiator
name = "gladiator costume spawner"
items = list(
- /obj/item/clothing/under/gladiator,
+ /obj/item/clothing/under/costume/gladiator,
/obj/item/clothing/head/helmet/gladiator)
/obj/effect/spawner/bundle/costume/madscientist
name = "mad scientist costume spawner"
items = list(
- /obj/item/clothing/under/gimmick/rank/captain/suit,
+ /obj/item/clothing/under/rank/command/captain/suit,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/suit/toggle/labcoat/mad)
/obj/effect/spawner/bundle/costume/elpresidente
name = "el presidente costume spawner"
items = list(
- /obj/item/clothing/under/gimmick/rank/captain/suit,
+ /obj/item/clothing/under/rank/command/captain/suit,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/mask/cigarette/cigar/havana,
/obj/item/clothing/shoes/jackboots)
@@ -45,14 +45,14 @@
/obj/effect/spawner/bundle/costume/nyangirl
name = "nyangirl costume spawner"
items = list(
- /obj/item/clothing/under/schoolgirl,
+ /obj/item/clothing/under/costume/schoolgirl,
/obj/item/clothing/head/kitty,
/obj/item/clothing/glasses/blindfold)
/obj/effect/spawner/bundle/costume/maid
name = "maid costume spawner"
items = list(
- /obj/item/clothing/under/skirt/black,
+ /obj/item/clothing/under/dress/skirt/black,
/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
/obj/item/clothing/glasses/blindfold)
@@ -61,13 +61,13 @@
name = "butler costume spawner"
items = list(
/obj/item/clothing/accessory/waistcoat,
- /obj/item/clothing/under/suit_jacket,
+ /obj/item/clothing/under/suit,
/obj/item/clothing/head/that)
/obj/effect/spawner/bundle/costume/highlander
name = "highlander costume spawner"
items = list(
- /obj/item/clothing/under/kilt,
+ /obj/item/clothing/under/costume/kilt,
/obj/item/clothing/head/beret)
/obj/effect/spawner/bundle/costume/prig
@@ -78,7 +78,7 @@
/obj/effect/spawner/lootdrop/minor/bowler_or_that,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/cane,
- /obj/item/clothing/under/sl_suit,
+ /obj/item/clothing/under/suit/sl_suit,
/obj/item/clothing/mask/fakemoustache)
/obj/effect/spawner/bundle/costume/plaguedoctor
@@ -92,7 +92,7 @@
name = "night owl costume spawner"
items = list(
/obj/item/clothing/suit/toggle/owlwings,
- /obj/item/clothing/under/owl,
+ /obj/item/clothing/under/costume/owl,
/obj/item/clothing/mask/gas/owl_mask)
/obj/effect/spawner/bundle/costume/griffin
@@ -100,20 +100,20 @@
items = list(
/obj/item/clothing/suit/toggle/owlwings/griffinwings,
/obj/item/clothing/shoes/griffin,
- /obj/item/clothing/under/griffin,
+ /obj/item/clothing/under/costume/griffin,
/obj/item/clothing/head/griffin)
/obj/effect/spawner/bundle/costume/waiter
name = "waiter costume spawner"
items = list(
- /obj/item/clothing/under/waiter,
+ /obj/item/clothing/under/suit/waiter,
/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
/obj/item/clothing/suit/apron)
/obj/effect/spawner/bundle/costume/pirate
name = "pirate costume spawner"
items = list(
- /obj/item/clothing/under/pirate,
+ /obj/item/clothing/under/costume/pirate,
/obj/item/clothing/suit/pirate,
/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
/obj/item/clothing/glasses/eyepatch)
@@ -121,7 +121,7 @@
/obj/effect/spawner/bundle/costume/commie
name = "commie costume spawner"
items = list(
- /obj/item/clothing/under/soviet,
+ /obj/item/clothing/under/costume/soviet,
/obj/item/clothing/head/ushanka)
/obj/effect/spawner/bundle/costume/imperium_monk
@@ -145,7 +145,7 @@
/obj/effect/spawner/bundle/costume/cutewitch
name = "cute witch costume spawner"
items = list(
- /obj/item/clothing/under/sundress,
+ /obj/item/clothing/under/dress/sundress,
/obj/item/clothing/head/witchwig,
/obj/item/staff/broom)
@@ -161,10 +161,10 @@
name = "sexy clown costume spawner"
items = list(
/obj/item/clothing/mask/gas/sexyclown,
- /obj/item/clothing/under/rank/clown/sexy)
+ /obj/item/clothing/under/rank/civilian/clown/sexy)
/obj/effect/spawner/bundle/costume/sexymime
name = "sexy mime costume spawner"
items = list(
/obj/item/clothing/mask/gas/sexymime,
- /obj/item/clothing/under/sexymime)
+ /obj/item/clothing/under/rank/civilian/mime/sexy)
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index aefead875e86..39962577f6f6 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -737,7 +737,7 @@
lootdoubles = FALSE
loot = list(
- /obj/item/clothing/under/drip = 20,
+ /obj/item/clothing/under/costume/drip = 20,
"" = 80)
/obj/effect/spawner/lootdrop/twenty_percent_drip_shoes
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 374d8d4d419b..4f2a2ab53705 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -26,7 +26,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/righthand_file = 'icons/mob/inhands/items_righthand.dmi'
///Icon file for mob worn overlays.
- var/icon/mob_overlay_icon
+ var/icon/worn_icon
///Icon state for mob worn overlays, if null the normal icon_state will be used.
var/worn_icon_state
///Icon state for the belt overlay, if null the normal icon_state will be used.
@@ -306,7 +306,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if(!greyscale_colors)
return
if(greyscale_config_worn)
- /*worn_icon*/mob_overlay_icon = SSgreyscale.GetColoredIconByType(greyscale_config_worn, greyscale_colors)
+ worn_icon = SSgreyscale.GetColoredIconByType(greyscale_config_worn, greyscale_colors)
if(greyscale_config_inhand_left)
lefthand_file = SSgreyscale.GetColoredIconByType(greyscale_config_inhand_left, greyscale_colors)
if(greyscale_config_inhand_right)
diff --git a/code/game/objects/items/holy_armours.dm b/code/game/objects/items/holy_armours.dm
index 01cfdc254a3a..64c568324327 100644
--- a/code/game/objects/items/holy_armours.dm
+++ b/code/game/objects/items/holy_armours.dm
@@ -78,7 +78,7 @@
/obj/item/clothing/head/helmet/chaplain/cage
name = "insightful cage"
desc = "A cage that restrains the will of the self, allowing one to see the profane world for what it is. The user will be more vulnerable but move slightly faster."
- mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
+ worn_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
icon_state = "cage"
item_state = "cage"
armor = list(MELEE = -15, BULLET = -10, LASER = -10, ENERGY = -5, BOMB = -5, BIO = -2, RAD = 0, FIRE = 0, ACID = 0)
@@ -127,7 +127,7 @@
armor = list(MELEE = 40, BULLET = 10, LASER = 10, ENERGY = 5, BOMB = 10, BIO = 0, RAD = 0, FIRE = 0, ACID = 40) //Basically faster Dark Templar but you lose out on a lot of the non-melee armor
slowdown = 0.1
body_parts_covered = CHEST|GROIN|LEGS|ARMS
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/head/helmet/chaplain/witchunter_hat
name = "witch hunter hat"
@@ -248,7 +248,7 @@
item_state = "flagelantes_chains"
armor = list(MELEE = -15, BULLET = -15, LASER = -15, ENERGY = -15, BOMB = -15, BIO = -15, RAD = 0, FIRE = 0, ACID = 0)
body_parts_covered = CHEST|GROIN|LEGS|ARMS
- mutantrace_variation = MUTANTRACE_VARIATION //No leg squishing
+ mutantrace_variation = DIGITIGRADE_VARIATION //No leg squishing
resistance_flags = FIRE_PROOF | ACID_PROOF //No turning to ash/mush in the quest for pain
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant)
hoodtype = /obj/item/clothing/head/hooded/flagelantes_chains_hood
@@ -432,7 +432,7 @@
name = "flagellant's hood"
desc = "A hood worn by flagellants to hide their face."
icon = 'icons/obj/clothing/hats/hats.dmi'
- mob_overlay_icon = 'icons/mob/clothing/head/head.dmi'
+ worn_icon = 'icons/mob/clothing/head/head.dmi'
icon_state = "flagelantes_chains_hood"
item_state = "flagelantes_chains_hood"
armor = list(MELEE = -15, BULLET = -15, LASER = -15, ENERGY = -15, BOMB = -15, BIO = -15, RAD = 0, FIRE = 0, ACID = 0)
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index eb64dec62127..4f4e825609c5 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -1272,7 +1272,7 @@ it also swaps back if it gets thrown into the chaplain, but the chaplain catches
icon = 'icons/obj/misc.dmi'
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- mob_overlay_icon = 'icons/mob/clothing/belt.dmi'
+ worn_icon = 'icons/mob/clothing/belt.dmi'
icon_state = "aspergillum0"
item_state = "aspergillum0"
base_icon_state = "aspergillum"
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index 33d6f0609769..c70dfbe84aea 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -111,7 +111,7 @@
name = "Braveheart, the Scottish rebel - 1300's."
/obj/item/storage/box/hero/scottish/PopulateContents()
- new /obj/item/clothing/under/kilt(src)
+ new /obj/item/clothing/under/costume/kilt(src)
new /obj/item/claymore/weak/ceremonial(src)
new /obj/item/toy/crayon/spraycan(src)
new /obj/item/clothing/shoes/sandal(src)
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index f6ddcc25c1d0..0b778e8ad15a 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -92,7 +92,7 @@
result = /obj/item/banner/security/mundane
time = 4 SECONDS
reqs = list(/obj/item/stack/rods = 2,
- /obj/item/clothing/under/rank/security = 1)
+ /obj/item/clothing/under/rank/security/officer = 1)
category = CAT_MISC
/obj/item/banner/medical
@@ -116,7 +116,7 @@
result = /obj/item/banner/medical/mundane
time = 4 SECONDS
reqs = list(/obj/item/stack/rods = 2,
- /obj/item/clothing/under/rank/medical = 1)
+ /obj/item/clothing/under/rank/medical/doctor = 1)
category = CAT_MISC
/obj/item/banner/medical/special_inspiration(mob/living/carbon/human/H)
@@ -145,7 +145,7 @@
result = /obj/item/banner/science/mundane
time = 4 SECONDS
reqs = list(/obj/item/stack/rods = 2,
- /obj/item/clothing/under/rank/scientist = 1)
+ /obj/item/clothing/under/rank/rnd/scientist = 1)
category = CAT_MISC
/obj/item/banner/cargo
@@ -166,7 +166,7 @@
result = /obj/item/banner/cargo/mundane
time = 4 SECONDS
reqs = list(/obj/item/stack/rods = 2,
- /obj/item/clothing/under/rank/cargotech = 1)
+ /obj/item/clothing/under/rank/cargo/tech = 1)
category = CAT_MISC
/obj/item/banner/engineering
@@ -190,7 +190,7 @@
result = /obj/item/banner/engineering/mundane
time = 4 SECONDS
reqs = list(/obj/item/stack/rods = 2,
- /obj/item/clothing/under/rank/engineer = 1)
+ /obj/item/clothing/under/rank/engineering/engineer = 1)
category = CAT_MISC
/obj/item/banner/command
@@ -211,7 +211,7 @@
result = /obj/item/banner/command/mundane
time = 4 SECONDS
reqs = list(/obj/item/stack/rods = 2,
- /obj/item/clothing/under/captainparade = 1)
+ /obj/item/clothing/under/rank/command/captain/parade = 1)
category = CAT_MISC
/obj/item/banner/red
@@ -280,7 +280,7 @@
/obj/item/clothing/head/helmet/plate/crusader/prophet
name = "Prophet's Hat"
desc = "A religious-looking hat."
- mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
+ worn_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
flags_1 = 0
armor = list(MELEE = 60, BULLET = 60, LASER = 60, ENERGY = 50, BOMB = 70, BIO = 60, RAD = 50, FIRE = 60, ACID = 60) //religion protects you from disease and radiation, honk.
worn_x_dimension = 64
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index cfe994c1acd0..7eb65eb5783d 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -35,7 +35,7 @@ GLOBAL_LIST_INIT(human_recipes, list( \
GLOBAL_LIST_INIT(gondola_recipes, list ( \
new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1), \
- new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/gondola, 2), \
+ new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/costume/gondola, 2), \
))
/obj/item/stack/sheet/animalhide/gondola
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 57fd0aefe77d..82b1ad2acb11 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -470,7 +470,7 @@
item_state = "duffel-syndieammo"
/obj/item/storage/backpack/duffelbag/syndie/hitman/PopulateContents()
- new /obj/item/clothing/under/lawyer/blacksuit(src)
+ new /obj/item/clothing/under/rank/civilian/lawyer/blacksuit(src)
new /obj/item/clothing/accessory/waistcoat(src)
new /obj/item/clothing/suit/toggle/lawyer/black(src)
new /obj/item/clothing/shoes/laceup(src)
@@ -673,7 +673,7 @@
/obj/item/storage/backpack/duffelbag/clown/syndie/PopulateContents()
new /obj/item/modular_computer/tablet/pda/preset/clown/syndicate (src)
- new /obj/item/clothing/under/rank/clown(src)
+ new /obj/item/clothing/under/rank/civilian/clown(src)
new /obj/item/clothing/shoes/clown_shoes(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/bikehorn(src)
@@ -699,10 +699,10 @@
desc = "A large duffel bag filled with clothing."
/obj/item/storage/backpack/duffelbag/clothing/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/turtleneck(src)
- new /obj/item/clothing/under/rank/head_of_personnel/skirt/turtleneck(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/turtleneck(src)
+ new /obj/item/clothing/under/rank/command/head_of_personnel/skirt/turtleneck(src)
new /obj/item/clothing/head/hopcap(src)
new /obj/item/clothing/head/beret/hop(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
@@ -721,12 +721,12 @@
new /obj/item/clothing/suit/bio_suit/scientist(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
new /obj/item/clothing/suit/toggle/labcoat(src)
- 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/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/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/hooded/wintercoat/science/rd(src)
new /obj/item/clothing/head/beret/rd(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
@@ -741,8 +741,8 @@
/obj/item/storage/backpack/duffelbag/clothing/ce/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/engineering/chief_engineer(src)
+ new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/hardhat/weldhat/white(src)
new /obj/item/clothing/head/welding(src)
@@ -765,13 +765,13 @@
desc = "A large duffel bag filled with clothing."
/obj/item/storage/backpack/duffelbag/clothing/sec/detective/PopulateContents()
- new /obj/item/clothing/under/rank/det(src)
- new /obj/item/clothing/under/rank/det/skirt(src)
+ new /obj/item/clothing/under/rank/security/detective(src)
+ new /obj/item/clothing/under/rank/security/detective/skirt(src)
new /obj/item/clothing/suit/det_suit(src)
new /obj/item/clothing/head/fedora/det_hat(src)
new /obj/item/clothing/gloves/color/black/forensic(src)
- new /obj/item/clothing/under/rank/det/grey(src)
- new /obj/item/clothing/under/rank/det/grey/skirt(src)
+ new /obj/item/clothing/under/rank/security/detective/grey(src)
+ new /obj/item/clothing/under/rank/security/detective/grey/skirt(src)
new /obj/item/clothing/accessory/waistcoat(src)
new /obj/item/clothing/suit/det_suit/grey(src)
new /obj/item/clothing/suit/det_suit/noir(src)
@@ -800,8 +800,8 @@
new /obj/item/clothing/head/warden/drill(src)
new /obj/item/clothing/head/beret/sec/navywarden(src)
new /obj/item/clothing/suit/armor/vest/warden/alt(src)
- new /obj/item/clothing/under/rank/warden/navyblue(src)
- new /obj/item/clothing/under/rank/warden/skirt(src)
+ new /obj/item/clothing/under/rank/security/warden/navyblue(src)
+ new /obj/item/clothing/under/rank/security/warden/skirt(src)
new /obj/item/clothing/shoes/jackboots/warden(src)
/obj/item/storage/backpack/duffelbag/clothing/sec/head
@@ -809,17 +809,17 @@
desc = "A large duffel bag filled with clothing."
/obj/item/storage/backpack/duffelbag/clothing/sec/head/PopulateContents()
- new /obj/item/clothing/under/hosparadefem(src)
- new /obj/item/clothing/under/hosparademale(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/hosparadefem(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/hosparademale(src)
new /obj/item/clothing/suit/armor/vest/leather(src)
new /obj/item/clothing/suit/armor/hos(src)
- new /obj/item/clothing/under/rank/head_of_security/skirt(src)
- new /obj/item/clothing/under/rank/head_of_security/alt(src)
- new /obj/item/clothing/under/rank/head_of_security/alt/skirt(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/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/head/HoS(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src)
- new /obj/item/clothing/under/rank/head_of_security/grey(src)
+ new /obj/item/clothing/under/rank/security/head_of_security/grey(src)
new /obj/item/clothing/under/yogs/lieutgeneral(src)
new /obj/item/clothing/under/yogs/dictatorhos(src)
new /obj/item/clothing/suit/armor/hos/germancoat(src)
@@ -838,10 +838,10 @@
new /obj/item/clothing/suit/bio_suit/cmo(src)
new /obj/item/clothing/head/bio_hood/cmo(src)
new /obj/item/clothing/suit/toggle/labcoat/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/turtleneck(src)
- new /obj/item/clothing/under/rank/chief_medical_officer/skirt/turtleneck(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/turtleneck(src)
+ new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt/turtleneck(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/shoes/xeno_wraps/command(src)
new /obj/item/clothing/head/beret/cmo(src)
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 8878f19fec56..1145abc21a0a 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -73,7 +73,7 @@
new /obj/item/storage/belt/holster/syndicate(src) //A holster for your four guns. It could be 1 TC I guess, since the tactical webbing can't hold normal items?
new /obj/item/clothing/gloves/color/latex/nitrile(src) //Free?
new /obj/item/clothing/mask/gas/clown_hat(src) //Free?
- new /obj/item/clothing/under/suit_jacket/really_black(src) //Free?
+ new /obj/item/clothing/under/suit/really_black(src) //Free?
if("murder") //Total cost of 28 TC
new /obj/item/melee/transforming/energy/sword/saber(src) //8 TC
@@ -125,7 +125,7 @@
new /obj/item/clothing/glasses/thermal/syndi(src) //4 TC
new /obj/item/clothing/gloves/color/latex/nitrile(src) //Free?
new /obj/item/clothing/mask/gas/clown_hat(src) //Free?
- new /obj/item/clothing/under/suit_jacket/really_black(src) //Free?
+ new /obj/item/clothing/under/suit/really_black(src) //Free?
if("metaops") //30 TC
new /obj/item/clothing/suit/space/hardsuit/syndi(src) //8 TC
@@ -263,7 +263,7 @@
if("gang_boss")
- new /obj/item/clothing/under/jabroni(src) //fishnet suit
+ new /obj/item/clothing/under/costume/jabroni(src) //fishnet suit
new /obj/item/clothing/suit/yogs/pinksweater(src) //close enough
new /obj/item/guardiancreator/tech(src) //15 TC
new /obj/item/stand_arrow/boss(src) //priceless, but if it had to get a price it'd be ~45 for 3 holoparasite injectors and ~21 3 mindslave implants. although its difficult to conceal and the holoparasites are random.
@@ -832,7 +832,7 @@
new /obj/item/book/granter/action/spell/mime/mimery_guns(src)
/obj/item/storage/box/syndie_kit/centcom_costume/PopulateContents()
- new /obj/item/clothing/under/rank/centcom_officer(src)
+ new /obj/item/clothing/under/rank/centcom/officer(src)
new /obj/item/clothing/head/beret/sec/centcom(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/gloves/color/black(src)
diff --git a/code/game/objects/items/two_handed/spears.dm b/code/game/objects/items/two_handed/spears.dm
index d782903aeb09..f44c266ae03a 100644
--- a/code/game/objects/items/two_handed/spears.dm
+++ b/code/game/objects/items/two_handed/spears.dm
@@ -69,7 +69,7 @@
force += 1
throwforce += 1
righthand_file = 'yogstation/icons/mob/inhands/weapons/polearms_righthand.dmi' //yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/back.dmi' //yogs
+ worn_icon = 'yogstation/icons/mob/clothing/back.dmi' //yogs
base_icon_state = "spearplasma"
update_appearance(UPDATE_ICON)
qdel(tip)
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 0368ea11cc23..4e18a969fb06 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -10,7 +10,7 @@ LINEN BINS
icon = 'icons/obj/bedsheets.dmi'
lefthand_file = 'icons/mob/inhands/misc/bedsheet_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/bedsheet_righthand.dmi'
- mob_overlay_icon = 'icons/mob/clothing/neck/sheets.dmi'
+ worn_icon = 'icons/mob/clothing/neck/sheets.dmi'
icon_state = "sheetwhite"
item_state = "sheetwhite"
slot_flags = ITEM_SLOT_NECK
diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
index 90b01b3b6c30..f4a390831cb6 100644
--- a/code/game/objects/structures/crates_lockers/closets/fitness.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -11,7 +11,7 @@
new /obj/item/clothing/under/shorts/red(src)
new /obj/item/clothing/under/shorts/blue(src)
new /obj/item/clothing/under/shorts/green(src)
- new /obj/item/clothing/under/jabroni(src)
+ new /obj/item/clothing/under/costume/jabroni(src)
/obj/structure/closet/boxinggloves
@@ -86,4 +86,4 @@
new /obj/item/cardboard_cutout/chess/black/knight(src)
new /obj/item/cardboard_cutout/chess/black/bishop(src)
new /obj/item/cardboard_cutout/chess/black/queen(src)
- new /obj/item/cardboard_cutout/chess/black/king(src)
\ No newline at end of file
+ new /obj/item/cardboard_cutout/chess/black/king(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index d81a146758d8..14193cddddda 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -27,7 +27,7 @@
for(var/i in 1 to 5)
new /obj/item/clothing/head/ushanka(src)
for(var/i in 1 to 5)
- new /obj/item/clothing/under/soviet(src)
+ new /obj/item/clothing/under/costume/soviet(src)
/obj/structure/closet/gimmick/tacticool
name = "tacticool gear closet"
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 451203112aff..c8379b4e5490 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -10,8 +10,8 @@
var/static/items_inside = list(
/obj/item/clothing/head/that = 2,
/obj/item/radio/headset/headset_srv = 2,
- /obj/item/clothing/under/sl_suit = 2,
- /obj/item/clothing/under/rank/bartender = 2,
+ /obj/item/clothing/under/suit/sl_suit = 2,
+ /obj/item/clothing/under/rank/civilian/bartender = 2,
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/head/soft/black = 2,
/obj/item/clothing/shoes/sneakers/black = 2,
@@ -32,7 +32,7 @@
/obj/structure/closet/chefcloset/PopulateContents()
..()
var/static/items_inside = list(
- /obj/item/clothing/under/waiter = 2,
+ /obj/item/clothing/under/suit/waiter = 2,
/obj/item/radio/headset/headset_srv = 2,
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/suit/apron/chef = 3,
@@ -40,7 +40,7 @@
/obj/item/storage/box/mousetraps = 2,
/obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/clothing/suit/toggle/chef = 1,
- /obj/item/clothing/under/rank/chef = 1,
+ /obj/item/clothing/under/rank/civilian/chef = 1,
/obj/item/clothing/head/chefhat = 1,
/obj/item/reagent_containers/glass/rag = 1)
generate_items_inside(items_inside,src)
@@ -52,7 +52,7 @@
/obj/structure/closet/jcloset/PopulateContents()
..()
- new /obj/item/clothing/under/rank/janitor(src)
+ new /obj/item/clothing/under/rank/civilian/janitor(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/head/soft/purple(src)
new /obj/item/paint/paint_remover(src)
@@ -76,14 +76,14 @@
/obj/structure/closet/lawcloset/PopulateContents()
..()
- new /obj/item/clothing/under/lawyer/female(src)
- new /obj/item/clothing/under/lawyer/black(src)
- new /obj/item/clothing/under/lawyer/red(src)
- new /obj/item/clothing/under/lawyer/bluesuit(src)
+ new /obj/item/clothing/under/rank/civilian/lawyer/female(src)
+ new /obj/item/clothing/under/rank/civilian/lawyer/black(src)
+ new /obj/item/clothing/under/rank/civilian/lawyer/red(src)
+ new /obj/item/clothing/under/rank/civilian/lawyer/bluesuit(src)
new /obj/item/clothing/suit/toggle/lawyer(src)
- new /obj/item/clothing/under/lawyer/purpsuit(src)
+ new /obj/item/clothing/under/rank/civilian/lawyer/purpsuit(src)
new /obj/item/clothing/suit/toggle/lawyer/purple(src)
- new /obj/item/clothing/under/lawyer/blacksuit(src)
+ new /obj/item/clothing/under/rank/civilian/lawyer/blacksuit(src)
new /obj/item/clothing/suit/toggle/lawyer/black(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/clothing/shoes/laceup(src)
@@ -98,7 +98,7 @@
/obj/structure/closet/wardrobe/chaplain_black/PopulateContents()
new /obj/item/choice_beacon/holy(src)
new /obj/item/clothing/accessory/pocketprotector/cosmetology(src)
- new /obj/item/clothing/under/rank/chaplain(src)
+ new /obj/item/clothing/under/rank/civilian/chaplain(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/suit/chaplainsuit/nun(src)
new /obj/item/clothing/head/nun_hood(src)
@@ -118,8 +118,8 @@
/obj/item/storage/backpack/security = 1,
/obj/item/storage/backpack/satchel/sec = 1,
/obj/item/storage/backpack/duffelbag/sec = 2,
- /obj/item/clothing/under/rank/security = 3,
- /obj/item/clothing/under/rank/security/skirt = 2,
+ /obj/item/clothing/under/rank/security/officer = 3,
+ /obj/item/clothing/under/rank/security/officer/skirt = 2,
/obj/item/clothing/shoes/jackboots = 3,
/obj/item/clothing/head/beret/sec = 3,
/obj/item/clothing/head/soft/sec = 3,
@@ -134,7 +134,7 @@
/obj/structure/closet/wardrobe/cargotech/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/suit/hooded/wintercoat/cargo = 1,
- /obj/item/clothing/under/rank/cargotech = 3,
+ /obj/item/clothing/under/rank/cargo/tech = 3,
/obj/item/clothing/shoes/sneakers/black = 3,
/obj/item/clothing/gloves/fingerless = 3,
/obj/item/clothing/head/soft = 3,
@@ -152,7 +152,7 @@
/obj/item/storage/backpack/satchel/eng = 1,
/obj/item/storage/backpack/industrial = 1,
/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
- /obj/item/clothing/under/rank/atmospheric_technician = 3,
+ /obj/item/clothing/under/rank/engineering/atmospheric_technician = 3,
/obj/item/clothing/shoes/sneakers/black = 3)
generate_items_inside(items_inside,src)
return
@@ -168,7 +168,7 @@
/obj/item/storage/backpack/industrial = 1,
/obj/item/storage/backpack/satchel/eng = 1,
/obj/item/clothing/suit/hooded/wintercoat/engineering = 1,
- /obj/item/clothing/under/rank/engineer = 3,
+ /obj/item/clothing/under/rank/engineering/engineer = 3,
/obj/item/clothing/suit/hazardvest = 3,
/obj/item/clothing/shoes/workboots = 3,
/obj/item/clothing/head/hardhat = 3)
@@ -185,11 +185,11 @@
/obj/item/storage/backpack/medic = 1,
/obj/item/storage/backpack/satchel/med = 1,
/obj/item/clothing/suit/hooded/wintercoat/medical = 1,
- /obj/item/clothing/under/rank/nursesuit = 1,
+ /obj/item/clothing/under/rank/medical/nursesuit = 1,
/obj/item/clothing/head/nursehat = 1,
- /obj/item/clothing/under/rank/medical/blue = 1,
- /obj/item/clothing/under/rank/medical/green = 1,
- /obj/item/clothing/under/rank/medical/purple = 1,
+ /obj/item/clothing/under/rank/medical/doctor/blue = 1,
+ /obj/item/clothing/under/rank/medical/doctor/green = 1,
+ /obj/item/clothing/under/rank/medical/doctor/purple = 1,
/obj/item/clothing/under/rank/medical = 3,
/obj/item/clothing/suit/toggle/labcoat/md = 3,
/obj/item/clothing/suit/toggle/labcoat/emt = 3,
@@ -205,7 +205,7 @@
/obj/structure/closet/wardrobe/robotics_black/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/glasses/hud/diagnostic = 2,
- /obj/item/clothing/under/rank/roboticist = 2,
+ /obj/item/clothing/under/rank/rnd/roboticist = 2,
/obj/item/clothing/suit/toggle/labcoat = 2,
/obj/item/clothing/shoes/sneakers/black = 2,
/obj/item/clothing/gloves/fingerless = 2,
@@ -224,7 +224,7 @@
/obj/structure/closet/wardrobe/chemistry_white/PopulateContents()
var/static/items_inside = list(
- /obj/item/clothing/under/rank/chemist = 2,
+ /obj/item/clothing/under/rank/medical/chemist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/chemist = 2,
/obj/item/storage/backpack/chemistry = 2,
@@ -240,7 +240,7 @@
/obj/structure/closet/wardrobe/genetics_white/PopulateContents()
var/static/items_inside = list(
- /obj/item/clothing/under/rank/geneticist = 2,
+ /obj/item/clothing/under/rank/rnd/geneticist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/storage/backpack/genetics = 2,
@@ -255,7 +255,7 @@
/obj/structure/closet/wardrobe/virology_white/PopulateContents()
var/static/items_inside = list(
- /obj/item/clothing/under/rank/virologist = 2,
+ /obj/item/clothing/under/rank/medical/virologist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/virologist = 2,
/obj/item/clothing/mask/surgical = 2,
@@ -274,7 +274,7 @@
/obj/item/storage/backpack/science = 2,
/obj/item/storage/backpack/satchel/tox = 2,
/obj/item/clothing/suit/hooded/wintercoat/science = 1,
- /obj/item/clothing/under/rank/scientist = 3,
+ /obj/item/clothing/under/rank/rnd/scientist = 3,
/obj/item/clothing/suit/toggle/labcoat/science = 3,
/obj/item/clothing/shoes/sneakers/white = 3,
/obj/item/radio/headset/headset_sci = 2,
@@ -293,7 +293,7 @@
/obj/item/clothing/suit/hooded/wintercoat/hydro = 1,
/obj/item/clothing/suit/apron = 2,
/obj/item/clothing/suit/apron/overalls = 2,
- /obj/item/clothing/under/rank/hydroponics = 3,
+ /obj/item/clothing/under/rank/civilian/hydroponics = 3,
/obj/item/clothing/mask/bandana = 3)
generate_items_inside(items_inside,src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index c4764501e8c9..91b48137197c 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -6,10 +6,10 @@
/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
..()
new /obj/item/storage/lockbox/medal/cargo(src)
- new /obj/item/clothing/under/rank/cargo(src)
- new /obj/item/clothing/under/rank/cargo/skirt(src)
- new /obj/item/clothing/under/rank/cargo/turtleneck(src)
- new /obj/item/clothing/under/rank/cargo/skirt/turtleneck(src)
+ new /obj/item/clothing/under/rank/cargo/qm(src)
+ new /obj/item/clothing/under/rank/cargo/qm/skirt(src)
+ new /obj/item/clothing/under/rank/cargo/qm/turtleneck(src)
+ new /obj/item/clothing/under/rank/cargo/qm/skirt/turtleneck(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/clothing/suit/fire/firefighter(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 3442c3fd4dc3..52e5af710574 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -88,18 +88,18 @@
new /obj/item/clothing/shoes/sneakers/white(src)
switch(pick("blue", "green", "purple"))
if ("blue")
- new /obj/item/clothing/under/rank/medical/blue(src)
+ new /obj/item/clothing/under/rank/medical/doctor/blue(src)
if ("green")
- new /obj/item/clothing/under/rank/medical/green(src)
+ new /obj/item/clothing/under/rank/medical/doctor/green(src)
if ("purple")
- new /obj/item/clothing/under/rank/medical/purple(src)
+ new /obj/item/clothing/under/rank/medical/doctor/purple(src)
switch(pick("blue", "green", "purple"))
if ("blue")
- new /obj/item/clothing/under/rank/medical/blue(src)
+ new /obj/item/clothing/under/rank/medical/doctor/blue(src)
if ("green")
- new /obj/item/clothing/under/rank/medical/green(src)
+ new /obj/item/clothing/under/rank/medical/doctor/green(src)
if ("purple")
- new /obj/item/clothing/under/rank/medical/purple(src)
+ new /obj/item/clothing/under/rank/medical/doctor/purple(src)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/suit/toggle/labcoat/emt(src)
new /obj/item/clothing/head/beret/emt/green(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/service.dm b/code/game/objects/structures/crates_lockers/closets/secure/service.dm
index 9a8d4b309610..877247813230 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/service.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/service.dm
@@ -9,8 +9,8 @@
var/static/items_inside = list(
/obj/item/clothing/head/that = 2,
/obj/item/radio/headset/headset_srv = 2,
- /obj/item/clothing/under/sl_suit = 2,
- /obj/item/clothing/under/rank/bartender = 2,
+ /obj/item/clothing/under/suit/sl_suit = 2,
+ /obj/item/clothing/under/rank/civilian/bartender = 2,
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/head/soft/black = 2,
/obj/item/clothing/shoes/sneakers/black = 2,
@@ -22,4 +22,4 @@
/obj/item/clothing/neck/petcollar = 1,
/obj/item/storage/belt/bandolier = 1,
/obj/item/gun/ballistic/shotgun/doublebarrel = 1) //now in closet rather than on a table
- generate_items_inside(items_inside,src)
\ No newline at end of file
+ generate_items_inside(items_inside,src)
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 70c5556abc09..a2349272b311 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -120,10 +120,10 @@
icon_door = "white"
/obj/structure/closet/wardrobe/pjs/PopulateContents()
- new /obj/item/clothing/under/pj/red(src)
- new /obj/item/clothing/under/pj/red(src)
- new /obj/item/clothing/under/pj/blue(src)
- new /obj/item/clothing/under/pj/blue(src)
+ new /obj/item/clothing/under/rank/medical/pj/red(src)
+ new /obj/item/clothing/under/rank/medical/pj/red(src)
+ new /obj/item/clothing/under/rank/medical/pj/blue(src)
+ new /obj/item/clothing/under/rank/medical/pj/blue(src)
for(var/i in 1 to 4)
new /obj/item/clothing/shoes/sneakers/white(src)
return
@@ -148,9 +148,9 @@
new /obj/item/clothing/mask/bandana/black(src)
new /obj/item/clothing/mask/bandana/black(src)
if(prob(40))
- new /obj/item/clothing/under/assistantformal(src)
+ new /obj/item/clothing/under/rank/civilian/assistantformal(src)
if(prob(40))
- new /obj/item/clothing/under/assistantformal(src)
+ new /obj/item/clothing/under/rank/civilian/assistantformal(src)
if(prob(30))
new /obj/item/clothing/suit/hooded/wintercoat(src)
new /obj/item/clothing/shoes/winterboots(src)
diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm
index ea6f2bc9cd95..e3996558ff7d 100644
--- a/code/game/objects/structures/crates_lockers/crates/wooden.dm
+++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm
@@ -24,17 +24,17 @@
/obj/structure/closet/crate/wooden/ashwalker/PopulateContents()
. = ..()
- new /obj/item/clothing/under/chestwrap(src)
- new /obj/item/clothing/under/chestwrap(src)
- new /obj/item/clothing/under/ash_robe(src)
- new /obj/item/clothing/under/ash_robe(src)
- new /obj/item/clothing/under/ash_robe(src)
- new /obj/item/clothing/under/ash_robe/young(src)
- new /obj/item/clothing/under/ash_robe/young(src)
- new /obj/item/clothing/under/ash_robe/hunter(src)
- new /obj/item/clothing/under/ash_robe/hunter(src)
- new /obj/item/clothing/under/ash_robe/chief(src)
- new /obj/item/clothing/under/ash_robe/shaman(src)
+ new /obj/item/clothing/under/tribal/chestwrap(src)
+ new /obj/item/clothing/under/tribal/chestwrap(src)
+ new /obj/item/clothing/under/tribal/ash_robe(src)
+ new /obj/item/clothing/under/tribal/ash_robe(src)
+ new /obj/item/clothing/under/tribal/ash_robe(src)
+ new /obj/item/clothing/under/tribal/ash_robe/young(src)
+ new /obj/item/clothing/under/tribal/ash_robe/young(src)
+ new /obj/item/clothing/under/tribal/ash_robe/hunter(src)
+ new /obj/item/clothing/under/tribal/ash_robe/hunter(src)
+ new /obj/item/clothing/under/tribal/ash_robe/chief(src)
+ new /obj/item/clothing/under/tribal/ash_robe/shaman(src)
new /obj/item/clothing/neck/cloak/tribalmantle(src)
new /obj/item/clothing/neck/cloak/tribalmantle(src)
new /obj/item/clothing/suit/hooded/cloak/goliath/desert(src)
@@ -45,7 +45,7 @@
// Testing
/obj/structure/closet/crate/wooden/ashwalker/extra/PopulateContents()
. = ..()
- new /obj/item/clothing/under/raider_leather(src)
+ new /obj/item/clothing/under/tribal/raider_leather(src)
new /obj/item/clothing/under/tribal(src)
- new /obj/item/clothing/under/ash_robe/tunic(src)
- new /obj/item/clothing/under/ash_robe/dress(src)
+ new /obj/item/clothing/under/tribal/ash_robe/tunic(src)
+ new /obj/item/clothing/under/tribal/ash_robe/dress(src)
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 616747e17955..25d5664ddea2 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -76,7 +76,7 @@
/datum/outfit/ashwalker
name = "Ashwalker"
- uniform = /obj/item/clothing/under/chestwrap
+ uniform = /obj/item/clothing/under/tribal/chestwrap
/datum/outfit/ashwalker/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
H.underwear = "Nude"
@@ -84,11 +84,11 @@
/datum/outfit/ashwalker/tribesperson
name = "Ashwalker Tribesperson"
- uniform = /obj/item/clothing/under/ash_robe
+ uniform = /obj/item/clothing/under/tribal/ash_robe
/datum/outfit/ashwalker/hunter
name = "Ashwalker Hunter"
- uniform = /obj/item/clothing/under/ash_robe/hunter
+ uniform = /obj/item/clothing/under/tribal/ash_robe/hunter
suit = /obj/item/clothing/suit/hooded/cloak/goliath/desert
back = /obj/item/gun/ballistic/bow/ashen
belt = /obj/item/storage/belt/quiver/weaver/ashwalker
@@ -108,7 +108,7 @@
/datum/outfit/ashwalker/chief
name = "Ashwalker Chief"
- uniform = /obj/item/clothing/under/ash_robe/chief
+ uniform = /obj/item/clothing/under/tribal/ash_robe/chief
head = /obj/item/clothing/head/crown/resin
suit = /obj/item/clothing/suit/armor/bone
back = /obj/item/melee/spear/bonespear/chitinspear
@@ -118,7 +118,7 @@
/datum/outfit/ashwalker/shaman
name = "Ashwalker Shaman"
- uniform = /obj/item/clothing/under/ash_robe/shaman
+ uniform = /obj/item/clothing/under/tribal/ash_robe/shaman
head = /obj/item/clothing/head/shamanash
suit = /obj/item/clothing/suit/leather_mantle
belt = /obj/item/storage/bag/medpouch
@@ -300,7 +300,7 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
flavour_text += "you were a [pick("arms dealer", "shipwright", "docking manager")]'s assistant on a small trading station several sectors from here. Raiders attacked, and there was \
only one pod left when you got to the escape bay. You took it and launched it alone, and the crowd of terrified faces crowding at the airlock door as your pod's engines burst to \
life and sent you to this hell are forever branded into your memory."
- outfit.uniform = /obj/item/clothing/under/assistantformal
+ outfit.uniform = /obj/item/clothing/under/rank/civilian/assistantformal
if(2)
flavour_text += "you're an exile from the Tiger Cooperative. Their technological fanaticism drove you to question the power and beliefs of the Exolitics, and they saw you as a \
heretic and subjected you to hours of horrible torture. You were hours away from execution when a high-ranking friend of yours in the Cooperative managed to secure you a pod, \
@@ -402,7 +402,7 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
/datum/outfit/hotelstaff
name = "Hotel Staff"
- uniform = /obj/item/clothing/under/assistantformal
+ uniform = /obj/item/clothing/under/rank/civilian/assistantformal
shoes = /obj/item/clothing/shoes/laceup
r_pocket = /obj/item/radio/off
back = /obj/item/storage/backpack
@@ -474,7 +474,7 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
/datum/outfit/demonic_friend
name = "Demonic Friend"
- uniform = /obj/item/clothing/under/assistantformal
+ uniform = /obj/item/clothing/under/rank/civilian/assistantformal
shoes = /obj/item/clothing/shoes/laceup
r_pocket = /obj/item/radio/off
back = /obj/item/storage/backpack
@@ -770,7 +770,7 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
important_info = "Work as a team with your fellow survivors and do not abandon them."
- uniform = /obj/item/clothing/under/rank/engineer
+ uniform = /obj/item/clothing/under/rank/engineering/engineer
shoes = /obj/item/clothing/shoes/workboots
id = /obj/item/card/id/away/old/eng
gloves = /obj/item/clothing/gloves/color/fyellow/old
@@ -786,7 +786,7 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \
your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod."
important_info = "Work as a team with your fellow survivors and do not abandon them."
- uniform = /obj/item/clothing/under/rank/scientist
+ uniform = /obj/item/clothing/under/rank/rnd/scientist
shoes = /obj/item/clothing/shoes/laceup
id = /obj/item/card/id/away/old/sci
l_pocket = /obj/item/stack/medical/bruise_pack
@@ -851,7 +851,7 @@ GLOBAL_LIST_EMPTY(servant_golem_users)
/datum/outfit/innkeeper
name = "Innkeeper"
- uniform = /obj/item/clothing/under/rank/bartender
+ uniform = /obj/item/clothing/under/rank/civilian/bartender
head = /obj/item/clothing/head/flatcap
back = /obj/item/storage/backpack
suit = /obj/item/clothing/suit/armor/vest
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 2b1bbc53c205..a7c12f562874 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -405,8 +405,8 @@
H.fully_replace_character_name(H.real_name,newname)
H.update_mutant_bodyparts()
if(animetype == "Yes")
- var/seifuku = pick(typesof(/obj/item/clothing/under/schoolgirl))
- var/obj/item/clothing/under/schoolgirl/I = new seifuku
+ var/seifuku = pick(typesof(/obj/item/clothing/under/costume/schoolgirl))
+ var/obj/item/clothing/under/costume/schoolgirl/I = new seifuku
var/olduniform = H.w_uniform
H.temporarilyRemoveItemFromInventory(H.w_uniform, TRUE, FALSE)
H.equip_to_slot_or_del(I, ITEM_SLOT_ICLOTHING)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index bfa4c3a4b3b6..4eac15b773f2 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1153,7 +1153,7 @@
if(ishuman(L))
var/mob/living/carbon/human/observer = L
- observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), ITEM_SLOT_ICLOTHING)
+ observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit(observer), ITEM_SLOT_ICLOTHING)
observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), ITEM_SLOT_FEET)
L.Unconscious(10 SECONDS)
sleep(0.5 SECONDS)
diff --git a/code/modules/antagonists/bloodsuckers/powers/cloak.dm b/code/modules/antagonists/bloodsuckers/powers/cloak.dm
index d1265033e259..a0e72d0acb5c 100644
--- a/code/modules/antagonists/bloodsuckers/powers/cloak.dm
+++ b/code/modules/antagonists/bloodsuckers/powers/cloak.dm
@@ -93,7 +93,7 @@
name = "cloak of shadows"
desc = "Fancy stuff."
icon = 'icons/obj/vamp_obj.dmi'
- mob_overlay_icon = 'icons/obj/vamp_obj.dmi'
+ worn_icon = 'icons/obj/vamp_obj.dmi'
icon_state = "cloak"
item_state = "cloak"
armor = list(MELEE = 0, BULLET = 0, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 10, ACID = 100) //good if you haven nothing
diff --git a/code/modules/antagonists/bloodsuckers/powers/gangrel.dm b/code/modules/antagonists/bloodsuckers/powers/gangrel.dm
index 3177ef22750c..0d21e28dfdf5 100644
--- a/code/modules/antagonists/bloodsuckers/powers/gangrel.dm
+++ b/code/modules/antagonists/bloodsuckers/powers/gangrel.dm
@@ -576,7 +576,7 @@
icon_state = "collar"
item_state = "collar"
icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
- mob_overlay_icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
+ worn_icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
armor = list("melee" = 0, "bullet" = 0, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 100)
body_parts_covered = NECK|HEAD
@@ -586,7 +586,7 @@
icon_state = "ears"
item_state = "ears"
icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
- mob_overlay_icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
+ worn_icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
armor = list("melee" = 0, "bullet" = 0, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 100)
flags_inv = HIDEHAIR|HIDEFACE
alternate_worn_layer = ABOVE_BODY_FRONT_LAYER
@@ -598,7 +598,7 @@
icon_state = "claws"
item_state = "claws"
icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
- mob_overlay_icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
+ worn_icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
body_parts_covered = ARMS|HANDS
flags_inv = HIDEJUMPSUIT
var/datum/action/cooldown/bloodsucker/targeted/tear/tearaction = new
@@ -609,7 +609,7 @@
icon_state = "legs"
item_state = "legs"
icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
- mob_overlay_icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
+ worn_icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
slowdown = SHOES_SLOWDOWN - 0.5
body_parts_covered = GROIN|LEGS|FEET
@@ -619,7 +619,7 @@
icon_state = "digilegs"
item_state = "digilegs"
icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
- mob_overlay_icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
+ worn_icon = 'icons/mob/actions/actions_gangrel_bloodsucker.dmi'
slowdown = SHOES_SLOWDOWN - 0.5
xenoshoe = YES_DIGIT
body_parts_covered = GROIN|LEGS|FEET
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index deb16d442031..48dd940a7a00 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -343,7 +343,7 @@
prof.inhand_icon_state_list[slot] = I.item_state
prof.lefthand_file_list[slot] = I.lefthand_file
prof.righthand_file_list[slot] = I.righthand_file
- prof.worn_icon_list[slot] = I.mob_overlay_icon
+ prof.worn_icon_list[slot] = I.worn_icon
prof.worn_icon_state_list[slot] = I.worn_icon_state
prof.exists_list[slot] = 1
else
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index c035ea13b884..c7fcd224b4de 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -310,7 +310,7 @@
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN|LEGS|ARMS
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/head/culthood/alt
diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm
index e51538b60a18..71d8ed8b0980 100644
--- a/code/modules/antagonists/devil/devil.dm
+++ b/code/modules/antagonists/devil/devil.dm
@@ -440,11 +440,11 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
if(BANISH_FUNERAL_GARB)
if(ishuman(body))
var/mob/living/carbon/human/H = body
- if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under/burial))
+ if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under/rank/civilian/chaplain/burial))
return 1
return 0
else
- for(var/obj/item/clothing/under/burial/B in range(0,body))
+ for(var/obj/item/clothing/under/rank/civilian/chaplain/burial/B in range(0,body))
if(B.loc == get_turf(B)) //Make sure it's not in someone's inventory or something.
return 1
return 0
@@ -482,7 +482,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
return -1
currentMob.change_mob_type( /mob/living/carbon/human, targetturf, null, 1)
var/mob/living/carbon/human/H = owner.current
- H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/black(H), ITEM_SLOT_ICLOTHING)
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/lawyer/black(H), ITEM_SLOT_ICLOTHING)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), ITEM_SLOT_FEET)
H.equip_to_slot_or_del(new /obj/item/storage/briefcase(H), ITEM_SLOT_HANDS)
H.equip_to_slot_or_del(new /obj/item/pen(H), ITEM_SLOT_LPOCKET)
diff --git a/code/modules/antagonists/devil/devil_helpers.dm b/code/modules/antagonists/devil/devil_helpers.dm
index ddcabde7d293..00809fc2755d 100644
--- a/code/modules/antagonists/devil/devil_helpers.dm
+++ b/code/modules/antagonists/devil/devil_helpers.dm
@@ -8,19 +8,19 @@
var/obj/item/clothing/under/U = H.w_uniform
var/static/list/whiteness = list (
/obj/item/clothing/under/color/white = 2,
- /obj/item/clothing/under/rank/bartender = 1,
- /obj/item/clothing/under/rank/chef = 1,
- /obj/item/clothing/under/rank/chief_engineer = 1,
- /obj/item/clothing/under/rank/scientist = 1,
- /obj/item/clothing/under/rank/chemist = 1,
- /obj/item/clothing/under/rank/chief_medical_officer = 1,
- /obj/item/clothing/under/rank/geneticist = 1,
- /obj/item/clothing/under/rank/virologist = 1,
- /obj/item/clothing/under/rank/nursesuit = 1,
+ /obj/item/clothing/under/rank/civilian/bartender = 1,
+ /obj/item/clothing/under/rank/civilian/chef = 1,
+ /obj/item/clothing/under/rank/engineering/chief_engineer = 1,
+ /obj/item/clothing/under/rank/rnd/scientist = 1,
+ /obj/item/clothing/under/rank/medical/chemist = 1,
+ /obj/item/clothing/under/rank/medical/chief_medical_officer = 1,
+ /obj/item/clothing/under/rank/rnd/geneticist = 1,
+ /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/suit_jacket/white = 0.5,
- /obj/item/clothing/under/burial = 1
+ /obj/item/clothing/under/suit/white = 0.5,
+ /obj/item/clothing/under/rank/civilian/chaplain/burial = 1
)
if(U && whiteness[U.type])
src.visible_message(span_warning("[src] seems to have been harmed by the purity of [attacker]'s clothes."), span_notice("Unsullied white clothing is disrupting your form."))
@@ -35,4 +35,4 @@
Paralyze(40)
qdel(weapon)
return 2
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm
index b738c281a302..c7fdc96400a6 100644
--- a/code/modules/antagonists/fugitive/fugitive_outfits.dm
+++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm
@@ -26,7 +26,7 @@
/datum/outfit/yalp_cultist
name = "Cultist of Yalp Elor"
- uniform = /obj/item/clothing/under/rank/chaplain
+ uniform = /obj/item/clothing/under/rank/civilian/chaplain
suit = /obj/item/clothing/suit/chaplainsuit/holidaypriest
gloves = /obj/item/clothing/gloves/color/red
shoes = /obj/item/clothing/shoes/sneakers/black
@@ -95,7 +95,7 @@
/datum/outfit/russianhunters
name = "Russian Bouny Hunter"
- uniform = /obj/item/clothing/under/soviet
+ uniform = /obj/item/clothing/under/costume/soviet
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/bearpelt
gloves = /obj/item/clothing/gloves/color/black
diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index d9653fe4c299..09fe1626b5a9 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -46,7 +46,7 @@
for(var/obj/item/I in H.held_items)
qdel(I)
if(!isplasmaman(H)) //no killing plasmies
- H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt/highlander(H), ITEM_SLOT_ICLOTHING)
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt/highlander(H), ITEM_SLOT_ICLOTHING)
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(H), ITEM_SLOT_HEAD)
else
H.equip_to_slot_or_del(new /obj/item/clothing/under/plasmaman(H), ITEM_SLOT_ICLOTHING)
diff --git a/code/modules/antagonists/monsterhunter/monsterhunter.dm b/code/modules/antagonists/monsterhunter/monsterhunter.dm
index 0eaf294e7bb7..b90d8a96bb64 100644
--- a/code/modules/antagonists/monsterhunter/monsterhunter.dm
+++ b/code/modules/antagonists/monsterhunter/monsterhunter.dm
@@ -157,7 +157,7 @@
name = "Monster Hunter"
head = /obj/item/clothing/head/helmet/chaplain/witchunter_hat
- uniform = /obj/item/clothing/under/rank/chaplain
+ uniform = /obj/item/clothing/under/rank/civilian/chaplain
suit = /obj/item/clothing/suit/armor/riot/chaplain/witchhunter
l_hand = /obj/item/stake
r_hand = /obj/item/stake/hardened/silver
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index 21f3fa748ce0..9afff16d77f9 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -268,7 +268,7 @@
var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionnaire)
H.equip_to_slot_or_del(new hat(H), ITEM_SLOT_HEAD)
- H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), ITEM_SLOT_ICLOTHING)
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), ITEM_SLOT_ICLOTHING)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET)
H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
H.put_in_hands(new /obj/item/claymore(H), TRUE)
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index e2c4329286f1..e5a9fb5de5c0 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -393,7 +393,7 @@
/datum/outfit/spacebartender
name = "Space Bartender"
- uniform = /obj/item/clothing/under/rank/bartender
+ uniform = /obj/item/clothing/under/rank/civilian/bartender
back = /obj/item/storage/backpack
shoes = /obj/item/clothing/shoes/sneakers/black
suit = /obj/item/clothing/suit/armor/vest
@@ -498,7 +498,7 @@
/datum/outfit/nanotrasenbridgeofficercorpse
name = "Bridge Officer Corpse"
ears = /obj/item/radio/headset/heads/hop
- uniform = /obj/item/clothing/under/rank/centcom_officer
+ uniform = /obj/item/clothing/under/rank/centcom/officer
suit = /obj/item/clothing/suit/armor/bulletproof
shoes = /obj/item/clothing/shoes/sneakers/black
glasses = /obj/item/clothing/glasses/sunglasses
@@ -513,7 +513,7 @@
/datum/outfit/nanotrasencommandercorpse
name = "Nanotrasen Private Security Commander"
- uniform = /obj/item/clothing/under/rank/centcom_commander
+ uniform = /obj/item/clothing/under/rank/centcom/commander
suit = /obj/item/clothing/suit/armor/bulletproof
ears = /obj/item/radio/headset/heads/captain
glasses = /obj/item/clothing/glasses/eyepatch
@@ -627,7 +627,7 @@
/datum/outfit/cryobartender
name = "Cryogenic Bartender"
- uniform = /obj/item/clothing/under/rank/bartender
+ uniform = /obj/item/clothing/under/rank/civilian/bartender
back = /obj/item/storage/backpack
shoes = /obj/item/clothing/shoes/sneakers/black
suit = /obj/item/clothing/suit/armor/vest
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index b44e0f8fc2d4..8636d4df6756 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -360,7 +360,7 @@
/datum/outfit/butler
name = "Butler"
- uniform = /obj/item/clothing/under/suit_jacket/really_black
+ uniform = /obj/item/clothing/under/suit/really_black
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/bowler
glasses = /obj/item/clothing/glasses/monocle
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index 95d4cb6996f6..e761484c956c 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -36,7 +36,7 @@
/obj/item/clothing/suit/space/hardsuit/powerarmor_advanced,
/obj/item/prisoncube,
/obj/item/staff/storm,
- /obj/item/clothing/under/drip, //Drip is very valuable to many investors in high fashion
+ /obj/item/clothing/under/costume/drip, //Drip is very valuable to many investors in high fashion
/obj/item/clothing/shoes/drip,
/obj/item/gun/energy/plasmacutter/adv/robocutter,
/obj/item/melee/spear/bonespear/stalwartpike)
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index b24883576f03..77861c3b82e7 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -411,10 +411,10 @@
/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,
- /obj/item/clothing/under/rank/head_of_security/navyblue,
+ /obj/item/clothing/under/rank/security/head_of_security/navyblue,
/obj/item/clothing/suit/armor/hosjacket,
/obj/item/clothing/head/beret/sec/navyhos)
crate_name = "security clothing crate"
@@ -763,7 +763,7 @@
/obj/item/clothing/shoes/russian,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/under/syndicate/rus_army,
- /obj/item/clothing/under/soviet,
+ /obj/item/clothing/under/costume/soviet,
/obj/item/clothing/mask/russian_balaclava,
/obj/item/clothing/head/helmet/rus_ushanka,
/obj/item/clothing/suit/armor/vest/russian_coat,
@@ -2727,14 +2727,14 @@
name = "Formalwear Crate"
desc = "You're gonna like the way you look, I guaranteed it. Contains an asston of fancy clothing."
cost = 3000 //Lots of very expensive items. You gotta pay up to look good!
- contains = list(/obj/item/clothing/under/blacktango,
- /obj/item/clothing/under/assistantformal,
- /obj/item/clothing/under/assistantformal,
- /obj/item/clothing/under/lawyer/bluesuit,
+ contains = list(/obj/item/clothing/under/dress/blacktango,
+ /obj/item/clothing/under/rank/civilian/assistantformal,
+ /obj/item/clothing/under/rank/civilian/assistantformal,
+ /obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
/obj/item/clothing/suit/toggle/lawyer,
- /obj/item/clothing/under/lawyer/purpsuit,
+ /obj/item/clothing/under/rank/civilian/lawyer/purpsuit,
/obj/item/clothing/suit/toggle/lawyer/purple,
- /obj/item/clothing/under/lawyer/blacksuit,
+ /obj/item/clothing/under/rank/civilian/lawyer/blacksuit,
/obj/item/clothing/suit/toggle/lawyer/black,
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/neck/tie/blue,
@@ -2748,11 +2748,11 @@
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/laceup,
- /obj/item/clothing/under/suit_jacket/charcoal,
- /obj/item/clothing/under/suit_jacket/navy,
- /obj/item/clothing/under/suit_jacket/burgundy,
- /obj/item/clothing/under/suit_jacket/checkered,
- /obj/item/clothing/under/suit_jacket/tan,
+ /obj/item/clothing/under/suit/charcoal,
+ /obj/item/clothing/under/suit/navy,
+ /obj/item/clothing/under/suit/burgundy,
+ /obj/item/clothing/under/suit/checkered,
+ /obj/item/clothing/under/suit/tan,
/obj/item/lipstick/random)
crate_name = "formalwear crate"
crate_type = /obj/structure/closet/crate/wooden
@@ -2802,9 +2802,9 @@
name = "Mech Pilot's Suit Crate"
desc = "Suits for piloting big robots. Contains all three colors!"
cost = 1500 //state-of-the-art technology doesn't come cheap
- contains = list(/obj/item/clothing/under/mech_suit,
- /obj/item/clothing/under/mech_suit/white,
- /obj/item/clothing/under/mech_suit/blue)
+ contains = list(/obj/item/clothing/under/costume/mech_suit,
+ /obj/item/clothing/under/costume/mech_suit/white,
+ /obj/item/clothing/under/costume/mech_suit/blue)
crate_name = "mech pilot's suit crate"
crate_type = /obj/structure/closet/crate/wooden
@@ -2836,9 +2836,9 @@
contains = list(/obj/item/storage/backpack/clown,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/mask/gas/clown_hat,
- /obj/item/clothing/under/rank/clown,
+ /obj/item/clothing/under/rank/civilian/clown,
/obj/item/bikehorn,
- /obj/item/clothing/under/rank/mime,
+ /obj/item/clothing/under/rank/civilian/mime,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/mask/gas/mime,
@@ -3122,7 +3122,7 @@
desc = "At the end of the day, someone's gonna want someone dead. Give them a proper send-off with these funeral supplies! Contains a coffin with burial garmets and flowers."
cost = 600 //doesn't sell for 500 credits like a normal crate so its fine
access_view = ACCESS_CHAPEL_OFFICE
- contains = list(/obj/item/clothing/under/burial,
+ contains = list(/obj/item/clothing/under/rank/civilian/chaplain/burial,
/obj/item/reagent_containers/food/snacks/grown/harebell,
/obj/item/reagent_containers/food/snacks/grown/poppy/geranium)
crate_name = "coffin"
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index dd04f34ac01a..28563976c467 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -229,12 +229,12 @@
if(isitem(atom_target))
var/obj/item/item_target = target
- item_target.mob_overlay_icon = initial(picked_item.mob_overlay_icon)
+ item_target.worn_icon = initial(picked_item.worn_icon)
item_target.lefthand_file = initial(picked_item.lefthand_file)
item_target.righthand_file = initial(picked_item.righthand_file)
if(initial(picked_item.greyscale_colors))
if(initial(picked_item.greyscale_config_worn))
- item_target.mob_overlay_icon = SSgreyscale.GetColoredIconByType(
+ item_target.worn_icon = SSgreyscale.GetColoredIconByType(
initial(picked_item.greyscale_config_worn),
initial(picked_item.greyscale_colors),
)
@@ -310,7 +310,7 @@
//starts off as black
name = "black jumpsuit"
icon_state = "jumpsuit"
- mob_overlay_icon = 'icons/mob/clothing/uniform/color.dmi'
+ worn_icon = 'icons/mob/clothing/uniform/color.dmi'
greyscale_colors = "#3f3f3f"
greyscale_config = /datum/greyscale_config/jumpsuit
greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit_inhand_left
@@ -331,7 +331,7 @@
/obj/item/clothing/under/chameleon/ratvar
name = "ratvarian engineer's jumpsuit"
desc = "A tough jumpsuit woven from alloy threads. It can take on the appearance of other jumpsuits."
- mob_overlay_icon = 'icons/mob/clothing/uniform/uniform.dmi'
+ worn_icon = 'icons/mob/clothing/uniform/uniform.dmi'
greyscale_colors = null
greyscale_config = null
greyscale_config_inhand_left = null
diff --git a/code/modules/clothing/gloves/knifeboxing.dm b/code/modules/clothing/gloves/knifeboxing.dm
index c42616477c44..84ce52806a83 100644
--- a/code/modules/clothing/gloves/knifeboxing.dm
+++ b/code/modules/clothing/gloves/knifeboxing.dm
@@ -2,6 +2,6 @@
name = "knife gloves"
desc = "I'm here to punch people in the face with knives."
icon = 'icons/obj/clothing/gloves.dmi'
- mob_overlay_icon = 'icons/mob/clothing/hands/hands.dmi'
+ worn_icon = 'icons/mob/clothing/hands/hands.dmi'
icon_state = "knife_boxing"
item_state = "knife_boxing"
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 30e05d836d0b..f5cf221fd4ca 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -216,7 +216,7 @@
desc = "Ancient gauntlets lost to the necropolis, fabled to bestow the wearer the power to shatter stone with but a simple punch."
icon_state = "concussive_gauntlets"
item_state = "concussive_gauntlets"
- mob_overlay_icon = 'icons/mob/clothing/hands/hands.dmi'
+ worn_icon = 'icons/mob/clothing/hands/hands.dmi'
icon = 'icons/obj/lavaland/artefacts.dmi'
toolspeed = 0
strip_delay = 40
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 47d51326b1a7..da3eb96891c1 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -3,7 +3,7 @@
desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
icon_state = "hardhat0_yellow"
item_state = "hardhat0_yellow"
- mob_overlay_icon = 'icons/mob/clothing/head/head.dmi'
+ worn_icon = 'icons/mob/clothing/head/head.dmi'
armor = list(MELEE = 15, BULLET = 5, LASER = 20, ENERGY = 10, BOMB = 20, BIO = 10, RAD = 20, FIRE = 100, ACID = 50, WOUND = 10, ELECTRIC = 100) // now OSHA-compliant!
flags_inv = 0
actions_types = list(/datum/action/item_action/toggle_helmet_light)
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index bb85098f19f8..0bb43ccddeea 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -8,8 +8,8 @@
var/modifies_speech = FALSE
var/mask_adjusted = 0
var/adjusted_flags = null
- var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
- var/mutantrace_adjusted = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
+ var/mutantrace_variation = NONE //Are there special sprites for specific situations? Don't use this unless you need to.
+ var/mutantrace_adjusted = NONE //Are there special sprites for specific situations? Don't use this unless you need to.
/obj/item/clothing/mask/attack_self(mob/user)
if(CHECK_BITFIELD(clothing_flags, VOICEBOX_TOGGLABLE))
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 3f7ef0a1afc7..feeab2e24aee 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -6,7 +6,7 @@
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
actions_types = list(/datum/action/item_action/adjust)
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 95522d18134b..8e9af7a6a789 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -13,7 +13,7 @@
flags_cover = MASKCOVERSMOUTH
visor_flags_cover = MASKCOVERSMOUTH
resistance_flags = NONE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/breath/tactical
name = "tactical breath mask"
@@ -50,5 +50,5 @@
icon_state = "medical"
item_state = "m_mask"
equip_delay_other = 10
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 0, FIRE = 0, ACID = 0)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index ab7c14bf4198..da529f8ad0f4 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -9,7 +9,7 @@
gas_transfer_coefficient = 0.01
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
resistance_flags = FIRE_PROOF
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 60, RAD = 0, FIRE = 0, ACID = 0)
// **** Atmos gas mask ****
@@ -37,7 +37,7 @@
visor_flags_inv = HIDEEYES
visor_flags_cover = MASKCOVERSEYES
resistance_flags = FIRE_PROOF
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/gas/welding/attack_self(mob/user)
weldingvisortoggle(user)
@@ -51,7 +51,7 @@
desc = "A modernised version of the classic design, this mask will not only filter out toxins but it can also be connected to an air supply."
icon_state = "plaguedoctor"
item_state = "gas_mask"
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
armor = list(MELEE = 0, BULLET = 0, LASER = 2,ENERGY = 2, BOMB = 0, BIO = 75, RAD = 0, FIRE = 0, ACID = 0)
/obj/item/clothing/mask/gas/syndicate
@@ -59,7 +59,7 @@
desc = "A close-fitting tactical mask that can be connected to an air supply."
icon_state = "syndicate"
strip_delay = 60
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/gas/clown_hat
name = "clown wig and mask"
@@ -70,7 +70,7 @@
dye_color = "clown"
flags_cover = MASKCOVERSEYES
resistance_flags = FLAMMABLE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
actions_types = list(/datum/action/item_action/adjust)
dog_fashion = /datum/dog_fashion/head/clown
var/list/clownmask_designs = list()
@@ -117,7 +117,7 @@
item_state = "sexyclown"
flags_cover = MASKCOVERSEYES
resistance_flags = FLAMMABLE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/mask/gas/mime
name = "mime mask"
@@ -127,7 +127,7 @@
item_state = "mime"
flags_cover = MASKCOVERSEYES
resistance_flags = FLAMMABLE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
actions_types = list(/datum/action/item_action/adjust)
var/list/mimemask_designs = list()
@@ -171,7 +171,7 @@
item_state = "monkeymask"
flags_cover = MASKCOVERSEYES
resistance_flags = FLAMMABLE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/mask/gas/sexymime
name = "sexy mime mask"
@@ -181,20 +181,20 @@
item_state = "sexymime"
flags_cover = MASKCOVERSEYES
resistance_flags = FLAMMABLE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/mask/gas/death_commando
name = "Death Commando Mask"
icon_state = "death_commando_mask"
item_state = "death_commando_mask"
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/mask/gas/cyborg
name = "cyborg visor"
desc = "Beep boop."
icon_state = "death"
resistance_flags = FLAMMABLE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/mask/gas/owl_mask
name = "owl mask"
@@ -203,13 +203,13 @@
clothing_flags = MASKINTERNALS
flags_cover = MASKCOVERSEYES
resistance_flags = FLAMMABLE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/mask/gas/carp
name = "carp mask"
desc = "Gnash gnash."
icon_state = "carp_mask"
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/mask/gas/tiki_mask
name = "tiki mask"
@@ -220,7 +220,7 @@
max_integrity = 100
actions_types = list(/datum/action/item_action/adjust)
dog_fashion = null
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
var/list/tikimask_designs = list()
/obj/item/clothing/mask/gas/tiki_mask/Initialize(mapload)
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index 4d274cf4a614..2f111ccc0564 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -17,7 +17,7 @@
visor_flags_inv = HIDEFACIALHAIR|HIDEFACE
flags_cover = MASKCOVERSMOUTH
visor_flags_cover = MASKCOVERSMOUTH
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
modifies_speech = TRUE
var/aggressiveness = 2
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 70084ff9db3f..0f1658efe54d 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -37,7 +37,7 @@
visor_flags_inv = HIDEFACE
visor_flags_cover = MASKCOVERSMOUTH
gas_transfer_coefficient = 0.9
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 100, RAD = 0, FIRE = 0, ACID = 0)
actions_types = list(/datum/action/item_action/adjust)
@@ -260,7 +260,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
slot_flags = ITEM_SLOT_MASK
adjusted_flags = ITEM_SLOT_HEAD
icon_state = "bandbotany"
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/bandana/attack_self(mob/user)
adjustmask(user)
@@ -279,7 +279,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
var/obj/item/clothing/neck/neckerchief/nk = new(src)
nk.name = "[name] neckerchief"
nk.desc = "[desc] It's tied up like a neckerchief."
- nk.mob_overlay_icon = 'icons/blank.dmi'
+ nk.worn_icon = 'icons/blank.dmi'
nk.icon_state = icon_state
nk.sourceBandanaType = src.type
var/currentHandIndex = user.get_held_index_of_item(src)
@@ -294,43 +294,43 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
name = "red bandana"
desc = "A fine red bandana with nanotech lining."
icon_state = "bandred"
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/bandana/blue
name = "blue bandana"
desc = "A fine blue bandana with nanotech lining."
icon_state = "bandblue"
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/bandana/green
name = "green bandana"
desc = "A fine green bandana with nanotech lining."
icon_state = "bandgreen"
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/bandana/gold
name = "gold bandana"
desc = "A fine gold bandana with nanotech lining."
icon_state = "bandgold"
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/bandana/black
name = "black bandana"
desc = "A fine black bandana with nanotech lining."
icon_state = "bandblack"
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/bandana/skull
name = "skull bandana"
desc = "A fine black bandana with nanotech lining and a skull emblem."
icon_state = "bandskull"
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/bandana/durathread
name = "durathread bandana"
desc = "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..."
icon_state = "banddurathread"
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/bandana/durathread/tied/Initialize(mapload)
. = ..()
diff --git a/code/modules/clothing/masks/swat.dm b/code/modules/clothing/masks/swat.dm
index 3b0fb68f91e0..670178fa8e89 100644
--- a/code/modules/clothing/masks/swat.dm
+++ b/code/modules/clothing/masks/swat.dm
@@ -7,7 +7,7 @@
aggressiveness = 3
flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR
visor_flags_inv = 0
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/mask/gas/sechailer/swat/encrypted
name = "\improper MK.II SWAT mask"
diff --git a/code/modules/clothing/neck/skillcapes/skillcapes.dm b/code/modules/clothing/neck/skillcapes/skillcapes.dm
index 6d67e97bed06..41e06ad6df3e 100644
--- a/code/modules/clothing/neck/skillcapes/skillcapes.dm
+++ b/code/modules/clothing/neck/skillcapes/skillcapes.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/clothing/skillcapes.dmi'
icon_state = "ghost-skillcape"
item_state = "ghost-skillcape"
- mob_overlay_icon = 'icons/mob/clothing/neck/skillcapes.dmi'
+ worn_icon = 'icons/mob/clothing/neck/skillcapes.dmi'
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDESUITSTORAGE
diff --git a/code/modules/clothing/outfits/amber.dm b/code/modules/clothing/outfits/amber.dm
index 4c4634510e52..db8615d0a777 100644
--- a/code/modules/clothing/outfits/amber.dm
+++ b/code/modules/clothing/outfits/amber.dm
@@ -1,12 +1,12 @@
// amber task force clothing
-/obj/item/clothing/under/rank/security/grey/amber
+/obj/item/clothing/under/rank/security/officer/grey/amber
name = "amber task force jumpsuit"
/obj/item/clothing/head/beret/sec/amber_medic
name = "amber medic beret"
desc = "A white beret for the mundane life of an amber task force medic."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_ce"
@@ -52,7 +52,7 @@
/datum/outfit/amber
name = "Amber Soldier"
- uniform = /obj/item/clothing/under/rank/security/grey/amber
+ uniform = /obj/item/clothing/under/rank/security/officer/grey/amber
suit = /obj/item/clothing/suit/armor/bulletproof
shoes = /obj/item/clothing/shoes/combat/combat_knife
gloves = /obj/item/clothing/gloves/combat
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index 8c3d41d32940..0881b7156b27 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -3,7 +3,7 @@
id = /obj/item/card/id/ert
back = /obj/item/storage/backpack
- uniform = /obj/item/clothing/under/rank/centcom_officer
+ uniform = /obj/item/clothing/under/rank/centcom/officer
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/headset_cent/alt
@@ -308,7 +308,7 @@
belt = /obj/item/storage/belt/mining
mask = /obj/item/clothing/mask/gas/explorer
shoes = /obj/item/clothing/shoes/bhop
- uniform = /obj/item/clothing/under/rank/miner/lavaland
+ uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland
box = /obj/item/storage/box/survival/mining
backpack_contents = list(
/obj/item/crusher_trophy/demon_claws=1,
@@ -335,7 +335,7 @@
id = /obj/item/card/id/centcom
belt = /obj/item/modular_computer/tablet/pda/preset/clown
ears = /obj/item/radio/headset/headset_cent
- uniform = /obj/item/clothing/under/rank/clown
+ uniform = /obj/item/clothing/under/rank/civilian/clown
back = /obj/item/storage/backpack/clown
shoes = /obj/item/clothing/shoes/clown_shoes
mask = /obj/item/clothing/mask/gas/clown_hat
diff --git a/code/modules/clothing/outfits/occupying.dm b/code/modules/clothing/outfits/occupying.dm
index 8e9ed6b43493..fcede774b6e1 100644
--- a/code/modules/clothing/outfits/occupying.dm
+++ b/code/modules/clothing/outfits/occupying.dm
@@ -1,17 +1,17 @@
// Peacekeeping force clothing
-/obj/item/clothing/under/rank/security/grey/amber/occupying
+/obj/item/clothing/under/rank/security/officer/grey/amber/occupying
name = "peacekeeping officer jumpsuit"
desc = "A Peacekeeper uniform with red marking denoting officers and heavies."
icon_state = "occuniformofficer"
item_state = "occuniformofficer"
-/obj/item/clothing/under/rank/security/grey/amber/occupying/commander
+/obj/item/clothing/under/rank/security/officer/grey/amber/occupying/commander
name = "peacekeeping commander jumpsuit"
desc = "A Peacekeeper uniform with blue markings denoting commanders"
icon_state = "occuniformcommander"
item_state = "occuniformcommander"
-/obj/item/clothing/under/rank/security/grey/amber/occupying/Initialize(mapload, mob/user)
+/obj/item/clothing/under/rank/security/officer/grey/amber/occupying/Initialize(mapload, mob/user)
. = ..()
if(prob(50)) // Adds variation to the uniform. 50% will be worn casually.
rolldown(TRUE)
@@ -34,7 +34,7 @@
desc = "A reinforced version of the standard Peacekeeper vest with extra padding to protect against melee attacks. Not as strong as riot suits typically issued to NT stations."
icon_state = "occriotsuit"
item_state = "occriotsuit"
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/head/helmet/riot/raised/occupying
name = "peacekeeping force riot helmet"
@@ -85,7 +85,7 @@
/datum/outfit/occupying
name = "Peacekeeping Officer"
- uniform = /obj/item/clothing/under/rank/security/grey/amber/occupying
+ uniform = /obj/item/clothing/under/rank/security/officer/grey/amber/occupying
suit = /obj/item/clothing/suit/armor/vest/alt/occupying
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/color/black
@@ -124,7 +124,7 @@
/datum/outfit/occupying/commander
name = "Peacekeeping force Commander"
- uniform = /obj/item/clothing/under/rank/security/grey/amber/occupying/commander
+ uniform = /obj/item/clothing/under/rank/security/officer/grey/amber/occupying/commander
head = /obj/item/clothing/head/beret/sec/centcom/occupying
belt = /obj/item/storage/belt/military/occbelt/occupying_commander
l_pocket = /obj/item/pinpointer/nuke
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index b43c41157dbb..02348b4c7fc4 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -38,7 +38,7 @@
/datum/outfit/tournament/janitor
name = "tournament janitor"
- uniform = /obj/item/clothing/under/rank/janitor
+ uniform = /obj/item/clothing/under/rank/civilian/janitor
back = /obj/item/storage/backpack
suit = null
head = null
@@ -80,14 +80,14 @@
/datum/outfit/pirate
name = "Space Pirate"
- uniform = /obj/item/clothing/under/pirate
+ uniform = /obj/item/clothing/under/costume/pirate
shoes = /obj/item/clothing/shoes/sneakers/brown
suit = /obj/item/clothing/suit/pirate
head = /obj/item/clothing/head/pirate/bandana
glasses = /obj/item/clothing/glasses/eyepatch
/datum/outfit/pirate/space
- uniform = /obj/item/clothing/under/pirate/space
+ uniform = /obj/item/clothing/under/costume/pirate/space
suit = /obj/item/clothing/suit/space/pirate
head = /obj/item/clothing/head/helmet/space/pirate/bandana
ears = /obj/item/radio/headset/syndicate
@@ -116,7 +116,7 @@
/datum/outfit/tunnel_clown
name = "Tunnel Clown"
- uniform = /obj/item/clothing/under/rank/clown
+ uniform = /obj/item/clothing/under/rank/civilian/clown
shoes = /obj/item/clothing/shoes/clown_shoes
gloves = /obj/item/clothing/gloves/color/black
mask = /obj/item/clothing/mask/gas/clown_hat
@@ -142,7 +142,7 @@
/datum/outfit/psycho
name = "Masked Killer"
- uniform = /obj/item/clothing/under/overalls
+ uniform = /obj/item/clothing/under/rank/cargo/overalls
shoes = /obj/item/clothing/shoes/sneakers/white
gloves = /obj/item/clothing/gloves/color/latex
mask = /obj/item/clothing/mask/surgical
@@ -164,7 +164,7 @@
/datum/outfit/assassin
name = "Assassin"
- uniform = /obj/item/clothing/under/suit_jacket
+ uniform = /obj/item/clothing/under/suit
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset
@@ -294,7 +294,7 @@
/datum/outfit/soviet
name = "Soviet Admiral"
- uniform = /obj/item/clothing/under/soviet
+ uniform = /obj/item/clothing/under/costume/soviet
head = /obj/item/clothing/head/pirate/captain
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
@@ -322,7 +322,7 @@
/datum/outfit/mobster
name = "Mobster"
- uniform = /obj/item/clothing/under/suit_jacket/really_black
+ uniform = /obj/item/clothing/under/suit/really_black
head = /obj/item/clothing/head/fedora
shoes = /obj/item/clothing/shoes/laceup
gloves = /obj/item/clothing/gloves/color/black
@@ -355,7 +355,7 @@
/datum/outfit/death_commando
name = "Death Commando"
- uniform = /obj/item/clothing/under/rank/centcom_commander
+ uniform = /obj/item/clothing/under/rank/centcom/commander
suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/combat
@@ -411,7 +411,7 @@
/datum/outfit/debug //Debug objs plus hardsuit
name = "Debug outfit"
- uniform = /obj/item/clothing/under/patriotsuit
+ uniform = /obj/item/clothing/under/costume/patriotsuit
suit = /obj/item/clothing/suit/space/hardsuit/syndi/debug
shoes = /obj/item/clothing/shoes/magboots/advance
suit_store = /obj/item/tank/internals/oxygen
diff --git a/code/modules/clothing/outfits/vr.dm b/code/modules/clothing/outfits/vr.dm
index 1d81c2db9204..e39f52ed0250 100644
--- a/code/modules/clothing/outfits/vr.dm
+++ b/code/modules/clothing/outfits/vr.dm
@@ -1,6 +1,6 @@
/datum/outfit/vr
name = "Basic VR"
- uniform = /obj/item/clothing/under/rank/cargotech
+ uniform = /obj/item/clothing/under/rank/cargo/tech
shoes = /obj/item/clothing/shoes/sneakers/black
id = /obj/item/card/id/no_bank
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index 2d3797a78573..a9aa009a16a4 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -15,7 +15,7 @@
var/offset = 0
var/equipped_before_drop = FALSE
var/xenoshoe = NO_DIGIT // Check for if shoes can be worn by straight legs (NO_DIGIT) which is default, both / hybrid (EITHER_STYLE), or digitigrade only (YES_DIGIT)
- var/mutantrace_variation = NO_MUTANTRACE_VARIATION // Assigns shoes to have variations for if worn clothing doesn't enforce straight legs (such as cursed jumpskirts)
+ var/mutantrace_variation = NONE // Assigns shoes to have variations for if worn clothing doesn't enforce straight legs (such as cursed jumpskirts)
var/adjusted = NORMAL_STYLE // Default needed to make the above work
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index ac8d322725e1..b01ed55982c2 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -282,7 +282,7 @@
greyscale_config = /datum/greyscale_config/sneakers_wheelys
greyscale_config_inhand_left = /datum/greyscale_config/sneakers_inhand_left
greyscale_config_inhand_right = /datum/greyscale_config/sneakers_inhand_right
- mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/feet.dmi'
+ worn_icon = 'icons/mob/large-worn-icons/64x64/feet.dmi'
worn_icon_state = "wheelys"
worn_x_dimension = 64
worn_y_dimension = 64
@@ -472,7 +472,7 @@
icon_state = "footwraps"
item_state = "footwraps"
xenoshoe = EITHER_STYLE // This can be worn by digitigrade or straight legs, or a hybridization thereof (one prosthetic one digitigrade). Xenoshoe variable will default to NO_DIGIT, excluding digitigrade feet.
- mutantrace_variation = MUTANTRACE_VARIATION // Yes these shoes account for non-straight leg situations, such as jumpskirts
+ mutantrace_variation = DIGITIGRADE_VARIATION // Yes these shoes account for non-straight leg situations, such as jumpskirts
/obj/item/clothing/shoes/xeno_wraps/jackboots // Footwraps woven with security-grade materials, still somewhat inferior to full jackboots.
name = "reinforced footwraps"
@@ -530,7 +530,7 @@
icon_state = "footwraps_e"
item_state = "footwraps_e"
xenoshoe = YES_DIGIT
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0, ELECTRIC = 100)
/obj/item/clothing/shoes/xeno_wraps/science
@@ -539,7 +539,7 @@
icon_state = "footwraps_sc"
item_state = "footwraps_sc"
xenoshoe = YES_DIGIT
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/shoes/xeno_wraps/medical
name = "medical footwraps"
@@ -547,7 +547,7 @@
icon_state = "footwraps_m"
item_state = "footwraps_m"
xenoshoe = YES_DIGIT
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/shoes/xeno_wraps/cargo
name = "cargo footwraps"
@@ -555,7 +555,7 @@
icon_state = "footwraps_ca"
item_state = "footwraps_ca"
xenoshoe = YES_DIGIT
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/datum/action/item_action/dash
name = "Dash"
@@ -632,7 +632,7 @@
name = "fashionable shoes"
desc = "Expensive-looking designer sneakers. Loud, ostentatious, agressively attractive, you detest the idea of taking them off. The elaborate design on the sole could probably give you some decent traction."
icon = 'icons/obj/clothing/shoes.dmi'
- mob_overlay_icon = 'icons/mob/clothing/feet/feet.dmi'
+ worn_icon = 'icons/mob/clothing/feet/feet.dmi'
icon_state = "dripshoes"
item_state = "dripshoes"
clothing_flags = NOSLIP_ICE | NOSLIP
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index b868b39dd731..117ca32c59d8 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -68,7 +68,7 @@
add_overlay(hat)
hat.forceMove(src)
- hat_overlay = mutable_appearance(hat.mob_overlay_icon, hat.icon_state)
+ hat_overlay = mutable_appearance(hat.worn_icon, hat.icon_state)
hat_overlay.alpha = hat.alpha
hat_overlay.color = hat.color
if(ishuman(loc))
diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm
index adb6769542b2..112d2a0dc2b5 100644
--- a/code/modules/clothing/suits/_suits.dm
+++ b/code/modules/clothing/suits/_suits.dm
@@ -12,7 +12,7 @@
var/blood_overlay_type = "suit"
var/togglename = null
var/suittoggled = FALSE
- var/mutantrace_variation = NO_MUTANTRACE_VARIATION
+ var/mutantrace_variation = NONE
var/adjusted = NORMAL_STYLE
limb_integrity = 0 // disabled for most exo-suits
var/obj/item/badge/attached_badge
@@ -74,7 +74,7 @@
return
if(user)
to_chat(user, span_notice("You attach [I] to [src]."))
- badge_overlay = mutable_appearance(attached_badge.mob_overlay_icon, "[attached_badge.accessory_state]")
+ badge_overlay = mutable_appearance(attached_badge.worn_icon, "[attached_badge.accessory_state]")
badge_overlay.alpha = attached_badge.alpha
badge_overlay.color = attached_badge.color
if(ishuman(loc))
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 5a7b1e1ddeae..62b11a4db756 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -55,7 +55,7 @@
heat_protection = CHEST|GROIN|LEGS|ARMS
strip_delay = 80
clothing_flags = THICKMATERIAL
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
pocket_storage_component_path = /datum/component/storage/concrete/pockets/hosarmor
/obj/item/clothing/suit/armor/hos/trenchcoat
@@ -82,7 +82,7 @@
name = "warden's armored jacket"
desc = "A red jacket with silver rank pips and body armor strapped on top."
icon_state = "warden_jacket"
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/suit/armor/vest/leather
name = "security overcoat"
@@ -92,7 +92,7 @@
body_parts_covered = CHEST|GROIN|ARMS|LEGS
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
dog_fashion = null
/obj/item/clothing/suit/armor/vest/capcarapace
@@ -141,7 +141,7 @@
strip_delay = 80
equip_delay_other = 60
slowdown = 0.33
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/suit/armor/bone
name = "bone armor"
@@ -186,7 +186,7 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
cold_protection = CHEST|GROIN|LEGS|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/suit/armor/pathfinder/Initialize(mapload)
. = ..()
@@ -289,7 +289,7 @@
desc = "A classic suit of plate armour, highly effective at stopping melee attacks."
icon_state = "knight_green"
item_state = "knight_green"
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/suit/armor/riot/knight/yellow
icon_state = "knight_yellow"
@@ -412,7 +412,7 @@
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
resistance_flags = FIRE_PROOF | ACID_PROOF
clothing_flags = THICKMATERIAL
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
//////////////// PLATED ARMOR ////////////////
// Helmet type in code/modules/clothing/head/helmet.dm
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index f9aa94972d1f..189e78fb951a 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -26,7 +26,7 @@
strip_delay = 70
equip_delay_other = 70
resistance_flags = ACID_PROOF
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
//Standard biosuit, orange stripe
/obj/item/clothing/head/bio_hood/general
@@ -86,4 +86,4 @@
item_state = "bio_suit"
strip_delay = 40
equip_delay_other = 20
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm
index fb1cd85962d8..6b5b7b80723b 100644
--- a/code/modules/clothing/suits/chaplainsuits.dm
+++ b/code/modules/clothing/suits/chaplainsuits.dm
@@ -1,11 +1,11 @@
//Chaplain Suit Subtypes
//If any new staple chaplain items get added, put them in these lists
/obj/item/clothing/suit/chaplainsuit
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant)
/obj/item/clothing/suit/hooded/chaplainsuit
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant)
//Suits
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 2c7852cd5fa5..788f1574dece 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -55,7 +55,7 @@
armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 0, RAD = 0, FIRE = 50, ACID = 50, WOUND = 15)
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/suit/det_suit/Initialize(mapload)
. = ..()
@@ -104,7 +104,7 @@
desc = "A dapper private investigator's grey suit coat."
icon_state = "detsuit"
item_state = "detsuit"
- mutantrace_variation = NO_MUTANTRACE_VARIATION //This should be done for any det_suit that isn't an overcoat, as to not require two sprites to deal with weird-ass legs
+ mutantrace_variation = NONE //This should be done for any det_suit that isn't an overcoat, as to not require two sprites to deal with weird-ass legs
//Engineering
/obj/item/clothing/suit/hazardvest
@@ -195,7 +195,7 @@
item_state = "techpriest"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hooded/techpriest
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/head/hooded/techpriest
name = "techpriest's hood"
diff --git a/code/modules/clothing/suits/wintercoat.dm b/code/modules/clothing/suits/wintercoat.dm
index 21662fd7534a..ac8c5372fb85 100644
--- a/code/modules/clothing/suits/wintercoat.dm
+++ b/code/modules/clothing/suits/wintercoat.dm
@@ -1,7 +1,7 @@
// WINTER COATS
/obj/item/clothing/suit/hooded/wintercoat
- mob_overlay_icon = 'icons/mob/clothing/suit/wintercoat.dmi'
+ worn_icon = 'icons/mob/clothing/suit/wintercoat.dmi'
icon = 'icons/obj/clothing/suits/wintercoat.dmi'
name = "winter coat"
desc = "A heavy jacket made from 'synthetic' animal furs."
@@ -14,7 +14,7 @@
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
/obj/item/clothing/head/hooded/winterhood
- mob_overlay_icon = 'icons/mob/clothing/head/winterhood.dmi'
+ worn_icon = 'icons/mob/clothing/head/winterhood.dmi'
icon = 'icons/obj/clothing/hats/winterhood.dmi'
name = "winter hood"
desc = "A hood attached to a heavy winter jacket."
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index 77a29feda1e2..9596bf04350b 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -69,7 +69,7 @@
strip_delay = 50
equip_delay_other = 50
resistance_flags = FIRE_PROOF | ACID_PROOF
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/suit/wizrobe/red
name = "red wizard robe"
@@ -101,7 +101,7 @@
icon_state = "magusblue"
item_state = "magusblue"
flags_inv = HIDEJUMPSUIT
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/suit/wizrobe/magusred
name = "\improper Magus robe"
@@ -109,7 +109,7 @@
icon_state = "magusred"
item_state = "magusred"
flags_inv = HIDEJUMPSUIT
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/suit/wizrobe/santa
@@ -118,7 +118,7 @@
icon_state = "santa"
item_state = "santa"
flags_inv = HIDEJUMPSUIT
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/suit/wizrobe/fake
name = "wizard robe"
@@ -202,7 +202,7 @@
resistance_flags = FIRE_PROOF | ACID_PROOF | THICKMATERIAL
w_class = WEIGHT_CLASS_BULKY
flags_inv = HIDEJUMPSUIT
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
var/current_charges = 15
var/max_charges = 3
var/recharge_delay = 0
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 31a4870f22cd..63143f507389 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -19,7 +19,7 @@
var/can_adjust = TRUE
var/adjusted = NORMAL_STYLE
var/alt_covers_chest = FALSE // for adjusted/rolled-down jumpsuits, FALSE = exposes chest and arms, TRUE = exposes arms only
- var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
+ var/mutantrace_variation = NONE //Are there special sprites for specific situations? Don't use this unless you need to.
var/freshly_laundered = FALSE
var/obj/item/clothing/accessory/attached_accessory
@@ -93,7 +93,7 @@
return
var/mob/living/carbon/human/H = user
- if(mutantrace_variation == MUTANTRACE_VARIATION)
+ if(mutantrace_variation & DIGITIGRADE_VARIATION)
var/is_digi = FALSE
if(DIGITIGRADE in H.dna.species.species_traits)
is_digi = TRUE
@@ -146,7 +146,7 @@
to_chat(user, span_notice("You attach [I] to [src]."))
var/accessory_color = attached_accessory.icon_state
- accessory_overlay = mutable_appearance(attached_accessory.mob_overlay_icon, "[accessory_color]")
+ accessory_overlay = mutable_appearance(attached_accessory.worn_icon, "[accessory_color]")
accessory_overlay.alpha = attached_accessory.alpha
accessory_overlay.color = attached_accessory.color
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index 0d8f0e3ffc6f..50a47e8b8764 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/clothing/accessories.dmi'
icon_state = "plasma"
item_state = "" //no inhands
- mob_overlay_icon = 'icons/mob/clothing/accessories.dmi'
+ worn_icon = 'icons/mob/clothing/accessories.dmi'
slot_flags = 0
w_class = WEIGHT_CLASS_SMALL
var/above_suit = FALSE
diff --git a/code/modules/clothing/under/badges.dm b/code/modules/clothing/under/badges.dm
index 3794c821b63e..2ad441737f4c 100644
--- a/code/modules/clothing/under/badges.dm
+++ b/code/modules/clothing/under/badges.dm
@@ -5,7 +5,7 @@
icon = 'icons/obj/clothing/badges.dmi'
icon_state = "sec1"
item_state = ""
- mob_overlay_icon = 'icons/mob/clothing/badges.dmi'
+ worn_icon = 'icons/mob/clothing/badges.dmi'
w_class = WEIGHT_CLASS_TINY
/// State of worn icon
var/accessory_state = "worn_chest_gold"
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 32eb5096678d..d00b4588c6aa 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -11,8 +11,8 @@
icon_state = "jumpsuit"
item_state = "jumpsuit"
worn_icon_state = "jumpsuit"
- mob_overlay_icon = 'icons/mob/clothing/uniform/color.dmi'
- mutantrace_variation = MUTANTRACE_VARIATION
+ worn_icon = 'icons/mob/clothing/uniform/color.dmi'
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/under/skirt/color
dying_key = DYE_REGISTRY_JUMPSKIRT
@@ -28,7 +28,7 @@
icon_state = "jumpskirt"
item_state = "jumpsuit"
worn_icon_state = "jumpskirt"
- mob_overlay_icon = 'icons/mob/clothing/uniform/color.dmi'
+ worn_icon = 'icons/mob/clothing/uniform/color.dmi'
/obj/item/clothing/under/color/random
icon_state = "random_jumpsuit"
diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm
new file mode 100644
index 000000000000..429551bb3460
--- /dev/null
+++ b/code/modules/clothing/under/costume.dm
@@ -0,0 +1,380 @@
+/obj/item/clothing/under/costume
+ worn_icon = 'icons/mob/clothing/uniform/costume.dmi'
+
+/obj/item/clothing/under/costume/jabroni
+ name = "Jabroni Outfit"
+ desc = "The leather club is two sectors down."
+ icon_state = "darkholme"
+ item_state = "darkholme"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/patriotsuit
+ name = "Patriotic Suit"
+ desc = "Motorcycle not included."
+ icon_state = "ek"
+ item_state = "ek"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/roman
+ name = "\improper Roman armor"
+ desc = "Ancient Roman armor. Made of metallic and leather straps."
+ icon_state = "roman"
+ item_state = "armor"
+ can_adjust = FALSE
+ strip_delay = 100
+ resistance_flags = NONE
+
+/obj/item/clothing/under/costume/owl
+ name = "owl uniform"
+ desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction."
+ icon_state = "owl"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/griffin
+ name = "griffon uniform"
+ desc = "A soft brown jumpsuit with a white feather collar made of synthetic feathers and a lust for mayhem."
+ icon_state = "griffin"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/cloud
+ name = "cloud"
+ desc = "Cloud."
+ icon_state = "cloud"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/schoolgirl
+ name = "blue schoolgirl uniform"
+ desc = "It's just like one of my Japanese animes!"
+ icon_state = "schoolgirl"
+ item_state = "schoolgirl"
+ body_parts_covered = CHEST|GROIN|ARMS
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/schoolgirl/red
+ name = "red schoolgirl uniform"
+ icon_state = "schoolgirlred"
+ item_state = "schoolgirlred"
+
+/obj/item/clothing/under/costume/schoolgirl/green
+ name = "green schoolgirl uniform"
+ icon_state = "schoolgirlgreen"
+ item_state = "schoolgirlgreen"
+
+/obj/item/clothing/under/costume/schoolgirl/orange
+ name = "orange schoolgirl uniform"
+ icon_state = "schoolgirlorange"
+ item_state = "schoolgirlorange"
+
+/obj/item/clothing/under/costume/pirate
+ name = "pirate outfit"
+ desc = "Yarr! A fine shirt and pants for the enterprising corsair."
+ icon_state = "pirate"
+ item_state = "pirate"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/pirate/space
+ name = "syndicate pirate outfit"
+ desc = "Yarr! A set of reinforced pirate clothing worn by boney Syndicate privateers."
+ has_sensor = NO_SENSORS
+ armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 40)
+
+/obj/item/clothing/under/costume/soviet
+ name = "soviet uniform"
+ desc = "For the Motherland!"
+ icon_state = "soviet"
+ item_state = "soviet"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/redcoat
+ name = "redcoat uniform"
+ desc = "Looks old."
+ icon_state = "redcoat"
+ item_state = "redcoat"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/kilt
+ name = "kilt"
+ desc = "Includes shoes and plaid."
+ icon_state = "kilt"
+ item_state = "kilt"
+ body_parts_covered = CHEST|GROIN|LEGS|FEET
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/kilt/highlander
+ desc = "You're the only one worthy of this kilt."
+
+/obj/item/clothing/under/costume/kilt/highlander/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER)
+
+/obj/item/clothing/under/costume/gladiator
+ name = "gladiator uniform"
+ desc = "Are you not entertained? Is that not why you are here?"
+ icon_state = "gladiator"
+ item_state = "gladiator"
+ body_parts_covered = CHEST|GROIN|ARMS
+ fitted = NO_FEMALE_UNIFORM
+ can_adjust = FALSE
+ resistance_flags = NONE
+
+/obj/item/clothing/under/costume/gladiator/ash_walker
+ desc = "This gladiator uniform appears to be covered in ash and fairly dated."
+ has_sensor = NO_SENSORS
+
+/obj/item/clothing/under/costume/maid
+ name = "maid costume"
+ desc = "Maid in China."
+ icon_state = "maid"
+ item_state = "maid"
+ body_parts_covered = CHEST|GROIN
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/maid/Initialize(mapload)
+ . = ..()
+ var/obj/item/clothing/accessory/maidapron/A = new (src)
+ attach_accessory(A)
+
+/obj/item/clothing/under/costume/singery
+ name = "yellow performer's outfit"
+ desc = "Just looking at this makes you want to sing."
+ icon_state = "ysing"
+ item_state = "ysing"
+ body_parts_covered = CHEST|GROIN|ARMS
+ fitted = NO_FEMALE_UNIFORM
+ alternate_worn_layer = ABOVE_SHOES_LAYER
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/singerb
+ name = "blue performer's outfit"
+ desc = "Just looking at this makes you want to sing."
+ icon_state = "bsing"
+ item_state = "bsing"
+ body_parts_covered = CHEST|GROIN|ARMS
+ alternate_worn_layer = ABOVE_SHOES_LAYER
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/jester
+ name = "jester suit"
+ desc = "A jolly dress, well suited to entertain your master, nuncle."
+ icon_state = "jester"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/geisha
+ name = "geisha suit"
+ desc = "Cute space ninja senpai not included."
+ icon_state = "geisha"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/villain
+ name = "villain suit"
+ desc = "A change of wardrobe is necessary if you ever want to catch a real superhero."
+ icon_state = "villain"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/sailor
+ name = "sailor suit"
+ desc = "Skipper's in the wardroom drinkin' gin."
+ icon_state = "sailor"
+ item_state = "b_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/mummy
+ name = "mummy wrapping"
+ desc = "Return the slab or suffer my stale references."
+ icon_state = "mummy"
+ item_state = "mummy"
+ body_parts_covered = CHEST|GROIN|ARMS|LEGS
+ fitted = NO_FEMALE_UNIFORM
+ can_adjust = FALSE
+ resistance_flags = NONE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/scarecrow
+ name = "scarecrow clothes"
+ desc = "Perfect camouflage for hiding in botany."
+ icon_state = "scarecrow"
+ item_state = "scarecrow"
+ body_parts_covered = CHEST|GROIN|ARMS|LEGS
+ fitted = NO_FEMALE_UNIFORM
+ can_adjust = FALSE
+ resistance_flags = NONE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/draculass
+ name = "draculass coat"
+ desc = "A dress inspired by the ancient \"Victorian\" era."
+ icon_state = "draculass"
+ item_state = "draculass"
+ body_parts_covered = CHEST|GROIN|ARMS
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/drfreeze
+ name = "doctor freeze's jumpsuit"
+ desc = "A modified scientist jumpsuit to look extra cool."
+ icon_state = "drfreeze"
+ item_state = "drfreeze"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/lobster
+ name = "foam lobster suit"
+ desc = "Who beheaded the college mascot?"
+ icon_state = "lobster"
+ item_state = "lobster"
+ fitted = NO_FEMALE_UNIFORM
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/gondola
+ name = "gondola hide suit"
+ desc = "Now you're cooking."
+ icon_state = "gondola"
+ item_state = "lb_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/skeleton
+ name = "skeleton jumpsuit"
+ desc = "A black jumpsuit with a white bone pattern printed on it. Spooky!"
+ icon_state = "skeleton"
+ item_state = "skeleton"
+ body_parts_covered = CHEST|GROIN|ARMS|LEGS
+ fitted = NO_FEMALE_UNIFORM
+ can_adjust = FALSE
+ resistance_flags = NONE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/mech_suit
+ name = "red mech pilot's suit"
+ desc = "A red mech pilot's suit. Might make your butt look big."
+ icon_state = "red_mech_suit"
+ item_state = "red_mech_suit"
+ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ fitted = NO_FEMALE_UNIFORM
+ alternate_worn_layer = GLOVES_LAYER //covers hands but gloves can go over it. This is how these things work in my head.
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/mech_suit/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/mech_pilot, 0.9)
+
+/obj/item/clothing/under/costume/mech_suit/white
+ name = "white mech pilot's suit"
+ desc = "A white mech pilot's suit. Very fetching."
+ icon_state = "white_mech_suit"
+ item_state = "white_mech_suit"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/mech_suit/blue
+ name = "blue mech pilot's suit"
+ desc = "A blue mech pilot's suit. For the more reluctant mech pilots."
+ icon_state = "blue_mech_suit"
+ item_state = "blue_mech_suit"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/mech_suit/cybersun
+ name = "Cybersun mech pilot's suit"
+ desc = "An armored mech pilot suit, used exclusively by Cybersun mech agents."
+ icon_state = "black_mech_suit"
+ item_state = "black_mech_suit"
+ armor = list(MELEE = 15, BULLET = 15, LASER = 10, ENERGY = 10, BOMB = 50, BIO = 50, RAD = 20, FIRE = 50, ACID = 50, WOUND = 5)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/costume/lampskirt
+ name = "lamp dress"
+ desc = "A peculier garment woven in silk; under the lower dress appears to be a lamp and a switch."
+ icon_state = "lampskirt_male"
+ item_state = "lampskirt_male"
+ body_parts_covered = CHEST|GROIN|LEGS|FEET
+ can_adjust = FALSE
+ light_system = MOVABLE_LIGHT
+ light_range = 2
+ light_on = FALSE
+ var/on = FALSE
+ actions_types = list(/datum/action/item_action/toggle_helmet_light)
+
+/obj/item/clothing/under/costume/lampskirt/attack_self(mob/user)
+ on = !on
+ icon_state = "[initial(icon_state)][on ? "-light":""]"
+ item_state = icon_state
+ user.update_inv_w_uniform() //So the mob overlay updates
+
+ if(on)
+ set_light_on(TRUE)
+ user.visible_message(span_notice("[user] discreetly pulls a cord for the bulbs under [user.p_their()] skirt, turning [user.p_them()] on."))
+ else
+ set_light_on(FALSE)
+
+ for(var/X in actions)
+ var/datum/action/A=X
+ A.build_all_button_icons()
+
+/obj/item/clothing/under/costume/lampskirt/female
+ icon_state = "lampskirt_female"
+ item_state = "lampskirt_female"
+ body_parts_covered = CHEST|GROIN|LEGS|FEET
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/costume/weiner
+ name = "weiner outfit"
+ desc = "The meat part of a hot dog costume. People may think you're trying to compensate for something."
+ icon_state = "weiner"
+ item_state = "weiner"
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/costume/drip
+ name = "incredibly fashionable outfit"
+ desc = "Expensive-looking designer vest. It radiates an aggressively attractive aura. You feel putting this on would change you forever."
+ icon = 'icons/obj/clothing/uniforms.dmi'
+ worn_icon = 'icons/mob/clothing/uniform/uniform.dmi'
+ icon_state = "drippy"
+ item_state = "drippy"
+ armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 10, RAD = 10, FIRE = 100, ACID = 100)
+ resistance_flags = FIRE_PROOF | ACID_PROOF | LAVA_PROOF//Miners Bizzare Adventure Drip is Unbreakable
+ can_adjust = FALSE
+
+/obj/item/clothing/under/costume/drip/equipped(mob/user, slot)
+ . = ..()
+ if(slot == ITEM_SLOT_ICLOTHING)
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "drippy", /datum/mood_event/drippy)
+ SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "dripless", /datum/mood_event/drippy)
+ if(user && ishuman(user) && !user.GetComponent(/datum/component/mood))
+ to_chat(user, span_danger("As you put on the drip, you have an overwhelming sense of superiority shape your soul!"))
+ user.AddComponent(/datum/component/mood) //The drips curse, mood.
+
+/obj/item/clothing/under/costume/drip/dropped(mob/user)
+ . = ..()
+ if(!ishuman(user))
+ return
+ var/mob/living/carbon/human/H = user
+ if(H.get_item_by_slot(ITEM_SLOT_ICLOTHING) == src)
+ SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "drippy")
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "dripless", /datum/mood_event/dripless)
+
+/* Commented out in favor of yogstation custom content
+/obj/item/clothing/under/costume/psyche
+ name = "psychedelic jumpsuit"
+ desc = "Groovy!"
+ icon_state = "psyche"
+ item_state = "p_suit"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+*/
diff --git a/code/modules/clothing/under/jobs/Plasmaman/_plasmaman.dm b/code/modules/clothing/under/jobs/Plasmaman/_plasmaman.dm
new file mode 100644
index 000000000000..2b3f7441acd6
--- /dev/null
+++ b/code/modules/clothing/under/jobs/Plasmaman/_plasmaman.dm
@@ -0,0 +1,50 @@
+/obj/item/clothing/under/plasmaman
+ name = "envirosuit"
+ desc = "The latest generation of Nanotrasen-designed plasmamen envirosuits. This new version has an extinguisher built into the uniform's workings. While airtight, the suit is not EVA-rated."
+ icon_state = "plasmaman"
+ item_state = "plasmaman"
+ worn_icon = 'icons/mob/clothing/uniform/plasmaman.dmi'
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 0, FIRE = 95, ACID = 95)
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ can_adjust = FALSE
+ strip_delay = 80
+ var/next_extinguish = 0
+ var/extinguish_cooldown = 100
+ var/extinguishes_left = 5
+
+
+/obj/item/clothing/under/plasmaman/examine(mob/user)
+ . = ..()
+ . += span_notice("There are [extinguishes_left] extinguisher charges left in this suit.")
+
+/obj/item/clothing/under/plasmaman/proc/Extinguish(mob/living/carbon/human/H)
+ if(!istype(H))
+ return
+
+ if(H.on_fire)
+ if(extinguishes_left)
+ if(next_extinguish > world.time)
+ return
+ next_extinguish = world.time + extinguish_cooldown
+ extinguishes_left--
+ H.visible_message(span_warning("[H]'s suit automatically extinguishes [H.p_them()]!"),span_warning("Your suit automatically extinguishes you."))
+ H.extinguish_mob()
+ new /obj/effect/particle_effect/water(get_turf(H))
+ return 0
+
+/obj/item/clothing/under/plasmaman/attackby(obj/item/E, mob/user, params)
+ ..()
+ if (istype(E, /obj/item/extinguisher_refill))
+ if (extinguishes_left == 5)
+ to_chat(user, span_notice("The inbuilt extinguisher is full."))
+ else
+ extinguishes_left = 5
+ to_chat(user, span_notice("You refill the suit's built-in extinguisher, using up the cartridge."))
+ qdel(E)
+
+/obj/item/extinguisher_refill
+ name = "envirosuit extinguisher cartridge"
+ desc = "A cartridge loaded with a compressed extinguisher mix, used to refill the automatic extinguisher on plasma envirosuits."
+ icon_state = "plasmarefill"
+ icon = 'icons/obj/device.dmi'
diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm
new file mode 100644
index 000000000000..020ddbc20b65
--- /dev/null
+++ b/code/modules/clothing/under/jobs/cargo.dm
@@ -0,0 +1,96 @@
+/obj/item/clothing/under/rank/cargo
+ worn_icon = 'icons/mob/clothing/uniform/cargo.dmi'
+
+/obj/item/clothing/under/rank/cargo/qm
+ name = "quartermaster's jumpsuit"
+ desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
+ icon_state = "qm"
+ item_state = "lb_suit"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/cargo/qm/turtleneck
+ name = "quartermaster's turtleneck jumpsuit"
+ desc = "It's a fashionable turtleneck worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
+ icon_state = "turtleneck_qm"
+ item_state = "lb_suit"
+
+/obj/item/clothing/under/rank/cargo/qm/skirt
+ name = "quartermaster's jumpskirt"
+ desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
+ icon_state = "qm_skirt"
+ item_state = "lb_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/cargo/qm/skirt/turtleneck
+ name = "quartermaster's skirtleneck"
+ desc = "It's a stylish skirtleneck worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
+ icon_state = "skirtleneckQM"
+ item_state = "lb_suit"
+
+/obj/item/clothing/under/rank/cargo/tech
+ name = "cargo technician's jumpsuit"
+ desc = "Shooooorts! They're comfy and easy to wear!"
+ icon_state = "cargotech"
+ item_state = "lb_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ mutantrace_variation = DIGITIGRADE_VARIATION
+ alt_covers_chest = TRUE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/cargo/tech/turtleneck
+ name = "cargo technician's turtleneck jumpsuit"
+ desc = "Perfect for pushing crates and looking good while doing it! Shorts not included."
+ icon_state = "turtleneck_cargo"
+ item_state = "lb_suit"
+
+/obj/item/clothing/under/rank/cargo/tech/skirt
+ name = "cargo technician's jumpskirt"
+ desc = "Skiiiiirts! They're comfy and easy to wear!"
+ icon_state = "cargo_skirt"
+ item_state = "lb_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ mutantrace_variation = NONE
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/cargo/tech/skirt/turtleneck
+ name = "cargo technician's skirtleneck"
+ desc = "Skiiiiirtlenecks! Even comfier and easier to wear!"
+ icon_state = "skirtleneck"
+ item_state = "lb_suit"
+
+/obj/item/clothing/under/rank/cargo/miner
+ desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
+ name = "shaft miner's jumpsuit"
+ icon_state = "miner"
+ item_state = "miner"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 0, WOUND = 10)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/cargo/miner/lavaland
+ desc = "A green uniform for operating in hazardous environments."
+ name = "shaft miner's jumpsuit"
+ icon_state = "explorer"
+ item_state = "explorer"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/rank/cargo/mailman
+ name = "mailman's jumpsuit"
+ desc = "'Special delivery!'"
+ icon_state = "mailman"
+ item_state = "b_suit"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/cargo/overalls
+ name = "laborer's overalls"
+ desc = "A set of durable overalls for getting the job done."
+ icon_state = "overalls"
+ item_state = "lb_suit"
+ can_adjust = FALSE
+ custom_price = 20
+ mutantrace_variation = DIGITIGRADE_VARIATION
diff --git a/code/modules/clothing/under/jobs/centcom.dm b/code/modules/clothing/under/jobs/centcom.dm
new file mode 100644
index 000000000000..842e9dcc338e
--- /dev/null
+++ b/code/modules/clothing/under/jobs/centcom.dm
@@ -0,0 +1,31 @@
+/obj/item/clothing/under/rank/centcom
+ worn_icon = 'icons/mob/clothing/uniform/centcom.dmi'
+
+/obj/item/clothing/under/rank/centcom/officer
+ desc = "It's a jumpsuit worn by CentCom Officers."
+ name = "\improper CentCom officer's jumpsuit"
+ icon_state = "officer"
+ item_state = "g_suit"
+ alt_covers_chest = TRUE
+
+/obj/item/clothing/under/rank/centcom/commander
+ desc = "It's a jumpsuit with gold markings worn by CentCom's highest-tier commanders."
+ name = "\improper CentCom officer's jumpsuit"
+ icon_state = "centcom"
+ item_state = "dg_suit"
+ alt_covers_chest = TRUE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+ can_adjust = TRUE //too important to look unimportant.
+
+/obj/item/clothing/under/rank/centcom/admiral
+ desc = "It's a jumpsuit with gold markings worn by CentCom High Command."
+ name = "\improper CentCom admiral's jumpsuit"
+ icon_state = "admiral"
+ item_state = "admiral"
+ can_adjust = FALSE //too important to look unimportant.
+
+/obj/item/clothing/under/rank/centcom/admiral/executive
+ desc = "It's a jumpsuit with gold markings worn by CentCom's highest-ranking officer."
+ name = "\improper CentCom executive admiral's jumpsuit"
+ icon_state = "grandadmiral"
+ item_state = "grandadmiral"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
deleted file mode 100644
index ee40f950e8d7..000000000000
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ /dev/null
@@ -1,459 +0,0 @@
-//Alphabetical order of civilian jobs.
-
-/obj/item/clothing/under/rank/bartender
- desc = "It looks like it could use some more flair."
- name = "bartender's uniform"
- icon_state = "barman"
- item_state = "bar_suit"
- alt_covers_chest = TRUE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/bartender/purple
- desc = "It looks like it has lots of flair!"
- name = "purple bartender's uniform"
- icon_state = "purplebartender"
- item_state = "purplebartender"
- can_adjust = FALSE
-
-/obj/item/clothing/under/rank/bartender/skirt
- name = "bartender's skirt"
- desc = "It looks like it could use some more flair."
- icon_state = "barman_skirt"
- item_state = "bar_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
- desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
- name = "captain's jumpsuit"
- icon_state = "captain"
- item_state = "b_suit"
- sensor_mode = SENSOR_COORDS
- random_sensor = FALSE
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, WOUND = 15)
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/captain/skirt
- name = "captain's jumpskirt"
- desc = "It's a blue jumpskirt with some gold markings denoting the rank of \"Captain\"."
- icon_state = "captain_skirt"
- item_state = "b_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- dying_key = DYE_REGISTRY_JUMPSKIRT
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/cargo
- name = "quartermaster's jumpsuit"
- desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
- icon_state = "qm"
- item_state = "lb_suit"
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/cargo/turtleneck
- name = "quartermaster's turtleneck jumpsuit"
- desc = "It's a fashionable turtleneck worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
- icon_state = "turtleneck_qm"
- item_state = "lb_suit"
-
-/obj/item/clothing/under/rank/cargo/skirt
- name = "quartermaster's jumpskirt"
- desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
- icon_state = "qm_skirt"
- item_state = "lb_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- dying_key = DYE_REGISTRY_JUMPSKIRT
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/cargo/skirt/turtleneck
- name = "quartermaster's skirtleneck"
- desc = "It's a stylish skirtleneck worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
- icon_state = "skirtleneckQM"
- item_state = "lb_suit"
-
-/obj/item/clothing/under/rank/cargotech
- name = "cargo technician's jumpsuit"
- desc = "Shooooorts! They're comfy and easy to wear!"
- icon_state = "cargotech"
- item_state = "lb_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- mutantrace_variation = MUTANTRACE_VARIATION
- alt_covers_chest = TRUE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/cargotech/turtleneck
- name = "cargo technician's turtleneck jumpsuit"
- desc = "Perfect for pushing crates and looking good while doing it! Shorts not included."
- icon_state = "turtleneck_cargo"
- item_state = "lb_suit"
-
-/obj/item/clothing/under/rank/cargotech/skirt
- name = "cargo technician's jumpskirt"
- desc = "Skiiiiirts! They're comfy and easy to wear!"
- icon_state = "cargo_skirt"
- item_state = "lb_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- mutantrace_variation = NO_MUTANTRACE_VARIATION
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/cargotech/skirt/turtleneck
- name = "cargo technician's skirtleneck"
- desc = "Skiiiiirtlenecks! Even comfier and easier to wear!"
- icon_state = "skirtleneck"
- item_state = "lb_suit"
-
-/obj/item/clothing/under/rank/chaplain
- desc = "It's a black jumpsuit, often worn by religious folk."
- name = "chaplain's jumpsuit"
- icon_state = "chaplain"
- item_state = "bl_suit"
- can_adjust = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/chaplain/skirt
- name = "chaplain's jumpskirt"
- desc = "It's a black jumpskirt, often worn by religious folk."
- icon_state = "chapblack_skirt"
- item_state = "bl_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/chef
- name = "cook's suit"
- desc = "A suit which is given only to the most hardcore cooks in space."
- icon_state = "chef"
- alt_covers_chest = TRUE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/chef/skirt
- name = "cook's skirt"
- desc = "A skirt which is given only to the most hardcore cooks in space."
- icon_state = "chef_skirt"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-/obj/item/clothing/under/rank/clown
- name = "clown suit"
- desc = "'HONK!'"
- icon_state = "clown"
- item_state = "clown"
- fitted = FEMALE_UNIFORM_TOP
- can_adjust = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/blueclown
- name = "blue clown suit"
- desc = "'BLUE HONK!'"
- icon_state = "blueclown"
- item_state = "blueclown"
- fitted = FEMALE_UNIFORM_TOP
- can_adjust = FALSE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/greenclown
- name = "green clown suit"
- desc = "'GREEN HONK!'"
- icon_state = "greenclown"
- item_state = "greenclown"
- fitted = FEMALE_UNIFORM_TOP
- can_adjust = FALSE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/yellowclown
- name = "yellow clown suit"
- desc = "'YELLOW HONK!'"
- icon_state = "yellowclown"
- item_state = "yellowclown"
- fitted = FEMALE_UNIFORM_TOP
- can_adjust = FALSE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/purpleclown
- name = "purple clown suit"
- desc = "'PURPLE HONK!'"
- icon_state = "purpleclown"
- item_state = "purpleclown"
- fitted = FEMALE_UNIFORM_TOP
- can_adjust = FALSE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/orangeclown
- name = "orange clown suit"
- desc = "'ORANGE HONK!'"
- icon_state = "orangeclown"
- item_state = "orangeclown"
- fitted = FEMALE_UNIFORM_TOP
- can_adjust = FALSE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/rainbowclown
- name = "rainbow clown suit"
- desc = "'R A I N B O W HONK!'"
- icon_state = "rainbowclown"
- item_state = "rainbowclown"
- fitted = FEMALE_UNIFORM_TOP
- can_adjust = FALSE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/clown/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50)
-
-/obj/item/clothing/under/rank/head_of_personnel
- name = "head of personnel's jumpsuit"
- desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
- icon_state = "hop"
- item_state = "b_suit"
- can_adjust = FALSE
- sensor_mode = SENSOR_COORDS
- random_sensor = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/head_of_personnel/turtleneck
- name = "head of personnel's turtleneck jumpsuit"
- desc = "It's a comfy turtleneck jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
- icon_state = "hopturtle"
- item_state = "b_suit"
- can_adjust = TRUE
-
-/obj/item/clothing/under/rank/head_of_personnel/skirt
- name = "head of personnel's jumpskirt"
- desc = "It's a jumpskirt worn by someone who works in the position of \"Head of Personnel\"."
- icon_state = "hop_skirt"
- item_state = "b_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- dying_key = DYE_REGISTRY_JUMPSKIRT
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/head_of_personnel/skirt/turtleneck
- name = "head of personnel's skirtleneck"
- desc = "It's a fashionable skirtleneck worn by someone who works in the position of \"Head of Personnel\"."
- icon_state = "hopturtle_skirt"
- item_state = "b_suit"
- can_adjust = TRUE
-
-/obj/item/clothing/under/rank/hydroponics
- desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
- name = "botanist's jumpsuit"
- icon_state = "hydroponics"
- item_state = "g_suit"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 5, RAD = 0, FIRE = 0, ACID = 0)
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/hydroponics/skirt
- name = "botanist's jumpskirt"
- desc = "It's a jumpskirt designed to protect against minor plant-related hazards."
- icon_state = "hydroponics_skirt"
- item_state = "g_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/janitor
- desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
- name = "janitor's jumpsuit"
- icon_state = "janitor"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 10, RAD = 0, FIRE = 0, ACID = 0)
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/janitor/skirt
- name = "janitor's jumpskirt"
- desc = "It's the official skirt of the station's janitor. It has minor protection from biohazards."
- icon_state = "janitor_skirt"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer
- desc = "Slick threads."
- name = "Lawyer suit"
- can_adjust = FALSE
-
-/obj/item/clothing/under/lawyer/black
- icon_state = "lawyer_black"
- item_state = "lawyer_black"
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/black/skirt
- name = "Lawyer black suitskirt"
- icon_state = "lawyer_black_skirt"
- item_state = "lawyer_black"
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/female
- icon_state = "black_suit_fem"
- item_state = "black_suit_fem"
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/red
- icon_state = "lawyer_red"
- item_state = "lawyer_red"
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/red/skirt
- name = "Lawyer red suitskirt"
- icon_state = "lawyer_red_skirt"
- item_state = "lawyer_red"
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/blue
- icon_state = "lawyer_blue"
- item_state = "lawyer_blue"
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/blue/skirt
- name = "Lawyer blue suitskirt"
- icon_state = "lawyer_blue_skirt"
- item_state = "lawyer_blue"
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/bluesuit
- name = "blue suit"
- desc = "A classy suit and tie."
- icon_state = "bluesuit"
- item_state = "bluesuit"
- can_adjust = TRUE
- alt_covers_chest = TRUE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/bluesuit/skirt
- name = "blue suitskirt"
- desc = "A classy suitskirt and tie."
- icon_state = "bluesuit_skirt"
- item_state = "bluesuit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/purpsuit
- name = "purple suit"
- icon_state = "lawyer_purp"
- item_state = "lawyer_purp"
- fitted = NO_FEMALE_UNIFORM
- can_adjust = TRUE
- alt_covers_chest = TRUE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/purpsuit/skirt
- name = "purple suitskirt"
- icon_state = "lawyer_purp_skirt"
- item_state = "lawyer_purp"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/blacksuit
- name = "black suit"
- desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
- icon_state = "blacksuit"
- item_state = "bar_suit"
- can_adjust = TRUE
- alt_covers_chest = TRUE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/lawyer/blacksuit/skirt
- name = "black suitskirt"
- desc = "A professional black suitskirt. Nanotrasen Investigation Bureau approved!"
- icon_state = "reallyblack_suit_skirt"
- item_state = "bar_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- dying_key = DYE_REGISTRY_JUMPSKIRT
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/curator
- name = "sensible suit"
- desc = "It's very... sensible."
- icon_state = "red_suit"
- item_state = "red_suit"
- can_adjust = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/curator/skirt
- name = "sensible suitskirt"
- desc = "It's very... sensible."
- icon_state = "red_suit_skirt"
- item_state = "red_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/curator/treasure_hunter
- name = "treasure hunter uniform"
- desc = "A rugged uniform suitable for treasure hunting."
- icon_state = "curator"
- item_state = "curator"
-
-/obj/item/clothing/under/rank/mime
- name = "mime's outfit"
- desc = "It's not very colourful."
- icon_state = "mime"
- item_state = "mime"
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/mime/skirt
- name = "mime's skirt"
- desc = "It's not very colourful."
- icon_state = "mime_skirt"
- item_state = "mime"
- body_parts_covered = CHEST|GROIN|ARMS
- dying_key = DYE_REGISTRY_JUMPSKIRT
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/artist
- name = "post-modern suit"
- desc = "Only the most modern of folk have the right to wear this suit."
- icon_state = "artist"
- item_state = "artist"
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/artist/skirt
- name = "post-modern skirt"
- desc = "Only the most modern of folk have the right to wear this suit."
- icon_state = "artist_skirt"
- item_state = "artist"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-
-/obj/item/clothing/under/rank/miner
- desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
- name = "shaft miner's jumpsuit"
- icon_state = "miner"
- item_state = "miner"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 0, WOUND = 10)
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/miner/lavaland
- desc = "A green uniform for operating in hazardous environments."
- name = "shaft miner's jumpsuit"
- icon_state = "explorer"
- item_state = "explorer"
- can_adjust = FALSE
diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm
new file mode 100644
index 000000000000..0c40f77e4667
--- /dev/null
+++ b/code/modules/clothing/under/jobs/civilian/civilian.dm
@@ -0,0 +1,259 @@
+//Alphabetical order of civilian jobs.
+/obj/item/clothing/under/rank/civilian
+ worn_icon = 'icons/mob/clothing/uniform/civilian.dmi'
+
+/obj/item/clothing/under/rank/civilian/assistantformal
+ name = "assistant's formal uniform"
+ desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown."
+ icon_state = "assistant_formal"
+ item_state = "gy_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/bartender
+ desc = "It looks like it could use some more flair."
+ name = "bartender's uniform"
+ icon_state = "barman"
+ item_state = "bar_suit"
+ alt_covers_chest = TRUE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/bartender/purple
+ desc = "It looks like it has lots of flair!"
+ name = "purple bartender's uniform"
+ icon_state = "purplebartender"
+ item_state = "purplebartender"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/rank/civilian/bartender/skirt
+ name = "bartender's skirt"
+ desc = "It looks like it could use some more flair."
+ icon_state = "barman_skirt"
+ item_state = "bar_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/chaplain
+ desc = "It's a black jumpsuit, often worn by religious folk."
+ name = "chaplain's jumpsuit"
+ icon_state = "chaplain"
+ item_state = "bl_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/chaplain/skirt
+ name = "chaplain's jumpskirt"
+ desc = "It's a black jumpskirt, often worn by religious folk."
+ icon_state = "chapblack_skirt"
+ item_state = "bl_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/chaplain/burial
+ name = "burial garments"
+ desc = "Traditional burial garments from the early 22nd century."
+ icon_state = "burial"
+ item_state = "burial"
+ has_sensor = NO_SENSORS
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/chef
+ name = "cook's suit"
+ desc = "A suit which is given only to the most hardcore cooks in space."
+ icon_state = "chef"
+ alt_covers_chest = TRUE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/chef/skirt
+ name = "cook's skirt"
+ desc = "A skirt which is given only to the most hardcore cooks in space."
+ icon_state = "chef_skirt"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/hydroponics
+ desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
+ name = "botanist's jumpsuit"
+ icon_state = "hydroponics"
+ item_state = "g_suit"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 5, RAD = 0, FIRE = 0, ACID = 0)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/hydroponics/skirt
+ name = "botanist's jumpskirt"
+ desc = "It's a jumpskirt designed to protect against minor plant-related hazards."
+ icon_state = "hydroponics_skirt"
+ item_state = "g_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/hydroponics/durathread
+ name = "durathread jumpsuit"
+ desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer."
+ icon = 'icons/obj/clothing/under/color.dmi'
+ icon_state = "jumpsuit"
+ item_state = "jumpsuit"
+ worn_icon = 'icons/mob/clothing/uniform/color.dmi'
+ greyscale_colors = "#8291a1"
+ greyscale_config = /datum/greyscale_config/jumpsuit
+ greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit_inhand_left
+ greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit_inhand_right
+ greyscale_config_worn = /datum/greyscale_config/jumpsuit_worn
+ can_adjust = FALSE
+ armor = list(MELEE = 10, BULLET = 0, LASER = 10, ENERGY = 0, BOMB = 5, BIO = 0, RAD = 0, FIRE = 40, ACID = 10, WOUND= 5)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/janitor
+ desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
+ name = "janitor's jumpsuit"
+ icon_state = "janitor"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 10, RAD = 0, FIRE = 0, ACID = 0)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/janitor/skirt
+ name = "janitor's jumpskirt"
+ desc = "It's the official skirt of the station's janitor. It has minor protection from biohazards."
+ icon_state = "janitor_skirt"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/janitor/maid
+ name = "maid uniform"
+ desc = "A simple maid uniform for housekeeping."
+ icon_state = "janimaid"
+ item_state = "janimaid"
+ body_parts_covered = CHEST|GROIN|FEET|LEGS
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+
+/obj/item/clothing/under/rank/civilian/lawyer
+ desc = "Slick threads."
+ name = "Lawyer suit"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/rank/civilian/lawyer/black
+ icon_state = "lawyer_black"
+ item_state = "lawyer_black"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/lawyer/black/skirt
+ name = "Lawyer black suitskirt"
+ icon_state = "lawyer_black_skirt"
+ item_state = "lawyer_black"
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/lawyer/female
+ icon_state = "black_suit_fem"
+ item_state = "black_suit_fem"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/lawyer/red
+ icon_state = "lawyer_red"
+ item_state = "lawyer_red"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/lawyer/red/skirt
+ name = "Lawyer red suitskirt"
+ icon_state = "lawyer_red_skirt"
+ item_state = "lawyer_red"
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/lawyer/blue
+ icon_state = "lawyer_blue"
+ item_state = "lawyer_blue"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/lawyer/blue/skirt
+ name = "Lawyer blue suitskirt"
+ icon_state = "lawyer_blue_skirt"
+ item_state = "lawyer_blue"
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit
+ name = "blue suit"
+ desc = "A classy suit and tie."
+ icon_state = "bluesuit"
+ item_state = "bluesuit"
+ can_adjust = TRUE
+ alt_covers_chest = TRUE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt
+ name = "blue suitskirt"
+ desc = "A classy suitskirt and tie."
+ icon_state = "bluesuit_skirt"
+ item_state = "bluesuit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/lawyer/purpsuit
+ name = "purple suit"
+ icon_state = "lawyer_purp"
+ item_state = "lawyer_purp"
+ fitted = NO_FEMALE_UNIFORM
+ can_adjust = TRUE
+ alt_covers_chest = TRUE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt
+ name = "purple suitskirt"
+ icon_state = "lawyer_purp_skirt"
+ item_state = "lawyer_purp"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/lawyer/blacksuit
+ name = "black suit"
+ desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
+ icon_state = "blacksuit"
+ item_state = "bar_suit"
+ can_adjust = TRUE
+ alt_covers_chest = TRUE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/lawyer/blacksuit/skirt
+ name = "black suitskirt"
+ desc = "A professional black suitskirt. Nanotrasen Investigation Bureau approved!"
+ icon_state = "reallyblack_suit_skirt"
+ item_state = "bar_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/artist
+ name = "post-modern suit"
+ desc = "Only the most modern of folk have the right to wear this suit."
+ icon_state = "artist"
+ item_state = "artist"
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/artist/skirt
+ name = "post-modern skirt"
+ desc = "Only the most modern of folk have the right to wear this suit."
+ icon_state = "artist_skirt"
+ item_state = "artist"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
diff --git a/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/code/modules/clothing/under/jobs/civilian/clown_mime.dm
new file mode 100644
index 000000000000..7c9d86a8f633
--- /dev/null
+++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm
@@ -0,0 +1,113 @@
+/obj/item/clothing/under/rank/civilian/mime
+ name = "mime's outfit"
+ desc = "It's not very colourful."
+ icon_state = "mime"
+ item_state = "mime"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/mime/skirt
+ name = "mime's skirt"
+ desc = "It's not very colourful."
+ icon_state = "mime_skirt"
+ item_state = "mime"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/mime/sexy
+ name = "sexy mime outfit"
+ desc = "The only time when you DON'T enjoy looking at someone's rack."
+ icon_state = "sexymime"
+ item_state = "sexymime"
+ body_parts_covered = CHEST|GROIN|LEGS
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/mime/twosexytwomime
+ name = "REALLY sexy mime outfit"
+ desc = "Yes the skirt is a very important fundamental part of advanced mimery Vol. 6."
+ icon_state = "mimeskirt"
+ item_state = "mimeskirt"
+ body_parts_covered = CHEST|GROIN|LEGS
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/clown
+ name = "clown suit"
+ desc = "'HONK!'"
+ icon_state = "clown"
+ item_state = "clown"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/civilian/clown/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50)
+
+
+/obj/item/clothing/under/rank/civilian/clown/blue
+ name = "blue clown suit"
+ desc = "'BLUE HONK!'"
+ icon_state = "blueclown"
+ item_state = "blueclown"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/green
+ name = "green clown suit"
+ desc = "'GREEN HONK!'"
+ icon_state = "greenclown"
+ item_state = "greenclown"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/yellow
+ name = "yellow clown suit"
+ desc = "'YELLOW HONK!'"
+ icon_state = "yellowclown"
+ item_state = "yellowclown"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/purple
+ name = "purple clown suit"
+ desc = "'PURPLE HONK!'"
+ icon_state = "purpleclown"
+ item_state = "purpleclown"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/orange
+ name = "orange clown suit"
+ desc = "'ORANGE HONK!'"
+ icon_state = "orangeclown"
+ item_state = "orangeclown"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/rainbow
+ name = "rainbow clown suit"
+ desc = "'R A I N B O W HONK!'"
+ icon_state = "rainbowclown"
+ item_state = "rainbowclown"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/sexy
+ name = "sexy-clown suit"
+ desc = "It makes you look HONKable!"
+ icon_state = "sexyclown"
+ item_state = "sexyclown"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
diff --git a/code/modules/clothing/under/jobs/civilian/curator.dm b/code/modules/clothing/under/jobs/civilian/curator.dm
new file mode 100644
index 000000000000..92b1b2e31217
--- /dev/null
+++ b/code/modules/clothing/under/jobs/civilian/curator.dm
@@ -0,0 +1,41 @@
+/obj/item/clothing/under/rank/curator
+ name = "sensible suit"
+ desc = "It's very... sensible."
+ icon_state = "red_suit"
+ item_state = "red_suit"
+ worn_icon = 'icons/mob/clothing/uniform/suits.dmi'
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/curator/skirt
+ name = "sensible suitskirt"
+ desc = "It's very... sensible."
+ icon_state = "red_suit_skirt"
+ item_state = "red_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/curator/treasure_hunter
+ name = "treasure hunter uniform"
+ desc = "A rugged uniform suitable for treasure hunting."
+ icon_state = "curator"
+ item_state = "curator"
+
+/obj/item/clothing/under/rank/curator/space
+ name = "\improper NASA jumpsuit"
+ desc = "It has a NASA logo on it and is made of space-proofed materials."
+ icon_state = "black"
+ item_state = "bl_suit"
+ w_class = WEIGHT_CLASS_BULKY
+ gas_transfer_coefficient = 0.01
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 90, RAD = 0, FIRE = 0, ACID = 0, WOUND = 5)
+ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ cold_protection = CHEST | GROIN | LEGS | ARMS //Needs gloves and shoes with cold protection to be fully protected.
+ min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+ can_adjust = FALSE
+ resistance_flags = NONE
+ mutantrace_variation = DIGITIGRADE_VARIATION
diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm
new file mode 100644
index 000000000000..b4c32c43cb13
--- /dev/null
+++ b/code/modules/clothing/under/jobs/command.dm
@@ -0,0 +1,104 @@
+/obj/item/clothing/under/rank/command
+ worn_icon = 'icons/mob/clothing/uniform/captain.dmi'
+
+/obj/item/clothing/under/rank/command/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
+ desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
+ name = "captain's jumpsuit"
+ icon_state = "captain"
+ item_state = "b_suit"
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, WOUND = 15)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/command/captain/skirt
+ name = "captain's jumpskirt"
+ desc = "It's a blue jumpskirt with some gold markings denoting the rank of \"Captain\"."
+ icon_state = "captain_skirt"
+ item_state = "b_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/command/captain/suit
+ name = "captain's suit"
+ desc = "A green suit and yellow necktie. Exemplifies authority."
+ icon_state = "green_suit"
+ item_state = "dg_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/command/captain/suit/skirt
+ name = "green suitskirt"
+ desc = "A green suitskirt and yellow necktie. Exemplifies authority."
+ icon_state = "green_suit_skirt"
+ item_state = "dg_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/command/captain/parade
+ name = "captain's parade uniform"
+ desc = "A captain's luxury-wear, for special occasions."
+ icon_state = "captain_parade"
+ item_state = "by_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+// yogs - moves head of personnel to command file
+/obj/item/clothing/under/rank/command/head_of_personnel
+ name = "head of personnel's jumpsuit"
+ desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
+ icon_state = "hop"
+ item_state = "b_suit"
+ can_adjust = FALSE
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/command/head_of_personnel/turtleneck
+ name = "head of personnel's turtleneck jumpsuit"
+ desc = "It's a comfy turtleneck jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
+ icon_state = "hopturtle"
+ item_state = "b_suit"
+ can_adjust = TRUE
+
+/obj/item/clothing/under/rank/command/civilian/head_of_personnel/skirt
+ name = "head of personnel's jumpskirt"
+ desc = "It's a jumpskirt worn by someone who works in the position of \"Head of Personnel\"."
+ icon_state = "hop_skirt"
+ item_state = "b_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/command/head_of_personnel/skirt/turtleneck
+ name = "head of personnel's skirtleneck"
+ desc = "It's a fashionable skirtleneck worn by someone who works in the position of \"Head of Personnel\"."
+ icon_state = "hopturtle_skirt"
+ item_state = "b_suit"
+ can_adjust = TRUE
+
+/obj/item/clothing/under/rank/command/head_of_personnel/suit
+ name = "head of personnel's suit"
+ desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble."
+ icon_state = "teal_suit"
+ item_state = "g_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/command/head_of_personnel/suit/skirt
+ name = "teal suitskirt"
+ desc = "A teal suitskirt and yellow necktie. An authoritative yet tacky ensemble."
+ icon_state = "teal_suit_skirt"
+ item_state = "g_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+// yogs end
diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm
index d89818e2aea9..8a9592049fc7 100644
--- a/code/modules/clothing/under/jobs/engineering.dm
+++ b/code/modules/clothing/under/jobs/engineering.dm
@@ -1,5 +1,8 @@
//Contains: Engineering department jumpsuits
-/obj/item/clothing/under/rank/chief_engineer
+/obj/item/clothing/under/rank/engineering/
+ worn_icon = 'icons/mob/clothing/uniform/engineering.dmi'
+
+/obj/item/clothing/under/rank/engineering/chief_engineer
desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief Engineer\". It has minor radiation shielding."
name = "chief engineer's jumpsuit"
icon_state = "chiefengineer"
@@ -8,9 +11,9 @@
resistance_flags = NONE
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
-/obj/item/clothing/under/rank/chief_engineer/skirt
+/obj/item/clothing/under/rank/engineering/chief_engineer/skirt
name = "chief engineer's jumpskirt"
desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief Engineer\". It has minor radiation shielding."
icon_state = "chief_skirt"
@@ -19,18 +22,18 @@
dying_key = DYE_REGISTRY_JUMPSKIRT
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
-/obj/item/clothing/under/rank/atmospheric_technician
+/obj/item/clothing/under/rank/engineering/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians."
name = "atmospheric technician's jumpsuit"
icon_state = "atmos"
item_state = "atmos_suit"
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 0, ELECTRIC = 0)
resistance_flags = NONE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
-/obj/item/clothing/under/rank/atmospheric_technician/skirt
+/obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt
name = "atmospheric technician's jumpskirt"
desc = "It's a jumpskirt worn by atmospheric technicians."
icon_state = "atmos_skirt"
@@ -38,26 +41,26 @@
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
-/obj/item/clothing/under/rank/engineer
+/obj/item/clothing/under/rank/engineering/engineer
desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
name = "engineer's jumpsuit"
icon_state = "engine"
item_state = "engi_suit"
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 10, FIRE = 60, ACID = 20)
resistance_flags = NONE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
-/obj/item/clothing/under/rank/engineer/hazard
+/obj/item/clothing/under/rank/engineering/engineer/hazard
name = "engineer's hazard jumpsuit"
desc = "A high visibility jumpsuit made from heat and radiation resistant materials."
icon_state = "hazard"
item_state = "suit-orange"
alt_covers_chest = TRUE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
-/obj/item/clothing/under/rank/engineer/skirt
+/obj/item/clothing/under/rank/engineering/engineer/skirt
name = "engineer's jumpskirt"
desc = "It's an orange high visibility jumpskirt worn by engineers."
icon_state = "engine_skirt"
@@ -65,22 +68,4 @@
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/roboticist
- desc = "It's a slimming black with reinforced seams; great for industrial work."
- name = "roboticist's jumpsuit"
- icon_state = "robotics"
- item_state = "robotics"
- resistance_flags = NONE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/roboticist/skirt
- name = "roboticist's jumpskirt"
- desc = "It's a slimming black with reinforced seams; great for industrial work."
- icon_state = "robotics_skirt"
- item_state = "robotics"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm
new file mode 100644
index 000000000000..67fe01547a40
--- /dev/null
+++ b/code/modules/clothing/under/jobs/medical.dm
@@ -0,0 +1,138 @@
+/obj/item/clothing/under/rank/medical
+ worn_icon = 'icons/mob/clothing/uniform/medical.dmi'
+
+/obj/item/clothing/under/rank/medical/chemist
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
+ name = "chemist's jumpsuit"
+ icon_state = "chemistry"
+ item_state = "w_suit"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 50, ACID = 65)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/medical/chemist/skirt
+ name = "chemist's jumpskirt"
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
+ icon_state = "chemistrywhite_skirt"
+ item_state = "w_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/*
+ * Medical
+ */
+/obj/item/clothing/under/rank/medical/chief_medical_officer
+ desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
+ name = "chief medical officer's jumpsuit"
+ icon_state = "cmo"
+ item_state = "w_suit"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck
+ desc = "It's a jumpsuit worn by those with the experience, and the style, to be \"Chief Medical Officer\". It provides minor biological protection."
+ name = "chief medical officer's turtleneck jumpsuit"
+ icon_state = "cmoturtle"
+ item_state = "w_suit"
+
+/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
+ name = "chief medical officer's jumpskirt"
+ desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
+ icon_state = "cmo_skirt"
+ item_state = "w_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt/turtleneck
+ name = "chief medical officer's skirtleneck"
+ desc = "It's a jumpskirt worn by those with the experience, and the style, to be \"Chief Medical Officer\". It provides minor biological protection."
+ icon_state = "cmoturtle_skirt"
+ item_state = "w_suit"
+
+/obj/item/clothing/under/rank/medical/virologist
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
+ name = "virologist's jumpsuit"
+ icon_state = "virology"
+ item_state = "w_suit"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/medical/virologist/skirt
+ name = "virologist's jumpskirt"
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
+ icon_state = "virologywhite_skirt"
+ item_state = "w_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/medical/nursesuit
+ desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
+ name = "nurse's suit"
+ icon_state = "nursesuit"
+ item_state = "w_suit"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
+ body_parts_covered = CHEST|GROIN|ARMS
+ fitted = NO_FEMALE_UNIFORM
+ can_adjust = FALSE
+
+/obj/item/clothing/under/rank/medical/doctor
+ desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
+ name = "medical doctor's jumpsuit"
+ icon_state = "medical"
+ item_state = "w_suit"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/medical/doctor/blue
+ name = "medical scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
+ icon_state = "scrubsblue"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/rank/medical/doctor/green
+ name = "medical scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
+ icon_state = "scrubsgreen"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/rank/medical/doctor/purple
+ name = "medical scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
+ icon_state = "scrubspurple"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/rank/medical/doctor/skirt
+ name = "medical doctor's jumpskirt"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
+ icon_state = "medical_skirt"
+ item_state = "w_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+// yogs - removed miscellaneous.dm
+/obj/item/clothing/under/rank/medical/pj/red
+ name = "red pj's"
+ desc = "Sleepwear."
+ icon_state = "red_pyjamas"
+ item_state = "w_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/medical/pj/blue
+ name = "blue pj's"
+ desc = "Sleepwear."
+ icon_state = "blue_pyjamas"
+ item_state = "w_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+// yogs end
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
deleted file mode 100644
index 00361915b525..000000000000
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Science
- */
-/obj/item/clothing/under/rank/research_director
- desc = "It's a suit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
- name = "research director's vest suit"
- icon_state = "director"
- item_state = "lb_suit"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 10, BIO = 10, RAD = 0, FIRE = 0, ACID = 35)
- can_adjust = FALSE
- sensor_mode = SENSOR_COORDS
- random_sensor = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/research_director/skirt
- name = "research director's vest suitskirt"
- desc = "It's a suitskirt worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
- icon_state = "director_skirt"
- item_state = "lb_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- dying_key = DYE_REGISTRY_JUMPSKIRT
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/research_director/alt
- desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
- name = "research director's tan suit"
- icon_state = "rdwhimsy"
- item_state = "rdwhimsy"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 10, RAD = 0, FIRE = 0, ACID = 0)
- can_adjust = TRUE
- alt_covers_chest = TRUE
-
-/obj/item/clothing/under/rank/research_director/alt/skirt
- name = "research director's tan suitskirt"
- desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
- icon_state = "rdwhimsy_skirt"
- item_state = "rdwhimsy"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/research_director/turtleneck
- desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style."
- name = "research director's turtleneck"
- icon_state = "rdturtle"
- item_state = "p_suit"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 10, RAD = 0, FIRE = 0, ACID = 0)
- can_adjust = TRUE
- alt_covers_chest = TRUE
-
-/obj/item/clothing/under/rank/research_director/turtleneck/skirt
- name = "research director's turtleneck skirt"
- desc = "A dark purple turtleneck and tan khaki skirt, for a director with a superior sense of style."
- icon_state = "rdturtle_skirt"
- item_state = "p_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/scientist
- desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
- name = "scientist's jumpsuit"
- icon_state = "toxins"
- item_state = "w_suit"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 10, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/scientist/skirt
- name = "scientist's jumpskirt"
- desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
- icon_state = "toxinswhite_skirt"
- item_state = "w_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/scientist/black
- name = "black scientist's jumpsuit"
- desc = "A customized black jumpsuit with a bit of purple added to it, it smells rather burnt. It has markings that denote the wearer as a scientist, and provides minor protection against explosions."
- icon_state = "toxins_black"
-
-/obj/item/clothing/under/rank/chemist
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
- name = "chemist's jumpsuit"
- icon_state = "chemistry"
- item_state = "w_suit"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 50, ACID = 65)
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/chemist/skirt
- name = "chemist's jumpskirt"
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
- icon_state = "chemistrywhite_skirt"
- item_state = "w_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/*
- * Medical
- */
-/obj/item/clothing/under/rank/chief_medical_officer
- desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
- name = "chief medical officer's jumpsuit"
- icon_state = "cmo"
- item_state = "w_suit"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
- sensor_mode = SENSOR_COORDS
- random_sensor = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/chief_medical_officer/turtleneck
- desc = "It's a jumpsuit worn by those with the experience, and the style, to be \"Chief Medical Officer\". It provides minor biological protection."
- name = "chief medical officer's turtleneck jumpsuit"
- icon_state = "cmoturtle"
- item_state = "w_suit"
-
-/obj/item/clothing/under/rank/chief_medical_officer/skirt
- name = "chief medical officer's jumpskirt"
- desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
- icon_state = "cmo_skirt"
- item_state = "w_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- dying_key = DYE_REGISTRY_JUMPSKIRT
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/chief_medical_officer/skirt/turtleneck
- name = "chief medical officer's skirtleneck"
- desc = "It's a jumpskirt worn by those with the experience, and the style, to be \"Chief Medical Officer\". It provides minor biological protection."
- icon_state = "cmoturtle_skirt"
- item_state = "w_suit"
-
-/obj/item/clothing/under/rank/geneticist
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
- name = "geneticist's jumpsuit"
- icon_state = "genetics"
- item_state = "w_suit"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/geneticist/skirt
- name = "geneticist's jumpskirt"
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
- icon_state = "geneticswhite_skirt"
- item_state = "w_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/virologist
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
- name = "virologist's jumpsuit"
- icon_state = "virology"
- item_state = "w_suit"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/virologist/skirt
- name = "virologist's jumpskirt"
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
- icon_state = "virologywhite_skirt"
- item_state = "w_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/nursesuit
- desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
- name = "nurse's suit"
- icon_state = "nursesuit"
- item_state = "w_suit"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
- body_parts_covered = CHEST|GROIN|ARMS
- fitted = NO_FEMALE_UNIFORM
- can_adjust = FALSE
-
-/obj/item/clothing/under/rank/medical
- desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
- name = "medical doctor's jumpsuit"
- icon_state = "medical"
- item_state = "w_suit"
- armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
- mutantrace_variation = MUTANTRACE_VARIATION
-
-/obj/item/clothing/under/rank/medical/blue
- name = "medical scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
- icon_state = "scrubsblue"
- can_adjust = FALSE
-
-/obj/item/clothing/under/rank/medical/green
- name = "medical scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
- icon_state = "scrubsgreen"
- can_adjust = FALSE
-
-/obj/item/clothing/under/rank/medical/purple
- name = "medical scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
- icon_state = "scrubspurple"
- can_adjust = FALSE
-
-/obj/item/clothing/under/rank/medical/skirt
- name = "medical doctor's jumpskirt"
- desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
- icon_state = "medical_skirt"
- item_state = "w_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm
new file mode 100644
index 000000000000..37970b6147bd
--- /dev/null
+++ b/code/modules/clothing/under/jobs/rnd.dm
@@ -0,0 +1,124 @@
+/*
+ * Science
+ */
+/obj/item/clothing/under/rank/rnd
+ worn_icon = 'icons/mob/clothing/uniform/rnd.dmi'
+
+/obj/item/clothing/under/rank/rnd/research_director
+ desc = "It's a suit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
+ name = "research director's vest suit"
+ icon_state = "director"
+ item_state = "lb_suit"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 10, BIO = 10, RAD = 0, FIRE = 0, ACID = 35)
+ can_adjust = FALSE
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/rnd/research_director/skirt
+ name = "research director's vest suitskirt"
+ desc = "It's a suitskirt worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
+ icon_state = "director_skirt"
+ item_state = "lb_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ dying_key = DYE_REGISTRY_JUMPSKIRT
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/rnd/research_director/alt
+ desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
+ name = "research director's tan suit"
+ icon_state = "rdwhimsy"
+ item_state = "rdwhimsy"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 10, RAD = 0, FIRE = 0, ACID = 0)
+ can_adjust = TRUE
+ alt_covers_chest = TRUE
+
+/obj/item/clothing/under/rank/rnd/research_director/alt/skirt
+ name = "research director's tan suitskirt"
+ desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
+ icon_state = "rdwhimsy_skirt"
+ item_state = "rdwhimsy"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/rnd/research_director/turtleneck
+ desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style."
+ name = "research director's turtleneck"
+ icon_state = "rdturtle"
+ item_state = "p_suit"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 10, RAD = 0, FIRE = 0, ACID = 0)
+ can_adjust = TRUE
+ alt_covers_chest = TRUE
+
+/obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt
+ name = "research director's turtleneck skirt"
+ desc = "A dark purple turtleneck and tan khaki skirt, for a director with a superior sense of style."
+ icon_state = "rdturtle_skirt"
+ item_state = "p_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/rnd/scientist
+ desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
+ name = "scientist's jumpsuit"
+ icon_state = "toxins"
+ item_state = "w_suit"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 10, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/rnd/scientist/skirt
+ name = "scientist's jumpskirt"
+ desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
+ icon_state = "toxinswhite_skirt"
+ item_state = "w_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/rnd/scientist/black
+ name = "black scientist's jumpsuit"
+ desc = "A customized black jumpsuit with a bit of purple added to it, it smells rather burnt. It has markings that denote the wearer as a scientist, and provides minor protection against explosions."
+ icon_state = "toxins_black"
+
+/obj/item/clothing/under/rank/rnd/roboticist
+ desc = "It's a slimming black with reinforced seams; great for industrial work."
+ name = "roboticist's jumpsuit"
+ icon_state = "robotics"
+ item_state = "robotics"
+ resistance_flags = NONE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/rnd/roboticist/skirt
+ name = "roboticist's jumpskirt"
+ desc = "It's a slimming black with reinforced seams; great for industrial work."
+ icon_state = "robotics_skirt"
+ item_state = "robotics"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/rnd/geneticist
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
+ name = "geneticist's jumpsuit"
+ icon_state = "genetics"
+ item_state = "w_suit"
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/rnd/geneticist/skirt
+ name = "geneticist's jumpskirt"
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
+ icon_state = "geneticswhite_skirt"
+ item_state = "w_suit"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 057e0e298a08..1ed67372bfac 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -10,32 +10,35 @@
*/
/obj/item/clothing/under/rank/security
- name = "security jumpsuit"
- desc = "A tactical security jumpsuit for officers. Complete with Nanotrasen belt buckle."
- icon_state = "rsecurity"
- item_state = "r_suit"
armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 30, ACID = 30, WOUND = 10)
strip_delay = 50
alt_covers_chest = TRUE
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
+ worn_icon = 'icons/mob/clothing/uniform/security.dmi'
-/obj/item/clothing/under/rank/security/grey
+/obj/item/clothing/under/rank/security/officer
+ name = "security jumpsuit"
+ desc = "A tactical security jumpsuit for officers. Complete with Nanotrasen belt buckle."
+ icon_state = "rsecurity"
+ item_state = "r_suit"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/security/officer/grey
name = "grey security jumpsuit"
desc = "A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood."
icon_state = "security"
item_state = "gy_suit"
-/obj/item/clothing/under/rank/security/shitcurity
+/obj/item/clothing/under/rank/security/officer/shitcurity
name = "shitcurity uniform"
desc = "For the security members that want to show their true colors."
- mob_overlay_icon = 'yogstation/icons/mob/clothing/uniform/uniform.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/uniform/uniform.dmi'
icon = 'yogstation/icons/obj/clothing/uniforms.dmi'
icon_state = "altsecurity"
item_state = "altsecurity"
-/obj/item/clothing/under/rank/security/skirt
+/obj/item/clothing/under/rank/security/officer/skirt
name = "security jumpskirt"
desc = "A \"tactical\" security jumpsuit with the legs replaced by a skirt."
icon_state = "secskirt"
@@ -43,29 +46,23 @@
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE //you know now that i think of it if you adjust the skirt and the sprite disappears isn't that just like flashing everyone
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
-/obj/item/clothing/under/rank/warden
+/obj/item/clothing/under/rank/security/warden
name = "security suit"
desc = "A formal security suit for officers. Complete with Nanotrasen belt buckle."
icon_state = "rwarden"
item_state = "r_suit"
- armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 30, ACID = 30, WOUND = 10)
- strip_delay = 50
- alt_covers_chest = TRUE
- sensor_mode = 3
- sensor_mode = SENSOR_COORDS
- random_sensor = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
-/obj/item/clothing/under/rank/warden/grey
+/obj/item/clothing/under/rank/security/warden/grey
name = "grey security suit"
desc = "A formal relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood."
icon_state = "warden"
item_state = "gy_suit"
-/obj/item/clothing/under/rank/warden/skirt
+/obj/item/clothing/under/rank/security/warden/skirt
name = "warden's suitskirt"
desc = "A formal security suitskirt for officers. Complete with Nanotrasen belt buckle."
icon_state = "rwarden_skirt"
@@ -73,24 +70,19 @@
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/*
* Detective
*/
-/obj/item/clothing/under/rank/det
+/obj/item/clothing/under/rank/security/detective
name = "hard-worn suit"
desc = "Someone who wears this means business."
icon_state = "detective"
item_state = "det"
- armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 30, ACID = 30, WOUND = 10)
- strip_delay = 50
- alt_covers_chest = TRUE
- sensor_mode = 3
- random_sensor = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
-/obj/item/clothing/under/rank/det/skirt
+/obj/item/clothing/under/rank/security/detective/skirt
name = "detective's suitskirt"
desc = "Someone who wears this means business."
icon_state = "detective_skirt"
@@ -98,42 +90,38 @@
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
-/obj/item/clothing/under/rank/det/grey
+/obj/item/clothing/under/rank/security/detective/grey
name = "noir suit"
desc = "A hard-boiled private investigator's grey suit, complete with tie clip."
- icon_state = "greydet"
- item_state = "greydet"
+ icon_state = "noirdet"
+ item_state = "noirdet"
alt_covers_chest = TRUE
-/obj/item/clothing/under/rank/det/grey/skirt
+/obj/item/clothing/under/rank/security/detective/grey/skirt
name = "noir suitskirt"
desc = "A hard-boiled private investigator's grey suitskirt, complete with tie clip."
- icon_state = "greydet_skirt"
- item_state = "greydet"
+ icon_state = "noirdet_skirt"
+ item_state = "noirdet"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/*
* Head of Security
*/
-/obj/item/clothing/under/rank/head_of_security
+/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)
strip_delay = 60
- alt_covers_chest = TRUE
- sensor_mode = 3
- sensor_mode = SENSOR_COORDS
- random_sensor = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
-/obj/item/clothing/under/rank/head_of_security/skirt
+/obj/item/clothing/under/rank/security/head_of_security/skirt
name = "head of security's jumpskirt"
desc = "A security jumpskirt decorated for those few with the dedication to achieve the position of Head of Security."
icon_state = "rhos_skirt"
@@ -142,21 +130,21 @@
dying_key = DYE_REGISTRY_JUMPSKIRT
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
-/obj/item/clothing/under/rank/head_of_security/grey
+/obj/item/clothing/under/rank/security/head_of_security/grey
name = "head of security's grey jumpsuit"
desc = "There are old men, and there are bold men, but there are very few old, bold men."
icon_state = "hos"
item_state = "gy_suit"
-/obj/item/clothing/under/rank/head_of_security/alt
+/obj/item/clothing/under/rank/security/head_of_security/alt
name = "head of security's turtleneck"
desc = "A stylish alternative to the normal head of security jumpsuit, complete with tactical pants."
icon_state = "hosalt"
item_state = "bl_suit"
-/obj/item/clothing/under/rank/head_of_security/alt/skirt
+/obj/item/clothing/under/rank/security/head_of_security/alt/skirt
name = "head of security's turtleneck skirt"
desc = "A stylish alternative to the normal head of security jumpsuit, complete with a tactical skirt."
icon_state = "hosalt_skirt"
@@ -164,7 +152,25 @@
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/security/head_of_security/hosparademale
+ name = "head of security's parade uniform"
+ desc = "A male head of security's luxury-wear, for special occasions."
+ icon_state = "hos_parade_male"
+ item_state = "r_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/security/head_of_security/hosparadefem
+ name = "head of security's parade uniform"
+ desc = "A female head of security's luxury-wear, for special occasions."
+ icon_state = "hos_parade_fem"
+ item_state = "r_suit"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
/*
* Navy uniforms
@@ -177,14 +183,21 @@
item_state = "officerblueclothes"
alt_covers_chest = TRUE
-/obj/item/clothing/under/rank/head_of_security/navyblue
+/obj/item/clothing/under/rank/security/navyblue/russian
+ name = "\improper Russian officer's uniform"
+ desc = "The latest in fashionable Russian outfits."
+ icon_state = "hostanclothes"
+ item_state = "hostanclothes"
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/security/head_of_security/navyblue
desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security."
name = "head of security's formal uniform"
icon_state = "hosblueclothes"
item_state = "hosblueclothes"
alt_covers_chest = TRUE
-/obj/item/clothing/under/rank/warden/navyblue
+/obj/item/clothing/under/rank/security/warden/navyblue
desc = "The insignia on this uniform tells you that this uniform belongs to the Warden."
name = "warden's formal uniform"
icon_state = "wardenblueclothes"
@@ -213,6 +226,35 @@
item_state = "spacepol"
can_adjust = FALSE
+/obj/item/clothing/under/rank/prisoner
+ name = "prison jumpsuit"
+ desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+ icon_state = "jumpsuit"
+ item_state = "jumpsuit"
+ greyscale_colors = "#ff8300"
+ greyscale_config = /datum/greyscale_config/jumpsuit_prison
+ greyscale_config_worn = /datum/greyscale_config/jumpsuit_prison_worn
+ greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit_prison_inhand_left
+ greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit_prison_inhand_right
+ has_sensor = LOCKED_SENSORS
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/rank/prisoner/skirt
+ name = "prison jumpskirt"
+ desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+ icon_state = "jumpskirt"
+ greyscale_colors = "#ff8300"
+ greyscale_config = /datum/greyscale_config/jumpsuit_prison
+ greyscale_config_worn = /datum/greyscale_config/jumpsuit_prison_worn
+ greyscale_config_inhand_left = /datum/greyscale_config/jumpsuit_prison_inhand_left
+ greyscale_config_inhand_right = /datum/greyscale_config/jumpsuit_prison_inhand_right
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
/*
*Constable
*/
@@ -222,4 +264,3 @@
desc = "A pale blue and black uniform supposedly made from 90% Space Indian cotton."
icon_state = "secconuniform"
item_state = "secconuniform"
-
\ No newline at end of file
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 398c6dbc0825..feece142b66d 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -133,14 +133,14 @@
can_adjust = FALSE
mutantrace_variation = MUTANTRACE_VARIATION
-/obj/item/clothing/under/rank/centcom_officer
+/obj/item/clothing/under/rank/centcom/officer
desc = "It's a jumpsuit worn by CentCom Officers."
name = "\improper CentCom officer's jumpsuit"
icon_state = "officer"
item_state = "g_suit"
alt_covers_chest = TRUE
-/obj/item/clothing/under/rank/centcom_commander
+/obj/item/clothing/under/rank/centcom/commander
desc = "It's a jumpsuit with gold markings worn by CentCom's highest-tier commanders."
name = "\improper CentCom officer's jumpsuit"
icon_state = "centcom"
@@ -149,14 +149,14 @@
mutantrace_variation = MUTANTRACE_VARIATION
can_adjust = TRUE //too important to look unimportant.
-/obj/item/clothing/under/rank/centcom_admiral
+/obj/item/clothing/under/rank/centcom/admiral
desc = "It's a jumpsuit with gold markings worn by CentCom High Command."
name = "\improper CentCom admiral's jumpsuit"
icon_state = "admiral"
item_state = "admiral"
can_adjust = FALSE //too important to look unimportant.
-/obj/item/clothing/under/rank/centcom_admiral/executive
+/obj/item/clothing/under/rank/centcom/admiral/executive
desc = "It's a jumpsuit with gold markings worn by CentCom's highest-ranking officer."
name = "\improper CentCom executive admiral's jumpsuit"
icon_state = "grandadmiral"
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index 8b2befafdc95..f1ef8822f6b4 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -4,7 +4,8 @@
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
custom_price = 20
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
+ worn_icon = 'icons/mob/clothing/uniform/shorts_pants_shirts.dmi'
/obj/item/clothing/under/pants/classicjeans
name = "classic jeans"
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index bf8556e29d72..a0e00f17f45f 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -1,10 +1,11 @@
/obj/item/clothing/under/shorts
name = "athletic shorts"
desc = "95% Polyester, 5% Spandex!"
+ worn_icon = 'icons/mob/clothing/uniform/shorts_pants_shirts.dmi'
gender = PLURAL
body_parts_covered = GROIN
fitted = NO_FEMALE_UNIFORM
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
can_adjust = FALSE
/obj/item/clothing/under/shorts/red
diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm
new file mode 100644
index 000000000000..16b4c81b7cf3
--- /dev/null
+++ b/code/modules/clothing/under/skirt_dress.dm
@@ -0,0 +1,91 @@
+/obj/item/clothing/under/dress
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+ body_parts_covered = CHEST|GROIN
+ mutantrace_variation = NONE
+ worn_icon = 'icons/mob/clothing/uniform/dress.dmi'
+
+/obj/item/clothing/under/dress/blacktango
+ name = "black tango dress"
+ desc = "Filled with Latin fire."
+ icon_state = "black_tango"
+ item_state = "wcoat"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+
+/obj/item/clothing/under/dress/stripeddress
+ name = "striped dress"
+ desc = "Fashion in space."
+ icon_state = "striped_dress"
+ item_state = "stripeddress"
+ body_parts_covered = CHEST|GROIN|ARMS
+ fitted = FEMALE_UNIFORM_FULL
+ can_adjust = FALSE
+
+/obj/item/clothing/under/dress/sailordress
+ name = "sailor dress"
+ desc = "Formal wear for a leading lady."
+ icon_state = "sailor_dress"
+ item_state = "sailordress"
+ body_parts_covered = CHEST|GROIN|ARMS
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+
+/obj/item/clothing/under/dress/redeveninggown
+ name = "red evening gown"
+ desc = "Fancy dress for space bar singers."
+ icon_state = "red_evening_gown"
+ item_state = "redeveninggown"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+
+/obj/item/clothing/under/dress/sundress
+ name = "sundress"
+ desc = "Makes you want to frolic in a field of daisies."
+ icon_state = "sundress"
+ item_state = "sundress"
+
+/obj/item/clothing/under/dress/skirt/black
+ name = "black skirt"
+ desc = "A black skirt, very fancy!"
+ icon_state = "blackskirt"
+ body_parts_covered = CHEST|GROIN|ARMS
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+
+/obj/item/clothing/under/dress/skirt/plaid
+ name = "red plaid skirt"
+ desc = "A preppy red skirt with a white blouse."
+ icon_state = "plaid_red"
+ item_state = "plaid_red"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = TRUE
+ alt_covers_chest = TRUE
+ custom_price = 25
+
+/obj/item/clothing/under/dress/skirt/plaid/blue
+ name = "blue plaid skirt"
+ desc = "A preppy blue skirt with a white blouse."
+ icon_state = "plaid_blue"
+ item_state = "plaid_blue"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = TRUE
+ alt_covers_chest = TRUE
+
+/obj/item/clothing/under/dress/skirt/plaid/purple
+ name = "purple plaid skirt"
+ desc = "A preppy purple skirt with a white blouse."
+ icon_state = "plaid_purple"
+ item_state = "plaid_purple"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = TRUE
+ alt_covers_chest = TRUE
+
+/obj/item/clothing/under/dress/skirt/plaid/green
+ name = "green plaid skirt"
+ desc = "A preppy green skirt with a white blouse."
+ icon_state = "plaid_green"
+ item_state = "plaid_green"
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = TRUE
+ alt_covers_chest = TRUE
diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm
new file mode 100644
index 000000000000..eedbbd296fe0
--- /dev/null
+++ b/code/modules/clothing/under/suits.dm
@@ -0,0 +1,110 @@
+/obj/item/clothing/under/suit
+ name = "black suit"
+ desc = "A black suit and red tie. Very formal."
+ icon_state = "black_suit"
+ item_state = "bl_suit"
+ worn_icon = 'icons/mob/clothing/uniform/suits.dmi'
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/suit/really_black
+ name = "executive suit"
+ desc = "A formal black suit and red tie, intended for the station's finest."
+ icon_state = "really_black_suit"
+ item_state = "bl_suit"
+
+/obj/item/clothing/under/suit/female
+ name = "executive suit"
+ desc = "A formal trouser suit for women, intended for the station's finest."
+ icon_state = "black_suit_fem"
+ item_state = "black_suit_fem"
+
+/obj/item/clothing/under/suit/green
+ name = "green suit"
+ desc = "A green suit and yellow necktie. Baller."
+ icon_state = "green_suit"
+ item_state = "dg_suit"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/suit/red
+ name = "red suit"
+ desc = "A red suit and blue tie. Somewhat formal."
+ icon_state = "red_suit"
+ item_state = "r_suit"
+
+/obj/item/clothing/under/suit/charcoal
+ name = "charcoal suit"
+ desc = "A charcoal suit and red tie. Very professional."
+ icon_state = "charcoal_suit"
+ item_state = "charcoal_suit"
+
+/obj/item/clothing/under/suit/navy
+ name = "navy suit"
+ desc = "A navy suit and red tie, intended for the station's finest."
+ icon_state = "navy_suit"
+ item_state = "navy_suit"
+
+/obj/item/clothing/under/suit/burgundy
+ name = "burgundy suit"
+ desc = "A burgundy suit and black tie. Somewhat formal."
+ icon_state = "burgundy_suit"
+ item_state = "burgundy_suit"
+
+/obj/item/clothing/under/suit/checkered
+ name = "checkered suit"
+ desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?"
+ icon_state = "checkered_suit"
+ item_state = "checkered_suit"
+
+/obj/item/clothing/under/suit/tan
+ name = "tan suit"
+ desc = "A tan suit with a yellow tie. Smart, but casual."
+ icon_state = "tan_suit"
+ item_state = "tan_suit"
+
+/obj/item/clothing/under/suit/white
+ name = "white suit"
+ desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!"
+ icon_state = "white_suit"
+ item_state = "white_suit"
+
+/obj/item/clothing/under/suit/scratch
+ name = "white suit"
+ desc = "A white suit, suitable for an excellent host."
+ icon_state = "scratch"
+ item_state = "scratch"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/suit/scratch/skirt
+ name = "white suitskirt"
+ desc = "A white suitskirt, suitable for an excellent host."
+ icon_state = "white_suit_skirt"
+ item_state = "scratch"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NONE
+
+/obj/item/clothing/under/suit/sl_suit
+ desc = "It's a very amish looking suit."
+ name = "amish suit"
+ icon_state = "sl_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/suit/vice
+ name = "vice officer's jumpsuit"
+ desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision."
+ icon_state = "vice"
+ item_state = "gy_suit"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/suit/waiter
+ name = "waiter's outfit"
+ desc = "It's a very smart uniform with a special pocket for tips."
+ icon_state = "waiter"
+ item_state = "waiter"
+ can_adjust = FALSE
+ mutantrace_variation = DIGITIGRADE_VARIATION
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index e08dea96dda5..7d02a805badb 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -3,10 +3,11 @@
desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants."
icon_state = "syndicate"
item_state = "bl_suit"
+ worn_icon = 'icons/mob/clothing/uniform/syndicate.dmi'
has_sensor = NO_SENSORS
armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 40)
alt_covers_chest = TRUE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/under/syndicate/tacticool
name = "tacticool turtleneck"
@@ -19,7 +20,7 @@
/obj/item/clothing/under/syndicate/sniper
name = "tactical turtleneck suit"
desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp."
- icon_state = "really_black_suit"
+ icon_state = "tactical_suit"
item_state = "bl_suit"
can_adjust = FALSE
@@ -51,4 +52,21 @@
can_adjust = FALSE
armor = list(MELEE = 5, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)
resistance_flags = NONE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/syndicate/acj // yogs - removes miscellaneous.dm
+ name = "administrative cybernetic jumpsuit"
+ icon_state = "syndicate"
+ item_state = "bl_suit"
+ desc = "A cybernetically enhanced jumpsuit used for administrative duties."
+ gas_transfer_coefficient = 0.01
+ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ armor = list(MELEE = 100, BULLET = 100, LASER = 100,ENERGY = 100, BOMB = 100, BIO = 100, RAD = 100, FIRE = 100, ACID = 100)
+ cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
+ min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+ can_adjust = FALSE
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm
index 37826d5ec294..3da348d74e12 100644
--- a/code/modules/clothing/under/trek.dm
+++ b/code/modules/clothing/under/trek.dm
@@ -3,7 +3,8 @@
/obj/item/clothing/under/trek
can_adjust = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
+ worn_icon = 'icons/mob/clothing/uniform/trek.dmi'
//TOS
diff --git a/code/modules/clothing/under/tribal.dm b/code/modules/clothing/under/tribal.dm
new file mode 100644
index 000000000000..6b7bec1d5490
--- /dev/null
+++ b/code/modules/clothing/under/tribal.dm
@@ -0,0 +1,75 @@
+// Ashwalker Clothes
+/obj/item/clothing/under/tribal
+ has_sensor = NO_SENSORS
+ can_adjust = FALSE
+ worn_icon = 'icons/mob/clothing/uniform/tribal.dmi'
+
+/obj/item/clothing/under/tribal/chestwrap
+ name = "loincloth and chestwrap"
+ desc = "A poorly sewn dress made of leather."
+ icon_state = "chestwrap"
+ body_parts_covered = CHEST|GROIN
+ fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/tribal/raider_leather
+ name = "scavenged rags"
+ desc = "A porly made outfit made of scrapped materials."
+ icon_state = "raider_leather"
+ item_state = "raider_leather"
+ armor = list(MELEE = 5, FIRE = 5)
+ mutantrace_variation = DIGITIGRADE_VARIATION
+
+/obj/item/clothing/under/tribal/plated
+ name = "metal plated rags"
+ desc = "Thin metal bolted over poorly tanned leather."
+ icon_state = "tribal"
+ item_state = "tribal"
+ body_parts_covered = CHEST|GROIN|ARMS
+ armor = list(MELEE = 5)
+
+/obj/item/clothing/under/tribal/ash_robe
+ name = "tribal robes"
+ desc = "A robe from the ashlands. This one seems to be for common tribespeople."
+ icon_state = "robe_liz"
+ item_state = "robe_liz"
+ fitted = NO_FEMALE_UNIFORM
+ body_parts_covered = CHEST|GROIN
+
+/obj/item/clothing/under/tribal/ash_robe/young
+ name = "tribal rags"
+ desc = "Rags from Lavaland, coated with light ash. This one seems to be for the juniors of a tribe."
+ icon_state = "tribalrags"
+
+/obj/item/clothing/under/tribal/ash_robe/hunter
+ name = "hunter tribal rags"
+ desc = "A robe from the ashlands. This one seems to be for hunters."
+ icon_state = "hhunterrags"
+ item_state = "hhunterrags"
+
+/obj/item/clothing/under/tribal/ash_robe/chief
+ name = "chief tribal rags"
+ desc = "Rags from Lavaland, coated with heavy ash. This one seems to be for the elders of a tribe."
+ icon_state = "chiefrags"
+ item_state = "chiefrags"
+
+/obj/item/clothing/under/tribal/ash_robe/shaman
+ name = "shaman tribal rags"
+ desc = "Rags from Lavaland, drenched with ash, it has fine jewel coated bones sewn around the neck. This one seems to be for the shaman of a tribe."
+ icon_state = "shamanrags"
+ item_state = "shamanrags"
+
+/obj/item/clothing/under/tribal/ash_robe/tunic
+ name = "tribal tunic"
+ desc = "A tattered red tunic of reddened fabric."
+ icon_state = "caesar_clothes"
+ item_state = "caesar_clothes"
+
+/obj/item/clothing/under/tribal/ash_robe/dress
+ name = "tribal dress"
+ desc = "A tattered dress of white fabric."
+ icon_state = "cheongsam_s"
+ item_state = "cheongsam_s"
+
+/obj/item/clothing/under/tribal/ash_robe/hunter/jungle
+ name = "primal rags"
+ desc = "Light primal rags that are fashionable and practical, while still maximizing photosynthesis capability for plantpeople."
diff --git a/code/modules/jobs/job_types/artist.dm b/code/modules/jobs/job_types/artist.dm
index 92e77a296737..72640a4efd7a 100644
--- a/code/modules/jobs/job_types/artist.dm
+++ b/code/modules/jobs/job_types/artist.dm
@@ -42,8 +42,8 @@
head = /obj/item/clothing/head/frenchberet
ears = /obj/item/radio/headset/headset_srv
- uniform = /obj/item/clothing/under/rank/artist
- uniform_skirt = /obj/item/clothing/under/rank/artist/skirt
+ uniform = /obj/item/clothing/under/rank/civilian/artist
+ uniform_skirt = /obj/item/clothing/under/rank/civilian/artist/skirt
gloves = /obj/item/clothing/gloves/fingerless
neck = /obj/item/clothing/neck/artist
l_pocket = /obj/item/laser_pointer
diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm
index f280fe74ca06..292d92e020e1 100644
--- a/code/modules/jobs/job_types/atmospheric_technician.dm
+++ b/code/modules/jobs/job_types/atmospheric_technician.dm
@@ -46,8 +46,8 @@
belt = /obj/item/storage/belt/utility/atmostech
ears = /obj/item/radio/headset/headset_eng
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/engineering
- uniform = /obj/item/clothing/under/rank/atmospheric_technician
- uniform_skirt = /obj/item/clothing/under/rank/atmospheric_technician/skirt
+ uniform = /obj/item/clothing/under/rank/engineering/atmospheric_technician
+ uniform_skirt = /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt
r_pocket = /obj/item/analyzer
backpack = /obj/item/storage/backpack/industrial
diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm
index 0f2782538a1f..84cfa3dd6686 100644
--- a/code/modules/jobs/job_types/bartender.dm
+++ b/code/modules/jobs/job_types/bartender.dm
@@ -48,8 +48,8 @@
glasses = /obj/item/clothing/glasses/sunglasses/reagent
ears = /obj/item/radio/headset/headset_srv
- uniform = /obj/item/clothing/under/rank/bartender
- uniform_skirt = /obj/item/clothing/under/rank/bartender/skirt
+ uniform = /obj/item/clothing/under/rank/civilian/bartender
+ uniform_skirt = /obj/item/clothing/under/rank/civilian/bartender/skirt
suit = /obj/item/clothing/suit/armor/vest
backpack_contents = list(/obj/item/storage/box/beanbag=1)
shoes = /obj/item/clothing/shoes/laceup
diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm
index 9565d0670c8c..48a0552745e0 100644
--- a/code/modules/jobs/job_types/botanist.dm
+++ b/code/modules/jobs/job_types/botanist.dm
@@ -43,8 +43,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/botanist
ears = /obj/item/radio/headset/headset_srv
- uniform = /obj/item/clothing/under/rank/hydroponics
- uniform_skirt = /obj/item/clothing/under/rank/hydroponics/skirt
+ uniform = /obj/item/clothing/under/rank/civilian/hydroponics
+ uniform_skirt = /obj/item/clothing/under/rank/civilian/hydroponics/skirt
suit = /obj/item/clothing/suit/apron
gloves =/obj/item/clothing/gloves/botanic_leather
suit_store = /obj/item/plant_analyzer
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 75d55d8b4aed..b3f84025ebde 100644
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -69,8 +69,8 @@
glasses = /obj/item/clothing/glasses/hud/personnel
ears = /obj/item/radio/headset/heads/captain/alt
gloves = /obj/item/clothing/gloves/color/captain
- uniform = /obj/item/clothing/under/rank/captain
- uniform_skirt = /obj/item/clothing/under/rank/captain/skirt
+ uniform = /obj/item/clothing/under/rank/command/captain
+ uniform_skirt = /obj/item/clothing/under/rank/command/captain/skirt
suit = /obj/item/clothing/suit/armor/vest/capcarapace
shoes = /obj/item/clothing/shoes/sneakers/brown
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm
index 39eac3ceebc3..5179809e55af 100644
--- a/code/modules/jobs/job_types/cargo_technician.dm
+++ b/code/modules/jobs/job_types/cargo_technician.dm
@@ -45,8 +45,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/cargo
ears = /obj/item/radio/headset/headset_cargo
- uniform = /obj/item/clothing/under/rank/cargotech
- uniform_skirt = /obj/item/clothing/under/rank/cargotech/skirt
+ uniform = /obj/item/clothing/under/rank/cargo/tech
+ uniform_skirt = /obj/item/clothing/under/rank/cargo/tech/skirt
l_hand = /obj/item/export_scanner
/datum/outfit/job/cargo_tech/no_pda
diff --git a/code/modules/jobs/job_types/centcom.dm b/code/modules/jobs/job_types/centcom.dm
index 714b67375666..3a8907261a69 100644
--- a/code/modules/jobs/job_types/centcom.dm
+++ b/code/modules/jobs/job_types/centcom.dm
@@ -6,7 +6,7 @@
name = "CentCom Official"
var/pdaequip = TRUE
- uniform = /obj/item/clothing/under/rank/centcom_officer
+ uniform = /obj/item/clothing/under/rank/centcom/officer
suit = null
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
@@ -50,7 +50,7 @@
/datum/outfit/centcom/captain //CentCom Captain. Essentially a station captain.
name = "CentCom Captain"
- uniform = /obj/item/clothing/under/rank/centcom_commander
+ uniform = /obj/item/clothing/under/rank/centcom/commander
suit = /obj/item/clothing/suit/armor/vest/capcarapace/centcom
shoes = /obj/item/clothing/shoes/sneakers/brown
gloves = /obj/item/clothing/gloves/color/captain/centcom
@@ -83,7 +83,7 @@
/datum/outfit/centcom/major //CentCom Major.
name = "CentCom Major"
- uniform = /obj/item/clothing/under/rank/centcom_commander
+ uniform = /obj/item/clothing/under/rank/centcom/commander
suit = /obj/item/clothing/suit/armor/vest/capcarapace/centcom
shoes = /obj/item/clothing/shoes/sneakers/brown
gloves = /obj/item/clothing/gloves/color/captain/centcom
@@ -117,7 +117,7 @@
/datum/outfit/centcom/commander //CentCom Commander.
name = "CentCom Commodore"
- uniform = /obj/item/clothing/under/rank/centcom_commander
+ uniform = /obj/item/clothing/under/rank/centcom/commander
suit = /obj/item/clothing/suit/armor/vest/capcarapace/centcom
shoes = /obj/item/clothing/shoes/sneakers/brown
gloves = /obj/item/clothing/gloves/color/captain/centcom
@@ -152,7 +152,7 @@
/datum/outfit/centcom/colonel //CentCom Commander.
name = "CentCom Colonel"
- uniform = /obj/item/clothing/under/rank/centcom_commander
+ uniform = /obj/item/clothing/under/rank/centcom/commander
suit = /obj/item/clothing/suit/armor/vest/capcarapace/centcom
shoes = /obj/item/clothing/shoes/sneakers/brown
gloves = /obj/item/clothing/gloves/color/captain/centcom
@@ -187,7 +187,7 @@
/datum/outfit/centcom/rear_admiral //CentCom Rear-Admiral. Low-tier admiral.
name = "CentCom Rear-Admiral"
- uniform = /obj/item/clothing/under/rank/centcom_admiral
+ uniform = /obj/item/clothing/under/rank/centcom/admiral
suit = null
shoes = /obj/item/clothing/shoes/sneakers/brown
gloves = /obj/item/clothing/gloves/color/captain/centcom
@@ -222,7 +222,7 @@
/datum/outfit/centcom/admiral //CentCom Admiral.
name = "CentCom Admiral"
- uniform = /obj/item/clothing/under/rank/centcom_admiral
+ uniform = /obj/item/clothing/under/rank/centcom/admiral
suit = null
shoes = /obj/item/clothing/shoes/sneakers/brown
gloves = /obj/item/clothing/gloves/color/captain/centcom
@@ -257,7 +257,7 @@
/datum/outfit/centcom/executive_admiral //CentCom Executive Admiral. The final boss.
name = "CentCom Executive Admiral"
- uniform = /obj/item/clothing/under/rank/centcom_admiral/executive
+ uniform = /obj/item/clothing/under/rank/centcom/admiral/executive
suit = null
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/color/captain/centcom/admiral
diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm
index 076e60d6dcee..ca69cc105367 100644
--- a/code/modules/jobs/job_types/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain.dm
@@ -178,8 +178,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/chaplain
ears = /obj/item/radio/headset/headset_srv
- uniform = /obj/item/clothing/under/rank/chaplain
- uniform_skirt = /obj/item/clothing/under/rank/chaplain/skirt
+ uniform = /obj/item/clothing/under/rank/civilian/chaplain
+ uniform_skirt = /obj/item/clothing/under/rank/civilian/chaplain/skirt
backpack_contents = list(/obj/item/camera/spooky = 1)
backpack = /obj/item/storage/backpack/cultpack
satchel = /obj/item/storage/backpack/cultpack
diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm
index bb68d92217d1..f15b5a5dd66a 100644
--- a/code/modules/jobs/job_types/chemist.dm
+++ b/code/modules/jobs/job_types/chemist.dm
@@ -56,8 +56,8 @@
glasses = /obj/item/clothing/glasses/science
ears = /obj/item/radio/headset/headset_med
- uniform = /obj/item/clothing/under/rank/chemist
- uniform_skirt = /obj/item/clothing/under/rank/chemist/skirt
+ uniform = /obj/item/clothing/under/rank/medical/chemist
+ uniform_skirt = /obj/item/clothing/under/rank/medical/chemist/skirt
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/chemist
backpack = /obj/item/storage/backpack/chemistry
diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm
index 5ac7390fee2c..1d974c89c824 100644
--- a/code/modules/jobs/job_types/chief_engineer.dm
+++ b/code/modules/jobs/job_types/chief_engineer.dm
@@ -56,8 +56,8 @@
belt = /obj/item/storage/belt/utility/chief/full
ears = /obj/item/radio/headset/heads/ce
- uniform = /obj/item/clothing/under/rank/chief_engineer
- uniform_skirt = /obj/item/clothing/under/rank/chief_engineer/skirt
+ uniform = /obj/item/clothing/under/rank/engineering/chief_engineer
+ uniform_skirt = /obj/item/clothing/under/rank/engineering/chief_engineer/skirt
shoes = /obj/item/clothing/shoes/sneakers/brown
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
head = /obj/item/clothing/head/hardhat/white
diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm
index 2dec1ebd5fe6..70ecfd847e23 100644
--- a/code/modules/jobs/job_types/chief_medical_officer.dm
+++ b/code/modules/jobs/job_types/chief_medical_officer.dm
@@ -62,8 +62,8 @@
belt = /obj/item/storage/belt/medical/chief/full
ears = /obj/item/radio/headset/heads/cmo
- uniform = /obj/item/clothing/under/rank/chief_medical_officer
- uniform_skirt = /obj/item/clothing/under/rank/chief_medical_officer/skirt
+ uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer
+ uniform_skirt = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
shoes = /obj/item/clothing/shoes/sneakers/brown
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
suit = /obj/item/clothing/suit/toggle/labcoat/cmo
diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm
index aa36c0940476..912acbdfc686 100644
--- a/code/modules/jobs/job_types/clown.dm
+++ b/code/modules/jobs/job_types/clown.dm
@@ -48,7 +48,7 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/clown
ears = /obj/item/radio/headset/headset_srv
- uniform = /obj/item/clothing/under/rank/clown
+ uniform = /obj/item/clothing/under/rank/civilian/clown
shoes = /obj/item/clothing/shoes/clown_shoes
mask = /obj/item/clothing/mask/gas/clown_hat
l_pocket = /obj/item/bikehorn
diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm
index 077438809b92..b1f7c3440cdf 100644
--- a/code/modules/jobs/job_types/cook.dm
+++ b/code/modules/jobs/job_types/cook.dm
@@ -49,8 +49,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/cook
ears = /obj/item/radio/headset/headset_srv
- uniform = /obj/item/clothing/under/rank/chef
- uniform_skirt = /obj/item/clothing/under/rank/chef/skirt
+ uniform = /obj/item/clothing/under/rank/civilian/chef
+ uniform_skirt = /obj/item/clothing/under/rank/civilian/chef/skirt
suit = /obj/item/clothing/suit/toggle/chef
head = /obj/item/clothing/head/chefhat
mask = /obj/item/clothing/mask/fakemoustache/italian
diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm
index 3f95228c5949..89def9e56e1b 100644
--- a/code/modules/jobs/job_types/detective.dm
+++ b/code/modules/jobs/job_types/detective.dm
@@ -66,7 +66,7 @@
ears = /obj/item/radio/headset/headset_sec/alt
uniform = /obj/item/clothing/under/rank/det
- uniform_skirt = /obj/item/clothing/under/rank/det/skirt
+ uniform_skirt = /obj/item/clothing/under/rank/security/detective/skirt
neck = /obj/item/clothing/neck/tie/detective
shoes = /obj/item/clothing/shoes/sneakers/brown
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/jackboots
diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm
index 7825539565b9..48c91a4329b4 100644
--- a/code/modules/jobs/job_types/geneticist.dm
+++ b/code/modules/jobs/job_types/geneticist.dm
@@ -48,8 +48,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/geneticist
ears = /obj/item/radio/headset/headset_medsci
- uniform = /obj/item/clothing/under/rank/geneticist
- uniform_skirt = /obj/item/clothing/under/rank/geneticist/skirt
+ uniform = /obj/item/clothing/under/rank/rnd/geneticist
+ uniform_skirt = /obj/item/clothing/under/rank/rnd/geneticist/skirt
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/genetics
suit_store = /obj/item/flashlight/pen
diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm
index 234d9841c94b..9d429aee2402 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -75,8 +75,8 @@
glasses = /obj/item/clothing/glasses/hud/personnel
ears = /obj/item/radio/headset/heads/hop
- uniform = /obj/item/clothing/under/rank/head_of_personnel
- uniform_skirt = /obj/item/clothing/under/rank/head_of_personnel/skirt
+ uniform = /obj/item/clothing/under/rank/command/head_of_personnel
+ uniform_skirt = /obj/item/clothing/under/rank/command/head_of_personnel/skirt
shoes = /obj/item/clothing/shoes/sneakers/brown
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
head = /obj/item/clothing/head/hopcap
diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm
index 52f942866c02..f3e3820d7a46 100644
--- a/code/modules/jobs/job_types/head_of_security.dm
+++ b/code/modules/jobs/job_types/head_of_security.dm
@@ -82,8 +82,8 @@
belt = /obj/item/storage/belt/security/chief/full
ears = /obj/item/radio/headset/heads/hos/alt
- uniform = /obj/item/clothing/under/rank/head_of_security
- uniform_skirt = /obj/item/clothing/under/rank/head_of_security/skirt
+ uniform = /obj/item/clothing/under/rank/security/head_of_security
+ uniform_skirt = /obj/item/clothing/under/rank/security/head_of_security/skirt
shoes = /obj/item/clothing/shoes/jackboots
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/jackboots
suit = /obj/item/clothing/suit/armor/hos/trenchcoat
diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm
index d7f16be91c27..1f1230523a4b 100644
--- a/code/modules/jobs/job_types/janitor.dm
+++ b/code/modules/jobs/job_types/janitor.dm
@@ -44,5 +44,5 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/janitor
ears = /obj/item/radio/headset/headset_srv
- uniform = /obj/item/clothing/under/rank/janitor
- uniform_skirt = /obj/item/clothing/under/rank/janitor/skirt
+ uniform = /obj/item/clothing/under/rank/civilian/janitor
+ uniform_skirt = /obj/item/clothing/under/rank/civilian/janitor/skirt
diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm
index 6f1bce7c8330..c02350bfb5ee 100644
--- a/code/modules/jobs/job_types/lawyer.dm
+++ b/code/modules/jobs/job_types/lawyer.dm
@@ -43,8 +43,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/fountainpen/lawyer
ears = /obj/item/radio/headset/headset_srvsec
- uniform = /obj/item/clothing/under/lawyer/bluesuit
- uniform_skirt = /obj/item/clothing/under/lawyer/bluesuit/skirt
+ uniform = /obj/item/clothing/under/rank/civilian/lawyer/bluesuit
+ uniform_skirt = /obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt
suit = /obj/item/clothing/suit/toggle/lawyer
shoes = /obj/item/clothing/shoes/laceup
l_hand = /obj/item/storage/briefcase/lawyer
@@ -62,10 +62,10 @@
var/datum/job/lawyer/J = SSjob.GetJobType(jobtype)
J.lawyers++
if(J.lawyers>1)
- uniform = /obj/item/clothing/under/lawyer/purpsuit
+ uniform = /obj/item/clothing/under/rank/civilian/lawyer/purpsuit
suit = /obj/item/clothing/suit/toggle/lawyer/purple
/datum/outfit/job/lawyer/get_types_to_preload()
. = ..()
- . += /obj/item/clothing/under/lawyer/purpsuit
+ . += /obj/item/clothing/under/rank/civilian/lawyer/purpsuit
. += /obj/item/clothing/suit/toggle/lawyer/purple
diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm
index b44a4dcf9e6a..e2a782ececef 100644
--- a/code/modules/jobs/job_types/medical_doctor.dm
+++ b/code/modules/jobs/job_types/medical_doctor.dm
@@ -53,8 +53,8 @@
belt = /obj/item/storage/belt/medical
ears = /obj/item/radio/headset/headset_med
pda_type = /obj/item/modular_computer/tablet/pda/preset/medical
- uniform = /obj/item/clothing/under/rank/medical
- uniform_skirt = /obj/item/clothing/under/rank/medical/skirt
+ uniform = /obj/item/clothing/under/rank/medical/doctor
+ uniform_skirt = /obj/item/clothing/under/rank/medical/doctor/skirt
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/md
l_hand = /obj/item/storage/firstaid/medical
diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm
index 00c7187fb5ff..8819aed7e85d 100644
--- a/code/modules/jobs/job_types/mime.dm
+++ b/code/modules/jobs/job_types/mime.dm
@@ -46,8 +46,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/mime
ears = /obj/item/radio/headset/headset_srv
- uniform = /obj/item/clothing/under/rank/mime
- uniform_skirt = /obj/item/clothing/under/rank/mime/skirt
+ uniform = /obj/item/clothing/under/rank/civilian/mime
+ uniform_skirt = /obj/item/clothing/under/rank/civilian/mime/skirt
mask = /obj/item/clothing/mask/gas/mime
gloves = /obj/item/clothing/gloves/color/white
head = /obj/item/clothing/head/frenchberet
diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm
index 68171d4888ec..ca92acfb1dea 100644
--- a/code/modules/jobs/job_types/quartermaster.dm
+++ b/code/modules/jobs/job_types/quartermaster.dm
@@ -47,8 +47,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/cargo/quartermaster
ears = /obj/item/radio/headset/headset_cargo
- uniform = /obj/item/clothing/under/rank/cargo
- uniform_skirt = /obj/item/clothing/under/rank/cargo/skirt
+ uniform = /obj/item/clothing/under/rank/cargo/qm
+ uniform_skirt = /obj/item/clothing/under/rank/cargo/qm/skirt
shoes = /obj/item/clothing/shoes/sneakers/brown
glasses = /obj/item/clothing/glasses/sunglasses
l_hand = /obj/item/clipboard
diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm
index b6a91ef5c87d..edc2175fe1d5 100644
--- a/code/modules/jobs/job_types/research_director.dm
+++ b/code/modules/jobs/job_types/research_director.dm
@@ -76,8 +76,8 @@
ears = /obj/item/radio/headset/heads/rd
glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses/rd
- uniform = /obj/item/clothing/under/rank/research_director
- uniform_skirt = /obj/item/clothing/under/rank/research_director/skirt
+ uniform = /obj/item/clothing/under/rank/rnd/research_director
+ uniform_skirt = /obj/item/clothing/under/rank/rnd/research_director/skirt
shoes = /obj/item/clothing/shoes/sneakers/brown
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
suit = /obj/item/clothing/suit/toggle/labcoat
diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm
index b90ccf3d6aec..24a090244dc9 100644
--- a/code/modules/jobs/job_types/roboticist.dm
+++ b/code/modules/jobs/job_types/roboticist.dm
@@ -51,8 +51,8 @@
belt = /obj/item/storage/belt/utility/full
ears = /obj/item/radio/headset/headset_sci
- uniform = /obj/item/clothing/under/rank/roboticist
- uniform_skirt = /obj/item/clothing/under/rank/roboticist/skirt
+ uniform = /obj/item/clothing/under/rank/rnd/roboticist
+ uniform_skirt = /obj/item/clothing/under/rank/rnd/roboticist/skirt
suit = /obj/item/clothing/suit/toggle/labcoat
backpack = /obj/item/storage/backpack/science
diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm
index 19e4a4b7e9be..cdb4bce39e17 100644
--- a/code/modules/jobs/job_types/scientist.dm
+++ b/code/modules/jobs/job_types/scientist.dm
@@ -54,8 +54,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/scientist
ears = /obj/item/radio/headset/headset_sci
- uniform = /obj/item/clothing/under/rank/scientist
- uniform_skirt = /obj/item/clothing/under/rank/scientist/skirt
+ uniform = /obj/item/clothing/under/rank/rnd/scientist
+ uniform_skirt = /obj/item/clothing/under/rank/rnd/scientist/skirt
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/science
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index ebb83b948104..eb7df690e7c3 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -160,8 +160,8 @@ GLOBAL_LIST_INIT(available_depts_sec, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICA
pda_type = /obj/item/modular_computer/tablet/pda/preset/security
ears = /obj/item/radio/headset/headset_sec/alt
- uniform = /obj/item/clothing/under/rank/security
- uniform_skirt = /obj/item/clothing/under/rank/security/skirt
+ uniform = /obj/item/clothing/under/rank/security/officer
+ uniform_skirt = /obj/item/clothing/under/rank/security/officer/skirt
gloves = /obj/item/clothing/gloves/color/black
head = /obj/item/clothing/head/helmet/sec
suit = /obj/item/clothing/suit/armor/vest/alt
diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm
index cfc2e3f2b564..78ebe6e7a7cf 100644
--- a/code/modules/jobs/job_types/shaft_miner.dm
+++ b/code/modules/jobs/job_types/shaft_miner.dm
@@ -50,7 +50,7 @@
shoes = /obj/item/clothing/shoes/workboots/mining
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/cargo
gloves = /obj/item/clothing/gloves/color/black
- uniform = /obj/item/clothing/under/rank/miner/lavaland
+ uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland
neck = /obj/item/clothing/neck/bodycam/miner
l_pocket = /obj/item/wormhole_jaunter
r_pocket = /obj/item/flashlight/seclite
diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm
index c1df81b52b5a..ccd3192f6641 100644
--- a/code/modules/jobs/job_types/station_engineer.dm
+++ b/code/modules/jobs/job_types/station_engineer.dm
@@ -100,8 +100,8 @@ GLOBAL_LIST_INIT(available_depts_eng, list(ENG_DEPT_MEDICAL, ENG_DEPT_SCIENCE, E
belt = /obj/item/storage/belt/utility/full/engi
ears = /obj/item/radio/headset/headset_eng
- uniform = /obj/item/clothing/under/rank/engineer
- uniform_skirt = /obj/item/clothing/under/rank/engineer/skirt
+ uniform = /obj/item/clothing/under/rank/engineering/engineer
+ uniform_skirt = /obj/item/clothing/under/rank/engineering/engineer/skirt
shoes = /obj/item/clothing/shoes/workboots
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/engineering
head = /obj/item/clothing/head/hardhat
diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm
index 7b4332d33ca3..9a64807262db 100644
--- a/code/modules/jobs/job_types/virologist.dm
+++ b/code/modules/jobs/job_types/virologist.dm
@@ -59,8 +59,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/medical/viro
ears = /obj/item/radio/headset/headset_med
- uniform = /obj/item/clothing/under/rank/virologist
- uniform_skirt = /obj/item/clothing/under/rank/virologist/skirt
+ uniform = /obj/item/clothing/under/rank/medical/virologist
+ uniform_skirt = /obj/item/clothing/under/rank/medical/virologist/skirt
mask = /obj/item/clothing/mask/surgical
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/virologist
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index eb9d786179fc..3bf719b03290 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -73,8 +73,8 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/security/warden
ears = /obj/item/radio/headset/headset_sec/alt
- uniform = /obj/item/clothing/under/rank/warden
- uniform_skirt = /obj/item/clothing/under/rank/warden/skirt
+ uniform = /obj/item/clothing/under/rank/security/warden
+ uniform_skirt = /obj/item/clothing/under/rank/security/warden/skirt
shoes = /obj/item/clothing/shoes/jackboots
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/jackboots
suit = /obj/item/clothing/suit/armor/vest/warden/alt
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index 19c4ab3b310d..f40f238d3461 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -135,7 +135,7 @@
new /obj/item/dnainjector/xraymut(src)
if(94)
new /obj/item/storage/backpack/clown(src)
- new /obj/item/clothing/under/rank/clown(src)
+ new /obj/item/clothing/under/rank/civilian/clown(src)
new /obj/item/clothing/shoes/clown_shoes(src)
new /obj/item/pda/clown(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
@@ -143,7 +143,7 @@
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/reagent_containers/spray/waterflower(src)
if(95)
- new /obj/item/clothing/under/rank/mime(src)
+ new /obj/item/clothing/under/rank/civilian/mime(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/pda/mime(src)
new /obj/item/clothing/gloves/color/white(src)
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index bbd7b564d5c5..04944caf0207 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -15,7 +15,7 @@
armor = list(MELEE = 25, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 50, WOUND = 10)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat)
resistance_flags = FIRE_PROOF
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/head/hooded/explorer
name = "explorer hood"
@@ -63,8 +63,8 @@
visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
visor_flags_inv = HIDEFACIALHAIR
visor_flags_cover = MASKCOVERSMOUTH
- mutantrace_adjusted = MUTANTRACE_VARIATION
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_adjusted = DIGITIGRADE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
actions_types = list(/datum/action/item_action/adjust)
armor = list(MELEE = 10, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, BIO = 50, RAD = 0, FIRE = 20, ACID = 40, WOUND = 5)
resistance_flags = FIRE_PROOF
@@ -136,6 +136,6 @@
. = ..()
if(isinhands)
return
- var/mutable_appearance/M = mutable_appearance(mob_overlay_icon, "hostile_env_glass")
+ var/mutable_appearance/M = mutable_appearance(worn_icon, "hostile_env_glass")
M.appearance_flags = RESET_COLOR
. += M
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 8abbbc931d7c..04c1dd9b146e 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(aide_list)
if(1)
new /obj/item/shared_storage/red(src)
if(2)
- new /obj/item/clothing/under/drip(src)
+ new /obj/item/clothing/under/costume/drip(src)
new /obj/item/clothing/shoes/drip(src)
if(3)
new /obj/item/bodypart/r_arm/robot/seismic(src)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 42a2a9b99ee4..9454b1d15d25 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -28,9 +28,9 @@
new /obj/item/storage/backpack/duffelbag(src)
new /obj/item/storage/backpack/explorer(src)
new /obj/item/storage/backpack/satchel/explorer(src)
- new /obj/item/clothing/under/rank/miner/lavaland(src)
- new /obj/item/clothing/under/rank/miner/lavaland(src)
- new /obj/item/clothing/under/rank/miner/lavaland(src)
+ new /obj/item/clothing/under/rank/cargo/miner/lavaland(src)
+ new /obj/item/clothing/under/rank/cargo/miner/lavaland(src)
+ new /obj/item/clothing/under/rank/cargo/miner/lavaland(src)
new /obj/item/clothing/shoes/workboots/mining(src)
new /obj/item/clothing/shoes/workboots/mining(src)
new /obj/item/clothing/shoes/workboots/mining(src)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index b6d155ee645d..85b8936937ab 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -869,7 +869,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
bodyparts_to_add -= "waggingspines"
if("snout" in mutant_bodyparts) //Take a closer look at that snout!
- if((H.wear_mask && H.wear_mask.mutantrace_variation == NO_MUTANTRACE_VARIATION && (H.wear_mask.flags_inv & HIDEFACE)) || (H.head && (H.head.flags_inv & HIDEFACE)) || !HD || HD.status == BODYPART_ROBOTIC)
+ if((H.wear_mask && !(H.wear_mask.mutantrace_variation & DIGITIGRADE_VARIATION) && (H.wear_mask.flags_inv & HIDEFACE)) || (H.head && (H.head.flags_inv & HIDEFACE)) || !HD || HD.status == BODYPART_ROBOTIC)
bodyparts_to_add -= "snout"
if("frills" in mutant_bodyparts)
@@ -959,15 +959,15 @@ GLOBAL_LIST_EMPTY(features_by_species)
var/should_be_squished = FALSE
if(H.wear_suit && ((H.wear_suit.flags_inv & HIDEJUMPSUIT) || (H.wear_suit.body_parts_covered & LEGS))) //Check for snowflake suit
var/obj/item/clothing/suit/A = H.wear_suit
- if(A.mutantrace_variation != MUTANTRACE_VARIATION)
+ if(!(A.mutantrace_variation & DIGITIGRADE_VARIATION))
should_be_squished = TRUE
if(H.w_uniform && (H.w_uniform.body_parts_covered & LEGS)) //Check for snowflake jumpsuit
var/obj/item/clothing/under/U = H.w_uniform
- if(U.mutantrace_variation != MUTANTRACE_VARIATION)
+ if(!(U.mutantrace_variation & DIGITIGRADE_VARIATION))
should_be_squished = TRUE
if(H.shoes)
var/obj/item/clothing/shoes/S = H.shoes
- if(S.mutantrace_variation != MUTANTRACE_VARIATION)
+ if(!(S.mutantrace_variation & DIGITIGRADE_VARIATION))
should_be_squished = TRUE
if(should_be_squished)
S.adjusted = NORMAL_STYLE
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index db7a8f7143fd..2991dbe2b0cc 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -150,54 +150,35 @@ There are several things that need to be remembered:
if(wear_suit && (wear_suit.flags_inv & HIDEJUMPSUIT))
return
//This is how non-humanoid clothing works.
- //handled_by_bodytype is used to track whether or not we successfully used an alternate sprite. It's set to TRUE to ease up on copy-paste.
//icon_file MUST be set to null by default, or it causes issues.
- //handled_by_bodytype MUST be set to FALSE under the if(!icon_exists()) statement, or everything breaks.
//"override_file = handled_by_bodytype ? icon_file : null" MUST be added to the arguments of build_worn_icon()
//Friendly reminder that icon_exists(file, state, scream = TRUE) is your friend when debugging this code.
- var/handled_by_bodytype = TRUE
var/icon_file
var/target_overlay = RESOLVE_ICON_STATE(uniform) //Selects proper icon from the vars the clothing has (Search define for more.)
- //Checks for GAGS, if it uses it, use another system, so we can use a single config for both. Both statements below are Yogs changes.
- if(uniform.greyscale_config && uniform.greyscale_colors)
- if(uniform.adjusted == ALT_STYLE)
- target_overlay = "[target_overlay]_d"
- else if(uniform.adjusted == DIGITIGRADE_STYLE)
- target_overlay = "[target_overlay]_l"
- else if(uniform.adjusted == DIGIALT_STYLE)
- target_overlay = "[target_overlay]_d_l"
- else //Using this system we can tidy up clothes sprite files so we don't have massive amounts of same type sprites in a single folder.
- if(uniform.adjusted == ALT_STYLE || uniform.adjusted == DIGIALT_STYLE)
- target_overlay = "[target_overlay]_d"
- if(uniform.adjusted == DIGITIGRADE_STYLE || uniform.adjusted == DIGIALT_STYLE)
- icon_file = 'icons/mob/clothing/uniform/digitigrade.dmi'
-
- if(!icon_exists(icon_file, target_overlay)) //Sanity check.
- icon_file = 'icons/mob/clothing/uniform/uniform.dmi'
- handled_by_bodytype = FALSE
+ if(uniform.adjusted == ALT_STYLE)
+ target_overlay = "[target_overlay]_d"
+ else if(uniform.adjusted == DIGITIGRADE_STYLE) // yogs - digitigrade alt sprites
+ target_overlay = "[target_overlay]_l"
+ else if(uniform.adjusted == DIGIALT_STYLE)
+ target_overlay = "[target_overlay]_d_l" // yogs end
var/mutable_appearance/uniform_overlay
- if(dna && (FEMALE in dna.species.possible_genders))
- var/G = (gender == FEMALE) ? "f" : "m"
- if(G == "f" && uniform.fitted != NO_FEMALE_UNIFORM)
- uniform_overlay = uniform.build_worn_icon(
- default_layer = UNIFORM_LAYER,
- default_icon_file = icon_file,
- isinhands = FALSE,
- femaleuniform = uniform.fitted,
- override_state = target_overlay,
- override_file = handled_by_bodytype ? icon_file : null,
- )
-
- if(!uniform_overlay)
+ if(gender == FEMALE && uniform.fitted != NO_FEMALE_UNIFORM)
+ uniform_overlay = uniform.build_worn_icon(
+ default_layer = UNIFORM_LAYER,
+ default_icon_file = icon_file,
+ isinhands = FALSE,
+ femaleuniform = uniform.fitted,
+ override_state = target_overlay,
+ )
+ else
uniform_overlay = uniform.build_worn_icon(
default_layer = UNIFORM_LAYER,
default_icon_file = icon_file,
isinhands = FALSE,
override_state = target_overlay,
- override_file = handled_by_bodytype ? icon_file : null,
)
@@ -500,9 +481,9 @@ There are several things that need to be remembered:
if(wear_mask)
var/target_overlay = RESOLVE_ICON_STATE(wear_mask)
if("snout" in dna.species.mutant_bodyparts) //checks for snout and uses lizard mask variant
- if(wear_mask.mutantrace_variation == MUTANTRACE_VARIATION && !wear_mask.mask_adjusted)
+ if((wear_mask.mutantrace_variation & DIGITIGRADE_VARIATION) && !wear_mask.mask_adjusted) // i know digitigrade isn't the right word here but still
target_overlay = "[target_overlay]_l"
- else if (wear_mask.mutantrace_adjusted == MUTANTRACE_VARIATION)
+ else if(wear_mask.mutantrace_adjusted & DIGITIGRADE_VARIATION)
target_overlay = "[target_overlay]_l"
update_hud_wear_mask(wear_mask)
if(!(head && (head.flags_inv & HIDEMASK)))
@@ -610,7 +591,7 @@ default_layer: The layer to draw this on if no other layer is specified
default_icon_file: The icon file to draw states from if no other icon file is specified
-isinhands: If true then mob_overlay_icon is skipped so that default_icon_file is used,
+isinhands: If true then worn_icon is skipped so that default_icon_file is used,
in this situation default_icon_file is expected to match either the lefthand_ or righthand_ file var
femalueuniform: A value matching a uniform item's fitted var, if this is anything but NO_FEMALE_UNIFORM, we
@@ -624,7 +605,6 @@ generate/load female uniform sprites matching all previously decided variables
isinhands = FALSE,
femaleuniform = NO_FEMALE_UNIFORM,
override_state = null,
- override_file = null,
)
var/t_state
@@ -634,11 +614,7 @@ generate/load female uniform sprites matching all previously decided variables
t_state = !isinhands ? (worn_icon_state ? worn_icon_state : icon_state) : (item_state ? item_state : icon_state)
//Find a valid icon file from variables+arguments
- var/file2use
- if(override_file)
- file2use = override_file
- else
- file2use = !isinhands ? (mob_overlay_icon ? mob_overlay_icon : default_icon_file) : default_icon_file
+ var/file2use = !isinhands ? (worn_icon ? worn_icon : default_icon_file) : default_icon_file
//Find a valid layer from variables+arguments
var/layer2use = alternate_worn_layer ? alternate_worn_layer : default_layer
diff --git a/code/modules/mob/living/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm
index 414bcb25951d..54f0c2a3f75a 100644
--- a/code/modules/mob/living/inhand_holder.dm
+++ b/code/modules/mob/living/inhand_holder.dm
@@ -18,7 +18,7 @@
if(clothing_layer)
alternate_worn_layer = clothing_layer
if(held_icon)
- mob_overlay_icon = held_icon
+ worn_icon = held_icon
if(worn_state)
item_state = worn_state
if(lh_icon)
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index ee2a43932a33..de3bfe9f2acf 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -82,7 +82,7 @@
/datum/outfit/piratecorpse
name = "Pirate Corpse"
- uniform = /obj/item/clothing/under/pirate
+ uniform = /obj/item/clothing/under/costume/pirate
shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/eyepatch
head = /obj/item/clothing/head/pirate/bandana
@@ -106,7 +106,7 @@
/datum/outfit/russiancorpse
name = "Russian Corpse"
- uniform = /obj/item/clothing/under/soviet
+ uniform = /obj/item/clothing/under/costume/soviet
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/bearpelt
gloves = /obj/item/clothing/gloves/color/black
@@ -195,7 +195,7 @@
/datum/outfit/cat_butcher
name = "Cat Butcher Uniform"
- uniform = /obj/item/clothing/under/rank/medical/green
+ uniform = /obj/item/clothing/under/rank/medical/doctor/green
suit = /obj/item/clothing/suit/apron/surgical
shoes = /obj/item/clothing/shoes/sneakers/white
gloves = /obj/item/clothing/gloves/color/latex/nitrile
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 611a4a7d5b8a..a11ebd60ec72 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -314,7 +314,7 @@
head = /obj/item/clothing/head/helmet/space/plasmaman
belt = /obj/item/tank/internals/plasmaman/belt
else
- uniform = /obj/item/clothing/under/rank/miner/lavaland
+ uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland
if (prob(4))
belt = pickweight(list(/obj/item/storage/belt/mining = 2, /obj/item/storage/belt/mining/alt = 2))
else if(prob(10))
@@ -333,7 +333,7 @@
l_pocket = pickweight(list(/obj/item/stack/spacecash/c1000 = 7, /obj/item/reagent_containers/autoinjector/medipen/survival = 2, /obj/item/borg/upgrade/modkit/cooldown = 1 ))
if("Ashwalker")
mob_species = /datum/species/lizard/ashwalker
- uniform = /obj/item/clothing/under/gladiator/ash_walker
+ uniform = /obj/item/clothing/under/costume/gladiator/ash_walker
if(prob(95))
head = /obj/item/clothing/head/helmet/gladiator
else
@@ -373,7 +373,7 @@
l_pocket = pick(list(/obj/item/jawsoflife, /obj/item/handdrill, /obj/item/weldingtool/experimental))
if("YeOlde")
mob_gender = FEMALE
- uniform = /obj/item/clothing/under/maid
+ uniform = /obj/item/clothing/under/costume/maid
gloves = /obj/item/clothing/gloves/color/white
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/helmet/knight
@@ -396,7 +396,7 @@
back = /obj/item/tank/internals/oxygen
mask = /obj/item/clothing/mask/breath
if("Cultist")
- uniform = /obj/item/clothing/under/roman
+ uniform = /obj/item/clothing/under/costume/roman
suit = /obj/item/clothing/suit/cultrobes
head = /obj/item/clothing/head/culthood
suit_store = /obj/item/tome
diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
index 04f79c27ebbe..1840f5e0c24d 100644
--- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
@@ -465,7 +465,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
id_access_list = list(ACCESS_AWAY_GENERIC3, ACCESS_RESEARCH)
instant = TRUE
id = /obj/item/card/id/silver
- uniform = /obj/item/clothing/under/rank/research_director
+ uniform = /obj/item/clothing/under/rank/rnd/research_director
shoes = /obj/item/clothing/shoes/sneakers/brown
back = /obj/item/storage/backpack/satchel/leather
suit = /obj/item/clothing/suit/toggle/labcoat
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 6e192f888d24..2b3817fb2986 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -2508,7 +2508,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/role_restricted/armoredmechsuit
name = "Cybersun Mech Pilot's Suit"
desc = "A black and red stylishly armored mech pilot's suit used by Cybersun's elite mecha pilots. Provides potent protection both inside and outside a mech."
- item = /obj/item/clothing/under/mech_suit/cybersun
+ item = /obj/item/clothing/under/costume/mech_suit/cybersun
cost = 4
manufacturer = /datum/corporation/traitor/cybersun
restricted_roles = list("Research Director", "Scientist", "Roboticist")
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 2dbeb9a768dd..a692b87f385e 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -9,61 +9,61 @@
vend_reply = "Thank you for using AutoDrobe!"
products = list(/obj/item/clothing/suit/chickensuit = 1,
/obj/item/clothing/head/chicken = 1,
- /obj/item/clothing/under/rank/blueclown = 1,
- /obj/item/clothing/under/rank/greenclown = 1,
- /obj/item/clothing/under/rank/yellowclown = 1,
- /obj/item/clothing/under/rank/orangeclown = 1,
- /obj/item/clothing/under/rank/purpleclown = 1,
- /obj/item/clothing/under/gladiator = 1,
+ /obj/item/clothing/under/rank/civilian/clown/blue = 1,
+ /obj/item/clothing/under/rank/civilian/clown/green = 1,
+ /obj/item/clothing/under/rank/civilian/clown/yellow = 1,
+ /obj/item/clothing/under/rank/civilian/clown/orange = 1,
+ /obj/item/clothing/under/rank/civilian/clown/purple = 1,
+ /obj/item/clothing/under/costume/gladiator = 1,
/obj/item/clothing/head/helmet/gladiator = 1,
- /obj/item/clothing/under/gimmick/rank/captain/suit = 1,
- /obj/item/clothing/under/gimmick/rank/captain/suit/skirt = 1,
+ /obj/item/clothing/under/rank/command/captain/suit = 1,
+ /obj/item/clothing/under/rank/command/captain/suit/skirt = 1,
/obj/item/clothing/mask/rmask = 1,
/obj/item/clothing/head/flatcap = 1,
/obj/item/clothing/suit/toggle/labcoat/mad = 1,
/obj/item/clothing/shoes/jackboots = 10, //yogs added more jack boots
- /obj/item/clothing/under/schoolgirl = 1,
- /obj/item/clothing/under/schoolgirl/red = 1,
- /obj/item/clothing/under/schoolgirl/green = 1,
- /obj/item/clothing/under/schoolgirl/orange = 1,
+ /obj/item/clothing/under/costume/schoolgirl = 1,
+ /obj/item/clothing/under/costume/schoolgirl/red = 1,
+ /obj/item/clothing/under/costume/schoolgirl/green = 1,
+ /obj/item/clothing/under/costume/schoolgirl/orange = 1,
/obj/item/clothing/head/kitty = 1,
- /obj/item/clothing/under/skirt/black = 1,
+ /obj/item/clothing/under/dress/skirt/black = 1,
/obj/item/clothing/head/beret = 1,
/obj/item/clothing/accessory/waistcoat = 1,
- /obj/item/clothing/under/suit_jacket = 1,
+ /obj/item/clothing/under/suit = 1,
/obj/item/clothing/head/that = 1,
- /obj/item/clothing/under/kilt = 1,
+ /obj/item/clothing/under/costume/kilt = 1,
/obj/item/clothing/head/beret/vintage = 1,
/obj/item/clothing/head/beret/archaic = 1,
/obj/item/clothing/glasses/monocle = 1, //yogs added a single space the horrors!
/obj/item/clothing/head/bowler = 1,
/obj/item/cane = 1,
- /obj/item/clothing/under/sl_suit = 1,
+ /obj/item/clothing/under/suit/sl_suit = 1,
/obj/item/clothing/mask/fakemoustache = 1,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,
/obj/item/clothing/head/plaguedoctorhat = 1,
/obj/item/clothing/mask/gas/plaguedoctor = 1,
/obj/item/clothing/suit/toggle/owlwings = 1,
- /obj/item/clothing/under/owl = 1,
+ /obj/item/clothing/under/costume/owl = 1,
/obj/item/clothing/mask/gas/owl_mask = 1,
/obj/item/clothing/suit/toggle/owlwings/griffinwings = 1,
- /obj/item/clothing/under/griffin = 1,
+ /obj/item/clothing/under/costume/griffin = 1,
/obj/item/clothing/shoes/griffin = 1,
/obj/item/clothing/head/griffin = 1,
/obj/item/clothing/head/lobsterhat = 1,
- /obj/item/clothing/under/lobster = 1,
+ /obj/item/clothing/under/costume/lobster = 1,
/obj/item/clothing/gloves/boxing/crustacean = 1,
- /obj/item/clothing/under/weiner = 1,
+ /obj/item/clothing/under/costume/weiner = 1,
/obj/item/clothing/suit/buns = 1,
/obj/item/clothing/head/hatsky = 1,
/obj/item/clothing/suit/apron = 1,
- /obj/item/clothing/under/waiter = 1,
+ /obj/item/clothing/under/suit/waiter = 1,
/obj/item/clothing/suit/jacket/miljacket = 1,
- /obj/item/clothing/under/pirate = 1,
+ /obj/item/clothing/under/costume/pirate = 1,
/obj/item/clothing/suit/pirate = 1,
/obj/item/clothing/head/pirate = 1,
/obj/item/clothing/head/pirate/bandana = 1,
- /obj/item/clothing/under/soviet = 1,
+ /obj/item/clothing/under/costume/soviet = 1,
/obj/item/clothing/head/ushanka = 1,
/obj/item/clothing/suit/imperium_monk = 1,
/obj/item/clothing/mask/gas/cyborg = 1,
@@ -71,7 +71,7 @@
/obj/item/clothing/suit/chaplainsuit/whiterobe = 1,
/obj/item/clothing/head/wizard/marisa/fake = 1,
/obj/item/clothing/suit/wizrobe/marisa/fake = 1,
- /obj/item/clothing/under/sundress = 1,
+ /obj/item/clothing/under/dress/sundress = 1,
/obj/item/clothing/head/witchwig = 1,
/obj/item/staff/broom = 1,
/obj/item/clothing/suit/wizrobe/fake = 1,
@@ -80,11 +80,11 @@
/obj/item/staff = 3,
/obj/item/toy/dummy = 2,
/obj/item/clothing/mask/gas/sexyclown = 1,
- /obj/item/clothing/under/rank/clown/sexy = 1,
+ /obj/item/clothing/under/rank/civilian/clown/sexy = 1,
/obj/item/clothing/mask/gas/sexymime = 1,
- /obj/item/clothing/under/sexymime = 1,
- /obj/item/clothing/under/twosexytwomime = 1,
- /obj/item/clothing/under/rank/mime/skirt = 1,
+ /obj/item/clothing/under/rank/civilian/mime/sexy = 1,
+ /obj/item/clothing/under/rank/civilian/mime/twosexytwomime = 1,
+ /obj/item/clothing/under/rank/civilian/mime/skirt = 1,
/obj/item/clothing/mask/rat/bat = 1,
/obj/item/clothing/mask/rat/bee = 1,
/obj/item/clothing/mask/rat/bear = 1,
@@ -104,19 +104,19 @@
/obj/item/clothing/head/pharaoh = 1,
/obj/item/clothing/head/nemes = 1,
/obj/item/clothing/mask/mummy = 2,
- /obj/item/clothing/under/mummy = 2,
- /obj/item/clothing/under/maid = 1,
- /obj/item/clothing/under/janimaid = 1,
+ /obj/item/clothing/under/costume/mummy = 2,
+ /obj/item/clothing/under/costume/maid = 1,
+ /obj/item/clothing/under/rank/civilian/janitor/maid = 1,
/obj/item/clothing/glasses/cold=1,
/obj/item/clothing/glasses/heat=1,
/obj/item/clothing/suit/whitedress = 1,
- /obj/item/clothing/under/jester = 1,
+ /obj/item/clothing/under/costume/jester = 1,
/obj/item/clothing/head/jester = 1,
- /obj/item/clothing/under/villain = 1,
+ /obj/item/clothing/under/costume/villain = 1,
/obj/item/clothing/shoes/singery = 1,
- /obj/item/clothing/under/singery = 1,
+ /obj/item/clothing/under/costume/singery = 1,
/obj/item/clothing/shoes/singerb = 1,
- /obj/item/clothing/under/singerb = 1,
+ /obj/item/clothing/under/costume/singerb = 1,
/obj/item/clothing/suit/hooded/carp_costume = 1,
/obj/item/clothing/suit/hooded/ian_costume = 1,
/obj/item/clothing/suit/hooded/bee_costume = 1,
@@ -124,8 +124,8 @@
/obj/item/clothing/head/snowman = 1,
/obj/item/clothing/mask/joy = 1,
/obj/item/clothing/head/cueball = 1,
- /obj/item/clothing/under/scratch = 1,
- /obj/item/clothing/under/sailor = 1,
+ /obj/item/clothing/under/suit/scratch = 1,
+ /obj/item/clothing/under/costume/sailor = 1,
/obj/item/clothing/ears/headphones = 2,
/obj/item/clothing/head/wig/random = 3, // yogs added a ,
/obj/item/clothing/under/yogs/ronaldmcdonald = 1, // yogs clothes for autodrobe start here
@@ -217,16 +217,16 @@
/obj/item/clothing/suit/hooded/cultrobes/eldritch_toy = 1)
premium = list(/obj/item/clothing/suit/pirate/captain = 2,
/obj/item/clothing/head/pirate/captain = 2,
- /obj/item/clothing/under/rank/rainbowclown = 1,
+ /obj/item/clothing/under/rank/civilian/clown/rainbow = 1,
/obj/item/clothing/head/helmet/roman/fake = 1,
/obj/item/clothing/head/helmet/roman/legionnaire/fake = 1,
- /obj/item/clothing/under/roman = 1,
+ /obj/item/clothing/under/costume/roman = 1,
/obj/item/clothing/shoes/roman = 1,
/obj/item/shield/riot/roman/fake = 1,
/obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
/obj/item/clothing/head/clownmitre = 1,
/obj/item/skub = 1,
- /obj/item/clothing/under/lampskirt = 1,
+ /obj/item/clothing/under/costume/lampskirt = 1,
/obj/item/clothing/under/yogs/soviet_dress_uniform = 1, //yogs start
/obj/item/clothing/under/yogs/rycliesuni = 1,
/obj/item/clothing/head/yogs/toad = 1,
@@ -264,11 +264,11 @@
/obj/item/storage/backpack/satchel/cap = 1,
/obj/item/storage/backpack/duffelbag/captain = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
- /obj/item/clothing/under/rank/captain = 1,
- /obj/item/clothing/under/rank/captain/skirt = 1,
+ /obj/item/clothing/under/rank/command/captain = 1,
+ /obj/item/clothing/under/rank/command/captain/skirt = 1,
/obj/item/clothing/suit/armor/vest/capcarapace = 1,
/obj/item/clothing/head/caphat = 1,
- /obj/item/clothing/under/captainparade = 1,
+ /obj/item/clothing/under/rank/command/captain/parade = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/alt = 1,
/obj/item/clothing/head/caphat/parade = 1,
/obj/item/clothing/suit/captunic = 1,
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 5d80bd02a185..a5835259f4ed 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -48,7 +48,7 @@
/obj/item/storage/belt/fannypack/blue = 3,
/obj/item/storage/belt/fannypack/red = 3,
/obj/item/clothing/ears/headphones = 2,
- /obj/item/clothing/under/overalls = 2,
+ /obj/item/clothing/under/rank/cargo/overalls = 2,
/obj/item/clothing/under/pants/jeans = 2,
/obj/item/clothing/under/pants/classicjeans = 2,
/obj/item/clothing/under/pants/camo = 2,
@@ -61,18 +61,15 @@
/obj/item/clothing/under/pants/track = 2,
/obj/item/clothing/shoes/sneakers/black = 4,
/obj/item/clothing/head/wig/natural = 4,
- /obj/item/clothing/under/plaid_skirt = 2,
- /obj/item/clothing/under/plaid_skirt/blue = 2,
- /obj/item/clothing/under/plaid_skirt/purple = 2,
- /obj/item/clothing/under/plaid_skirt/green = 2,
- /obj/item/clothing/under/skirt/black = 2,
- /obj/item/clothing/under/skirt/blue = 2,
- /obj/item/clothing/under/skirt/red = 2,
- /obj/item/clothing/under/skirt/purple = 2,
- /obj/item/clothing/under/scratch/skirt = 2,
- /obj/item/clothing/under/scratch = 2,
- /obj/item/clothing/under/gimmick/rank/captain/suit/skirt = 2,
- /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt = 2,
+ /obj/item/clothing/under/dress/skirt/plaid = 2,
+ /obj/item/clothing/under/dress/skirt/plaid/blue = 2,
+ /obj/item/clothing/under/dress/skirt/plaid/purple = 2,
+ /obj/item/clothing/under/dress/skirt/plaid/green = 2,
+ /obj/item/clothing/under/dress/skirt/black = 2,
+ /obj/item/clothing/under/suit/scratch/skirt = 2,
+ /obj/item/clothing/under/suit/scratch = 2,
+ /obj/item/clothing/under/rank/command/captain/suit/skirt = 2,
+ /obj/item/clothing/under/rank/command/head_of_personnel/suit/skirt = 2,
/obj/item/clothing/suit/hooded/raincoat = 2,
/obj/item/clothing/suit/jacket = 2,
/obj/item/clothing/suit/jacket/puffer/vest = 2,
@@ -83,12 +80,12 @@
/obj/item/clothing/glasses/regular/jamjar = 1,
/obj/item/clothing/glasses/orange = 1,
/obj/item/clothing/glasses/red = 1,
- /obj/item/clothing/under/suit_jacket/navy = 1,
- /obj/item/clothing/under/suit_jacket/really_black = 1,
- /obj/item/clothing/under/suit_jacket/burgundy = 1,
- /obj/item/clothing/under/suit_jacket/charcoal = 1,
- /obj/item/clothing/under/suit_jacket/white = 1,
- /obj/item/clothing/under/sl_suit = 1,
+ /obj/item/clothing/under/suit/navy = 1,
+ /obj/item/clothing/under/suit/really_black = 1,
+ /obj/item/clothing/under/suit/burgundy = 1,
+ /obj/item/clothing/under/suit/charcoal = 1,
+ /obj/item/clothing/under/suit/white = 1,
+ /obj/item/clothing/under/suit/sl_suit = 1,
/obj/item/clothing/accessory/waistcoat = 1,
/obj/item/clothing/head/that = 1,
/obj/item/clothing/head/fedora/brown = 1,
@@ -99,12 +96,12 @@
/obj/item/clothing/glasses/monocle = 1,
/obj/item/clothing/head/sombrero = 1,
/obj/item/clothing/suit/poncho = 1,
- /obj/item/clothing/under/kilt = 1,
- /obj/item/clothing/under/sundress = 1,
- /obj/item/clothing/under/stripeddress = 1,
- /obj/item/clothing/under/sailordress = 1,
- /obj/item/clothing/under/redeveninggown = 1,
- /obj/item/clothing/under/blacktango = 1,
+ /obj/item/clothing/under/costume/kilt = 1,
+ /obj/item/clothing/under/dress/sundress = 1,
+ /obj/item/clothing/under/dress/stripeddress = 1,
+ /obj/item/clothing/under/dress/sailordress = 1,
+ /obj/item/clothing/under/dress/redeveninggown = 1,
+ /obj/item/clothing/under/dress/blacktango = 1,
/obj/item/clothing/suit/ianshirt = 1,
/obj/item/clothing/suit/nerdshirt = 1,
/obj/item/clothing/under/yogs/tourist = 3,
@@ -117,7 +114,7 @@
/obj/item/clothing/shoes/xeno_wraps = 3,
/obj/item/clothing/suit/jacket/miljacket = 1,
/obj/item/clothing/suit/apron/purple_bartender = 2,
- /obj/item/clothing/under/rank/bartender/purple = 2, //yogs added a ,
+ /obj/item/clothing/under/rank/civilian/bartender/purple = 2, //yogs added a ,
/obj/item/clothing/neck/yogs/stripedscarf/black = 3, //yogs clothes for clothesmate start here
/obj/item/clothing/neck/yogs/stripedscarf/pink = 3,
/obj/item/clothing/neck/yogs/stripedscarf/red = 3,
@@ -166,7 +163,7 @@
/obj/item/clothing/under/yogs/grimhoodie = 2,
/obj/item/clothing/suit/yogs/bikerjacket = 2,
/obj/item/clothing/suit/yogs/varsity = 2,
- /obj/item/clothing/under/lawyer/blacksuit = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/blacksuit = 2,
/obj/item/clothing/suit/toggle/lawyer/black = 2,
/obj/item/clothing/suit/hooded/wintercoat = 2,
/obj/item/clothing/suit/hooded/wintercoat/bluecoat = 2,
@@ -195,17 +192,17 @@
contraband = list(/obj/item/clothing/under/syndicate/tacticool = 1,
/obj/item/clothing/mask/balaclava = 1,
/obj/item/clothing/head/ushanka = 1,
- /obj/item/clothing/under/soviet = 1,
+ /obj/item/clothing/under/costume/soviet = 1,
/obj/item/storage/belt/fannypack/black = 2,
/obj/item/clothing/suit/jacket/letterman_syndie = 1,
/obj/item/clothing/suit/yogs/battlejacket = 2,
- /obj/item/clothing/under/jabroni = 1,
+ /obj/item/clothing/under/costume/jabroni = 1,
/obj/item/clothing/suit/vapeshirt = 1,
- /obj/item/clothing/under/geisha = 1, //yogs added a ,
+ /obj/item/clothing/under/costume/geisha = 1, //yogs added a ,
/obj/item/clothing/under/yogs/soviet_dress_uniform = 1) //yogs
- premium = list(/obj/item/clothing/under/suit_jacket/checkered = 1,
+ premium = list(/obj/item/clothing/under/suit/checkered = 1,
/obj/item/clothing/head/mailman = 1,
- /obj/item/clothing/under/rank/mailman = 1,
+ /obj/item/clothing/under/rank/cargo/mailman = 1,
/obj/item/clothing/suit/jacket/leather = 1,
/obj/item/clothing/suit/jacket/leather/overcoat = 1,
/obj/item/clothing/under/pants/mustangjeans = 1,
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index 0bd952c59b7f..c9688c521637 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -6,8 +6,8 @@
icon_deny = "engi-deny"
panel_type = "panel10"
req_access = list(ACCESS_ENGINE_EQUIP)
- products = list(/obj/item/clothing/under/rank/chief_engineer = 4,
- /obj/item/clothing/under/rank/engineer = 4,
+ products = list(/obj/item/clothing/under/rank/engineering/chief_engineer = 4,
+ /obj/item/clothing/under/rank/engineering/engineer = 4,
/obj/item/clothing/shoes/sneakers/orange = 4,
/obj/item/clothing/head/hardhat = 4,
/obj/item/storage/belt/utility = 4,
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index 774989c7e4a6..7caf8ef8c629 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -24,7 +24,7 @@
/obj/item/ammo_box/magazine/m75 = 2,
/obj/item/reagent_containers/food/snacks/cheesyfries = 5,
/obj/item/reagent_containers/food/snacks/burger/baconburger = 5) //Premium burgers for the premium section
- contraband = list(/obj/item/clothing/under/patriotsuit = 3,
+ contraband = list(/obj/item/clothing/under/costume/patriotsuit = 3,
/obj/item/bedsheet/patriot = 5,
/obj/item/reagent_containers/food/snacks/burger/superbite = 3) //U S A
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
diff --git a/code/modules/vending/plasmaresearch.dm b/code/modules/vending/plasmaresearch.dm
index 423840e74d89..9b529676577a 100644
--- a/code/modules/vending/plasmaresearch.dm
+++ b/code/modules/vending/plasmaresearch.dm
@@ -2,7 +2,7 @@
/obj/machinery/vending/plasmaresearch
name = "\improper Toximate 3000"
desc = "All the fine parts you need in one vending machine!"
- products = list(/obj/item/clothing/under/rank/scientist = 6,
+ products = list(/obj/item/clothing/under/rank/rnd/scientist = 6,
/obj/item/clothing/suit/bio_suit = 6,
/obj/item/clothing/head/bio_hood = 6,
/obj/item/transfer_valve = 6,
@@ -13,4 +13,4 @@
contraband = list(/obj/item/assembly/health = 3)
default_price = 200
extra_price = 250
- payment_department = ACCOUNT_SCI
\ No newline at end of file
+ payment_department = ACCOUNT_SCI
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 4c8d65b165c8..befea3c3001f 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -32,7 +32,7 @@
/obj/item/storage/backpack/security = 3,
/obj/item/storage/backpack/satchel/sec = 3,
/obj/item/storage/backpack/duffelbag/sec = 3,
- /obj/item/clothing/under/rank/security = 3,
+ /obj/item/clothing/under/rank/security/officer = 3,
/obj/item/clothing/under/yogs/armyuniform = 3,
/obj/item/clothing/shoes/jackboots = 3,
/obj/item/clothing/shoes/xeno_wraps/jackboots = 3,
@@ -49,9 +49,9 @@
/obj/item/clothing/under/yogs/redcoatuniform = 5,
/obj/item/clothing/suit/armor/vest/redcoatcoat = 5,
/obj/item/clothing/head/yogs/tricornhat = 5,
- /obj/item/clothing/under/rank/security/skirt = 3,
- /obj/item/clothing/under/rank/security/grey = 3,
- /obj/item/clothing/under/rank/security/shitcurity = 3,
+ /obj/item/clothing/under/rank/security/officer/skirt = 3,
+ /obj/item/clothing/under/rank/security/officer/grey = 3,
+ /obj/item/clothing/under/rank/security/officer/shitcurity = 3,
/obj/item/clothing/under/pants/khaki = 3,
/obj/item/clothing/under/rank/security/blueshirt = 3,
/obj/item/clothing/under/rank/security/secconuniform = 3,
@@ -84,14 +84,14 @@
/obj/item/clothing/head/beret/med = 4,
/obj/item/clothing/suit/hooded/wintercoat/medical = 4,
/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic = 4,
- /obj/item/clothing/under/rank/nursesuit = 4,
+ /obj/item/clothing/under/rank/medical/nursesuit = 4,
/obj/item/clothing/head/nursehat = 4,
/obj/item/clothing/under/yogs/nursedress = 4,
- /obj/item/clothing/under/rank/medical/skirt= 4,
- /obj/item/clothing/under/rank/medical/blue = 4,
- /obj/item/clothing/under/rank/medical/green = 4,
- /obj/item/clothing/under/rank/medical/purple = 4,
- /obj/item/clothing/under/rank/medical = 4,
+ /obj/item/clothing/under/rank/medical/doctor/skirt = 4,
+ /obj/item/clothing/under/rank/medical/doctor/blue = 4,
+ /obj/item/clothing/under/rank/medical/doctor/green = 4,
+ /obj/item/clothing/under/rank/medical/doctor/purple = 4,
+ /obj/item/clothing/under/rank/medical/doctor = 4,
/obj/item/clothing/suit/toggle/labcoat/md = 4,
/obj/item/clothing/suit/toggle/labcoat/emt = 4,
/obj/item/clothing/shoes/sneakers/white = 4,
@@ -117,9 +117,9 @@
/obj/item/storage/backpack/industrial = 3,
/obj/item/storage/backpack/satchel/eng = 3,
/obj/item/clothing/suit/hooded/wintercoat/engineering = 3,
- /obj/item/clothing/under/rank/engineer = 3,
- /obj/item/clothing/under/rank/engineer/skirt = 3,
- /obj/item/clothing/under/rank/engineer/hazard = 3,
+ /obj/item/clothing/under/rank/engineering/engineer = 3,
+ /obj/item/clothing/under/rank/engineering/engineer/skirt = 3,
+ /obj/item/clothing/under/rank/engineering/engineer/hazard = 3,
/obj/item/clothing/suit/hazardvest = 3,
/obj/item/clothing/shoes/workboots = 3,
/obj/item/clothing/shoes/xeno_wraps/engineering = 3,
@@ -147,8 +147,8 @@
/obj/item/storage/backpack/industrial = 2,
/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
/obj/item/clothing/head/beret/atmos = 3,
- /obj/item/clothing/under/rank/atmospheric_technician = 3,
- /obj/item/clothing/under/rank/atmospheric_technician/skirt = 3,
+ /obj/item/clothing/under/rank/engineering/atmospheric_technician = 3,
+ /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 3,
/obj/item/clothing/shoes/sneakers/black = 3)
refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe
payment_department = ACCOUNT_ENG
@@ -184,10 +184,10 @@
product_ads = "Upgraded Assistant Style! Pick yours today!;These shorts are comfy and easy to wear, get yours now!"
vend_reply = "Thank you for using the CargoDrobe!"
products = list(/obj/item/clothing/suit/hooded/wintercoat/cargo = 3,
- /obj/item/clothing/under/rank/cargotech = 3,
- /obj/item/clothing/under/rank/cargotech/skirt = 3,
- /obj/item/clothing/under/rank/cargotech/turtleneck = 3,
- /obj/item/clothing/under/rank/cargotech/skirt/turtleneck = 3,
+ /obj/item/clothing/under/rank/cargo/tech = 3,
+ /obj/item/clothing/under/rank/cargo/tech/skirt = 3,
+ /obj/item/clothing/under/rank/cargo/tech/turtleneck = 3,
+ /obj/item/clothing/under/rank/cargo/tech/skirt/turtleneck = 3,
/obj/item/clothing/shoes/sneakers/black = 3,
/obj/item/clothing/shoes/xeno_wraps/cargo = 3,
/obj/item/clothing/gloves/fingerless = 3,
@@ -195,7 +195,7 @@
/obj/item/radio/headset/headset_cargo = 3,
/obj/item/clothing/accessory/armband/cargo = 2,
/obj/item/storage/bag/mail = 3)
- premium = list(/obj/item/clothing/under/rank/miner = 3)
+ premium = list(/obj/item/clothing/under/rank/cargo/miner = 3)
refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe
payment_department = ACCOUNT_CAR
/obj/item/vending_refill/wardrobe/cargo_wardrobe
@@ -211,8 +211,8 @@
/obj/item/clothing/head/welding/carp = 1,
/obj/item/clothing/head/welding/fancy = 1,
/obj/item/clothing/head/welding/demon = 1,
- /obj/item/clothing/under/rank/roboticist = 2,
- /obj/item/clothing/under/rank/roboticist/skirt = 2,
+ /obj/item/clothing/under/rank/rnd/roboticist = 2,
+ /obj/item/clothing/under/rank/rnd/roboticist/skirt = 2,
/obj/item/clothing/suit/toggle/labcoat = 2,
/obj/item/clothing/suit/toggle/labcoat/wardtlab = 2,
/obj/item/clothing/suit/toggle/labcoat/aeneasrinil = 2,
@@ -238,8 +238,8 @@
/obj/item/storage/backpack/satchel/tox = 3,
/obj/item/clothing/head/beret/sci = 3,
/obj/item/clothing/suit/hooded/wintercoat/science = 3,
- /obj/item/clothing/under/rank/scientist = 3,
- /obj/item/clothing/under/rank/scientist/skirt = 3,
+ /obj/item/clothing/under/rank/rnd/scientist = 3,
+ /obj/item/clothing/under/rank/rnd/scientist/skirt = 3,
/obj/item/clothing/suit/toggle/labcoat/science = 3,
/obj/item/clothing/shoes/sneakers/white = 3,
/obj/item/clothing/shoes/xeno_wraps/science = 3,
@@ -263,8 +263,8 @@
/obj/item/clothing/suit/apron = 2,
/obj/item/clothing/suit/apron/overalls = 3,
/obj/item/clothing/under/yogs/botanyuniform = 3,
- /obj/item/clothing/under/rank/hydroponics = 3,
- /obj/item/clothing/under/rank/hydroponics/skirt = 3,
+ /obj/item/clothing/under/rank/civilian/hydroponics = 3,
+ /obj/item/clothing/under/rank/civilian/hydroponics/skirt = 3,
/obj/item/clothing/mask/bandana = 3,
/obj/item/clothing/accessory/armband/hydro = 3)
refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe
@@ -288,8 +288,8 @@
/obj/item/toner = 3,
/obj/item/clothing/accessory/pocketprotector = 2,
/obj/item/clothing/under/rank/curator/skirt = 2,
- /obj/item/clothing/under/gimmick/rank/captain/suit/skirt = 2,
- /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt = 2,
+ /obj/item/clothing/under/rank/command/captain/suit/skirt = 2,
+ /obj/item/clothing/under/rank/command/head_of_personnel/suit/skirt = 2,
/obj/item/storage/backpack/satchel/explorer = 1,
/obj/item/clothing/under/yogs/treasure = 1,
/obj/item/clothing/under/yogs/colony = 1,
@@ -310,14 +310,14 @@
vend_reply = "Thank you for using the BarDrobe!"
products = list(/obj/item/clothing/head/that = 2,
/obj/item/radio/headset/headset_srv = 2,
- /obj/item/clothing/under/sl_suit = 2,
- /obj/item/clothing/under/rank/bartender = 2,
+ /obj/item/clothing/under/suit/sl_suit = 2,
+ /obj/item/clothing/under/rank/civilian/bartender = 2,
/obj/item/clothing/under/yogs/billydonka = 2,
/obj/item/clothing/head/yogs/billydonkahat = 2,
/obj/item/cane = 2,
/obj/item/clothing/under/yogs/callumsuit = 2,
- /obj/item/clothing/under/rank/bartender/purple = 2,
- /obj/item/clothing/under/rank/bartender/skirt = 2,
+ /obj/item/clothing/under/rank/civilian/bartender/purple = 2,
+ /obj/item/clothing/under/rank/civilian/bartender/skirt = 2,
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/suit/apron/purple_bartender = 2,
/obj/item/clothing/head/soft/black = 2,
@@ -341,7 +341,7 @@
icon_state = "chefdrobe"
product_ads = "Our clothes are guaranteed to protect you from food splatters!"
vend_reply = "Thank you for using the ChefDrobe!"
- products = list(/obj/item/clothing/under/waiter = 2,
+ products = list(/obj/item/clothing/under/suit/waiter = 2,
/obj/item/radio/headset/headset_srv = 2,
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/suit/apron/chef = 3,
@@ -349,8 +349,8 @@
/obj/item/storage/box/mousetraps = 2,
/obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/clothing/suit/toggle/chef = 1,
- /obj/item/clothing/under/rank/chef = 2,
- /obj/item/clothing/under/rank/chef/skirt = 2,
+ /obj/item/clothing/under/rank/civilian/chef = 2,
+ /obj/item/clothing/under/rank/civilian/chef/skirt = 2,
/obj/item/clothing/head/chefhat = 1,
/obj/item/reagent_containers/glass/rag = 2,
/obj/item/clothing/suit/hooded/wintercoat = 2,
@@ -366,12 +366,12 @@
icon_state = "janidrobe"
product_ads = "Come and get your janitorial clothing, now endorsed by lizard janitors everywhere!"
vend_reply = "Thank you for using the JaniDrobe!"
- products = list(/obj/item/clothing/under/rank/janitor = 2,
+ products = list(/obj/item/clothing/under/rank/civilian/janitor = 2,
/obj/item/clothing/under/yogs/casualjanitorsuit = 2,
/obj/item/clothing/suit/yogs/janitorcoat = 2,
/obj/item/clothing/suit/hooded/wintercoat/janitor = 2,
- /obj/item/clothing/under/rank/janitor/skirt = 2,
- /obj/item/clothing/under/janimaid = 2,
+ /obj/item/clothing/under/rank/civilian/janitor/skirt = 2,
+ /obj/item/clothing/under/rank/civilian/janitor/maid = 2,
/obj/item/clothing/gloves/color/black = 2,
/obj/item/clothing/head/soft/purple = 2,
/obj/item/broom = 2,
@@ -401,21 +401,21 @@
icon_state = "lawdrobe"
product_ads = "OBJECTION! Get the rule of law for yourself!"
vend_reply = "Thank you for using the LawDrobe!"
- products = list(/obj/item/clothing/under/lawyer/female = 2,
- /obj/item/clothing/under/lawyer/black = 2,
- /obj/item/clothing/under/lawyer/black/skirt = 2,
- /obj/item/clothing/under/lawyer/red = 2,
- /obj/item/clothing/under/lawyer/red/skirt = 2,
- /obj/item/clothing/under/lawyer/bluesuit = 2,
- /obj/item/clothing/under/lawyer/bluesuit/skirt = 2,
- /obj/item/clothing/under/lawyer/blue/skirt = 2,
+ products = list(/obj/item/clothing/under/rank/civilian/lawyer/female = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/black = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/black/skirt = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/red = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/red/skirt = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/bluesuit = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/blue/skirt = 2,
/obj/item/clothing/under/yogs/prosecutorsuit = 2,
/obj/item/clothing/suit/toggle/lawyer = 2,
- /obj/item/clothing/under/lawyer/purpsuit = 2,
- /obj/item/clothing/under/lawyer/purpsuit/skirt = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/purpsuit = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt = 2,
/obj/item/clothing/suit/toggle/lawyer/purple = 2,
- /obj/item/clothing/under/lawyer/blacksuit = 2,
- /obj/item/clothing/under/lawyer/blacksuit/skirt = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/blacksuit = 2,
+ /obj/item/clothing/under/rank/civilian/lawyer/blacksuit/skirt = 2,
/obj/item/clothing/suit/toggle/lawyer/black = 2,
/obj/item/clothing/shoes/laceup = 2,
/obj/item/clothing/accessory/lawyers_badge = 2)
@@ -434,8 +434,8 @@
/obj/item/storage/backpack/cultpack = 1,
/obj/item/reagent_containers/glass/urn = 10,
/obj/item/clothing/accessory/pocketprotector/cosmetology = 1,
- /obj/item/clothing/under/rank/chaplain = 1,
- /obj/item/clothing/under/rank/chaplain/skirt = 2,
+ /obj/item/clothing/under/rank/civilian/chaplain = 1,
+ /obj/item/clothing/under/rank/civilian/chaplain/skirt = 2,
/obj/item/clothing/shoes/sneakers/black = 1,
/obj/item/clothing/suit/chaplainsuit/nun = 1,
/obj/item/clothing/head/nun_hood = 1,
@@ -472,8 +472,8 @@
icon_state = "chemdrobe"
product_ads = "Our clothes are 0.5% more resistant to acid spills! Get yours now!"
vend_reply = "Thank you for using the ChemDrobe!"
- products = list(/obj/item/clothing/under/rank/chemist = 2,
- /obj/item/clothing/under/rank/chemist/skirt = 2,
+ products = list(/obj/item/clothing/under/rank/medical/chemist = 2,
+ /obj/item/clothing/under/rank/medical/chemist/skirt = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/chemist = 2,
/obj/item/clothing/suit/hooded/wintercoat/medical/chemistry = 2,
@@ -492,8 +492,8 @@
icon_state = "genedrobe"
product_ads = "Perfect for the mad scientist in you!"
vend_reply = "Thank you for using the GeneDrobe!"
- products = list(/obj/item/clothing/under/rank/geneticist = 2,
- /obj/item/clothing/under/rank/geneticist/skirt = 2,
+ products = list(/obj/item/clothing/under/rank/rnd/geneticist = 2,
+ /obj/item/clothing/under/rank/rnd/geneticist/skirt = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/clothing/suit/hooded/wintercoat/science/genetics = 2,
@@ -510,8 +510,8 @@
icon_state = "virodrobe"
product_ads = " Viruses getting you down? Then upgrade to sterilized clothing today!"
vend_reply = "Thank you for using the ViroDrobe"
- products = list(/obj/item/clothing/under/rank/virologist = 2,
- /obj/item/clothing/under/rank/virologist/skirt = 2,
+ products = list(/obj/item/clothing/under/rank/medical/virologist = 2,
+ /obj/item/clothing/under/rank/medical/virologist/skirt = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/virologist = 2,
/obj/item/clothing/suit/hooded/wintercoat/medical/viro = 2,
diff --git a/icons/mob/clothing/uniform/captain.dmi b/icons/mob/clothing/uniform/captain.dmi
new file mode 100644
index 000000000000..9d07cc0b2f07
Binary files /dev/null and b/icons/mob/clothing/uniform/captain.dmi differ
diff --git a/icons/mob/clothing/uniform/cargo.dmi b/icons/mob/clothing/uniform/cargo.dmi
new file mode 100644
index 000000000000..7f97f90f8d36
Binary files /dev/null and b/icons/mob/clothing/uniform/cargo.dmi differ
diff --git a/icons/mob/clothing/uniform/centcom.dmi b/icons/mob/clothing/uniform/centcom.dmi
new file mode 100644
index 000000000000..c54a31d381e0
Binary files /dev/null and b/icons/mob/clothing/uniform/centcom.dmi differ
diff --git a/icons/mob/clothing/uniform/civilian.dmi b/icons/mob/clothing/uniform/civilian.dmi
new file mode 100644
index 000000000000..67c88cf5a031
Binary files /dev/null and b/icons/mob/clothing/uniform/civilian.dmi differ
diff --git a/icons/mob/clothing/uniform/costume.dmi b/icons/mob/clothing/uniform/costume.dmi
new file mode 100644
index 000000000000..aedc77a17e7a
Binary files /dev/null and b/icons/mob/clothing/uniform/costume.dmi differ
diff --git a/icons/mob/clothing/uniform/digitigrade.dmi b/icons/mob/clothing/uniform/digitigrade.dmi
deleted file mode 100644
index 8a9be29a0f67..000000000000
Binary files a/icons/mob/clothing/uniform/digitigrade.dmi and /dev/null differ
diff --git a/icons/mob/clothing/uniform/dress.dmi b/icons/mob/clothing/uniform/dress.dmi
new file mode 100644
index 000000000000..57cfbeb89373
Binary files /dev/null and b/icons/mob/clothing/uniform/dress.dmi differ
diff --git a/icons/mob/clothing/uniform/engineering.dmi b/icons/mob/clothing/uniform/engineering.dmi
new file mode 100644
index 000000000000..1785c58ba43b
Binary files /dev/null and b/icons/mob/clothing/uniform/engineering.dmi differ
diff --git a/icons/mob/clothing/uniform/medical.dmi b/icons/mob/clothing/uniform/medical.dmi
new file mode 100644
index 000000000000..1c185404e8c8
Binary files /dev/null and b/icons/mob/clothing/uniform/medical.dmi differ
diff --git a/icons/mob/clothing/uniform/plasmaman.dmi b/icons/mob/clothing/uniform/plasmaman.dmi
new file mode 100644
index 000000000000..2469e81e1ded
Binary files /dev/null and b/icons/mob/clothing/uniform/plasmaman.dmi differ
diff --git a/icons/mob/clothing/uniform/rnd.dmi b/icons/mob/clothing/uniform/rnd.dmi
new file mode 100644
index 000000000000..0230587fa40e
Binary files /dev/null and b/icons/mob/clothing/uniform/rnd.dmi differ
diff --git a/icons/mob/clothing/uniform/security.dmi b/icons/mob/clothing/uniform/security.dmi
new file mode 100644
index 000000000000..b2a9762dd121
Binary files /dev/null and b/icons/mob/clothing/uniform/security.dmi differ
diff --git a/icons/mob/clothing/uniform/shorts_pants_shirts.dmi b/icons/mob/clothing/uniform/shorts_pants_shirts.dmi
new file mode 100644
index 000000000000..2f2012d458e0
Binary files /dev/null and b/icons/mob/clothing/uniform/shorts_pants_shirts.dmi differ
diff --git a/icons/mob/clothing/uniform/suits.dmi b/icons/mob/clothing/uniform/suits.dmi
new file mode 100644
index 000000000000..a66968c0c269
Binary files /dev/null and b/icons/mob/clothing/uniform/suits.dmi differ
diff --git a/icons/mob/clothing/uniform/syndicate.dmi b/icons/mob/clothing/uniform/syndicate.dmi
new file mode 100644
index 000000000000..1280939fd5f5
Binary files /dev/null and b/icons/mob/clothing/uniform/syndicate.dmi differ
diff --git a/icons/mob/clothing/uniform/trek.dmi b/icons/mob/clothing/uniform/trek.dmi
new file mode 100644
index 000000000000..850b06f890e7
Binary files /dev/null and b/icons/mob/clothing/uniform/trek.dmi differ
diff --git a/icons/mob/clothing/uniform/tribal.dmi b/icons/mob/clothing/uniform/tribal.dmi
new file mode 100644
index 000000000000..91ce3c4786a1
Binary files /dev/null and b/icons/mob/clothing/uniform/tribal.dmi differ
diff --git a/icons/mob/clothing/uniform/uniform.dmi b/icons/mob/clothing/uniform/uniform.dmi
index 851891a391b1..c20fe78cb04c 100644
Binary files a/icons/mob/clothing/uniform/uniform.dmi and b/icons/mob/clothing/uniform/uniform.dmi differ
diff --git a/yogstation.dme b/yogstation.dme
index 6bfa2adfb841..af9b591260df 100644
--- a/yogstation.dme
+++ b/yogstation.dme
@@ -2394,15 +2394,25 @@
#include "code\modules\clothing\under\accessories.dm"
#include "code\modules\clothing\under\badges.dm"
#include "code\modules\clothing\under\color.dm"
-#include "code\modules\clothing\under\miscellaneous.dm"
+#include "code\modules\clothing\under\costume.dm"
#include "code\modules\clothing\under\pants.dm"
#include "code\modules\clothing\under\shorts.dm"
+#include "code\modules\clothing\under\skirt_dress.dm"
+#include "code\modules\clothing\under\suits.dm"
#include "code\modules\clothing\under\syndicate.dm"
#include "code\modules\clothing\under\trek.dm"
-#include "code\modules\clothing\under\jobs\civilian.dm"
+#include "code\modules\clothing\under\tribal.dm"
+#include "code\modules\clothing\under\jobs\cargo.dm"
+#include "code\modules\clothing\under\jobs\centcom.dm"
+#include "code\modules\clothing\under\jobs\command.dm"
#include "code\modules\clothing\under\jobs\engineering.dm"
-#include "code\modules\clothing\under\jobs\medsci.dm"
+#include "code\modules\clothing\under\jobs\medical.dm"
+#include "code\modules\clothing\under\jobs\rnd.dm"
#include "code\modules\clothing\under\jobs\security.dm"
+#include "code\modules\clothing\under\jobs\civilian\civilian.dm"
+#include "code\modules\clothing\under\jobs\civilian\clown_mime.dm"
+#include "code\modules\clothing\under\jobs\civilian\curator.dm"
+#include "code\modules\clothing\under\jobs\Plasmaman\_plasmaman.dm"
#include "code\modules\clothing\under\jobs\Plasmaman\civilian_service.dm"
#include "code\modules\clothing\under\jobs\Plasmaman\engineering.dm"
#include "code\modules\clothing\under\jobs\Plasmaman\medsci.dm"
diff --git a/yogstation/code/datums/ruins/free_miners.dm b/yogstation/code/datums/ruins/free_miners.dm
index 98e1910956e3..b5b6b4fce50b 100644
--- a/yogstation/code/datums/ruins/free_miners.dm
+++ b/yogstation/code/datums/ruins/free_miners.dm
@@ -63,7 +63,7 @@
/datum/outfit/freeminer
name = "Free Miner"
- uniform = /obj/item/clothing/under/rank/miner
+ uniform = /obj/item/clothing/under/rank/cargo/miner
shoes = /obj/item/clothing/shoes/workboots/mining
gloves = /obj/item/clothing/gloves/color/black
back = /obj/item/storage/backpack/industrial
@@ -88,7 +88,7 @@
prompt_name = "a free miner engineer"
/datum/outfit/freeminer/engi
- uniform = /obj/item/clothing/under/overalls
+ uniform = /obj/item/clothing/under/rank/cargo/overalls
l_pocket = null
r_pocket = null
gloves = /obj/item/clothing/gloves/color/yellow
@@ -108,7 +108,7 @@
return TRUE
/datum/outfit/freeminer/captain
- uniform = /obj/item/clothing/under/rank/vice
+ uniform = /obj/item/clothing/under/suit/vice
back = /obj/item/storage/backpack
l_pocket = /obj/item/melee/classic_baton/telescopic
r_pocket = null
diff --git a/yogstation/code/game/gamemodes/vampire/vampire_other.dm b/yogstation/code/game/gamemodes/vampire/vampire_other.dm
index ae80cae4f84f..308d07700fa9 100644
--- a/yogstation/code/game/gamemodes/vampire/vampire_other.dm
+++ b/yogstation/code/game/gamemodes/vampire/vampire_other.dm
@@ -7,7 +7,7 @@
/obj/item/clothing/suit/draculacoat
name = "Vampire Coat"
desc = "What is a man? A miserable little pile of secrets."
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'icons/obj/clothing/suits/suits.dmi'
icon_state = "draculacoat"
item_state = "draculacoat"
diff --git a/yogstation/code/game/objects/items/storage/backpack.dm b/yogstation/code/game/objects/items/storage/backpack.dm
index 1cf6689bf5f8..5a4a6624d7a9 100644
--- a/yogstation/code/game/objects/items/storage/backpack.dm
+++ b/yogstation/code/game/objects/items/storage/backpack.dm
@@ -179,7 +179,7 @@
name = "snail shell"
desc = "You wonder who this came from."
icon = 'yogstation/icons/obj/storage.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/back.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/back.dmi'
item_state = "snail_green"
icon_state = "snail_green"
slowdown = 1
@@ -195,7 +195,7 @@
name = "green shell backpack"
desc = "An emerald-green snail shell converted into a backpack. Still smells of salt."
icon = 'yogstation/icons/obj/storage.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/back.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/back.dmi'
item_state = "snail_green"
icon_state = "snail_green"
@@ -203,7 +203,7 @@
name = "banana backpack"
desc = "Is it a backpack made of bananas or a backpack with a banana texture? The world may never know."
icon = 'yogstation/icons/obj/storage.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/back.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/back.dmi'
icon_state = "bananabackpack"
item_state = "bananabackpack"
@@ -211,7 +211,7 @@
name = "clown face backpack"
desc = "Sometimes there are some things better left off not existing, this is one of them."
icon = 'yogstation/icons/obj/storage.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/back.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/back.dmi'
icon_state = "clownfacebackpack"
item_state = "clownfacebackpack"
@@ -224,7 +224,7 @@
new /obj/item/clothing/under/yogs/rank/physician(src)
new /obj/item/clothing/suit/toggle/labcoat/emt/physician(src)
new /obj/item/clothing/head/soft/emt/phys(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/suit/toggle/labcoat/physician(src)
diff --git a/yogstation/code/game/objects/items/wielded/big_spoon.dm b/yogstation/code/game/objects/items/wielded/big_spoon.dm
index d6f0ad40c6ca..979f36d5804c 100644
--- a/yogstation/code/game/objects/items/wielded/big_spoon.dm
+++ b/yogstation/code/game/objects/items/wielded/big_spoon.dm
@@ -2,7 +2,7 @@
name = "comically large spoon"
desc = "For when you're only allowed one spoonful of something."
icon = 'icons/obj/kitchen.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/back.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/back.dmi'
icon_state = "bigspoon"
item_state = "bigspoon0"
base_icon_state = "bigspoon"
diff --git a/yogstation/code/game/objects/items/wielded/sledgehammer.dm b/yogstation/code/game/objects/items/wielded/sledgehammer.dm
index 750a91ccf359..9c1c26c8df9f 100644
--- a/yogstation/code/game/objects/items/wielded/sledgehammer.dm
+++ b/yogstation/code/game/objects/items/wielded/sledgehammer.dm
@@ -5,7 +5,7 @@
name = "sledgehammer"
desc = "An archaic tool used to drive nails and break down hollow walls."
icon = 'icons/obj/weapons/misc.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/back.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/back.dmi'
icon_state = "sledgehammer"
item_state = "sledgehammer"
lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
diff --git a/yogstation/code/game/objects/structures/bedsheet_bin.dm b/yogstation/code/game/objects/structures/bedsheet_bin.dm
index 8a9b585345d5..ba6e995813cc 100644
--- a/yogstation/code/game/objects/structures/bedsheet_bin.dm
+++ b/yogstation/code/game/objects/structures/bedsheet_bin.dm
@@ -9,7 +9,7 @@ LINEN BINS
//The description is a reference to the Medical Blanket's description.
desc = "It's a very unsterile blanket used in Virology, covered in pathogens of all sorts. You probably shouldn't wear this one."
icon = 'yogstation/icons/obj/bedsheets.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/neck/neck.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/neck/neck.dmi'
icon_state = "sheetvirology"
dream_messages = list("plague", "green", "sneezing", "a virologist")
newbedpath = null
@@ -18,6 +18,6 @@ LINEN BINS
name = "prisoner's blanket"
desc = "An old, heavy-duty, Nanotrasen-issue prison bedsheet. You try not to think about where those stains came from..."
icon = 'yogstation/icons/obj/bedsheets.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/neck/neck.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/neck/neck.dmi'
icon_state = "sheetprisoner"
dream_messages = list("a prison cell", "orange", "a warden", "filth", "captivity", "shackles", "misconduct", "depravity")
diff --git a/yogstation/code/game/objects/structures/ghost_role_spawners.dm b/yogstation/code/game/objects/structures/ghost_role_spawners.dm
index 0e05040098f9..81c29821c7be 100644
--- a/yogstation/code/game/objects/structures/ghost_role_spawners.dm
+++ b/yogstation/code/game/objects/structures/ghost_role_spawners.dm
@@ -126,7 +126,7 @@
/datum/outfit/crewmember
name = "Exploratory Crew Member"
- uniform = /obj/item/clothing/under/rank/scientist
+ uniform = /obj/item/clothing/under/rank/rnd/scientist
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/science
back = /obj/item/storage/backpack/science
@@ -198,7 +198,7 @@
glasses = /obj/item/clothing/glasses/sunglasses
gloves = /obj/item/clothing/gloves/color/captain
- uniform = /obj/item/clothing/under/rank/captain
+ uniform = /obj/item/clothing/under/rank/command/captain
suit = /obj/item/clothing/suit/armor/vest/capcarapace/alt
shoes = /obj/item/clothing/shoes/sneakers/brown
head = /obj/item/clothing/head/caphat/parade
diff --git a/yogstation/code/game/objects/structures/ghostbeacon.dm b/yogstation/code/game/objects/structures/ghostbeacon.dm
index eba5da5ce9ed..bfa3fe67713f 100644
--- a/yogstation/code/game/objects/structures/ghostbeacon.dm
+++ b/yogstation/code/game/objects/structures/ghostbeacon.dm
@@ -88,7 +88,7 @@
id = /obj/item/card/id
head = /obj/item/clothing/head/that
- uniform = /obj/item/clothing/under/assistantformal
+ uniform = /obj/item/clothing/under/rank/civilian/assistantformal
shoes = /obj/item/clothing/shoes/sneakers/brown
glasses = /obj/item/clothing/glasses/sunglasses
back = /obj/item/storage/backpack
diff --git a/yogstation/code/modules/antagonists/gang/gang.dm b/yogstation/code/modules/antagonists/gang/gang.dm
index d125285519a8..cb8d5bb6d05f 100644
--- a/yogstation/code/modules/antagonists/gang/gang.dm
+++ b/yogstation/code/modules/antagonists/gang/gang.dm
@@ -480,7 +480,7 @@
/datum/outfit/gangster
name = "Gangster (Preview only)"
mask = /obj/item/clothing/mask/cigarette/cigar/havana
- uniform = /obj/item/clothing/under/rank/vice
+ uniform = /obj/item/clothing/under/suit/vice
neck = /obj/item/clothing/neck/necklace/dope
head = /obj/item/clothing/head/fedora
diff --git a/yogstation/code/modules/antagonists/gang/gang_datums.dm b/yogstation/code/modules/antagonists/gang/gang_datums.dm
index bcaa21b2029b..7c336579532d 100644
--- a/yogstation/code/modules/antagonists/gang/gang_datums.dm
+++ b/yogstation/code/modules/antagonists/gang/gang_datums.dm
@@ -22,7 +22,7 @@
/datum/team/gang/zerog
name = "Zero-G"
color = "#C0C0C0"
- inner_outfits = list(/obj/item/clothing/under/suit_jacket/white)
+ inner_outfits = list(/obj/item/clothing/under/suit/white)
outer_outfits = list(/obj/item/clothing/suit/hooded/wintercoat)
/datum/team/gang/max
@@ -34,13 +34,13 @@
/datum/team/gang/blasto
name = "Blasto"
color = "#000080"
- inner_outfits = list(/obj/item/clothing/under/suit_jacket/navy)
+ inner_outfits = list(/obj/item/clothing/under/suit/navy)
outer_outfits = list(/obj/item/clothing/suit/jacket/miljacket)
/datum/team/gang/waffle
name = "Waffle"
color = "#808000"
- inner_outfits = list(/obj/item/clothing/under/suit_jacket/green)
+ inner_outfits = list(/obj/item/clothing/under/suit/green)
outer_outfits = list(/obj/item/clothing/suit/poncho)
/datum/team/gang/north
@@ -88,7 +88,7 @@
/datum/team/gang/tunnel
name = "Tunnel"
color = "#FF00FF"
- inner_outfits = list(/obj/item/clothing/under/villain)
+ inner_outfits = list(/obj/item/clothing/under/costume/villain)
outer_outfits = list(/obj/item/clothing/suit/poncho/ponchoshame)
/datum/team/gang/diablo
@@ -129,11 +129,11 @@
/datum/team/gang/rigatonifamily
name = "Rigatoni family"
color = "#cc9900" // p a s t a colored
- inner_outfits = list(/obj/item/clothing/under/rank/chef)
+ inner_outfits = list(/obj/item/clothing/under/rank/civilian/chef)
outer_outfits = list(/obj/item/clothing/suit/apron/chef)
/datum/team/gang/weed
name = "Weed"
color = "#66ff33"
inner_outfits = list(/obj/item/clothing/under/color/darkgreen)
- outer_outfits = list(/obj/item/clothing/suit/vapeshirt)
\ No newline at end of file
+ outer_outfits = list(/obj/item/clothing/suit/vapeshirt)
diff --git a/yogstation/code/modules/clothing/clothing.dm b/yogstation/code/modules/clothing/clothing.dm
index 672703be3a50..d3cf29df1b58 100644
--- a/yogstation/code/modules/clothing/clothing.dm
+++ b/yogstation/code/modules/clothing/clothing.dm
@@ -1,48 +1,48 @@
/obj/item/clothing/ears/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/ears/ears.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/ears/ears.dmi'
icon = 'yogstation/icons/obj/clothing/ears.dmi'
/obj/item/clothing/glasses/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/eyes/eyes.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/eyes/eyes.dmi'
icon = 'yogstation/icons/obj/clothing/glasses.dmi'
/obj/item/clothing/gloves/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/hands/hands.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/hands/hands.dmi'
icon = 'yogstation/icons/obj/clothing/gloves.dmi'
/obj/item/clothing/head/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
/obj/item/clothing/neck/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/neck/neck.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/neck/neck.dmi'
icon = 'yogstation/icons/obj/clothing/neck.dmi'
/obj/item/clothing/mask/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/mask/mask.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/mask/mask.dmi'
icon = 'yogstation/icons/obj/clothing/masks.dmi'
/obj/item
var/list/alternate_screams = list()
/obj/item/clothing/shoes/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi'
icon = 'yogstation/icons/obj/clothing/shoes.dmi'
/obj/item/clothing/suit/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
/obj/item/clothing/under/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/uniform/uniform.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/uniform/uniform.dmi'
icon = 'yogstation/icons/obj/clothing/uniforms.dmi'
/obj/item/clothing/back/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/back.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/back.dmi'
icon = 'yogstation/icons/obj/clothing/back.dmi'
/obj/item/storage/belt/yogs
- mob_overlay_icon = 'yogstation/icons/mob/clothing/belt.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/belt.dmi'
icon = 'yogstation/icons/obj/clothing/belts.dmi'
/obj/item/clothing/torncloth
diff --git a/yogstation/code/modules/clothing/donator.dm b/yogstation/code/modules/clothing/donator.dm
index 434c156005cb..d94ce11b5727 100644
--- a/yogstation/code/modules/clothing/donator.dm
+++ b/yogstation/code/modules/clothing/donator.dm
@@ -85,7 +85,7 @@
/obj/item/clothing/suit/yogs/megumu
name = "Megumu's dress"
desc = "Tofu!"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "megumu_dress"
item_state = "megumu_dress"
@@ -108,7 +108,7 @@
/obj/item/clothing/neck/yogs/megumu
name = "Megumu's Cape"
desc = "Tofu!"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/neck/neck.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/neck/neck.dmi'
icon = 'yogstation/icons/obj/clothing/neck.dmi'
icon_state = "megumu_cape"
item_state = "megumu_cape"
@@ -116,7 +116,7 @@
/obj/item/clothing/head/soft/fishfear
name = "novelty fishing cap"
desc = "It's an extra-tall snap-back hat with a picture of a fish, and text that reads: \"Women fear me. Fish fear me. Men turn their eyes away from me as I walk. No beast dares make a sound in my presence. I am alone on this barren Earth.\""
- mob_overlay_icon = 'icons/mob/clothing/head/fishfear.dmi'
+ worn_icon = 'icons/mob/clothing/head/fishfear.dmi'
worn_x_dimension = 32
worn_y_dimension = 64
icon_state = "fishfearsoft"
@@ -153,7 +153,7 @@
/obj/item/storage/box/isotope/PopulateContents()
. = ..()
- new /obj/item/clothing/under/rank/scientist/black(src)
+ new /obj/item/clothing/under/rank/rnd/scientist/black(src)
new /obj/item/lighter/badass(src)
/obj/item/storage/box/hisa
@@ -197,7 +197,7 @@
/obj/item/bedsheet/pride
name = "Pride Bedsheet"
desc = "A very prideful queen size bedsheet. How you are carrying all that weight is beyond me though."
- mob_overlay_icon = 'icons/mob/clothing/neck/sheets.dmi'
+ worn_icon = 'icons/mob/clothing/neck/sheets.dmi'
icon_state = "sheetpride"
item_state = "sheetpride"
randomizable = FALSE
diff --git a/yogstation/code/modules/clothing/fishing.dm b/yogstation/code/modules/clothing/fishing.dm
index fdb292469e9d..b58930cc32f4 100644
--- a/yogstation/code/modules/clothing/fishing.dm
+++ b/yogstation/code/modules/clothing/fishing.dm
@@ -3,7 +3,7 @@
desc = "She said she's down to fish!"
icon_state = "fishing_cap"
item_state = "fishing_cap"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
/obj/item/clothing/head/fishing/Initialize(mapload)
@@ -15,7 +15,7 @@
desc = "As she banging my line, she wastin my time."
icon_state = "fishing_vest"
item_state = "fishing_vest"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
/obj/item/clothing/suit/fishing/Initialize(mapload)
@@ -27,7 +27,7 @@
desc = "Packin my tackle box down by the brook."
icon_state = "fishing_gloves"
item_state = "fishing_gloves"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/hands/hands.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/hands/hands.dmi'
icon = 'yogstation/icons/obj/clothing/gloves.dmi'
/obj/item/clothing/gloves/fishing/Initialize(mapload)
@@ -39,7 +39,7 @@
desc = "We livin' the life, if we ain't going fishing then don't waste my time."
icon_state = "fishing_sandals"
item_state = "fishing_sandals"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi'
icon = 'yogstation/icons/obj/clothing/shoes.dmi'
/obj/item/clothing/shoes/fishing/Initialize(mapload)
diff --git a/yogstation/code/modules/clothing/head.dm b/yogstation/code/modules/clothing/head.dm
index 1a9cf51d471e..6abb32658335 100644
--- a/yogstation/code/modules/clothing/head.dm
+++ b/yogstation/code/modules/clothing/head.dm
@@ -44,7 +44,7 @@
name = "nam helmet"
desc = "An ancient war helmet that is perfect for protecting your noggin from greytide clobberin'!"
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "namhelm"
item_state = "namhelm"
@@ -130,7 +130,7 @@
name = "war helmet"
desc = "Get ready boys, we are going to war!"
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "kr_helm"
item_state = "kr_helm"
@@ -156,7 +156,7 @@
name = "corporate warden beret"
desc = "A special black beret with a warden's insignia in the middle. This one is commonly worn by wardens of the corporation."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_corporate_warden"
armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 30, acid = 60)
strip_delay = 60
@@ -165,7 +165,7 @@
name = "corporate security beret"
desc = "A special black beret for the mundane life of a corporate security officer."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_corporate_officer"
armor = list(melee = 40, bullet = 30, laser = 30,energy = 10, bomb = 25, bio = 0, rad = 0, fire = 20, acid = 50)
strip_delay = 60
@@ -174,7 +174,7 @@
name = "engineering beret"
desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_engineering"
armor = list(rad = 10, fire = 10)
strip_delay = 60
@@ -183,7 +183,7 @@
name = "atmospherics beret"
desc = "A beret for those who have shown immaculate proficiency in piping. Or plumbing."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_atmospherics"
armor = list(rad = 10, fire = 80)
strip_delay = 60
@@ -192,7 +192,7 @@
name = "chief engineer beret"
desc = "A white beret with the engineering insignia emblazoned on it. Its owner knows what they're doing. Probably."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_ce"
armor = list(rad = 20, fire = 80)
strip_delay = 60
@@ -201,7 +201,7 @@
name = "science beret"
desc = "A purple beret with the science insignia emblazoned on it. It has that authentic burning plasma smell."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_sci"
armor = list(bomb = 5, bio = 5, fire = 5, acid = 10)
strip_delay = 60
@@ -210,7 +210,7 @@
name = "research director beret"
desc = "A purple beret with a golden science insignia emblazoned on it. It has that authentic burning plasma smell, with a hint of tritium."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_rd"
armor = list(bomb = 15, bio = 10, fire = 10, acid = 15)
strip_delay = 60
@@ -219,7 +219,7 @@
name = "medical beret"
desc = "A white beret with a blue cross finely threaded into it. It has that sterile smell about it."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_med"
armor = list(bio = 20)
strip_delay = 60
@@ -228,7 +228,7 @@
name = "chemistry beret"
desc = "A white beret with an orange cross finely threaded into it. It smells like hazardous chemicals."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_chem"
armor = list(fire = 10, acid = 30)
strip_delay = 60
@@ -237,7 +237,7 @@
name = "chief medical officer beret"
desc = "A baby blue beret with the insignia of Medistan. It smells very sterile."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_cmo"
armor = list(bio = 30, acid = 20)
strip_delay = 60
@@ -246,7 +246,7 @@
name = "head of personnel beret"
desc = "A lovely blue beret with a red nanotrasen logo emblazoned on it. It seems to have a bit of dog hair in it."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_hop"
armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 50, acid = 50)
strip_delay = 90
@@ -255,7 +255,7 @@
name = "captain beret"
desc = "A lovely blue Captain beret with a gold and white insignia."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_captain"
armor = list(melee = 50, bullet = 30, laser = 20, energy = 10, bomb = 15, bio = 10, rad = 10, fire = 10, acid = 60)
strip_delay = 90
@@ -266,7 +266,7 @@
lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "demonwelding"
item_state = "demonwelding"
@@ -276,7 +276,7 @@
lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "knightwelding"
item_state = "welding"
@@ -286,7 +286,7 @@
lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "fancywelding"
item_state = "fancywelding"
@@ -296,7 +296,7 @@
lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "engiewelding"
item_state = "engiewelding"
@@ -306,14 +306,14 @@
lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "carpwelding"
item_state = "carpwelding"
/obj/item/clothing/head/milliondollarhat
name = "millionaires hat"
desc = "On a small label at the bottom of the hat it reads.'My name is Doug Dimmadome, owner of the Dimmsdale Dimmadome and thank you for buying one of my top quality dimmahats!' On an even smaller label hidden in the small label it reads 'No refunds'."
- mob_overlay_icon = 'yogstation/icons/mob/large-worn-icons/1024x1024/head.dmi'
+ worn_icon = 'yogstation/icons/mob/large-worn-icons/1024x1024/head.dmi'
icon = 'yogstation/icons/obj/clothing/1024x1024/hats.dmi'
icon_state = "milliondollarhat"
item_state = "milliondollarhat"
diff --git a/yogstation/code/modules/clothing/head/jobs.dm b/yogstation/code/modules/clothing/head/jobs.dm
index 0bc30548bd16..ee65ee4686c7 100644
--- a/yogstation/code/modules/clothing/head/jobs.dm
+++ b/yogstation/code/modules/clothing/head/jobs.dm
@@ -21,7 +21,7 @@
name = "Brig Physician's cap"
desc = "It's a baseball hat with a dark brown color and a reflective cross on the top. Has BP embossed into it."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "emtsecsoft"
soft_type = "emtsec"
@@ -34,6 +34,6 @@
name = "corporate physician beret"
desc = "A special black beret for the mundane life of a corporate brig physician."
icon = 'yogstation/icons/obj/clothing/hats.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "beret_corporate_phys"
armor = list(BIO = 20) //So it isnt a direct upgrade over the normal berret
diff --git a/yogstation/code/modules/clothing/head/misc.dm b/yogstation/code/modules/clothing/head/misc.dm
index bfb6fa7996aa..634001a79597 100644
--- a/yogstation/code/modules/clothing/head/misc.dm
+++ b/yogstation/code/modules/clothing/head/misc.dm
@@ -29,7 +29,7 @@
/obj/item/clothing/head/helmet/juggernaut
name = "Juggernaut Helmet"
desc = "I...am...the...JUGGERNAUT!!!."
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
icon_state = "juggernauthelm"
item_state = "juggernauthelm"
@@ -50,7 +50,7 @@
/obj/item/clothing/head/yogs/goatpope
name = "goat pope hat"
desc = "And on the seventh day King Goat said there will be cabbage!"
- mob_overlay_icon = 'yogstation/icons/mob/large-worn-icons/64x64/head.dmi'
+ worn_icon = 'yogstation/icons/mob/large-worn-icons/64x64/head.dmi'
icon_state = "goatpope"
item_state = "goatpope"
worn_x_dimension = 64
diff --git a/yogstation/code/modules/clothing/mask.dm b/yogstation/code/modules/clothing/mask.dm
index a951f537511c..b36ccee3bb8b 100644
--- a/yogstation/code/modules/clothing/mask.dm
+++ b/yogstation/code/modules/clothing/mask.dm
@@ -206,7 +206,7 @@
name = "banana mask"
desc = "Do you want a banana?"
clothing_flags = MASKINTERNALS
- mob_overlay_icon = 'yogstation/icons/mob/large-worn-icons/64x64/masks.dmi'
+ worn_icon = 'yogstation/icons/mob/large-worn-icons/64x64/masks.dmi'
icon_state = "bananamask"
item_state = "bananamask"
worn_x_dimension = 64
diff --git a/yogstation/code/modules/clothing/shoes/miscellaneous.dm b/yogstation/code/modules/clothing/shoes/miscellaneous.dm
index 467a4c37951e..5a7dce81229a 100644
--- a/yogstation/code/modules/clothing/shoes/miscellaneous.dm
+++ b/yogstation/code/modules/clothing/shoes/miscellaneous.dm
@@ -17,7 +17,7 @@
name = "scary clown shoes"
desc = "Clown shoes often seen being worn by sewer clowns."
icon = 'yogstation/icons/obj/clothing/shoes.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi'
icon_state = "scaryclownshoes"
item_state = "scaryclownshoes"
@@ -25,7 +25,7 @@
name = "bee shoes"
desc = "It's hip to wear bees."
icon = 'yogstation/icons/obj/clothing/shoes.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi'
icon_state = "bee_shoes"
item_state = "bee_shoes"
diff --git a/yogstation/code/modules/clothing/suits/armor.dm b/yogstation/code/modules/clothing/suits/armor.dm
index ba67ea89f6eb..99133c646fd8 100644
--- a/yogstation/code/modules/clothing/suits/armor.dm
+++ b/yogstation/code/modules/clothing/suits/armor.dm
@@ -12,7 +12,7 @@
/obj/item/clothing/suit/armor/vest/rycliesarmour
name = "war armour"
desc = "Good for protecting your chest during war."
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "rycliesarmour"
item_state = "rycliesarmour"
@@ -20,7 +20,7 @@
/obj/item/clothing/suit/armor/vest/namflakjacket
name = "nam flak jacket"
desc = "Good for protecting your chest from napalm and toolboxes!"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "namflakjacket"
item_state = "namflakjacket"
@@ -28,7 +28,7 @@
/obj/item/clothing/suit/armor/vest/redcoatcoat
name = "redcoat coat"
desc = "Security is coming! Security is coming! Also padded with kevlar for protection."
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "red_coat_coat"
item_state = "red_coat_coat"
@@ -36,7 +36,7 @@
/obj/item/clothing/suit/armor/vest/secmiljacket
name = "sec military jacket"
desc = "Aviators not included. Now with extra padding!"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "secmiljacket"
item_state = "secmiljacket"
@@ -56,7 +56,7 @@
/obj/item/clothing/suit/armor/vest/hosjacket
name = "head of security jacket"
desc = "All the style of a jacket with all the protection of a armor vest!"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "hos_jacket"
item_state = "hos_item"
@@ -64,7 +64,7 @@
/obj/item/clothing/suit/armor/vest/wardenjacket
name = "warden's black jacket"
desc = "All the style of a jacket with all the protection of a armor vest!"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "warden_jacket"
item_state = "warden_item"
@@ -72,7 +72,7 @@
/obj/item/clothing/suit/armor/hos/germancoat
name = "padded german coat"
desc = "For those cold german winters or those heads of security that want to show their true colors."
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "german_coat"
item_state = "german_item"
@@ -85,7 +85,7 @@
/obj/item/clothing/suit/armor/vest/sovietcoat
name = "soviet coat"
desc = "Glory to Arstotzka! Now with padding protection!"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "soviet_coat"
item_state = "soviet_item"
@@ -93,7 +93,7 @@
/obj/item/clothing/suit/armor/vest/rurmcoat
name = "russian officer coat"
desc = "Papers please. Now with padding protection!"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "ru_rmcoat"
item_state = "ru_rmcoat"
@@ -101,7 +101,7 @@
/obj/item/clothing/suit/armor/heavy/juggernaut
name = "Juggernaut Suit"
desc = "I...am...the...JUGGERNAUT!!!"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "juggernaut"
item_state = "juggernaut"
diff --git a/yogstation/code/modules/clothing/suits/labcoat.dm b/yogstation/code/modules/clothing/suits/labcoat.dm
index e4afdff8b7e0..adefa30480ef 100644
--- a/yogstation/code/modules/clothing/suits/labcoat.dm
+++ b/yogstation/code/modules/clothing/suits/labcoat.dm
@@ -10,7 +10,7 @@
desc = "A protective labcoat for medical emergencies on off-world planets."
armor = list(MELEE = 25, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 50, WOUND = 10)
allowed = list(/obj/item/analyzer,/obj/item/multitool/tricorder,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/autoinjector,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/melee/classic_baton/telescopic,/obj/item/soap,/obj/item/sensor_device,/obj/item/tank/internals, /obj/item/hypospray)
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon_state = "labcoat_mining"
item_state = "labcoat_mining"
diff --git a/yogstation/code/modules/clothing/suits/miscellaneous.dm b/yogstation/code/modules/clothing/suits/miscellaneous.dm
index ce8501efe69c..58e9d811d4d0 100644
--- a/yogstation/code/modules/clothing/suits/miscellaneous.dm
+++ b/yogstation/code/modules/clothing/suits/miscellaneous.dm
@@ -1,5 +1,5 @@
/obj/item/clothing/suit/hooded/wintercoat/engineering/tcomms
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
name = "network admin's winter coat"
icon_state = "coatsignaltech"
@@ -7,7 +7,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering/tcomms
/obj/item/clothing/head/hooded/winterhood/engineering/tcomms
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
icon_state = "winterhood_signaltech"
@@ -22,7 +22,7 @@
icon_state = "blackwhitesweat"
/obj/item/clothing/suit/hooded/wintercoat/bluecoat
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
name = "Blue winter coat"
icon_state = "coatwinterblue"
@@ -30,7 +30,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/bluecoat
/obj/item/clothing/head/hooded/winterhood/bluecoat
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
icon_state = "hood_blue"
@@ -53,7 +53,7 @@
item_state = "hamiltoncoat"
/obj/item/clothing/suit/hooded/sandsuit
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
name = "sand suit"
desc = "A suit often worn by desert nomads."
@@ -63,7 +63,7 @@
hoodtype = /obj/item/clothing/head/hooded/sandsuit
/obj/item/clothing/head/hooded/sandsuit
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
icon_state = "sandsuit"
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR
@@ -126,7 +126,7 @@
name = "robotics steampunk labcoat"
desc = "A labcoat with a steampunk design to it for a roboticist."
icon = 'yogstation/icons/obj/clothing/suits.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon_state = "wardt_lab"
item_state = "wardt_lab"
@@ -134,7 +134,7 @@
name = "robotics fancy labcoat"
desc = "A labcoat with a few markings denoting it as a labcoat for a roboticist."
icon = 'yogstation/icons/obj/clothing/suits.dmi'
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon_state = "aeneasrinil"
item_state = "aeneasrinil"
@@ -190,7 +190,7 @@
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio)
/obj/item/clothing/suit/hooded/fiendcowl
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
name = "fiend cowl"
desc = "Only a really evil person would wear such a fiendish cowl!"
@@ -200,13 +200,13 @@
hoodtype = /obj/item/clothing/head/hooded/fiendhood
/obj/item/clothing/head/hooded/fiendhood
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
icon_state = "fiendhood"
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR
/obj/item/clothing/suit/hooded/eldritchcowl
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
name = "eldritch cowl"
desc = "A tattered heretical cloak from a time long passed."
@@ -216,7 +216,7 @@
hoodtype = /obj/item/clothing/head/hooded/eldritchhood
/obj/item/clothing/head/hooded/eldritchhood
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
icon_state = "eldritchhood"
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR|HIDEMASK
@@ -228,7 +228,7 @@
item_state = "infsuit"
/obj/item/clothing/suit/hooded/caretakercloak
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
name = "caretaker cloak"
desc = "Yeah, he will 'take care' of you alright."
@@ -238,7 +238,7 @@
hoodtype = /obj/item/clothing/head/hooded/caretakerhood
/obj/item/clothing/head/hooded/caretakerhood
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
icon_state = "caretakerhood"
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR
@@ -246,7 +246,7 @@
/obj/item/clothing/suit/det_suit/yogs
name = "detective long coat"
desc = "For those detectives that value fashion over function."
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "detective_coat"
item_state = "detective_item"
@@ -302,7 +302,7 @@
item_state = "monkrobes"
/obj/item/clothing/suit/hooded/spesshoodie
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
name = "spess hoodie"
desc = "A hoodie...IN SPESS!!!"
@@ -312,7 +312,7 @@
hoodtype = /obj/item/clothing/head/hooded/spesshoodie
/obj/item/clothing/head/hooded/spesshoodie
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon = 'yogstation/icons/obj/clothing/hats.dmi'
icon_state = "spesshoodie"
flags_inv = HIDEEARS|HIDEHAIR
@@ -351,7 +351,7 @@
name = "punk jacket"
desc = "My Moon My Man."
togglename = "symbol"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "punk"
item_state = "punk"
@@ -370,7 +370,7 @@
item_state = "northern"
/obj/item/clothing/suit/jacket/pride
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
name = "pride jacket"
desc = "Gay."
diff --git a/yogstation/code/modules/clothing/suits/nerd.dm b/yogstation/code/modules/clothing/suits/nerd.dm
index a7a7b14d5a73..70c83dc0f24e 100644
--- a/yogstation/code/modules/clothing/suits/nerd.dm
+++ b/yogstation/code/modules/clothing/suits/nerd.dm
@@ -8,7 +8,7 @@
via surplus medical technology found in the abandoned part of maintenance no one seems to want to talk about. \
Unfortunately the research department couldn't design a helmet before the third quarter so this is definitely not spaceproof. \
One size fits most."
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "nerd"
item_state = "nerd"
diff --git a/yogstation/code/modules/clothing/under/jobs/civilian.dm b/yogstation/code/modules/clothing/under/jobs/civilian.dm
index 127028c6f74d..3917a79fc47f 100644
--- a/yogstation/code/modules/clothing/under/jobs/civilian.dm
+++ b/yogstation/code/modules/clothing/under/jobs/civilian.dm
@@ -4,14 +4,14 @@
icon_state = "tourist"
item_state = "gy_suit"
can_adjust = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/under/yogs/rank/clerk
desc = "Oh, look it comes with its own vest."
name = "clerk's uniform"
icon_state = "clerk"
item_state = "clerk"
can_adjust = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/under/yogs/rank/clerk/skirt
desc = "Oh, look it comes with its own vest."
@@ -20,7 +20,7 @@
item_state = "clerk_skirt"
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
/obj/item/clothing/under/yogs/rank/miner/medic
desc = "A verstile blue and white uniform honored to hard working recovery medics in hazardous environments. It has minor protection against biohazards."
@@ -31,4 +31,4 @@
sensor_mode = 3
random_sensor = FALSE
armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 80, ACID = 0, WOUND = 10)
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
diff --git a/yogstation/code/modules/clothing/under/jobs/engineering.dm b/yogstation/code/modules/clothing/under/jobs/engineering.dm
index fa249dc23106..97f8abf0cfd5 100644
--- a/yogstation/code/modules/clothing/under/jobs/engineering.dm
+++ b/yogstation/code/modules/clothing/under/jobs/engineering.dm
@@ -5,7 +5,7 @@
item_state = "ro_suit"
cold_protection = CHEST
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/under/yogs/rank/network_admin/skirt
desc = "It's a green high jumpskirt worn by network admins. It is slightly warmer than most jumpskirts."
@@ -14,4 +14,4 @@
can_adjust = FALSE
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
diff --git a/yogstation/code/modules/clothing/under/jobs/security.dm b/yogstation/code/modules/clothing/under/jobs/security.dm
index bea227a7a75c..a1e80d111f61 100644
--- a/yogstation/code/modules/clothing/under/jobs/security.dm
+++ b/yogstation/code/modules/clothing/under/jobs/security.dm
@@ -20,7 +20,7 @@
sensor_mode = 3
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
- mutantrace_variation = MUTANTRACE_VARIATION
+ mutantrace_variation = DIGITIGRADE_VARIATION
/obj/item/clothing/under/yogs/rank/physician/white
name = "white brig physician's jumpsuit"
@@ -41,4 +41,4 @@
fitted = FEMALE_UNIFORM_TOP
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
- mutantrace_variation = NO_MUTANTRACE_VARIATION
+ mutantrace_variation = NONE
diff --git a/yogstation/code/modules/clothing/under/miscellaneous.dm b/yogstation/code/modules/clothing/under/miscellaneous.dm
index e0949e2a878f..0ae9bc0d2380 100644
--- a/yogstation/code/modules/clothing/under/miscellaneous.dm
+++ b/yogstation/code/modules/clothing/under/miscellaneous.dm
@@ -223,7 +223,7 @@
/obj/item/clothing/under/rank/det/yogs
name = "black detective suit"
desc = "A suit often worn by those detective types. Now in black!"
- mob_overlay_icon = 'yogstation/icons/mob/clothing/uniform/uniform.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/uniform/uniform.dmi'
icon = 'yogstation/icons/obj/clothing/uniforms.dmi'
icon_state = "black_detective"
item_state = "black_detective"
diff --git a/yogstation/code/modules/jobs/job_types/paramedic.dm b/yogstation/code/modules/jobs/job_types/paramedic.dm
index dd9e41ecd697..5ce2ea6200a8 100644
--- a/yogstation/code/modules/jobs/job_types/paramedic.dm
+++ b/yogstation/code/modules/jobs/job_types/paramedic.dm
@@ -48,8 +48,8 @@
backpack_contents = list(/obj/item/storage/firstaid/regular)
ears = /obj/item/radio/headset/headset_med
belt = /obj/item/storage/belt/medical
- uniform = /obj/item/clothing/under/rank/medical
- uniform_skirt = /obj/item/clothing/under/rank/medical/skirt
+ uniform = /obj/item/clothing/under/rank/medical/doctor
+ uniform_skirt = /obj/item/clothing/under/rank/medical/doctor/skirt
suit = /obj/item/clothing/suit/toggle/labcoat/emt
shoes = /obj/item/clothing/shoes/sneakers/white
l_hand = /obj/item/roller
diff --git a/yogstation/code/modules/jobs/job_types/psychiatrist.dm b/yogstation/code/modules/jobs/job_types/psychiatrist.dm
index b7487fc5ea68..a1090059d42b 100644
--- a/yogstation/code/modules/jobs/job_types/psychiatrist.dm
+++ b/yogstation/code/modules/jobs/job_types/psychiatrist.dm
@@ -46,7 +46,7 @@
jobtype = /datum/job/psych
shoes = /obj/item/clothing/shoes/sneakers/brown
- uniform = /obj/item/clothing/under/suit_jacket/burgundy
+ uniform = /obj/item/clothing/under/suit/burgundy
l_hand = /obj/item/storage/briefcase
glasses = /obj/item/clothing/glasses/regular
ears = /obj/item/radio/headset/headset_med
diff --git a/yogstation/code/modules/jungleland/ghost_role_spawners.dm b/yogstation/code/modules/jungleland/ghost_role_spawners.dm
index 7298935e07bc..bcb23e97e47c 100644
--- a/yogstation/code/modules/jungleland/ghost_role_spawners.dm
+++ b/yogstation/code/modules/jungleland/ghost_role_spawners.dm
@@ -38,7 +38,7 @@
/datum/outfit/ivymen
name = "Ivyman"
- uniform = /obj/item/clothing/under/ash_robe/hunter/jungle
+ uniform = /obj/item/clothing/under/tribal/ash_robe/hunter/jungle
/datum/outfit/ivymen/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
H.underwear = "Nude"
@@ -127,7 +127,7 @@
/datum/outfit/greedydemon
name = "Greedy Demon"
- uniform = /obj/item/clothing/under/suit_jacket/really_black
+ uniform = /obj/item/clothing/under/suit/really_black
head = /obj/item/clothing/head/that
back = /obj/item/storage/backpack
suit = /obj/item/clothing/suit/armor/vest
diff --git a/yogstation/code/modules/ninja/suit/ninja.dm b/yogstation/code/modules/ninja/suit/ninja.dm
index 9e2f50949363..efe0a62c8816 100644
--- a/yogstation/code/modules/ninja/suit/ninja.dm
+++ b/yogstation/code/modules/ninja/suit/ninja.dm
@@ -1,22 +1,22 @@
/obj/item/clothing/head/helmet/space/space_ninja
- mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/head/head.dmi'
icon_state = "s-ninja"
/obj/item/clothing/mask/gas/space_ninja
- mob_overlay_icon = 'yogstation/icons/mob/clothing/mask/mask.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/mask/mask.dmi'
icon = 'yogstation/icons/obj/clothing/masks.dmi'
icon_state = "s-ninja"
var/lights_on = FALSE
var/lights_colour = "16be00"
/obj/item/clothing/shoes/space_ninja
- mob_overlay_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi'
icon_state = "s-ninja"
var/lights_on = FALSE
var/lights_colour = "16be00"
/obj/item/clothing/suit/space/space_ninja
- mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
+ worn_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
icon = 'yogstation/icons/obj/clothing/suits.dmi'
icon_state = "s-ninja"
var/lights_on = FALSE
@@ -30,14 +30,14 @@
/obj/item/clothing/suit/space/space_ninja/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file)
. = ..()
if(!isinhands && lights_on)
- var/mutable_appearance/M = mutable_appearance(mob_overlay_icon, "s-ninja-overlay")
+ var/mutable_appearance/M = mutable_appearance(worn_icon, "s-ninja-overlay")
M.color = lights_colour
. += M
/obj/item/clothing/mask/gas/space_ninja/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file)
. = ..()
if(!isinhands && lights_on)
- var/mutable_appearance/M = mutable_appearance(mob_overlay_icon, "s-ninja-overlay")
+ var/mutable_appearance/M = mutable_appearance(worn_icon, "s-ninja-overlay")
M.color = lights_colour
. += M
@@ -45,14 +45,14 @@
/obj/item/clothing/shoes/space_ninja/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file)
. = ..()
if(!isinhands && lights_on)
- var/mutable_appearance/M = mutable_appearance(mob_overlay_icon, "s-ninja-overlay")
+ var/mutable_appearance/M = mutable_appearance(worn_icon, "s-ninja-overlay")
M.color = lights_colour
. += M
/obj/item/clothing/gloves/space_ninja/worn_overlays(mutable_appearance/standing, isinhands = FALSE, icon_file)
. = ..()
if(!isinhands && lights_on)
- var/mutable_appearance/M = mutable_appearance(mob_overlay_icon, "s-ninja-overlay")
+ var/mutable_appearance/M = mutable_appearance(worn_icon, "s-ninja-overlay")
M.color = lights_colour
. += M
diff --git a/yogstation/code/modules/ruins/lavaland_ruin_code.dm b/yogstation/code/modules/ruins/lavaland_ruin_code.dm
index c4508656b591..4bfa593c6be8 100644
--- a/yogstation/code/modules/ruins/lavaland_ruin_code.dm
+++ b/yogstation/code/modules/ruins/lavaland_ruin_code.dm
@@ -2,7 +2,7 @@
/obj/effect/mob_spawn/human/travelling_bard
name = "Travelling Bard"
- uniform = /obj/item/clothing/under/jester
+ uniform = /obj/item/clothing/under/costume/jester
shoes = /obj/item/clothing/shoes/sneakers/green
gloves = /obj/item/clothing/gloves/color/green
back = /obj/item/storage/backpack/clown