diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
index 67a4ed46cd..03d28bdff5 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
@@ -14,7 +14,7 @@
 /area/lavaland/surface/outdoors)
 "e" = (
 /obj/item/clothing/shoes/workboots/mining,
-/obj/item/clothing/under/rank/miner/lavaland,
+/obj/item/clothing/under/rank/cargo/miner/lavaland,
 /obj/effect/decal/remains/human,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
index fec70b215e..e22f21ef4f 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
@@ -188,10 +188,10 @@
 /area/ruin/powered/seedvault)
 "G" = (
 /obj/structure/closet/crate/hydroponics,
-/obj/item/clothing/under/rank/hydroponics,
-/obj/item/clothing/under/rank/hydroponics,
-/obj/item/clothing/under/rank/hydroponics,
-/obj/item/clothing/under/rank/hydroponics,
+/obj/item/clothing/under/rank/civilian/hydroponics,
+/obj/item/clothing/under/rank/civilian/hydroponics,
+/obj/item/clothing/under/rank/civilian/hydroponics,
+/obj/item/clothing/under/rank/civilian/hydroponics,
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "H" = (
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
index c8ccd8d30a..7cbee23c98 100644
--- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
@@ -324,7 +324,7 @@
 	dir = 1
 	},
 /obj/structure/rack,
-/obj/item/clothing/under/soviet,
+/obj/item/clothing/under/costume/soviet,
 /obj/item/clothing/head/ushanka,
 /turf/open/floor/plasteel/cafeteria,
 /area/ruin/space/djstation)
diff --git a/_maps/RandomRuins/SpaceRuins/advancedlab.dmm b/_maps/RandomRuins/SpaceRuins/advancedlab.dmm
index 39e29018ea..66a3d4e55d 100644
--- a/_maps/RandomRuins/SpaceRuins/advancedlab.dmm
+++ b/_maps/RandomRuins/SpaceRuins/advancedlab.dmm
@@ -219,7 +219,7 @@
 /obj/structure/closet{
 	name = "Official Clothing"
 	},
-/obj/item/clothing/under/rank/centcom_commander,
+/obj/item/clothing/under/rank/centcom/commander,
 /obj/item/clothing/head/centhat,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/suit/armor/vest,
diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index 6b5a44529e..63e6770e42 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -2098,7 +2098,7 @@
 /area/awaymission/BMPship/Aft)
 "gj" = (
 /obj/structure/closet,
-/obj/item/clothing/under/overalls,
+/obj/item/clothing/under/misc/overalls,
 /turf/open/floor/plasteel,
 /area/awaymission/BMPship/Aft)
 "gk" = (
@@ -2269,7 +2269,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/derelict2.dmm b/_maps/RandomRuins/SpaceRuins/derelict2.dmm
index a20be471f4..61c0913ac6 100644
--- a/_maps/RandomRuins/SpaceRuins/derelict2.dmm
+++ b/_maps/RandomRuins/SpaceRuins/derelict2.dmm
@@ -64,7 +64,7 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/obj/item/clothing/under/polychromic/shirt,
+/obj/item/clothing/under/misc/poly_shirt,
 /obj/item/clothing/neck/tie/black,
 /obj/item/clothing/shoes/laceup,
 /obj/item/storage/wallet/random,
@@ -89,7 +89,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/obj/item/clothing/under/polychromic/skirt,
+/obj/item/clothing/under/dress/skirt/polychromic,
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/gloves/color/white,
 /obj/item/clothing/glasses/regular,
diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
index 299d1769b0..308f58535a 100644
--- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
@@ -573,7 +573,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/LavaRuins/miningbase.dmm b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
similarity index 60%
rename from _maps/RandomRuins/LavaRuins/miningbase.dmm
rename to _maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
index 636d5fb3fd..3118ad3f5f 100644
--- a/_maps/RandomRuins/LavaRuins/miningbase.dmm
+++ b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
@@ -1,5 +1,2322 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aa" = (
+"al" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"ap" = (
+/obj/structure/ore_box,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"at" = (
+/obj/structure/gulag_beacon,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"au" = (
+/obj/machinery/door/airlock/mining/glass{
+	name = "Mining Station EVA";
+	req_access_txt = "54"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"av" = (
+/obj/machinery/door/airlock{
+	name = "Closet"
+	},
+/turf/open/floor/plating,
+/area/mine/production)
+"aG" = (
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"aJ" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"aK" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"aN" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/laborcamp)
+"aW" = (
+/obj/effect/turf_decal/tile/purple,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"aX" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/obj/machinery/door/airlock{
+	name = "Labor Camp External Access"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"bg" = (
+/turf/closed/wall,
+/area/mine/eva)
+"bn" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"bX" = (
+/obj/machinery/door/window/southleft,
+/obj/machinery/shower{
+	pixel_y = 22
+	},
+/turf/open/floor/plasteel/freezer,
+/area/mine/living_quarters)
+"cd" = (
+/turf/closed/wall,
+/area/mine/laborcamp)
+"cf" = (
+/obj/machinery/mineral/equipment_vendor,
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"ci" = (
+/obj/machinery/door/airlock{
+	name = "Vending"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"cn" = (
+/obj/machinery/door/airlock{
+	id_tag = "miningdorm3";
+	name = "Room 3"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"cr" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"cz" = (
+/obj/machinery/door/poddoor/preopen{
+	id = "labor";
+	name = "labor camp blast door"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"cA" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/eva)
+"cD" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"cX" = (
+/obj/structure/statue{
+	desc = "A lifelike statue of a horrifying monster.";
+	dir = 8;
+	icon = 'icons/mob/lavaland/lavaland_monsters.dmi';
+	icon_state = "goliath";
+	name = "goliath"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"dk" = (
+/obj/structure/table,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/hand_labeler,
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"dL" = (
+/obj/machinery/atmospherics/components/binary/pump/on,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"dP" = (
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
+/obj/machinery/computer/shuttle/mining{
+	req_access = null
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"dU" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/sign/warning/electricshock{
+	pixel_y = -32
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"dZ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/machinery/door/airlock/glass{
+	name = "Mining Station Bridge"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"eh" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/plasteel/white,
+/area/mine/laborcamp)
+"es" = (
+/turf/open/floor/plasteel,
+/area/mine/production)
+"ez" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"eE" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	id = "labor";
+	name = "Labor Camp Lockdown";
+	pixel_y = 28;
+	req_access_txt = "2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"eL" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/tile/purple,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"eP" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/machinery/door/airlock/glass{
+	name = "Mining Station Bridge"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"eS" = (
+/obj/structure/table,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"fm" = (
+/obj/structure/sign/warning/docking,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/production)
+"fs" = (
+/obj/item/radio/intercom{
+	desc = "Talk through this. It looks like it has been modified to not broadcast.";
+	name = "Prison Intercom (General)";
+	pixel_y = 24;
+	prison_radio = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"fx" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"fA" = (
+/obj/machinery/power/terminal{
+	dir = 4
+	},
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"fN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"fO" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/camera{
+	c_tag = "Shuttle Docking Foyer";
+	dir = 8;
+	network = list("mine")
+	},
+/obj/machinery/newscaster{
+	pixel_x = 30;
+	pixel_y = 1
+	},
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet/miner,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"fU" = (
+/obj/item/radio/intercom{
+	dir = 8;
+	name = "Station Intercom (General)";
+	pixel_x = -28
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"gk" = (
+/obj/structure/closet/crate{
+	icon_state = "crateopen"
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"gn" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"gs" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"gP" = (
+/obj/machinery/door/airlock/maintenance{
+	name = "Mining Station Communications";
+	req_access_txt = "48"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/maintenance)
+"gT" = (
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/obj/machinery/camera{
+	c_tag = "Labor Camp Medical";
+	dir = 8;
+	network = list("labor")
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/laborcamp)
+"hb" = (
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/smes{
+	charge = 5e+006
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"hf" = (
+/obj/item/twohanded/required/kirbyplants/random,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"hm" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"hy" = (
+/obj/machinery/camera{
+	c_tag = "Labor Camp External";
+	dir = 4;
+	network = list("labor")
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
+"hH" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/structure/displaycase,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"hP" = (
+/obj/structure/lattice/catwalk,
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
+	dir = 4;
+	piping_layer = 3
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/mine/living_quarters)
+"hQ" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
+	dir = 1;
+	piping_layer = 3
+	},
+/obj/structure/lattice/catwalk,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/mine/laborcamp/security)
+"ia" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"ig" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/red,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"ik" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"iv" = (
+/obj/machinery/camera{
+	c_tag = "Dormitories";
+	dir = 4;
+	network = list("mine")
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"iG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"iQ" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"jf" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/living_quarters)
+"jn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"jD" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/structure/table,
+/obj/item/restraints/handcuffs,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"jJ" = (
+/turf/closed/mineral/random/labormineral/volcanic,
+/area/lavaland/surface/outdoors/explored)
+"kb" = (
+/obj/machinery/mineral/processing_unit_console,
+/turf/closed/wall,
+/area/mine/laborcamp)
+"kj" = (
+/obj/machinery/conveyor{
+	id = "gulag"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp)
+"kz" = (
+/obj/machinery/light/small,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"kB" = (
+/obj/machinery/computer/security/labor,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"kE" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/obj/machinery/door/airlock/external{
+	glass = 1;
+	name = "Mining External Airlock";
+	opacity = 0;
+	req_access_txt = "54"
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"kF" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"kH" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"kP" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp)
+"kR" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"kS" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/toxin{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/living_quarters)
+"lj" = (
+/turf/open/floor/mech_bay_recharge_floor,
+/area/mine/eva)
+"lr" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 10
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/living_quarters)
+"lu" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/machinery/computer/mech_bay_power_console{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"ly" = (
+/obj/machinery/camera{
+	c_tag = "Labor Camp Central";
+	network = list("labor")
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"lI" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/brown,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"lS" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"me" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"mg" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -5;
+	pixel_y = 30
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"mi" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"mp" = (
+/obj/docking_port/stationary{
+	area_type = /area/lavaland/surface/outdoors;
+	dir = 8;
+	dwidth = 2;
+	height = 5;
+	id = "laborcamp_away";
+	name = "labor camp";
+	width = 9
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/explored)
+"mv" = (
+/obj/machinery/door/window/southright,
+/obj/machinery/shower{
+	pixel_y = 22
+	},
+/turf/open/floor/plasteel/freezer,
+/area/mine/living_quarters)
+"mw" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"my" = (
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/explored)
+"mI" = (
+/obj/machinery/space_heater,
+/turf/open/floor/plating,
+/area/mine/production)
+"mL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"mN" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/production)
+"nm" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"nx" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"ny" = (
+/obj/machinery/computer/prisoner,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"nH" = (
+/obj/structure/displaycase,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"nI" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"nJ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"nK" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"nL" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"nN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel/freezer,
+/area/mine/living_quarters)
+"nR" = (
+/obj/structure/ore_box,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"nX" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"oo" = (
+/obj/machinery/conveyor{
+	id = "mining_internal"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/mine/production)
+"ou" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/miner,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"ow" = (
+/obj/machinery/door/airlock/medical/glass{
+	name = "Infirmary"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/laborcamp)
+"oy" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"oG" = (
+/obj/machinery/mineral/equipment_vendor,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"oM" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"oY" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"pi" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"pr" = (
+/obj/structure/table,
+/obj/item/pickaxe,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"pu" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"pK" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"qb" = (
+/obj/structure/tank_dispenser/oxygen,
+/obj/effect/turf_decal/tile/purple,
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"qc" = (
+/obj/machinery/shower{
+	dir = 8
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 30
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"qg" = (
+/obj/structure/toilet{
+	dir = 8
+	},
+/turf/open/floor/plasteel/freezer,
+/area/mine/living_quarters)
+"qh" = (
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = 11
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"qm" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/closet/crate/secure/loot,
+/obj/structure/sign/warning/electricshock{
+	pixel_y = 32
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"qx" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"qH" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 30
+	},
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"qM" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/beer{
+	pixel_x = 7;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/food/drinks/beer{
+	pixel_x = -1;
+	pixel_y = 9
+	},
+/obj/item/reagent_containers/food/drinks/beer{
+	pixel_x = -8
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"qR" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"qS" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"qZ" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"re" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/structure/closet/secure_closet/labor_camp_security,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"rf" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"rB" = (
+/obj/machinery/mineral/unloading_machine{
+	dir = 1;
+	icon_state = "unloader-corner";
+	input_dir = 1;
+	output_dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/plating,
+/area/mine/production)
+"rK" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"rU" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 5
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/living_quarters)
+"sa" = (
+/obj/machinery/mineral/processing_unit{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp)
+"se" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"si" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"sj" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"sm" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"sx" = (
+/obj/item/radio/intercom{
+	dir = 8;
+	name = "Station Intercom (General)";
+	pixel_x = 28
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"sz" = (
+/obj/effect/turf_decal/loading_area,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"sE" = (
+/obj/structure/closet/crate,
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"sP" = (
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_y = 6
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"sR" = (
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"sU" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"sW" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"td" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/mine/laborcamp)
+"tk" = (
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"tr" = (
+/obj/structure/chair,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"tK" = (
+/obj/structure/closet/crate,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/explored)
+"tY" = (
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"uG" = (
+/obj/structure/table,
+/obj/item/clothing/glasses/meson,
+/obj/item/storage/bag/ore,
+/obj/item/pickaxe,
+/obj/item/mining_scanner,
+/obj/item/flashlight,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"uI" = (
+/obj/machinery/door/airlock/maintenance{
+	name = "Mining Station Maintenance";
+	req_access_txt = "48"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"uJ" = (
+/obj/item/bikehorn{
+	color = "#000";
+	desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks.";
+	name = "charred bike horn"
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/explored)
+"uR" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"va" = (
+/obj/machinery/button/door{
+	id = "miningbathroom";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_y = -25;
+	specialfunctions = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel/freezer,
+/area/mine/living_quarters)
+"vo" = (
+/obj/machinery/flasher{
+	id = "labor"
+	},
+/turf/closed/wall,
+/area/mine/laborcamp)
+"vy" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/obj/machinery/door/airlock{
+	name = "Labor Camp External Access"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"vA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"vE" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"vJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"vM" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/chair,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"wd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"wg" = (
+/obj/structure/closet/crate,
+/obj/item/dice/d4,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"wj" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"wt" = (
+/obj/structure/toilet{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"wz" = (
+/turf/closed/mineral/random/volcanic,
+/area/lavaland/surface/outdoors)
+"wB" = (
+/obj/structure/table,
+/turf/open/floor/plasteel/white,
+/area/mine/laborcamp)
+"wC" = (
+/turf/open/floor/circuit,
+/area/mine/maintenance)
+"wE" = (
+/obj/machinery/vending/cigarette,
+/obj/machinery/newscaster{
+	pixel_y = 32
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"wV" = (
+/turf/closed/mineral/random/volcanic,
+/area/lavaland/surface/outdoors/explored)
+"wX" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"xd" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"xh" = (
+/obj/machinery/vending/sustenance,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"xv" = (
+/obj/machinery/mech_bay_recharge_port,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/mine/eva)
+"xA" = (
+/obj/machinery/camera{
+	c_tag = "Communications Relay";
+	dir = 8;
+	network = list("mine")
+	},
+/turf/open/floor/circuit,
+/area/mine/maintenance)
+"xH" = (
+/obj/structure/table,
+/obj/item/cigbutt,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"xP" = (
+/obj/machinery/suit_storage_unit/mining,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"xS" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"yt" = (
+/obj/structure/closet/crate{
+	icon_state = "crateopen"
+	},
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"yF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"yQ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"yR" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"yT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel/freezer,
+/area/mine/living_quarters)
+"zh" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"zk" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"zo" = (
+/obj/structure/table,
+/turf/open/floor/carpet,
+/area/mine/living_quarters)
+"zx" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp)
+"zy" = (
+/obj/item/twohanded/required/kirbyplants/random,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"zI" = (
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors/explored)
+"zN" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"zY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"zZ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Ab" = (
+/obj/structure/ore_box,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors/explored)
+"Ad" = (
+/obj/machinery/light_switch{
+	pixel_y = -25
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/open/floor/circuit,
+/area/mine/maintenance)
+"Ag" = (
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Ah" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"Aj" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Al" = (
+/turf/closed/wall/r_wall,
+/area/mine/maintenance)
+"At" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/mine/production)
+"AH" = (
+/obj/machinery/cryopod{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"AJ" = (
+/obj/machinery/door/airlock/glass{
+	name = "Break Room"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"AQ" = (
+/obj/machinery/door/airlock{
+	id_tag = "miningdorm2";
+	name = "Room 2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"AS" = (
+/obj/machinery/door/airlock/external{
+	glass = 1;
+	name = "Mining External Airlock";
+	opacity = 0
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"AZ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Bc" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/production)
+"Be" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/mine/eva)
+"Bh" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Bo" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"BD" = (
+/obj/machinery/door/airlock/maintenance{
+	name = "Mining Station Maintenance";
+	req_access_txt = "48"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"BO" = (
+/obj/machinery/door/airlock{
+	name = "Labor Camp Storage"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Ca" = (
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "Mining Station Port Wing APC";
+	pixel_x = 1;
+	pixel_y = 23
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Cd" = (
+/turf/closed/wall,
+/area/mine/production)
+"Cg" = (
+/obj/structure/table,
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 5;
+	pixel_y = 3
+	},
+/obj/item/tank/internals/emergency_oxygen,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Cj" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Cl" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Cm" = (
+/obj/machinery/vending/snack,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Cw" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp)
+"Cy" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Labor Camp Shuttle Security Airlock";
+	req_access_txt = "2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"CA" = (
+/obj/machinery/atmospherics/pipe/manifold4w/supply,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"CH" = (
+/obj/structure/rack,
+/obj/item/storage/bag/ore,
+/obj/item/pickaxe,
+/obj/item/flashlight,
+/obj/item/clothing/glasses/meson,
+/obj/item/mining_scanner,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"CJ" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"CR" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"CV" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"Dd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Dr" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -5;
+	pixel_y = 30
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/chair,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Dv" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"DN" = (
+/obj/machinery/computer/shuttle/mining/common{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Ed" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/production)
+"Eg" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Ev" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/button/door{
+	id = "miningdorm2";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 25;
+	specialfunctions = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+	dir = 1
+	},
+/turf/open/floor/carpet,
+/area/mine/living_quarters)
+"Ex" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"EB" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"EH" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Fx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"FC" = (
+/obj/machinery/airalarm{
+	pixel_y = 24
+	},
+/turf/open/floor/circuit,
+/area/mine/maintenance)
+"FE" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Ga" = (
+/obj/machinery/status_display/evac{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Gt" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"GM" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"GN" = (
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "Mining Station Starboard Wing APC";
+	pixel_x = -25;
+	pixel_y = 2
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Hd" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/mine/eva)
+"Hg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Hh" = (
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "gulag"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp)
+"Hk" = (
+/obj/docking_port/stationary{
+	area_type = /area/lavaland/surface/outdoors;
+	dir = 8;
+	dwidth = 3;
+	height = 7;
+	id = "lavaland_common_away";
+	name = "Mining base public dock";
+	width = 7
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
+"Hm" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/obj/machinery/door/airlock/external{
+	name = "Lavaland Shuttle Airlock"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Ho" = (
+/obj/machinery/door/airlock{
+	name = "Restroom"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"Hq" = (
+/obj/structure/rack,
+/obj/item/storage/bag/ore,
+/obj/item/flashlight,
+/obj/item/pickaxe,
+/obj/item/clothing/glasses/meson,
+/obj/item/mining_scanner,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Hx" = (
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"HE" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 10
+	},
+/obj/machinery/bluespace_beacon,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/mine/maintenance)
+"HO" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Labor Camp Shuttle Prisoner Airlock"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"HS" = (
+/obj/machinery/conveyor{
+	dir = 10;
+	id = "gulag"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp)
+"HU" = (
+/obj/machinery/computer/shuttle/labor/one_way{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"HY" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
+/obj/machinery/iv_drip,
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/living_quarters)
+"If" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Ii" = (
+/obj/structure/table,
+/obj/item/storage/box/donkpockets,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Ik" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -5;
+	pixel_y = 30
+	},
+/obj/machinery/shower{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/purple,
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"ID" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/obj/machinery/meter,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"IG" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"II" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"IK" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/recharger,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"IS" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/living_quarters)
+"IY" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 6
+	},
+/turf/open/floor/carpet,
+/area/mine/living_quarters)
+"Jl" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Jo" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Jr" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"JH" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"JJ" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"JP" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"JV" = (
+/obj/machinery/mineral/processing_unit{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/plating,
+/area/mine/production)
+"JW" = (
+/obj/machinery/power/apc{
+	name = "Mining EVA APC";
+	pixel_x = 1;
+	pixel_y = -23
+	},
+/obj/machinery/recharge_station,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/structure/cable,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"JY" = (
+/turf/closed/mineral/random/labormineral/volcanic,
+/area/lavaland/surface/outdoors)
+"Kb" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Kk" = (
+/obj/machinery/conveyor_switch/oneway{
+	id = "mining_internal";
+	name = "mining conveyor"
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Kl" = (
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"Kt" = (
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "mining_internal"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/mine/production)
+"Kx" = (
 /obj/machinery/camera{
 	c_tag = "EVA";
 	dir = 4;
@@ -25,276 +2342,66 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/eva)
-"ab" = (
-/turf/template_noop,
-/area/template_noop)
-"ac" = (
-/turf/open/lava/smooth/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"ad" = (
-/obj/machinery/light_switch{
-	pixel_x = 27
-	},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"ae" = (
-/obj/machinery/airalarm{
-	pixel_y = 23
-	},
-/obj/machinery/computer/shuttle/mining{
-	req_access = null
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"af" = (
+"KG" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"ag" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"ah" = (
-/obj/machinery/telecomms/relay/preset/mining,
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/mine/maintenance)
-"ai" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
+/obj/item/beacon,
 /turf/open/floor/plasteel,
 /area/mine/production)
-"aj" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/eva)
-"ak" = (
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"al" = (
-/obj/structure/table,
-/obj/item/pickaxe,
-/obj/item/gps/mining,
-/obj/item/gps/mining,
-/obj/item/gps/mining,
-/obj/item/gps/mining,
-/obj/effect/turf_decal/tile/purple{
+"KO" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"am" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 10
-	},
-/obj/machinery/bluespace_beacon,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/mine/maintenance)
-"an" = (
-/obj/machinery/suit_storage_unit/mining,
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
+	dir = 5
 	},
 /turf/open/floor/plasteel,
-/area/mine/eva)
-"ao" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/mine/eva)
-"ap" = (
-/obj/structure/closet/crate,
-/obj/item/dice/d4,
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"aq" = (
-/obj/machinery/suit_storage_unit/mining,
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"ar" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
 /area/mine/living_quarters)
-"as" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
+"KP" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"at" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"au" = (
-/obj/machinery/door/airlock/mining/glass{
-	name = "Mining Station EVA";
+/obj/machinery/door/airlock/external{
+	glass = 1;
+	name = "Mining External Airlock";
+	opacity = 0;
 	req_access_txt = "54"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /turf/open/floor/plasteel,
 /area/mine/eva)
-"av" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
+"KQ" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/door/airlock/external{
+	glass = 1;
+	name = "Mining Shuttle Airlock";
+	opacity = 0
 	},
 /turf/open/floor/plasteel,
-/area/mine/eva)
-"aw" = (
-/turf/closed/wall,
 /area/mine/production)
-"ax" = (
-/obj/effect/turf_decal/tile/purple,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"ay" = (
-/obj/structure/table,
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"az" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aA" = (
+"KS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 9
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"KU" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/mine/eva)
-"aB" = (
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aD" = (
-/obj/structure/tank_dispenser/oxygen,
-/obj/effect/turf_decal/tile/purple,
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aE" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aF" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -5;
-	pixel_y = 30
-	},
-/obj/machinery/shower{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/purple,
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aG" = (
+"KV" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"Lb" = (
 /obj/docking_port/stationary{
 	area_type = /area/lavaland/surface/outdoors;
 	dir = 8;
@@ -306,436 +2413,78 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"aH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+"Lc" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-4"
 	},
-/obj/item/beacon,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"aI" = (
-/obj/structure/sign/warning/docking,
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/mine/production)
-"aJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
+"Le" = (
+/obj/structure/closet/crate/internals,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
 /turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"aK" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"aL" = (
-/obj/machinery/power/apc{
-	name = "Mining EVA APC";
-	pixel_x = 1;
-	pixel_y = -23
-	},
-/obj/machinery/recharge_station,
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
+/area/mine/laborcamp)
+"Lj" = (
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
 	},
 /obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aM" = (
-/obj/machinery/mech_bay_recharge_port,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /turf/open/floor/plating,
-/area/mine/eva)
-"aN" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/tile/purple,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"aO" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/obj/machinery/computer/mech_bay_power_console{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aP" = (
-/turf/template_noop,
-/area/space)
-"aQ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"aR" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aS" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/machinery/door/airlock/external{
-	glass = 1;
-	name = "Mining External Airlock";
-	opacity = 0;
-	req_access_txt = "54"
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aT" = (
-/obj/docking_port/stationary{
-	area_type = /area/lavaland/surface/outdoors;
-	dir = 8;
-	dwidth = 3;
-	height = 7;
-	id = "lavaland_common_away";
-	name = "Mining base public dock";
-	width = 7
-	},
+/area/mine/living_quarters)
+"Lm" = (
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"aU" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
+"LC" = (
+/obj/structure/table,
+/obj/item/storage/fancy/donut_box,
+/obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aV" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"aW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"aX" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/machinery/door/airlock/external{
-	glass = 1;
-	name = "Mining External Airlock";
-	opacity = 0;
-	req_access_txt = "54"
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"aY" = (
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"aZ" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 30
-	},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"ba" = (
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "Mining Station Starboard Wing APC";
-	pixel_x = -25;
-	pixel_y = 2
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bc" = (
-/obj/machinery/mineral/mint,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bd" = (
-/obj/structure/closet/crate,
-/obj/machinery/airalarm{
-	pixel_y = 23
-	},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"be" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet/miner,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bf" = (
-/turf/open/floor/mech_bay_recharge_floor,
-/area/mine/eva)
-"bg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bh" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bi" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"bj" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/eva)
-"bk" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bl" = (
-/obj/machinery/mineral/equipment_vendor,
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel,
-/area/mine/production)
-"bm" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/production)
-"bn" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet/miner,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bo" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/camera{
-	c_tag = "Shuttle Docking Foyer";
-	dir = 8;
-	network = list("mine")
-	},
-/obj/machinery/newscaster{
-	pixel_x = 30;
-	pixel_y = 1
-	},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/structure/closet/secure_closet/miner,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bp" = (
-/obj/machinery/door/airlock{
-	name = "Closet"
-	},
-/turf/open/floor/plating,
-/area/mine/production)
-"bq" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/mine/production)
-"br" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/machinery/door/airlock/external{
-	glass = 1;
-	name = "Mining Shuttle Airlock";
-	opacity = 0
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bs" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bt" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/machinery/door/airlock/external{
-	glass = 1;
-	name = "Mining Shuttle Airlock";
-	opacity = 0
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bu" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bv" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/production)
-"bw" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/production)
-"bx" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/mine/eva)
-"by" = (
-/obj/machinery/space_heater,
-/turf/open/floor/plating,
-/area/mine/production)
-"bz" = (
-/turf/closed/mineral/random/high_chance/volcanic,
-/area/lavaland/surface/outdoors)
-"bA" = (
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/explored)
-"bB" = (
-/turf/open/floor/circuit,
-/area/mine/maintenance)
-"bC" = (
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "Mining Communications APC";
-	pixel_x = 1;
-	pixel_y = 23
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
+/area/mine/laborcamp/security)
+"LG" = (
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/turf/open/floor/plasteel/dark,
-/area/mine/maintenance)
-"bD" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/airalarm{
-	pixel_y = 23
-	},
-/obj/machinery/iv_drip,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"LL" = (
+/obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
+/obj/machinery/light{
+	dir = 1
 	},
-/turf/open/floor/plasteel/white,
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "Labor Camp Security APC";
+	pixel_y = 23
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"LZ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
+/turf/open/floor/plasteel,
 /area/mine/living_quarters)
-"bE" = (
+"Mc" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
 /obj/machinery/door/airlock/mining/glass{
@@ -754,7 +2503,33 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/production)
-"bF" = (
+"Mh" = (
+/obj/structure/table,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/laborcamp)
+"Mj" = (
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = -12
+	},
+/obj/structure/mirror{
+	pixel_x = -28
+	},
+/turf/open/floor/plasteel/freezer,
+/area/mine/living_quarters)
+"Mk" = (
+/obj/machinery/conveyor_switch/oneway{
+	id = "gulag"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Mn" = (
+/turf/closed/wall/r_wall,
+/area/mine/laborcamp/security)
+"Ms" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
 	},
@@ -764,170 +2539,21 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
 /turf/open/floor/plasteel/white,
 /area/mine/living_quarters)
-"bG" = (
-/turf/open/lava/smooth/lava_land_surface,
-/area/template_noop)
-"bH" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+"Mw" = (
+/obj/machinery/door/airlock/external{
+	glass = 1;
+	name = "Mining External Airlock";
+	opacity = 0
 	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/production)
-"bI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bJ" = (
-/obj/machinery/conveyor{
-	id = "mining_internal"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/mine/production)
-"bK" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 5
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/circuit,
-/area/mine/maintenance)
-"bM" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/mine/production)
-"bN" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 6
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bO" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bP" = (
-/obj/machinery/mineral/processing_unit{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/open/floor/plating,
-/area/mine/production)
-"bQ" = (
-/turf/closed/wall,
-/area/mine/living_quarters)
-"bR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bS" = (
-/obj/item/radio/intercom{
-	dir = 8;
-	name = "Station Intercom (General)";
-	pixel_x = -28
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bT" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bU" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/machinery/door/airlock/glass{
-	name = "Mining Station Bridge"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bV" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bW" = (
+"MD" = (
+/turf/closed/mineral/random/volcanic,
+/area/lavaland/surface/outdoors/unexplored)
+"ME" = (
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
 /obj/structure/cable{
@@ -935,39 +2561,7 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/production)
-"bX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"bZ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"ca" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"cb" = (
+"MF" = (
 /obj/structure/closet/crate/freezer,
 /obj/item/reagent_containers/blood,
 /obj/item/reagent_containers/blood{
@@ -998,1028 +2592,72 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/mine/living_quarters)
-"cc" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 9
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cd" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"ce" = (
-/obj/machinery/airalarm{
-	dir = 1;
-	pixel_y = -22
-	},
-/obj/machinery/mineral/equipment_vendor,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cf" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cg" = (
-/obj/machinery/door/airlock/external{
-	glass = 1;
-	name = "Mining External Airlock";
-	opacity = 0
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"ch" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"ci" = (
-/obj/machinery/mineral/equipment_vendor,
+"MG" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/turf_decal/tile/brown{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/brown,
 /obj/effect/turf_decal/tile/brown{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
 /turf/open/floor/plasteel,
-/area/mine/production)
-"cj" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"ck" = (
-/obj/machinery/power/smes{
-	charge = 5e+006
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating,
 /area/mine/living_quarters)
-"cl" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/structure/closet/crate/secure/loot,
-/obj/structure/sign/warning/electricshock{
-	pixel_y = 32
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"cm" = (
+"MH" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
 /turf/open/floor/plating,
 /area/mine/living_quarters)
-"cn" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"co" = (
-/obj/machinery/shower{
-	dir = 8
-	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 30
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cp" = (
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"cq" = (
-/obj/machinery/door/airlock/external{
-	glass = 1;
-	name = "Mining External Airlock";
-	opacity = 0
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cr" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 5
-	},
-/turf/open/floor/plasteel/white,
-/area/mine/living_quarters)
-"cs" = (
-/obj/machinery/airalarm{
-	pixel_y = 24
-	},
-/turf/open/floor/circuit,
-/area/mine/maintenance)
-"ct" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cu" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/mine/production)
-"cv" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"cx" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/effect/turf_decal/loading_area{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cB" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -5;
-	pixel_y = 30
-	},
-/obj/structure/table,
-/obj/item/paper/fluff/stations/lavaland/orm_notice,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cC" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"cD" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cE" = (
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cJ" = (
-/obj/machinery/camera{
-	c_tag = "Communications Relay";
-	dir = 8;
-	network = list("mine")
-	},
-/turf/open/floor/circuit,
-/area/mine/maintenance)
-"cM" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cN" = (
-/turf/open/floor/plasteel,
-/area/mine/production)
-"cP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/dark,
-/area/mine/maintenance)
-"cQ" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/toxin{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/mine/living_quarters)
-"cX" = (
-/obj/machinery/power/terminal{
-	dir = 1
-	},
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"cY" = (
-/turf/closed/wall/r_wall,
-/area/mine/maintenance)
-"cZ" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
-	dir = 4;
-	piping_layer = 3
-	},
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/mine/living_quarters)
-"da" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
-	},
-/obj/machinery/meter,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"de" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dg" = (
-/obj/effect/turf_decal/tile/purple,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"di" = (
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dj" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"dk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dl" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dn" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"dq" = (
-/obj/machinery/camera{
-	c_tag = "Crew Area Hallway";
-	network = list("mine")
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dr" = (
-/obj/item/twohanded/required/kirbyplants/random,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dt" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"du" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dv" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -5;
-	pixel_y = 30
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dx" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dy" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dK" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"dL" = (
-/turf/closed/mineral/random/volcanic,
-/area/lavaland/surface/outdoors)
-"dM" = (
-/obj/effect/turf_decal/loading_area,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"dN" = (
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"dO" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dQ" = (
-/obj/effect/turf_decal/loading_area{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"dR" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"dS" = (
-/obj/machinery/light_switch{
-	pixel_y = -25
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/turf/open/floor/circuit,
-/area/mine/maintenance)
-"dT" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 10
-	},
-/turf/open/floor/plasteel/white,
-/area/mine/living_quarters)
-"dU" = (
-/obj/item/twohanded/required/kirbyplants/random,
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dV" = (
-/obj/machinery/newscaster{
-	pixel_y = 32
-	},
-/obj/structure/chair,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dW" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -5;
-	pixel_y = 30
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
+"MM" = (
 /obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/freezer/gulag_fridge,
+/obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/structure/chair,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dX" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
+/obj/effect/turf_decal/tile/red{
+	dir = 8
 	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
 /turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"dY" = (
+/area/mine/laborcamp/security)
+"MV" = (
 /obj/machinery/airalarm{
-	pixel_y = 23
+	dir = 1;
+	pixel_y = -22
 	},
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Nf" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/miner,
 /turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"ea" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/mine/living_quarters)
-"eb" = (
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"ec" = (
-/obj/machinery/atmospherics/components/binary/pump/on,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"ed" = (
+/area/mine/production)
+"Nk" = (
 /obj/structure/chair{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"ee" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"ef" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 5
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"eg" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/button/door{
-	id = "miningdorm1";
-	name = "Door Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = 25;
-	specialfunctions = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
-	dir = 1
-	},
-/turf/open/floor/carpet,
-/area/mine/living_quarters)
-"ei" = (
-/obj/structure/closet/crate{
-	icon_state = "crateopen"
-	},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel,
-/area/mine/production)
-"el" = (
-/obj/machinery/camera{
-	c_tag = "Processing Area Room";
-	dir = 8;
-	network = list("mine")
-	},
-/obj/item/radio/intercom{
-	dir = 8;
-	name = "Station Intercom (General)";
-	pixel_x = 28
-	},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"en" = (
-/obj/structure/table,
-/obj/item/clothing/glasses/meson,
-/obj/item/storage/bag/ore,
-/obj/item/pickaxe,
-/obj/item/mining_scanner,
-/obj/item/flashlight,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"eo" = (
-/obj/machinery/mineral/unloading_machine{
-	dir = 1;
-	icon_state = "unloader-corner";
-	input_dir = 1;
-	output_dir = 2
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/open/floor/plating,
-/area/mine/production)
-"ep" = (
-/obj/machinery/door/airlock/maintenance{
-	name = "Mining Station Communications";
-	req_access_txt = "48"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/maintenance)
-"eq" = (
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"er" = (
-/obj/machinery/door/airlock/medical/glass{
-	name = "Infirmary"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/turf/open/floor/plasteel/white,
-/area/mine/living_quarters)
-"es" = (
-/obj/machinery/door/airlock/maintenance{
-	name = "Mining Station Maintenance";
-	req_access_txt = "48"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"et" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"eu" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"ev" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/mine/production)
-"ex" = (
-/obj/machinery/conveyor_switch/oneway{
-	id = "mining_internal";
-	name = "mining conveyor"
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"eC" = (
-/obj/machinery/door/airlock{
-	id_tag = "miningdorm3";
-	name = "Room 3"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"eF" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/mine/living_quarters)
-"eI" = (
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/living_quarters)
-"eJ" = (
-/obj/machinery/airalarm{
-	pixel_y = 23
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"eK" = (
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "Mining Station Port Wing APC";
-	pixel_x = 1;
-	pixel_y = 23
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"eL" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"eM" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/production)
-"eO" = (
-/obj/structure/closet/crate{
-	icon_state = "crateopen"
-	},
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"eZ" = (
-/obj/machinery/camera{
-	c_tag = "Crew Area Hallway East";
-	network = list("mine")
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"fb" = (
-/obj/structure/bed,
-/obj/item/bedsheet/brown,
-/obj/machinery/airalarm{
-	pixel_y = 23
-	},
-/turf/open/floor/carpet,
-/area/mine/living_quarters)
-"fd" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"fy" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"fA" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"fB" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 6
-	},
-/turf/open/floor/carpet,
-/area/mine/living_quarters)
-"fC" = (
-/obj/machinery/door/airlock{
-	id_tag = "miningdorm2";
-	name = "Room 2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"fD" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"gJ" = (
-/obj/machinery/vending/cigarette,
-/obj/machinery/newscaster{
-	pixel_y = 32
-	},
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"hE" = (
-/obj/structure/chair,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"ib" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel/freezer,
-/area/mine/living_quarters)
-"jx" = (
-/obj/machinery/door/airlock{
-	id_tag = "miningdorm1";
-	name = "Room 1"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
-"jz" = (
-/obj/structure/table,
-/obj/item/cigbutt,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"jQ" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
-	dir = 8
-	},
-/turf/open/floor/plasteel/freezer,
-/area/mine/living_quarters)
-"mh" = (
-/obj/machinery/door/airlock/glass{
-	name = "Break Room"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"np" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"nx" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"nP" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"pI" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"pN" = (
-/obj/machinery/button/door{
-	id = "miningbathroom";
-	name = "Door Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_y = -25;
-	specialfunctions = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel/freezer,
-/area/mine/living_quarters)
-"qw" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"rb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"rp" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"rT" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"se" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/button/door{
-	id = "miningdorm2";
-	name = "Door Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = 25;
-	specialfunctions = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
-	dir = 1
-	},
-/turf/open/floor/carpet,
-/area/mine/living_quarters)
-"st" = (
-/obj/machinery/door/window/southleft,
-/obj/machinery/shower{
-	pixel_y = 22
-	},
-/turf/open/floor/plasteel/freezer,
-/area/mine/living_quarters)
-"sC" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"sP" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel/freezer,
-/area/mine/living_quarters)
-"vp" = (
+"NB" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
@@ -2035,195 +2673,20 @@
 	},
 /turf/open/floor/carpet,
 /area/mine/living_quarters)
-"vr" = (
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
+"NH" = (
 /turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"vx" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"vH" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"wd" = (
-/obj/machinery/vending/snack,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"wQ" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/structure/displaycase,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"xv" = (
-/obj/item/radio/intercom{
-	dir = 8;
-	name = "Station Intercom (General)";
-	pixel_x = 28
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"xK" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "mining_internal"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
+/area/mine/laborcamp)
+"NI" = (
+/obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/mine/production)
-"zE" = (
-/obj/structure/closet/crate,
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"Az" = (
-/obj/structure/table,
-/obj/item/gps/mining,
-/obj/item/gps/mining,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"BT" = (
-/obj/structure/displaycase,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"BZ" = (
-/obj/machinery/door/window/southright,
-/obj/machinery/shower{
-	pixel_y = 22
-	},
-/turf/open/floor/plasteel/freezer,
-/area/mine/living_quarters)
-"Cu" = (
-/turf/closed/wall,
-/area/mine/eva)
-"Cv" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"CJ" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer{
-	pixel_x = 7;
-	pixel_y = 5
-	},
-/obj/item/reagent_containers/food/drinks/beer{
-	pixel_x = -1;
-	pixel_y = 9
-	},
-/obj/item/reagent_containers/food/drinks/beer{
-	pixel_x = -8
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 5
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"CO" = (
-/obj/machinery/conveyor{
-	dir = 10;
-	id = "mining_internal"
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/mine/production)
-"De" = (
-/obj/machinery/door/airlock{
-	id_tag = "miningbathroom";
-	name = "Restroom"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel/freezer,
-/area/mine/living_quarters)
-"Dg" = (
-/obj/item/radio/intercom{
-	dir = 8;
-	name = "Station Intercom (General)";
-	pixel_x = -28
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+"Oh" = (
+/obj/structure/chair/office{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Dj" = (
-/obj/machinery/camera{
-	c_tag = "Dormitories";
-	dir = 4;
-	network = list("mine")
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Em" = (
+/area/mine/laborcamp/security)
+"Oj" = (
 /obj/machinery/conveyor{
 	dir = 8;
 	id = "mining_internal"
@@ -2234,162 +2697,55 @@
 	},
 /turf/open/floor/plating,
 /area/mine/production)
-"Fp" = (
-/obj/machinery/airalarm{
-	dir = 1;
-	pixel_y = -22
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Fu" = (
+"Op" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
-/obj/machinery/door/airlock/external{
-	name = "Lavaland Shuttle Airlock"
+/obj/machinery/door/airlock/security/glass{
+	name = "Labor Camp Shuttle Prisoner Airlock"
 	},
 /turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"FI" = (
-/obj/structure/toilet{
-	dir = 8
-	},
-/turf/open/floor/plasteel/freezer,
-/area/mine/living_quarters)
-"Hb" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/machinery/door/airlock/external{
-	name = "Lavaland Shuttle Airlock"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"He" = (
+/area/mine/laborcamp)
+"Os" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
 	},
-/obj/machinery/door/airlock/glass{
-	name = "Mining Station Bridge"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Iq" = (
-/obj/structure/chair{
+/obj/effect/turf_decal/tile/brown{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
-"Iz" = (
-/obj/machinery/camera{
-	c_tag = "Crew Area";
-	dir = 1;
-	network = list("mine")
-	},
-/obj/machinery/computer/security/telescreen/entertainment{
-	pixel_y = -32
-	},
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
+"Ov" = (
+/obj/machinery/airalarm{
+	pixel_y = 23
 	},
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
-"Ji" = (
-/obj/machinery/light/small,
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
+"OI" = (
+/obj/machinery/mineral/mint,
 /turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Kd" = (
-/obj/structure/statue{
-	desc = "A lifelike statue of a horrifying monster.";
-	dir = 8;
-	icon = 'icons/mob/lavaland/lavaland_monsters.dmi';
-	icon_state = "goliath";
-	name = "goliath"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"LK" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -12
-	},
-/obj/structure/mirror{
-	pixel_x = -28
-	},
-/turf/open/floor/plasteel/freezer,
-/area/mine/living_quarters)
-"Mi" = (
+/area/mine/production)
+"ON" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/machinery/door/airlock/glass,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Nn" = (
-/obj/structure/table,
-/turf/open/floor/carpet,
-/area/mine/living_quarters)
-"Oe" = (
-/obj/machinery/mineral/processing_unit_console,
-/turf/closed/wall,
-/area/mine/production)
-"Ou" = (
-/obj/machinery/atmospherics/pipe/manifold4w/supply,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Qh" = (
-/obj/effect/turf_decal/loading_area{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/production)
-"Qn" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 11
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+/obj/effect/turf_decal/tile/brown{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"QR" = (
-/obj/structure/table,
-/obj/item/tank/internals/emergency_oxygen{
-	pixel_x = 5;
-	pixel_y = 3
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/tank/internals/emergency_oxygen,
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
-"Rq" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/closed/wall,
-/area/mine/living_quarters)
-"Rt" = (
+"Pp" = (
 /obj/machinery/camera{
 	c_tag = "Public Shuttle Lobby";
 	network = list("mine")
@@ -2406,13 +2762,601 @@
 /obj/item/gps/mining,
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
-"Ru" = (
-/obj/machinery/computer/shuttle/mining/common{
+"Pq" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
-"TO" = (
+"PN" = (
+/obj/machinery/light_switch{
+	pixel_x = 27
+	},
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"PO" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"PY" = (
+/obj/machinery/shower{
+	dir = 8
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel/white,
+/area/mine/laborcamp)
+"Qi" = (
+/obj/structure/table,
+/obj/machinery/reagentgrinder,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Qr" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/structure/cable,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"Qx" = (
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Qy" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"QD" = (
+/obj/machinery/suit_storage_unit/mining,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"QL" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"Rf" = (
+/obj/machinery/mineral/unloading_machine{
+	dir = 1;
+	icon_state = "unloader-corner";
+	input_dir = 1;
+	output_dir = 2
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp)
+"Ro" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/door/airlock/highsecurity{
+	name = "Labor Camp Monitoring";
+	req_access_txt = "2";
+	security_level = 6
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Ru" = (
+/obj/machinery/newscaster{
+	pixel_y = 32
+	},
+/obj/structure/chair,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Rv" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"RC" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"RF" = (
+/turf/closed/wall,
+/area/mine/laborcamp/security)
+"RH" = (
+/obj/machinery/camera{
+	c_tag = "Crew Area";
+	dir = 1;
+	network = list("mine")
+	},
+/obj/machinery/computer/security/telescreen/entertainment{
+	pixel_y = -32
+	},
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"RI" = (
+/obj/structure/closet/crate,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"RP" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Sd" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Sj" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Sp" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp/security)
+"Sq" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Ss" = (
+/obj/machinery/conveyor{
+	dir = 10;
+	id = "mining_internal"
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/mine/production)
+"SO" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+	dir = 8
+	},
+/turf/open/floor/plasteel/freezer,
+/area/mine/living_quarters)
+"SW" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"SY" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"Te" = (
+/obj/structure/table,
+/obj/item/trash/plate,
+/obj/item/kitchen/fork,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Tm" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/obj/machinery/door/airlock/external{
+	glass = 1;
+	name = "Mining Shuttle Airlock";
+	opacity = 0
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"TC" = (
+/obj/structure/chair/comfy/brown{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"TG" = (
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/obj/machinery/mineral/equipment_vendor,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"TI" = (
+/obj/machinery/door/airlock/medical/glass{
+	name = "Infirmary"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/turf/open/floor/plasteel/white,
+/area/mine/living_quarters)
+"TJ" = (
+/obj/structure/bed,
+/obj/item/bedsheet/brown,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
+/turf/open/floor/carpet,
+/area/mine/living_quarters)
+"Ue" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 5
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/circuit,
+/area/mine/maintenance)
+"Uk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/mob/living/simple_animal/bot/secbot/beepsky{
+	desc = "Powered by the tears and sweat of laborers.";
+	name = "Prison Ofitser"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"Un" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/button/door{
+	id = "miningdorm1";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 25;
+	specialfunctions = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
+	dir = 1
+	},
+/turf/open/floor/carpet,
+/area/mine/living_quarters)
+"Uz" = (
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "Mining Communications APC";
+	pixel_x = 1;
+	pixel_y = 23
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/mine/maintenance)
+"UE" = (
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"UI" = (
+/obj/machinery/camera{
+	c_tag = "Crew Area Hallway East";
+	network = list("mine")
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"UJ" = (
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"Vj" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -5;
+	pixel_y = 30
+	},
+/obj/structure/table,
+/obj/item/paper/fluff/stations/lavaland/orm_notice,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Vo" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/mine/production)
+"Vs" = (
+/obj/effect/turf_decal/tile/purple,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"VN" = (
+/turf/closed/wall,
+/area/mine/living_quarters)
+"VP" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/mine/production)
+"VR" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Labor Camp Shuttle Security Airlock";
+	req_access_txt = "2"
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"VT" = (
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors)
+"VY" = (
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/eva)
+"Wf" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Wt" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Ww" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"WL" = (
+/obj/machinery/computer/secure_data,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"WN" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel/dark,
+/area/mine/maintenance)
+"WY" = (
+/obj/machinery/door/airlock{
+	id_tag = "miningdorm1";
+	name = "Room 1"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Xo" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white,
+/area/mine/laborcamp)
+"Xr" = (
+/obj/machinery/camera{
+	c_tag = "Processing Area Room";
+	dir = 8;
+	network = list("mine")
+	},
+/obj/item/radio/intercom{
+	dir = 8;
+	name = "Station Intercom (General)";
+	pixel_x = 28
+	},
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"XG" = (
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/mine/production)
+"XN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"XP" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"XU" = (
+/obj/machinery/power/smes{
+	charge = 5e+006
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/mine/living_quarters)
+"XX" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/closed/wall,
+/area/mine/living_quarters)
+"Ya" = (
+/turf/closed/wall/r_wall,
+/area/mine/laborcamp)
+"Ye" = (
+/turf/closed/mineral/random/high_chance/volcanic,
+/area/lavaland/surface/outdoors)
+"Yf" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Yg" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/machinery/camera{
+	c_tag = "Labor Camp Security Office";
+	dir = 1;
+	network = list("labor")
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp/security)
+"Yi" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/door/airlock/glass,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Yp" = (
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/mine/production)
+"Yr" = (
+/obj/machinery/light/small,
+/obj/effect/turf_decal/loading_area{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/laborcamp)
+"Yy" = (
+/obj/machinery/door/airlock{
+	id_tag = "miningbathroom";
+	name = "Restroom"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+	dir = 4
+	},
+/turf/open/floor/plasteel/freezer,
+/area/mine/living_quarters)
+"YH" = (
 /obj/machinery/door/airlock{
 	name = "Restroom"
 	},
@@ -2424,2015 +3368,4294 @@
 	},
 /turf/open/floor/plasteel/freezer,
 /area/mine/living_quarters)
-"Uj" = (
-/obj/effect/turf_decal/tile/purple{
+"YM" = (
+/obj/item/radio/intercom{
+	dir = 8;
+	name = "Station Intercom (General)";
+	pixel_x = -28
+	},
+/obj/effect/turf_decal/tile/brown{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"WS" = (
-/obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 6
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Xa" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Xi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Xm" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Yg" = (
-/obj/effect/turf_decal/tile/brown,
 /obj/effect/turf_decal/tile/brown{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
 /turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Za" = (
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "4-8"
+/area/mine/production)
+"YV" = (
+/obj/machinery/airalarm{
+	pixel_y = 23
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Zu" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/chair,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
-"Zy" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
+/obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Zp" = (
+/obj/machinery/camera{
+	c_tag = "Crew Area Hallway";
+	network = list("mine")
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
+"Zw" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "Lavaland Shuttle Airlock"
+	},
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
+"ZF" = (
+/obj/machinery/telecomms/relay/preset/mining,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/mine/maintenance)
+"ZK" = (
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "Labor Camp APC";
+	pixel_y = 23
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/mine/laborcamp)
+"ZN" = (
+/obj/machinery/mineral/processing_unit_console,
+/turf/closed/wall,
+/area/mine/production)
 
 (1,1,1) = {"
-aP
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ak
-ak
-ak
-ak
-ab
-ab
-ab
-ab
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (2,1,1) = {"
-aP
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ab
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (3,1,1) = {"
-aP
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (4,1,1) = {"
-aP
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+wz
+wz
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (5,1,1) = {"
-aP
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+wz
+wz
+wz
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (6,1,1) = {"
-aP
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+wz
+my
+Lm
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (7,1,1) = {"
-aP
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+zI
+zI
+Lm
+my
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
 "}
 (8,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ab
+VT
+Lm
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+zI
+zI
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (9,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ab
-ak
-ak
-ab
-dL
-ak
-ak
-ak
-ak
-ak
-ak
-aT
-ak
-ak
-ak
-ak
-ac
-ab
+Lm
+Lm
+VT
+Lm
+Lm
+VT
+VT
+VT
+VT
+zI
+zI
+VT
+VT
+zI
+zI
+VT
+VT
+zI
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (10,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ac
-bA
-ac
-ac
-ac
-ac
-dL
-ak
-ak
-ak
-ak
-ak
-eu
-Hb
-eu
-ak
-ak
-ak
-ac
-ab
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+VT
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (11,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-eu
-di
-eu
-ak
-ak
-ac
-ac
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+zI
+zI
+my
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+zI
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (12,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ac
-ac
-bA
-bA
-ac
-ak
-cZ
-ak
-bQ
-bQ
-bQ
-Rq
-bQ
-eu
-Fu
-eu
-ac
-ac
-ac
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+zI
+zI
+zI
+my
+zI
+zI
+zI
+zI
+zI
+my
+zI
+zI
+my
+zI
+zI
+zI
+VT
+zI
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (13,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-cY
-cY
-cY
-cY
-eI
-dj
-dN
-bQ
-dU
-ed
-Ru
-ed
-et
-vr
-eu
-ac
-ac
-ab
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+zI
+zI
+zI
+my
+my
+my
+my
+my
+my
+my
+my
+my
+zI
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (14,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ac
-cY
-bB
-bB
-cY
-dr
-Zu
-jz
-bQ
-dV
-di
-di
-di
-di
-di
-eu
-ac
-ab
-ab
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+zI
+zI
+zI
+zI
+my
+my
+my
+my
+my
+my
+my
+my
+my
+zI
+zI
+Lm
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
 "}
 (15,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ac
-cY
-bC
-bL
-cY
-cC
-dk
-ax
-bQ
-dW
-di
-en
-en
-di
-Kd
-eu
-ac
-ab
-ab
-ab
-ab
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+zI
+zI
+zI
+zI
+my
+my
+my
+my
+my
+my
+my
+my
+my
+zI
+zI
+zI
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (16,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ak
-cY
-ah
-am
-ep
-dl
-Za
-Cv
-Mi
-dX
-ef
-en
-en
-di
-di
-eu
-ac
-ab
-ab
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+zI
+zI
+zI
+my
+my
+my
+my
+my
+my
+my
+my
+my
+zI
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (17,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ak
-bz
-cY
-cP
-dS
-cY
-ca
-dD
-et
-bQ
-dY
-Xm
-di
-di
-di
-nP
-bQ
-ac
-ab
-ab
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+zI
+zI
+my
+my
+my
+my
+my
+my
+my
+mp
+my
+my
+my
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
 "}
 (18,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ak
-dL
-cY
-cs
-cJ
-cY
-dq
-Xi
-nP
-bQ
-Rt
-xv
-Az
-QR
-BT
-wQ
-bQ
-dL
-ak
-ab
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+cd
+cd
+cd
+cd
+cd
+Cy
+cd
+cd
+cd
+HO
+cd
+RF
+RF
+RF
+VT
+VT
+VT
+VT
+Lm
+wz
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (19,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ak
-ak
-cY
-cY
-cY
-cY
-eJ
-dD
-di
-bQ
-bQ
-bQ
-bQ
-bQ
-bQ
-bQ
-bQ
-bQ
-bQ
-ak
-ak
-ab
+JY
+Lm
+VT
+VT
+VT
+VT
+VT
+Lm
+cd
+Te
+CR
+xh
+cd
+eE
+cd
+HU
+cd
+Jr
+cd
+fA
+fx
+RF
+VT
+uJ
+VT
+Lm
+Lm
+wz
+wz
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (20,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ak
-bQ
-bD
-cb
-bQ
-di
-du
-dO
-bQ
-fb
-Nn
-bQ
-fb
-Nn
-bQ
-fb
-Nn
-bQ
-ak
-ab
-ab
+JY
+JY
+Lm
+VT
+VT
+VT
+Lm
+Lm
+cd
+Qx
+NH
+Yf
+cd
+VR
+cd
+at
+cd
+Op
+cd
+hb
+dU
+RF
+VT
+VT
+VT
+VT
+Lm
+wz
+wz
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (21,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ak
-eu
-bF
-cr
-ar
-dt
-dD
-di
-bQ
-fB
-eg
-bQ
-fB
-se
-bQ
-fB
-vp
-bQ
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+zx
+kP
+td
+cd
+cd
+cd
+ci
+cd
+cd
+cz
+cd
+Ga
+NH
+NH
+Ya
+Mn
+BD
+Mn
+Dv
+Mn
+wV
+VT
+VT
+VT
+wz
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (22,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ak
-eu
-eF
-dT
-er
-dX
-de
-di
-bQ
-jx
-bQ
-bQ
-fC
-bQ
-bQ
-eC
-bQ
-bQ
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+Cw
+wB
+Mh
+cd
+AH
+NH
+NH
+NH
+NH
+NH
+NH
+kR
+NH
+NH
+Ya
+jD
+EB
+MM
+LC
+Mn
+wV
+wV
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (23,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-dL
-ak
-bQ
-cQ
-ea
-ar
-ca
-dD
-di
-et
-fd
-Dj
-et
-fd
-Uj
-et
-fd
-ca
-eu
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+cd
+eh
+aN
+ow
+Cl
+Cl
+Cl
+gn
+vo
+ly
+vA
+Hg
+gs
+gs
+Ro
+Uk
+si
+fN
+TC
+Mn
+wV
+my
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (24,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-dL
-bQ
-bQ
-bQ
-bQ
-bQ
-eK
-vx
-fy
-fy
-fD
-fy
-fy
-fD
-rb
-fy
-Ou
-dO
-eu
-ak
-ab
-ab
+JY
+JY
+JY
+JY
+cd
+gT
+Xo
+cd
+fs
+NH
+Wt
+xd
+vA
+Fx
+Yf
+uR
+NH
+NH
+Ya
+nm
+Hx
+mL
+Yg
+Mn
+zI
+VT
+VT
+VT
+VT
+wz
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Hk
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (25,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-bQ
-ck
-cX
-eb
-bQ
-dv
-du
-dO
-bQ
-bQ
-ar
-ar
-bQ
-bQ
-bQ
-TO
-bQ
-bQ
-dL
-ak
-ak
+JY
+JY
+JY
+JY
+cd
+cd
+cd
+cd
+cd
+NH
+NH
+PY
+NH
+Mk
+cd
+Hh
+Ya
+Ya
+Ya
+LL
+Hx
+xS
+Gt
+Dv
+my
+VT
+VT
+VT
+VT
+wz
+Lm
+Lm
+Lm
+Lm
+Lm
+KV
+Zw
+KV
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (26,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-bQ
-cl
-cp
-cp
-bQ
-dt
-dD
-nP
-bQ
-wd
-qw
-Xa
-Dg
-bQ
-st
-sP
-bQ
-dL
-bz
-dL
-dL
+JY
+JY
+JY
+JY
+cd
+CH
+CH
+CH
+cd
+NH
+Yr
+cd
+cd
+kb
+cd
+Hh
+Ya
+ZK
+Ho
+oY
+JJ
+nJ
+Ah
+Qr
+hQ
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+KV
+Ag
+KV
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (27,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-bQ
-cm
-da
-ec
-es
-eL
-dx
-ax
-ar
-qw
-qw
-Zy
-qw
-bQ
-BZ
-ib
-bQ
-ak
-dL
-dL
-ak
+JY
+JY
+JY
+JY
+cd
+Hq
+NH
+NH
+BO
+NH
+ia
+Rf
+kj
+sa
+kj
+HS
+Ya
+wt
+RF
+WL
+Hx
+IG
+UJ
+yQ
+my
+my
+VT
+Lm
+hP
+Lm
+VN
+VN
+VN
+XX
+VN
+KV
+Hm
+KV
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (28,1,1) = {"
-ab
-ab
-ab
-ab
-ab
-ac
-ac
-ac
-ak
-bQ
-cp
-dn
-ee
-bQ
-eZ
-dy
-Yg
-mh
-pI
-hE
-CJ
-Iz
-bQ
-bQ
-De
-bQ
-ac
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+cd
+cd
+sW
+Le
+cd
+vy
+cd
+cd
+cd
+cd
+cd
+cd
+Ya
+Ya
+Mn
+kB
+Oh
+QL
+sR
+Al
+Al
+Al
+Al
+LG
+pu
+bn
+VN
+zy
+If
+DN
+If
+FE
+qZ
+KV
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (29,1,1) = {"
-ab
-ab
-ab
-ab
-ac
-ac
-ac
-ac
-ak
-bQ
-cv
-dK
-dK
-bQ
-fA
-Xi
-et
-ar
-qw
-qw
-Iq
-Fp
-bQ
-LK
-pN
-bQ
-ac
-ac
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+cd
+cd
+cd
+cd
+NH
+cd
+Ab
+tK
+tK
+my
+my
+my
+zI
+Dv
+ny
+ig
+IK
+re
+Al
+wC
+wC
+Al
+hf
+vM
+xH
+VN
+Ru
+Ag
+Ag
+Ag
+Ag
+Ag
+KV
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (30,1,1) = {"
-ab
-ab
-ab
-ac
-ac
-ac
-ac
-ac
-ac
-bQ
-bQ
-bQ
-bQ
-bQ
-di
-dD
-di
-bQ
-gJ
-qw
-vH
-qw
-bQ
-FI
-jQ
-bQ
-ac
-ac
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+cd
+Jr
+cd
+Ab
+my
+my
+my
+my
+my
+zI
+Sp
+zk
+nL
+nX
+nx
+Al
+Uz
+Ue
+Al
+qx
+sm
+aW
+VN
+Dr
+Ag
+uG
+uG
+Ag
+cX
+KV
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (31,1,1) = {"
-ab
-ab
-ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ak
-ac
-ac
-eu
-di
-dD
-di
-bQ
-WS
-sC
-rT
-Qn
-bQ
-bQ
-bQ
-bQ
-ac
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+cd
+aX
+cd
+Ab
+my
+my
+my
+my
+my
+VT
+VT
+VT
+VT
+VT
+Lm
+Al
+ZF
+HE
+gP
+ON
+tk
+zY
+Yi
+MG
+KO
+uG
+uG
+Ag
+Ag
+KV
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (32,1,1) = {"
-ab
-ab
-ab
-ac
-ac
-ak
-ac
-ac
-ac
-ac
-ak
-ak
-ac
-eu
-ax
-rp
-Ji
-bQ
-eu
-eu
-eu
-eu
-bQ
-dL
-dL
-dL
-ac
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+my
+my
+hy
+my
+my
+my
+my
+my
+VT
+VT
+VT
+VT
+VT
+Lm
+Ye
+Al
+WN
+Ad
+Al
+cD
+JP
+FE
+VN
+YV
+RP
+Ag
+Ag
+Ag
+oy
+VN
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (33,1,1) = {"
-ab
-ab
-ac
-ac
-ac
-ak
-ac
-ak
-ac
-ac
-ak
-ak
-ac
-eu
-eu
-He
-eu
-eu
-ak
-ak
-ak
-ak
-dL
-dL
-dL
-ac
-ac
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+my
+my
+my
+my
+my
+my
+my
+my
+my
+VT
+VT
+VT
+VT
+Lm
+wz
+Al
+FC
+xA
+Al
+Zp
+Sj
+oy
+VN
+Pp
+sx
+eS
+Cg
+nH
+hH
+VN
+wz
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (34,1,1) = {"
-ab
-ac
-ac
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ac
-ac
-eu
-aJ
-eu
-ak
-ak
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+my
+my
+my
+my
+my
+my
+my
+VT
+VT
+VT
+VT
+Lm
+Lm
+Al
+Al
+Al
+Al
+Ov
+JP
+Ag
+VN
+VN
+VN
+VN
+VN
+VN
+VN
+VN
+VN
+VN
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (35,1,1) = {"
-ac
-ac
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ac
-eu
-aK
-eu
-ak
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ab
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+my
+my
+my
+my
+my
+my
+my
+VT
+VT
+VT
+VT
+VT
+Lm
+VN
+HY
+MF
+VN
+Ag
+JH
+cr
+VN
+TJ
+zo
+VN
+TJ
+zo
+VN
+TJ
+zo
+VN
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (36,1,1) = {"
-ac
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ac
-eu
-aK
-eu
-ac
-ac
-ac
-ac
-ac
-ac
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+my
+my
+my
+my
+my
+my
+my
+my
+VT
+VT
+VT
+VT
+Lm
+KV
+Ms
+rU
+se
+EH
+JP
+Ag
+VN
+IY
+Un
+VN
+IY
+Ev
+VN
+IY
+NB
+VN
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (37,1,1) = {"
-ac
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-eu
-aK
-eu
-ac
-ac
-ac
-ac
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+my
+my
+Ab
+JY
+my
+jJ
+VT
+VT
+VT
+VT
+Lm
+KV
+IS
+lr
+TI
+MG
+Qy
+Ag
+VN
+WY
+VN
+VN
+AQ
+VN
+VN
+cn
+VN
+VN
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (38,1,1) = {"
-ac
-ac
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-eM
-bR
-eM
-ac
-ac
-ac
-ac
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+jJ
+jJ
+VT
+VT
+VT
+wz
+Ye
+VN
+kS
+jf
+se
+cD
+JP
+Ag
+FE
+Os
+iv
+FE
+Os
+Pq
+FE
+Os
+cD
+KV
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (39,1,1) = {"
-ac
-ac
-ak
-ak
-ak
-ak
-aG
-ak
-ak
-ak
-ak
-ac
-ac
-ac
-eM
-bR
-eM
-ac
-ac
-ac
-ac
-ac
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+VT
+VT
+VT
+VT
+wz
+VN
+VN
+VN
+VN
+VN
+Ca
+ik
+oM
+oM
+XP
+oM
+oM
+XP
+AZ
+oM
+CA
+cr
+KV
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (40,1,1) = {"
-ab
-ac
-ac
-ak
-ak
-aI
-br
-eM
-ak
-ak
-ac
-ac
-ac
-ak
-eM
-bR
-eM
-ac
-ac
-ac
-ac
-ac
-ac
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VN
+XU
+UE
+Lj
+VN
+mg
+JH
+cr
+VN
+VN
+se
+se
+VN
+VN
+VN
+YH
+VN
+VN
+wz
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (41,1,1) = {"
-ab
-ab
-ac
-ac
-ak
-eM
-cN
-eM
-ak
-ac
-ac
-ac
-ac
-ak
-eM
-bT
-eM
-ak
-ac
-ac
-ac
-ac
-ac
-ac
-ab
-ab
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VN
+qm
+aG
+aG
+VN
+EH
+JP
+oy
+VN
+Cm
+hm
+zZ
+fU
+VN
+bX
+yT
+VN
+wz
+Ye
+wz
+wz
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (42,1,1) = {"
-ab
-ab
-ac
-ac
-eM
-eM
-bt
-eM
-eM
-ak
-ac
-ac
-ak
-eM
-eM
-bU
-eM
-eM
-ak
-ak
-ac
-ac
-ac
-ac
-ab
-ab
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VN
+MH
+ID
+dL
+uI
+Dd
+nI
+aW
+se
+hm
+hm
+Nk
+hm
+VN
+mv
+nN
+VN
+Lm
+wz
+wz
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (43,1,1) = {"
-ab
-ac
-ac
-aw
-eM
-cM
-bu
-bk
-eM
-aw
-aw
-aw
-aw
-bv
-cM
-bV
-bk
-eM
-aw
-ak
-ak
-ac
-ac
-ac
-ac
-ab
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+VT
+Lm
+VN
+aG
+zh
+pi
+VN
+UI
+Sd
+kF
+AJ
+sU
+tr
+qM
+RH
+VN
+VN
+Yy
+VN
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (44,1,1) = {"
-ac
-ac
-ak
-aw
-ae
-ai
-cN
-aQ
-cM
-bS
-ba
-be
-bn
-bw
-np
-bR
-cN
-ce
-aw
-ak
-ak
-ak
-ac
-ac
-ac
-ac
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+JY
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VN
+Bo
+aK
+aK
+VN
+LZ
+Sj
+FE
+se
+hm
+hm
+rK
+MV
+VN
+Mj
+va
+VN
+VT
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (45,1,1) = {"
-ac
-ac
-ak
-eM
-ap
-as
-aH
-aV
-aW
-aW
-bb
-bg
-aW
-bE
-bK
-bW
-cd
-eO
-aw
-ak
-ak
-ak
-ak
-ac
-ac
-ac
-ab
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+JY
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VN
+VN
+VN
+VN
+VN
+Ag
+JP
+Ag
+VN
+wE
+hm
+rf
+hm
+VN
+qg
+SO
+VN
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (46,1,1) = {"
-ac
-ak
-ak
-eM
-aN
-at
-np
-nx
-aY
-aZ
-np
-bh
-cN
-bH
-bM
-bX
-cN
-zE
-aw
-aw
-aw
-aw
-cu
-ak
-ak
-ac
-ac
-ab
-ab
-ab
+JY
+JY
+JY
+JY
+JY
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+KV
+Ag
+JP
+Ag
+VN
+sP
+Qi
+Ii
+qh
+VN
+VN
+VN
+VN
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (47,1,1) = {"
-ak
-Cu
-Cu
-Cu
-bx
-au
-bx
-Cu
-bp
-aw
-ci
-bl
-bo
-bH
-cN
-bY
-cN
-dg
-eM
-ch
-dg
-eM
-ak
-ak
-dL
-ac
-ac
-ab
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+KV
+aW
+kH
+kz
+VN
+KV
+KV
+KV
+KV
+VN
+wz
+wz
+wz
+VT
+Lm
+VT
+VT
+Lm
+Lm
+VT
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (48,1,1) = {"
-ak
-Cu
-al
-aa
-ay
-av
-aL
-Cu
-bq
-aw
-aw
-bm
-aw
-bm
-cN
-bY
-cN
-cf
-cg
-cj
-cf
-cq
-ak
-ak
-dL
-dL
-ac
-ab
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+KV
+KV
+eP
+KV
+KV
+Lm
+Lm
+Lm
+Lm
+wz
+wz
+wz
+Lm
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+wz
+Ye
+Ye
+Lm
+Lm
+VT
+VT
+VT
+VT
 "}
 (49,1,1) = {"
-ak
-aj
-an
-az
-af
-aA
-aM
-Cu
-by
-aw
-bc
-dM
-ei
-cM
-ct
-bY
-cN
-cM
-eM
-cn
-co
-eM
-ak
-ak
-ak
-dL
-ac
-ab
-ab
-ab
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+wz
+wz
+wz
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+Lm
+KV
+CJ
+KV
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Ye
+Ye
+Ye
+Ye
+Ye
+wz
+wz
+VT
+VT
+VT
 "}
 (50,1,1) = {"
-ak
-aj
-an
-aB
-ag
-aC
-bf
-Cu
-aw
-aw
-cx
-cN
-cN
-cN
-cN
-bZ
-nx
-Qh
-aw
-aw
-aw
-aw
-cu
-ak
-ak
-ak
-ac
-ab
-ab
-ab
+wz
+wz
+wz
+wz
+wz
+wz
+wz
+MD
+wz
+Lm
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+KV
+JP
+KV
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+Lm
+Lm
+Ye
+Ye
+Ye
+Ye
+Ye
+Ye
+Ye
+Ye
+Lm
+VT
+VT
 "}
 (51,1,1) = {"
-ak
-Cu
-aq
-ad
-aD
-aR
-aO
-Cu
-bz
-aw
-bd
-cN
-bs
-bI
-bN
-cc
-aw
-Em
-aw
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ab
-ab
-ab
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+Lm
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+KV
+JP
+KV
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Ye
+Ye
+Ye
+Ye
+Ye
+Ye
+Ye
+Lm
+VT
+VT
 "}
 (52,1,1) = {"
-ak
-Cu
-Cu
-Cu
-aj
-aS
-aj
-Cu
-dL
-aw
-cB
-cN
-el
-ex
-bO
-eq
-ev
-xK
-aw
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ab
-ab
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+Lm
+VT
+VT
+Lm
+Lm
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+KV
+JP
+KV
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Ye
+Ye
+Ye
+Ye
+Ye
+Ye
+Ye
+Lm
+VT
+VT
 "}
 (53,1,1) = {"
-ak
-ak
-ak
-Cu
-aE
-aU
-bi
-Cu
-dL
-aw
-cD
-dQ
-aw
-ev
-Oe
-ev
-ev
-xK
-aw
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ac
-ab
-ab
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+Lm
+VT
+Lm
+Lm
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+Ed
+wd
+Ed
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Ye
+Ye
+wz
+Ye
+Lm
+Lm
+VT
+VT
 "}
 (54,1,1) = {"
-ac
-ak
-ak
-Cu
-aF
-aR
-bj
-Cu
-dL
-aw
-cE
-dR
-eo
-bJ
-bP
-bJ
-bJ
-CO
-aw
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ab
-ab
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lb
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+Ed
+wd
+Ed
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
 "}
 (55,1,1) = {"
-ac
-ac
-ak
-Cu
-aj
-aX
-aj
-Cu
-dL
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ab
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+fm
+Tm
+Ed
+Lm
+Lm
+VT
+VT
+VT
+Lm
+Ed
+wd
+Ed
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
 "}
 (56,1,1) = {"
-ak
-ak
-ak
-ao
-ak
-ak
-ak
-ao
-dL
-dL
-ak
-ak
-bG
-bG
-bG
-bG
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ac
-ab
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Ed
+es
+Ed
+Lm
+VT
+VT
+VT
+VT
+Lm
+Ed
+aJ
+Ed
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
 "}
 (57,1,1) = {"
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-bG
-bG
-bG
-bG
-bG
-bG
-bG
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ac
-ab
-ab
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+Ed
+Ed
+KQ
+Ed
+Ed
+Lm
+VT
+VT
+Lm
+Ed
+Ed
+dZ
+Ed
+Ed
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
 "}
 (58,1,1) = {"
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-bG
-bG
-bG
-bG
-bG
-bG
-bG
-bG
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ab
-ab
-ab
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+wz
+wz
+VT
+VT
+VT
+Cd
+Ed
+Wf
+II
+Jo
+Ed
+Cd
+Cd
+Cd
+Cd
+Lc
+Wf
+Ww
+Jo
+Ed
+Cd
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
 "}
 (59,1,1) = {"
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-bG
-bG
-bG
-ab
-ab
-ab
-bG
-bG
-bG
-bG
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ac
-ab
-ab
-ab
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+VT
+VT
+VT
+Lm
+Cd
+dP
+RC
+es
+wX
+Wf
+YM
+GN
+ou
+Nf
+mN
+Aj
+wd
+es
+TG
+Cd
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
 "}
 (60,1,1) = {"
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-bG
-bG
-ab
-ab
-ab
-ab
-ab
-ab
-bG
-dL
-dL
-ak
-ak
-ak
-ak
-ak
-ak
-ak
-ac
-ab
-ab
-ab
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+VT
+VT
+VT
+VT
+Lm
+Ed
+wg
+Bh
+KG
+nK
+sj
+sj
+mi
+GM
+sj
+Mc
+pK
+ME
+Cj
+yt
+Cd
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+"}
+(61,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+VT
+VT
+VT
+VT
+Lm
+Lm
+Ed
+eL
+PO
+Aj
+zN
+Sq
+qH
+Aj
+Eg
+es
+Vo
+Jl
+KS
+es
+sE
+Cd
+Cd
+Cd
+Cd
+At
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+"}
+(62,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+VT
+VT
+wz
+Lm
+bg
+bg
+bg
+Hd
+au
+Hd
+bg
+av
+Cd
+oG
+cf
+fO
+Vo
+es
+XN
+es
+Vs
+Ed
+tY
+Vs
+Ed
+Lm
+Lm
+wz
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+"}
+(63,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+wz
+wz
+Lm
+bg
+pr
+Kx
+dk
+vJ
+JW
+bg
+VP
+Cd
+Cd
+Bc
+Cd
+Bc
+es
+XN
+es
+lI
+AS
+qR
+lI
+Mw
+Lm
+Lm
+wz
+wz
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+"}
+(64,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+Lm
+Lm
+cA
+xP
+SY
+jn
+Ex
+xv
+bg
+mI
+Cd
+OI
+sz
+gk
+Wf
+Yp
+XN
+es
+Wf
+Ed
+lS
+qc
+Ed
+Lm
+Lm
+Lm
+wz
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+"}
+(65,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+VT
+VT
+Lm
+cA
+xP
+Kl
+CV
+al
+lj
+bg
+Cd
+Cd
+mw
+es
+es
+es
+es
+iG
+zN
+ez
+Cd
+Cd
+Cd
+Cd
+At
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+"}
+(66,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+VT
+VT
+Lm
+bg
+QD
+PN
+qb
+KU
+lu
+bg
+Ye
+Cd
+RI
+es
+yR
+yF
+me
+Kb
+Cd
+Oj
+Cd
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+"}
+(67,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+VT
+VT
+Lm
+bg
+bg
+bg
+cA
+kE
+cA
+bg
+wz
+Cd
+Vj
+es
+Xr
+Kk
+iQ
+Rv
+NI
+Kt
+Cd
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+"}
+(68,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+VT
+VT
+Lm
+Lm
+Lm
+bg
+qS
+vE
+VY
+bg
+wz
+Cd
+nR
+SW
+Cd
+NI
+ZN
+NI
+NI
+Kt
+Cd
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+"}
+(69,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+wz
+VT
+VT
+Lm
+Lm
+bg
+Ik
+KU
+ap
+bg
+wz
+Cd
+XG
+wj
+rB
+oo
+JV
+oo
+oo
+Ss
+Cd
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+"}
+(70,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+Lm
+wz
+wz
+VT
+VT
+Lm
+bg
+cA
+KP
+cA
+bg
+wz
+Cd
+Cd
+Cd
+Cd
+Cd
+Cd
+Cd
+Cd
+Cd
+Cd
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+"}
+(71,1,1) = {"
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+MD
+wz
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Be
+Lm
+Lm
+Lm
+Be
+wz
+wz
+Lm
+Lm
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+"}
+(72,1,1) = {"
+MD
+MD
+wz
+wz
+MD
+MD
+MD
+wz
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+Lm
+VT
+VT
+VT
+VT
+VT
+"}
+(73,1,1) = {"
+MD
+wz
+Lm
+Lm
+wz
+wz
+MD
+wz
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+"}
+(74,1,1) = {"
+wz
+Lm
+Lm
+Lm
+wz
+Lm
+wz
+MD
+wz
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
+Lm
+Lm
+VT
+VT
+VT
+VT
+Lm
+Lm
+Lm
+VT
+VT
+VT
+VT
 "}
diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm
index 2f08d9a29e..97ebb80101 100644
--- a/_maps/RandomZLevels/Academy.dmm
+++ b/_maps/RandomZLevels/Academy.dmm
@@ -2754,12 +2754,12 @@
 "hT" = (
 /obj/structure/closet,
 /obj/item/storage/belt/soulstone,
-/obj/item/clothing/under/schoolgirl,
+/obj/item/clothing/under/costume/schoolgirl,
 /turf/open/floor/plasteel,
 /area/awaymission/academy/academyaft)
 "hU" = (
 /obj/structure/closet,
-/obj/item/clothing/under/skirt/black,
+/obj/item/clothing/under/dress/skirt,
 /obj/item/clothing/glasses/regular,
 /turf/open/floor/plasteel,
 /area/awaymission/academy/academyaft)
@@ -2772,7 +2772,7 @@
 "hW" = (
 /obj/structure/closet,
 /obj/item/lipstick/random,
-/obj/item/clothing/under/schoolgirl,
+/obj/item/clothing/under/costume/schoolgirl,
 /turf/open/floor/plasteel,
 /area/awaymission/academy/academyaft)
 "hX" = (
diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm
index 222615619e..cbece3304a 100644
--- a/_maps/RandomZLevels/VR/snowdin_VR.dmm
+++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm
@@ -2524,7 +2524,7 @@
 /area/awaymission/snowdin/post)
 "fF" = (
 /obj/structure/closet,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /obj/item/clothing/suit/hooded/wintercoat,
 /obj/item/clothing/shoes/winterboots,
 /obj/effect/turf_decal/bot,
diff --git a/_maps/RandomZLevels/VR/syndicate_trainer.dmm b/_maps/RandomZLevels/VR/syndicate_trainer.dmm
index a8c316d770..0a44006802 100644
--- a/_maps/RandomZLevels/VR/syndicate_trainer.dmm
+++ b/_maps/RandomZLevels/VR/syndicate_trainer.dmm
@@ -2252,7 +2252,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/caves.dmm b/_maps/RandomZLevels/caves.dmm
index 913de0817c..e9d592c107 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -580,7 +580,7 @@
 /area/awaymission/caves/BMP_asteroid/level_four)
 "bH" = (
 /obj/effect/decal/remains/human,
-/obj/item/clothing/under/patriotsuit,
+/obj/item/clothing/under/misc/patriotsuit,
 /turf/open/floor/plating/asteroid/basalt/lava{
 	initial_gas_mix = "n2=23;o2=14"
 	},
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 8c33326703..0a08edb9b2 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -174,7 +174,7 @@
 /obj/structure/bed/nest,
 /obj/effect/decal/cleanable/blood/gibs,
 /obj/item/clothing/mask/facehugger/impregnated,
-/obj/item/clothing/under/rank/security,
+/obj/item/clothing/under/rank/security/officer,
 /obj/item/clothing/suit/armor/vest,
 /obj/item/melee/baton/loaded,
 /obj/item/clothing/head/helmet,
@@ -5718,7 +5718,7 @@
 	name = "personal closet";
 	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
 	},
@@ -6008,7 +6008,7 @@
 	name = "Kitchen Crate"
 	},
 /obj/item/storage/box/mousetraps,
-/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/suit/waiter,
 /turf/open/floor/plasteel/showroomfloor{
 	heat_capacity = 1e+006;
 	temperature = 273.15
@@ -6655,7 +6655,7 @@
 	name = "personal closet";
 	req_access_txt = "201"
 	},
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /turf/open/floor/carpet{
 	heat_capacity = 1e+006
 	},
@@ -6823,7 +6823,7 @@
 /obj/structure/table,
 /obj/structure/bedsheetbin,
 /obj/item/clothing/neck/tie/black,
-/obj/item/clothing/under/lawyer/blacksuit,
+/obj/item/clothing/under/suit/black,
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
@@ -7068,7 +7068,7 @@
 	name = "personal closet";
 	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/research.dmm b/_maps/RandomZLevels/research.dmm
index 2499270d8f..c07499fb57 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -3214,7 +3214,7 @@
 	id_job = "Geneticist";
 	oxy_damage = 55;
 	suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
-	uniform = /obj/item/clothing/under/rank/geneticist;
+	uniform = /obj/item/clothing/under/rank/medical/geneticist;
 	name = "Geneticist"
 	},
 /obj/effect/decal/cleanable/blood,
@@ -4322,7 +4322,7 @@
 	id_job = "Geneticist";
 	oxy_damage = 55;
 	suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
-	uniform = /obj/item/clothing/under/rank/geneticist;
+	uniform = /obj/item/clothing/under/rank/medical/geneticist;
 	name = "Geneticist"
 	},
 /obj/effect/decal/cleanable/blood,
@@ -5173,7 +5173,7 @@
 	id_job = "Geneticist";
 	oxy_damage = 55;
 	suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
-	uniform = /obj/item/clothing/under/rank/geneticist;
+	uniform = /obj/item/clothing/under/rank/medical/geneticist;
 	name = "Geneticist"
 	},
 /obj/effect/decal/cleanable/blood,
@@ -6047,7 +6047,7 @@
 	id_job = "Geneticist";
 	oxy_damage = 55;
 	suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
-	uniform = /obj/item/clothing/under/rank/geneticist;
+	uniform = /obj/item/clothing/under/rank/medical/geneticist;
 	name = "Geneticist"
 	},
 /turf/open/floor/mineral/titanium/blue,
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 56018b943a..33fdb7a28d 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -312,7 +312,7 @@
 	name = "personal closet";
 	req_access_txt = "201"
 	},
-/obj/item/clothing/under/pj/blue,
+/obj/item/clothing/under/misc/pj/blue,
 /turf/open/floor/carpet{
 	heat_capacity = 1e+006
 	},
@@ -362,7 +362,7 @@
 	name = "personal closet";
 	req_access_txt = "201"
 	},
-/obj/item/clothing/under/suit_jacket/female,
+/obj/item/clothing/under/suit/black/skirt,
 /turf/open/floor/carpet{
 	heat_capacity = 1e+006
 	},
@@ -2135,7 +2135,7 @@
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "ev" = (
-/obj/item/clothing/under/pj/red,
+/obj/item/clothing/under/misc/pj/red,
 /obj/structure/closet/secure_closet{
 	desc = "It's a secure locker for personnel. The first card swiped gains control.";
 	icon_state = "cabinet";
@@ -3130,7 +3130,7 @@
 	name = "Kitchen Crate"
 	},
 /obj/item/storage/box/mousetraps,
-/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/suit/waiter,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/showroomfloor{
 	heat_capacity = 1e+006
@@ -5263,7 +5263,7 @@
 	},
 /area/awaymission/undergroundoutpost45/gateway)
 "km" = (
-/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit/navy,
 /obj/structure/closet/secure_closet{
 	desc = "It's a secure locker for personnel. The first card swiped gains control.";
 	icon_state = "cabinet";
@@ -9706,7 +9706,7 @@
 	name = "personal closet";
 	req_access_txt = "201"
 	},
-/obj/item/clothing/under/pj/red,
+/obj/item/clothing/under/misc/pj/red,
 /turf/open/floor/carpet{
 	heat_capacity = 1e+006
 	},
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 07d0575e83..68e9ee8ec0 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -363,13 +363,13 @@
 	name = "formal uniform crate";
 	req_access = "3"
 	},
-/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/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/officer/formal,
+/obj/item/clothing/under/rank/security/officer/formal,
+/obj/item/clothing/under/rank/security/officer/formal,
+/obj/item/clothing/under/rank/security/officer/formal,
+/obj/item/clothing/under/rank/security/officer/formal,
+/obj/item/clothing/under/rank/security/warden/formal,
+/obj/item/clothing/under/rank/security/head_of_security/formal,
 /obj/item/clothing/suit/armor/navyblue,
 /obj/item/clothing/suit/armor/navyblue,
 /obj/item/clothing/suit/armor/navyblue,
@@ -8914,9 +8914,9 @@
 	dir = 8
 	},
 /obj/structure/closet/wardrobe/white,
-/obj/item/clothing/under/waiter,
-/obj/item/clothing/under/waiter,
-/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/suit/waiter,
+/obj/item/clothing/under/suit/waiter,
+/obj/item/clothing/under/suit/waiter,
 /obj/structure/sign/poster/contraband/lizard{
 	pixel_x = -32
 	},
@@ -9199,9 +9199,9 @@
 "aua" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/closet/wardrobe/mixed,
-/obj/item/clothing/under/kilt,
-/obj/item/clothing/under/kilt,
-/obj/item/clothing/under/skirt/purple,
+/obj/item/clothing/under/costume/kilt,
+/obj/item/clothing/under/costume/kilt,
+/obj/item/clothing/under/dress/skirt/purple,
 /obj/item/clothing/head/beret,
 /obj/item/clothing/head/beret,
 /obj/item/clothing/head/beret,
@@ -10189,10 +10189,10 @@
 /obj/item/clothing/under/trek/medsci/next,
 /obj/item/clothing/under/trek/medsci/next,
 /obj/item/clothing/under/trek/medsci/next,
-/obj/item/clothing/under/russobluecamooutfit,
-/obj/item/clothing/under/russobluecamooutfit,
-/obj/item/clothing/under/gladiator,
-/obj/item/clothing/under/gladiator,
+/obj/item/clothing/under/misc/blue_camo,
+/obj/item/clothing/under/misc/blue_camo,
+/obj/item/clothing/under/costume/gladiator,
+/obj/item/clothing/under/costume/gladiator,
 /obj/machinery/firealarm{
 	dir = 4;
 	pixel_x = -24
@@ -12046,7 +12046,7 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "aBE" = (
-/obj/item/clothing/under/rank/mailman,
+/obj/item/clothing/under/misc/mailman,
 /obj/item/clothing/head/mailman,
 /obj/structure/closet,
 /obj/effect/landmark/blobstart,
@@ -15259,9 +15259,9 @@
 /obj/structure/closet/secure_closet/bar{
 	req_access_txt = "25"
 	},
-/obj/item/clothing/under/waiter,
-/obj/item/clothing/under/waiter,
-/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/suit/waiter,
+/obj/item/clothing/under/suit/waiter,
+/obj/item/clothing/under/suit/waiter,
 /obj/item/gun/ballistic/revolver/doublebarrel,
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
@@ -18812,8 +18812,8 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/clothing/under/kilt,
-/obj/item/clothing/under/kilt,
+/obj/item/clothing/under/costume/kilt,
+/obj/item/clothing/under/costume/kilt,
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "aTy" = (
@@ -19331,9 +19331,9 @@
 	department = "Locker Room";
 	pixel_x = -32
 	},
-/obj/item/clothing/under/assistantformal,
-/obj/item/clothing/under/assistantformal,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /obj/item/clothing/under/color/grey,
 /obj/item/clothing/under/color/grey,
 /turf/open/floor/plasteel,
@@ -19946,10 +19946,10 @@
 "aWn" = (
 /obj/structure/closet/wardrobe/black,
 /obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/under/maid,
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
+/obj/item/clothing/under/costume/maid,
+/obj/item/clothing/under/costume/maid,
 /obj/item/clothing/accessory/maidapron,
 /obj/item/clothing/accessory/maidapron,
 /obj/item/clothing/head/beret/black,
@@ -27780,7 +27780,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 4
 	},
-/obj/item/clothing/under/captainparade,
+/obj/item/clothing/under/rank/captain/parade,
 /turf/open/floor/carpet,
 /area/crew_quarters/heads/captain)
 "bpl" = (
@@ -29454,8 +29454,8 @@
 /obj/item/clothing/head/beret/black,
 /obj/item/clothing/head/beret,
 /obj/item/clothing/head/beret,
-/obj/item/clothing/under/assistantformal,
-/obj/item/clothing/under/skirt/black,
+/obj/item/clothing/under/misc/assistantformal,
+/obj/item/clothing/under/dress/skirt,
 /turf/open/floor/plasteel/white,
 /area/medical/genetics)
 "btj" = (
@@ -29469,8 +29469,8 @@
 /area/science/explab)
 "btk" = (
 /obj/structure/closet/wardrobe/white,
-/obj/item/clothing/under/kilt,
-/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/costume/kilt,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
 /turf/open/floor/plasteel/white,
 /area/medical/genetics)
 "btl" = (
@@ -34209,12 +34209,12 @@
 "bDJ" = (
 /obj/structure/closet/jcloset,
 /obj/item/storage/bag/trash,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/under/maid,
-/obj/item/clothing/under/maid,
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
+/obj/item/clothing/under/costume/maid,
+/obj/item/clothing/under/costume/maid,
+/obj/item/clothing/under/costume/maid,
 /turf/open/floor/plasteel,
 /area/janitor)
 "bDK" = (
@@ -45760,8 +45760,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/item/clothing/under/overalls,
-/obj/item/clothing/under/overalls,
+/obj/item/clothing/under/misc/overalls,
+/obj/item/clothing/under/misc/overalls,
 /obj/item/radio/headset/headset_eng,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
@@ -45820,8 +45820,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/item/clothing/under/overalls,
-/obj/item/clothing/under/overalls,
+/obj/item/clothing/under/misc/overalls,
+/obj/item/clothing/under/misc/overalls,
 /obj/item/radio/headset/headset_eng,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
@@ -48179,8 +48179,8 @@
 "clO" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/closet/wardrobe/grey,
-/obj/item/clothing/under/assistantformal,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /obj/machinery/camera{
 	c_tag = "Dorms East - Holodeck";
 	dir = 4
@@ -52491,12 +52491,12 @@
 /area/maintenance/starboard/aft)
 "cBZ" = (
 /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/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
 /turf/open/floor/plasteel/grimy,
 /area/chapel/office)
 "cCb" = (
@@ -54036,10 +54036,10 @@
 /obj/item/clothing/head/ushanka,
 /obj/item/clothing/head/ushanka,
 /obj/item/clothing/head/ushanka,
-/obj/item/clothing/under/russobluecamooutfit,
-/obj/item/clothing/under/russobluecamooutfit,
-/obj/item/clothing/under/russobluecamooutfit,
-/obj/item/clothing/under/russobluecamooutfit,
+/obj/item/clothing/under/misc/blue_camo,
+/obj/item/clothing/under/misc/blue_camo,
+/obj/item/clothing/under/misc/blue_camo,
+/obj/item/clothing/under/misc/blue_camo,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
@@ -54237,7 +54237,7 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/miningdock)
 "eAG" = (
-/obj/item/clothing/under/pj/blue,
+/obj/item/clothing/under/misc/pj/blue,
 /obj/item/clothing/shoes/sneakers/white,
 /turf/open/floor/plating,
 /area/maintenance/fore)
@@ -54255,25 +54255,25 @@
 /obj/structure/closet{
 	name = "Suit Closet"
 	},
-/obj/item/clothing/under/suit_jacket/white,
-/obj/item/clothing/under/suit_jacket/tan,
-/obj/item/clothing/under/suit_jacket/red,
-/obj/item/clothing/under/suit_jacket/really_black,
-/obj/item/clothing/under/suit_jacket/navy,
-/obj/item/clothing/under/suit_jacket/green,
-/obj/item/clothing/under/suit_jacket/female,
-/obj/item/clothing/under/suit_jacket/checkered,
-/obj/item/clothing/under/suit_jacket/charcoal,
-/obj/item/clothing/under/suit_jacket/burgundy,
-/obj/item/clothing/under/suit_jacket,
-/obj/item/clothing/under/lawyer/black,
-/obj/item/clothing/under/lawyer/blacksuit,
-/obj/item/clothing/under/lawyer/blue,
-/obj/item/clothing/under/lawyer/bluesuit,
-/obj/item/clothing/under/lawyer/female,
-/obj/item/clothing/under/lawyer/purpsuit,
-/obj/item/clothing/under/lawyer/really_black,
-/obj/item/clothing/under/lawyer/red,
+/obj/item/clothing/under/suit/white,
+/obj/item/clothing/under/suit/tan,
+/obj/item/clothing/under/suit/red,
+/obj/item/clothing/under/suit/black_really,
+/obj/item/clothing/under/suit/navy,
+/obj/item/clothing/under/suit/green,
+/obj/item/clothing/under/suit/black/skirt,
+/obj/item/clothing/under/suit/checkered,
+/obj/item/clothing/under/suit/charcoal,
+/obj/item/clothing/under/suit/burgundy,
+/obj/item/clothing/under/suit/black,
+/obj/item/clothing/under/rank/civilian/lawyer/black,
+/obj/item/clothing/under/suit/black,
+/obj/item/clothing/under/rank/civilian/lawyer/blue,
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
+/obj/item/clothing/under/rank/civilian/lawyer/female,
+/obj/item/clothing/under/rank/civilian/lawyer/purpsuit,
+/obj/item/clothing/under/rank/civilian/lawyer/really_black,
+/obj/item/clothing/under/rank/civilian/lawyer/red,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
 "eCR" = (
@@ -55182,7 +55182,7 @@
 "hsb" = (
 /obj/structure/table/wood,
 /obj/item/book/codex_gigas,
-/obj/item/clothing/under/suit_jacket/red,
+/obj/item/clothing/under/suit/red,
 /obj/structure/destructible/cult/tome,
 /turf/open/floor/carpet,
 /area/library)
@@ -56392,25 +56392,25 @@
 /obj/structure/closet{
 	name = "Suit Closet"
 	},
-/obj/item/clothing/under/suit_jacket/white,
-/obj/item/clothing/under/suit_jacket/tan,
-/obj/item/clothing/under/suit_jacket/red,
-/obj/item/clothing/under/suit_jacket/really_black,
-/obj/item/clothing/under/suit_jacket/navy,
-/obj/item/clothing/under/suit_jacket/green,
-/obj/item/clothing/under/suit_jacket/female,
-/obj/item/clothing/under/suit_jacket/checkered,
-/obj/item/clothing/under/suit_jacket/charcoal,
-/obj/item/clothing/under/suit_jacket/burgundy,
-/obj/item/clothing/under/suit_jacket,
-/obj/item/clothing/under/lawyer/black,
-/obj/item/clothing/under/lawyer/blacksuit,
-/obj/item/clothing/under/lawyer/blue,
-/obj/item/clothing/under/lawyer/bluesuit,
-/obj/item/clothing/under/lawyer/female,
-/obj/item/clothing/under/lawyer/purpsuit,
-/obj/item/clothing/under/lawyer/really_black,
-/obj/item/clothing/under/lawyer/red,
+/obj/item/clothing/under/suit/white,
+/obj/item/clothing/under/suit/tan,
+/obj/item/clothing/under/suit/red,
+/obj/item/clothing/under/suit/black_really,
+/obj/item/clothing/under/suit/navy,
+/obj/item/clothing/under/suit/green,
+/obj/item/clothing/under/suit/black/skirt,
+/obj/item/clothing/under/suit/checkered,
+/obj/item/clothing/under/suit/charcoal,
+/obj/item/clothing/under/suit/burgundy,
+/obj/item/clothing/under/suit/black,
+/obj/item/clothing/under/rank/civilian/lawyer/black,
+/obj/item/clothing/under/suit/black,
+/obj/item/clothing/under/rank/civilian/lawyer/blue,
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
+/obj/item/clothing/under/rank/civilian/lawyer/female,
+/obj/item/clothing/under/rank/civilian/lawyer/purpsuit,
+/obj/item/clothing/under/rank/civilian/lawyer/really_black,
+/obj/item/clothing/under/rank/civilian/lawyer/red,
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "lnk" = (
@@ -57515,10 +57515,10 @@
 "oZl" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/closet/wardrobe/pjs,
-/obj/item/clothing/under/maid,
-/obj/item/clothing/under/maid,
-/obj/item/clothing/under/janimaid,
-/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/costume/maid,
+/obj/item/clothing/under/costume/maid,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
 /obj/item/clothing/accessory/maidapron,
 /obj/item/clothing/accessory/maidapron,
 /obj/machinery/light{
@@ -58179,12 +58179,12 @@
 	dir = 4
 	},
 /obj/structure/closet/wardrobe/black,
-/obj/item/clothing/under/skirt/black,
+/obj/item/clothing/under/dress/skirt,
 /obj/item/clothing/head/beret/black,
 /obj/item/clothing/head/beret/black,
-/obj/item/clothing/under/trendy_fit,
-/obj/item/clothing/under/trendy_fit,
-/obj/item/clothing/under/sundress,
+/obj/item/clothing/under/custom/trendy_fit,
+/obj/item/clothing/under/custom/trendy_fit,
+/obj/item/clothing/under/dress/sundress,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
 "rtl" = (
@@ -58260,7 +58260,7 @@
 /area/security/brig)
 "rBq" = (
 /obj/item/clothing/head/kitty,
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/costume/maid,
 /obj/item/clothing/mask/muzzle,
 /turf/open/floor/plating,
 /area/maintenance/bar)
@@ -58468,7 +58468,7 @@
 /area/maintenance/department/medical/morgue)
 "sqg" = (
 /obj/structure/table/wood,
-/obj/item/clothing/under/pj/red,
+/obj/item/clothing/under/misc/pj/red,
 /obj/item/clothing/shoes/sneakers/white,
 /turf/open/floor/plating,
 /area/maintenance/fore)
@@ -59559,8 +59559,8 @@
 /area/crew_quarters/fitness/pool)
 "vpY" = (
 /obj/structure/closet/lasertag/blue,
-/obj/item/clothing/under/pj/blue,
-/obj/item/clothing/under/pj/blue,
+/obj/item/clothing/under/misc/pj/blue,
+/obj/item/clothing/under/misc/pj/blue,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
 "vqP" = (
@@ -60603,8 +60603,8 @@
 /area/crew_quarters/fitness)
 "xZD" = (
 /obj/structure/closet/lasertag/red,
-/obj/item/clothing/under/pj/red,
-/obj/item/clothing/under/pj/red,
+/obj/item/clothing/under/misc/pj/red,
+/obj/item/clothing/under/misc/pj/red,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
 "xZL" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 9c4e05a862..73fe2cb8c1 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -4154,7 +4154,7 @@
 	},
 /obj/item/wirerod,
 /obj/item/wrench,
-/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/suit/waiter,
 /obj/item/clothing/accessory/waistcoat,
 /obj/structure/sign/poster/contraband/random{
 	pixel_x = -32
@@ -39822,7 +39822,7 @@
 /obj/structure/closet/secure_closet/hos,
 /obj/item/clothing/head/HoS/beret,
 /obj/item/clothing/suit/armor/hos/trenchcoat,
-/obj/item/clothing/under/rank/head_of_security/grey,
+/obj/item/clothing/under/rank/security/head_of_security/grey,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
@@ -50312,7 +50312,7 @@
 /obj/item/clothing/suit/det_suit{
 	icon_state = "curator"
 	},
-/obj/item/clothing/under/rank/det{
+/obj/item/clothing/under/rank/security/detective{
 	icon_state = "curator"
 	},
 /obj/effect/turf_decal/tile/neutral{
@@ -62632,7 +62632,7 @@
 /area/security/warden)
 "cbF" = (
 /obj/structure/closet/secure_closet/warden,
-/obj/item/clothing/under/rank/warden/grey,
+/obj/item/clothing/under/rank/security/warden/grey,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -74042,7 +74042,7 @@
 /area/maintenance/starboard)
 "cuG" = (
 /obj/structure/table,
-/obj/item/clothing/under/rank/security,
+/obj/item/clothing/under/rank/security/officer,
 /obj/item/restraints/handcuffs,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small,
@@ -78636,7 +78636,7 @@
 	pixel_x = 26;
 	pixel_y = 26
 	},
-/obj/item/clothing/under/kilt,
+/obj/item/clothing/under/costume/kilt,
 /obj/item/clothing/head/beret,
 /obj/machinery/airalarm{
 	pixel_y = 23
@@ -78674,7 +78674,7 @@
 /obj/item/clothing/head/fedora{
 	icon_state = "detective"
 	},
-/obj/item/clothing/under/geisha,
+/obj/item/clothing/under/costume/geisha,
 /obj/item/clothing/head/fedora{
 	icon_state = "curator"
 	},
@@ -78682,7 +78682,7 @@
 	desc = "This looks awfully familiar...";
 	icon_state = "curator"
 	},
-/obj/item/clothing/under/rank/curator/treasure_hunter,
+/obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
 /obj/machinery/airalarm{
 	pixel_y = 23
 	},
@@ -81143,7 +81143,7 @@
 	icon_state = "1-2"
 	},
 /obj/item/folder/blue,
-/obj/item/clothing/under/rank/centcom_commander{
+/obj/item/clothing/under/rank/centcom/commander{
 	desc = "A replica of a jumpsuit worn by the highest ranking commanders under Nanotrasen's central command.";
 	name = "Replica CentCom officer's jumpsuit"
 	},
@@ -88556,7 +88556,7 @@
 /area/crew_quarters/fitness/recreation)
 "cTg" = (
 /obj/structure/table,
-/obj/item/clothing/under/sl_suit{
+/obj/item/clothing/under/suit/sl{
 	name = "referee suit"
 	},
 /obj/effect/turf_decal/tile/neutral{
@@ -89705,7 +89705,7 @@
 /obj/structure/closet/secure_closet/personal/cabinet,
 /obj/item/clothing/suit/jacket/letterman_nanotrasen,
 /obj/item/clothing/suit/toggle/lawyer,
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/costume/maid,
 /obj/item/clothing/head/kitty,
 /obj/machinery/airalarm{
 	dir = 1;
@@ -89733,7 +89733,7 @@
 /obj/item/clothing/head/fedora{
 	icon_state = "detective"
 	},
-/obj/item/clothing/under/lawyer/female,
+/obj/item/clothing/under/rank/civilian/lawyer/female,
 /obj/machinery/airalarm{
 	dir = 1;
 	pixel_y = -22
@@ -89757,7 +89757,7 @@
 	pixel_y = -32
 	},
 /obj/item/clothing/head/fedora,
-/obj/item/clothing/under/redeveninggown,
+/obj/item/clothing/under/dress/redeveninggown,
 /obj/item/clothing/head/rabbitears,
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/dorms)
@@ -92803,7 +92803,7 @@
 /area/crew_quarters/fitness/recreation)
 "dae" = (
 /obj/structure/table,
-/obj/item/clothing/under/suit_jacket/really_black,
+/obj/item/clothing/under/suit/black_really,
 /obj/item/cane,
 /obj/item/clothing/head/bowler{
 	pixel_y = 5
@@ -98184,7 +98184,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/wood,
 /obj/item/clothing/suit/toggle/owlwings,
-/obj/item/clothing/under/owl,
+/obj/item/clothing/under/costume/owl,
 /obj/item/clothing/mask/gas/owl_mask,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
@@ -110502,7 +110502,7 @@
 /area/medical/medbay/central)
 "dFk" = (
 /obj/structure/table/wood,
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/costume/maid,
 /obj/item/clothing/head/kitty,
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/dirt,
@@ -111362,7 +111362,7 @@
 /area/maintenance/department/medical/morgue)
 "dGw" = (
 /obj/structure/closet/secure_closet/CMO,
-/obj/item/clothing/under/rank/nursesuit,
+/obj/item/clothing/under/rank/medical/doctor/nurse,
 /obj/item/clothing/head/nursehat,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -113664,7 +113664,7 @@
 /area/crew_quarters/theatre/abandoned)
 "dKr" = (
 /obj/structure/table/wood,
-/obj/item/clothing/under/geisha,
+/obj/item/clothing/under/costume/geisha,
 /obj/item/clothing/shoes/sandal,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -121170,7 +121170,7 @@
 /area/library/abandoned)
 "dYm" = (
 /obj/structure/table/wood,
-/obj/item/clothing/under/rank/curator,
+/obj/item/clothing/under/rank/civilian/curator,
 /obj/effect/spawner/lootdrop/maintenance{
 	lootcount = 2;
 	name = "2maintenance loot spawner"
@@ -125929,12 +125929,12 @@
 	dir = 8
 	},
 /obj/structure/table,
-/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/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
 "gbV" = (
@@ -126052,7 +126052,7 @@
 /area/science/circuit)
 "gVS" = (
 /obj/item/clothing/head/kitty,
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/costume/maid,
 /obj/item/clothing/mask/muzzle,
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index a18bb7cf97..376046512f 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -7053,7 +7053,7 @@
 /obj/effect/turf_decal/bot,
 /obj/structure/rack,
 /obj/item/clothing/gloves/color/brown,
-/obj/item/clothing/under/overalls,
+/obj/item/clothing/under/misc/overalls,
 /obj/item/clothing/mask/gas{
 	pixel_x = 4;
 	pixel_y = 4
@@ -9271,7 +9271,7 @@
 /obj/structure/closet{
 	name = "science locker"
 	},
-/obj/item/clothing/under/rank/scientist{
+/obj/item/clothing/under/rank/rnd/scientist{
 	pixel_x = 4;
 	pixel_y = 4
 	},
@@ -14495,12 +14495,12 @@
 /obj/structure/closet{
 	name = "skirt closet"
 	},
-/obj/item/clothing/under/skirt/red{
+/obj/item/clothing/under/dress/skirt/red{
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/clothing/under/skirt/blue,
-/obj/item/clothing/under/skirt/black{
+/obj/item/clothing/under/dress/skirt/blue,
+/obj/item/clothing/under/dress/skirt{
 	pixel_x = -4;
 	pixel_y = -4
 	},
@@ -23307,7 +23307,7 @@
 /area/science/mixing)
 "aLT" = (
 /obj/structure/closet,
-/obj/item/clothing/under/rank/bartender/purple{
+/obj/item/clothing/under/rank/civilian/bartender/purple{
 	pixel_x = 4;
 	pixel_y = 4
 	},
@@ -27296,11 +27296,11 @@
 	name = "medical locker"
 	},
 /obj/structure/grille/broken,
-/obj/item/clothing/under/skirt/blue{
+/obj/item/clothing/under/dress/skirt/blue{
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/clothing/under/rank/medical,
+/obj/item/clothing/under/rank/medical/doctor,
 /obj/item/clothing/gloves/color/latex,
 /obj/item/clothing/mask/surgical,
 /turf/open/floor/plating,
@@ -27633,7 +27633,7 @@
 	pixel_x = -26
 	},
 /obj/item/reagent_containers/food/snacks/pie/cream,
-/obj/item/clothing/under/lobster,
+/obj/item/clothing/under/costume/lobster,
 /obj/item/clothing/head/lobsterhat,
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
@@ -35208,7 +35208,7 @@
 /obj/structure/closet{
 	name = "kitchen closet"
 	},
-/obj/item/clothing/under/rank/chef{
+/obj/item/clothing/under/rank/civilian/chef{
 	pixel_x = 4;
 	pixel_y = 4
 	},
@@ -41672,7 +41672,7 @@
 /obj/structure/closet/secure_closet/personal,
 /obj/item/storage/backpack,
 /obj/item/storage/backpack/satchel,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /obj/item/clothing/suit/hooded/wintercoat,
 /obj/item/clothing/shoes/winterboots,
 /obj/effect/turf_decal/tile/neutral,
@@ -42353,7 +42353,7 @@
 /obj/structure/closet{
 	name = "supply locker"
 	},
-/obj/item/clothing/under/rank/cargotech,
+/obj/item/clothing/under/rank/cargo/tech,
 /obj/item/clothing/shoes/sneakers/brown,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
@@ -42575,11 +42575,11 @@
 /obj/effect/turf_decal/tile/neutral,
 /obj/structure/table,
 /obj/effect/decal/cleanable/cobweb,
-/obj/item/clothing/under/suit_jacket/really_black{
+/obj/item/clothing/under/suit/black_really{
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/clothing/under/suit_jacket/really_black,
+/obj/item/clothing/under/suit/black_really,
 /obj/item/clothing/neck/tie/black{
 	pixel_x = 6
 	},
@@ -42747,7 +42747,7 @@
 /obj/structure/closet/secure_closet/personal,
 /obj/item/storage/backpack,
 /obj/item/storage/backpack/satchel,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /obj/item/clothing/suit/hooded/wintercoat,
 /obj/item/clothing/shoes/winterboots,
 /obj/effect/turf_decal/tile/neutral,
@@ -49246,8 +49246,8 @@
 "byZ" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/closet/wardrobe/black,
-/obj/item/clothing/under/trendy_fit,
-/obj/item/clothing/under/trendy_fit,
+/obj/item/clothing/under/custom/trendy_fit,
+/obj/item/clothing/under/custom/trendy_fit,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/locker)
 "bza" = (
@@ -49915,12 +49915,12 @@
 /obj/structure/closet{
 	name = "suit closet"
 	},
-/obj/item/clothing/under/lawyer/female{
+/obj/item/clothing/under/rank/civilian/lawyer/female{
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/clothing/under/lawyer/bluesuit,
-/obj/item/clothing/under/lawyer/red{
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
+/obj/item/clothing/under/rank/civilian/lawyer/red{
 	pixel_x = -4;
 	pixel_y = -4
 	},
@@ -55123,7 +55123,7 @@
 /area/security/processing)
 "bIl" = (
 /obj/structure/table,
-/obj/item/clothing/under/rank/security{
+/obj/item/clothing/under/rank/security/officer{
 	pixel_x = -4
 	},
 /obj/item/toy/figure/dsquad{
@@ -63053,7 +63053,7 @@
 	name = "security locker"
 	},
 /obj/item/clothing/gloves/color/black,
-/obj/item/clothing/under/rank/security/skirt,
+/obj/item/clothing/under/rank/security/officer/skirt,
 /obj/item/clothing/shoes/jackboots,
 /obj/structure/grille/broken,
 /obj/effect/decal/cleanable/cobweb,
@@ -80232,7 +80232,7 @@
 /obj/effect/turf_decal/tile/neutral,
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/cobweb,
-/obj/item/clothing/under/geisha{
+/obj/item/clothing/under/costume/geisha{
 	pixel_y = 5
 	},
 /obj/item/toy/katana,
@@ -81091,7 +81091,7 @@
 	name = "engineering locker"
 	},
 /obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/under/rank/engineer,
+/obj/item/clothing/under/rank/engineering/engineer,
 /obj/item/clothing/shoes/workboots,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/decal/cleanable/dirt,
@@ -82773,11 +82773,11 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/gloves/color/white,
-/obj/item/clothing/under/maid{
+/obj/item/clothing/under/costume/maid{
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
 /obj/item/clothing/accessory/maidapron{
 	pixel_x = -4;
 	pixel_y = -4
@@ -87666,7 +87666,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/segment,
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/costume/maid,
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
 	},
@@ -88191,7 +88191,7 @@
 /area/hallway/primary/fore)
 "uqy" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
 	},
diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
index 445a0fdbce..30aeb69362 100644
--- a/_maps/map_files/LambdaStation/lambda.dmm
+++ b/_maps/map_files/LambdaStation/lambda.dmm
@@ -11069,7 +11069,7 @@
 	dir = 4
 	},
 /obj/structure/closet/secure_closet/warden,
-/obj/item/clothing/under/rank/warden/grey,
+/obj/item/clothing/under/rank/security/warden/grey,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
@@ -34914,7 +34914,7 @@
 	light_color = "#e8eaff"
 	},
 /obj/machinery/vending/wardrobe/jani_wardrobe{
-	products = list(/obj/item/clothing/under/rank/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
+	products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
 	},
 /turf/open/floor/plating,
 /area/janitor)
@@ -44998,7 +44998,7 @@
 /area/library)
 "bCG" = (
 /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{
 	dir = 2
@@ -64322,12 +64322,12 @@
 /turf/open/floor/plasteel/grimy,
 /area/chapel/office)
 "clT" = (
-/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/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
 /obj/structure/closet/crate{
 	name = "Burial Garment Crate"
 	},
@@ -65350,7 +65350,7 @@
 /area/engine/engineering)
 "cnW" = (
 /obj/machinery/vending/engineering{
-	products = list(/obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/sneakers/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/storage/belt/utility = 4, /obj/item/clothing/glasses/meson/engine = 4, /obj/item/clothing/gloves/color/yellow = 2, /obj/item/screwdriver = 12, /obj/item/crowbar = 12, /obj/item/wirecutters = 12, /obj/item/multitool = 12, /obj/item/wrench = 12, /obj/item/t_scanner = 12, /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, /obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, /obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5)
+	products = list(/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, /obj/item/clothing/glasses/meson/engine = 4, /obj/item/clothing/gloves/color/yellow = 2, /obj/item/screwdriver = 12, /obj/item/crowbar = 12, /obj/item/wirecutters = 12, /obj/item/multitool = 12, /obj/item/wrench = 12, /obj/item/t_scanner = 12, /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, /obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, /obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5)
 	},
 /obj/effect/turf_decal/trimline/yellow/filled/line{
 	icon_state = "trimline_fill";
@@ -77113,7 +77113,7 @@
 	},
 /obj/item/clothing/head/HoS/beret,
 /obj/item/clothing/suit/armor/hos/trenchcoat,
-/obj/item/clothing/under/rank/head_of_security/grey,
+/obj/item/clothing/under/rank/security/head_of_security/grey,
 /obj/item/storage/box/deputy,
 /obj/structure/sign/nanotrasen{
 	pixel_x = 32;
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index ac651d7165..e69b4b67ce 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -4556,7 +4556,7 @@
 /area/crew_quarters/fitness/recreation)
 "aiR" = (
 /obj/structure/table,
-/obj/item/clothing/under/sl_suit{
+/obj/item/clothing/under/suit/sl{
 	desc = "Whoever wears this makes the rules.";
 	name = "referee suit"
 	},
@@ -6918,8 +6918,8 @@
 /area/maintenance/port)
 "ana" = (
 /obj/structure/rack,
-/obj/item/clothing/under/rank/mailman,
-/obj/item/clothing/under/rank/vice{
+/obj/item/clothing/under/misc/mailman,
+/obj/item/clothing/under/misc/vice_officer{
 	pixel_x = 4;
 	pixel_y = -3
 	},
@@ -7555,7 +7555,7 @@
 	c_tag = "Brig - Infirmary";
 	dir = 1
 	},
-/obj/item/clothing/under/rank/medical/purple{
+/obj/item/clothing/under/rank/medical/doctor/purple{
 	pixel_y = -4
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -8886,7 +8886,7 @@
 /obj/structure/chair,
 /obj/item/restraints/handcuffs,
 /obj/effect/decal/remains/human,
-/obj/item/clothing/under/soviet,
+/obj/item/clothing/under/costume/soviet,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
@@ -9965,7 +9965,7 @@
 /obj/machinery/airalarm{
 	pixel_y = 23
 	},
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
 "asV" = (
@@ -10042,7 +10042,7 @@
 /obj/machinery/airalarm{
 	pixel_y = 23
 	},
-/obj/item/clothing/under/suit_jacket/burgundy,
+/obj/item/clothing/under/suit/burgundy,
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
 "atc" = (
@@ -11693,7 +11693,7 @@
 /obj/machinery/airalarm{
 	pixel_y = 23
 	},
-/obj/item/clothing/under/suit_jacket/tan,
+/obj/item/clothing/under/suit/tan,
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
 "awE" = (
@@ -13402,11 +13402,11 @@
 /area/crew_quarters/dorms)
 "aAe" = (
 /obj/structure/table,
-/obj/item/clothing/under/suit_jacket/female{
+/obj/item/clothing/under/suit/black/skirt{
 	pixel_x = 3;
 	pixel_y = 1
 	},
-/obj/item/clothing/under/suit_jacket/really_black{
+/obj/item/clothing/under/suit/black_really{
 	pixel_x = -2
 	},
 /obj/machinery/light/small{
@@ -13418,9 +13418,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/suit/black,
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
@@ -14755,7 +14755,7 @@
 /obj/machinery/airalarm{
 	pixel_y = 23
 	},
-/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit/navy,
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
 "aCM" = (
@@ -16789,7 +16789,7 @@
 /area/crew_quarters/dorms)
 "aGP" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
 "aGQ" = (
@@ -23603,7 +23603,7 @@
 /area/maintenance/starboard/fore)
 "aUX" = (
 /obj/structure/closet/secure_closet/personal,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/item/clothing/suit/hooded/wintercoat,
 /obj/item/clothing/shoes/winterboots,
@@ -26182,7 +26182,7 @@
 /area/ai_monitored/turret_protected/ai)
 "aZU" = (
 /obj/structure/closet/secure_closet/personal,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /obj/item/clothing/suit/hooded/wintercoat,
 /obj/item/clothing/shoes/winterboots,
 /obj/effect/turf_decal/tile/neutral{
@@ -26345,7 +26345,7 @@
 /area/maintenance/port/fore)
 "bah" = (
 /obj/structure/closet/secure_closet/personal,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/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";
@@ -27278,7 +27278,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/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";
@@ -29748,21 +29748,21 @@
 	name = "formal uniform crate";
 	req_access_txt = "3"
 	},
-/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/security/navyblue,
-/obj/item/clothing/under/rank/security/navyblue,
-/obj/item/clothing/under/rank/security/navyblue,
+/obj/item/clothing/under/rank/security/officer/formal,
+/obj/item/clothing/under/rank/security/officer/formal,
+/obj/item/clothing/under/rank/security/officer/formal,
+/obj/item/clothing/under/rank/security/officer/formal,
+/obj/item/clothing/under/rank/security/officer/formal,
+/obj/item/clothing/under/rank/security/officer/formal,
 /obj/item/clothing/suit/armor/navyblue,
 /obj/item/clothing/suit/armor/navyblue,
 /obj/item/clothing/suit/armor/navyblue,
 /obj/item/clothing/suit/armor/navyblue,
 /obj/item/clothing/suit/armor/navyblue,
 /obj/item/clothing/suit/armor/navyblue,
-/obj/item/clothing/under/rank/warden/navyblue,
+/obj/item/clothing/under/rank/security/warden/formal,
 /obj/item/clothing/suit/armor/vest/warden/navyblue,
-/obj/item/clothing/under/rank/head_of_security/navyblue,
+/obj/item/clothing/under/rank/security/head_of_security/formal,
 /obj/item/clothing/suit/armor/hos/navyblue,
 /obj/item/clothing/head/beret/sec/navyofficer,
 /obj/item/clothing/head/beret/sec/navyofficer,
@@ -46039,7 +46039,7 @@
 	},
 /obj/structure/table/wood,
 /obj/item/clothing/shoes/laceup,
-/obj/item/clothing/under/suit_jacket/really_black,
+/obj/item/clothing/under/suit/black_really,
 /obj/item/clothing/glasses/sunglasses,
 /obj/machinery/camera{
 	c_tag = "Corporate Showroom"
@@ -47330,7 +47330,7 @@
 /obj/machinery/newscaster{
 	pixel_x = -30
 	},
-/obj/item/clothing/under/suit_jacket/red,
+/obj/item/clothing/under/suit/red,
 /obj/effect/decal/cleanable/cobweb,
 /obj/item/book/codex_gigas,
 /turf/open/floor/engine/cult,
@@ -72433,12 +72433,12 @@
 	pixel_x = -26
 	},
 /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/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
 /turf/open/floor/plasteel/grimy,
 /area/chapel/office)
 "cLW" = (
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index c1f17e6c1c..97984fa656 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -74,47 +74,9 @@
 "an" = (
 /turf/closed/mineral/random/labormineral/volcanic,
 /area/lavaland/surface/outdoors)
-"ao" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/mob/living/simple_animal/bot/secbot/beepsky{
-	desc = "Powered by the tears and sweat of laborers.";
-	name = "Prison Ofitser"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"ap" = (
-/turf/open/floor/plating,
-/area/lavaland/surface/outdoors)
 "aA" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp)
-"aD" = (
-/obj/structure/chair/comfy/brown{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
+/turf/open/lava/smooth/lava_land_surface,
+/area/template_noop)
 "aQ" = (
 /obj/structure/stone_tile/surrounding_tile{
 	dir = 1
@@ -129,85 +91,12 @@
 /obj/item/t_scanner/adv_mining_scanner/lesser,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
-"aV" = (
-/obj/machinery/vending/sustenance,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"bd" = (
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"bf" = (
-/obj/machinery/door/airlock/medical/glass{
-	name = "Infirmary"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/white,
-/area/mine/laborcamp)
-"bs" = (
-/turf/closed/wall,
-/area/lavaland/surface/outdoors)
-"bC" = (
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"bG" = (
-/obj/structure/ore_box,
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/explored)
-"bP" = (
-/obj/machinery/computer/security/labor,
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"bY" = (
-/obj/machinery/computer/shuttle/labor/one_way{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"cb" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"ch" = (
-/obj/machinery/power/terminal{
-	dir = 4
-	},
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
-"cn" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "cp" = (
 /obj/structure/stone_tile/block{
 	dir = 1
 	},
 /turf/closed/indestructible/riveted/boss,
 /area/ruin/unpowered/ash_walkers)
-"cq" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "cu" = (
 /obj/item/pickaxe,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -229,36 +118,6 @@
 /obj/effect/decal/cleanable/blood,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"cV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"dg" = (
-/obj/docking_port/stationary{
-	area_type = /area/lavaland/surface/outdoors;
-	dir = 8;
-	dwidth = 2;
-	height = 5;
-	id = "laborcamp_away";
-	name = "labor camp";
-	width = 9
-	},
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/explored)
-"dj" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "dA" = (
 /obj/structure/stone_tile/block/cracked{
 	dir = 1
@@ -274,13 +133,7 @@
 "dF" = (
 /obj/structure/stone_tile/block/cracked,
 /turf/closed/mineral/volcanic/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"dG" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel/white,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "dM" = (
 /obj/structure/stone_tile/cracked{
 	dir = 8
@@ -337,48 +190,11 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
-"eR" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/machinery/camera{
-	c_tag = "Labor Camp Medical";
-	dir = 8;
-	network = list("labor")
-	},
-/turf/open/floor/plasteel/white,
-/area/mine/laborcamp)
-"eS" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/machinery/door/airlock{
-	name = "Labor Camp External Access"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"eW" = (
-/obj/machinery/status_display/evac{
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"fc" = (
-/obj/machinery/mineral/unloading_machine{
-	dir = 1;
-	icon_state = "unloader-corner";
-	input_dir = 1;
-	output_dir = 2
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp)
 "ft" = (
 /obj/structure/stone_tile/block,
 /obj/item/twohanded/bonespear,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"fC" = (
-/turf/closed/wall/r_wall,
-/area/mine/laborcamp/security)
+/area/ruin/unpowered/ash_walkers)
 "fN" = (
 /obj/structure/stone_tile{
 	dir = 4
@@ -412,10 +228,6 @@
 /obj/structure/stone_tile/slab,
 /turf/open/indestructible/boss,
 /area/lavaland/surface/outdoors)
-"gg" = (
-/obj/structure/table,
-/turf/open/floor/plasteel/white,
-/area/mine/laborcamp)
 "gj" = (
 /obj/structure/stone_tile/surrounding_tile{
 	dir = 1
@@ -444,9 +256,6 @@
 /obj/structure/stone_tile/block,
 /turf/open/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"gq" = (
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/explored)
 "gr" = (
 /obj/structure/stone_tile{
 	dir = 1
@@ -598,16 +407,7 @@
 /obj/effect/mob_spawn/human/corpse/damaged,
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"hG" = (
-/obj/item/radio/intercom{
-	desc = "Talk through this. It looks like it has been modified to not broadcast.";
-	name = "Prison Intercom (General)";
-	pixel_y = 24;
-	prison_radio = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "hH" = (
 /obj/structure/stone_tile/block{
 	dir = 1
@@ -628,22 +428,6 @@
 	},
 /turf/open/indestructible/boss,
 /area/lavaland/surface/outdoors)
-"hU" = (
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/smes{
-	charge = 5e+006
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
-"hY" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "gulag"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp)
 "ia" = (
 /obj/item/reagent_containers/glass/bucket/wood,
 /obj/structure/stone_tile/block/cracked{
@@ -664,15 +448,6 @@
 	},
 /turf/open/indestructible/boss,
 /area/lavaland/surface/outdoors)
-"iq" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/sign/warning/electricshock{
-	pixel_y = -32
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
 "ir" = (
 /obj/structure/stone_tile/slab/cracked{
 	dir = 5
@@ -709,14 +484,6 @@
 /obj/structure/stone_tile/cracked,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"iB" = (
-/obj/item/bikehorn{
-	color = "#000";
-	desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks.";
-	name = "charred bike horn"
-	},
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/explored)
 "iC" = (
 /obj/structure/stone_tile/block{
 	dir = 1
@@ -737,21 +504,15 @@
 /obj/item/stack/sheet/mineral/wood,
 /obj/item/stack/sheet/mineral/wood,
 /obj/item/seeds/ambrosia/deus{
+	potency = 50;
 	yield = 5
-	potency = 50
 	},
 /obj/item/seeds/ambrosia/deus{
+	potency = 50;
 	yield = 5
-	potency = 50
-	},
-/obj/item/seeds/tower{
-	yield = 5
-	potency = 50
-	},
-/obj/item/seeds/tower{
-	yield = 5
-	potency = 50
 	},
+/obj/item/seeds/tower,
+/obj/item/seeds/tower,
 /mob/living/simple_animal/hostile/asteroid/gutlunch/guthen,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
@@ -877,30 +638,12 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"ju" = (
-/obj/machinery/door/airlock{
-	name = "Vending"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "jx" = (
 /obj/structure/stone_tile{
 	dir = 4
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"jD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "jF" = (
 /obj/structure/stone_tile/surrounding_tile,
 /obj/structure/stone_tile/surrounding_tile{
@@ -1247,12 +990,6 @@
 	},
 /turf/open/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"lL" = (
-/obj/structure/table,
-/obj/item/trash/plate,
-/obj/item/kitchen/fork,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "lP" = (
 /obj/structure/stone_tile/block/cracked{
 	dir = 4
@@ -1297,13 +1034,6 @@
 	},
 /turf/open/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"lY" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
 "lZ" = (
 /obj/structure/stone_tile/block/cracked{
 	dir = 4
@@ -1714,22 +1444,10 @@
 	dir = 8
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"nC" = (
-/obj/machinery/cryopod{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"nE" = (
-/turf/closed/mineral/random/volcanic,
-/area/lavaland/surface/outdoors/explored)
+/area/ruin/unpowered/ash_walkers)
 "nJ" = (
 /turf/closed/wall/mineral/wood,
 /area/ruin/unpowered/ash_walkers)
-"nQ" = (
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "nU" = (
 /obj/structure/stone_tile,
 /obj/item/shard,
@@ -1750,12 +1468,9 @@
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "ol" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp)
+/obj/effect/landmark/stationroom/lavaland/station,
+/turf/open/lava/smooth/lava_land_surface,
+/area/template_noop)
 "ot" = (
 /obj/structure/stone_tile/surrounding_tile,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -1766,15 +1481,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"oL" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red,
-/obj/structure/closet/secure_closet/labor_camp_security,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
+/area/ruin/unpowered/ash_walkers)
 "oS" = (
 /obj/structure/stone_tile/cracked{
 	dir = 8
@@ -1784,10 +1491,6 @@
 /obj/structure/safe,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
-"oW" = (
-/obj/structure/gulag_beacon,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "pc" = (
 /obj/effect/decal/cleanable/blood,
 /obj/structure/stone_tile/block,
@@ -1798,13 +1501,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"pf" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "pq" = (
 /obj/structure/stone_tile/cracked{
 	dir = 1
@@ -1851,26 +1548,6 @@
 	},
 /turf/closed/indestructible/riveted/boss,
 /area/lavaland/surface/outdoors)
-"pR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp)
-"pX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
-"qe" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/red,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "qh" = (
 /obj/structure/stone_tile/surrounding/cracked{
 	dir = 1
@@ -1885,15 +1562,6 @@
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered/ash_walkers)
-"qr" = (
-/obj/machinery/door/airlock{
-	name = "Restroom"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "qA" = (
 /obj/item/flashlight/lantern,
 /obj/structure/stone_tile/center,
@@ -1912,20 +1580,7 @@
 "qS" = (
 /obj/structure/stone_tile/slab,
 /turf/closed/indestructible/riveted/boss,
-/area/ruin/unpowered/ash_walkers)
-"rb" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
+/area/lavaland/surface/outdoors)
 "rz" = (
 /obj/item/storage/box/rxglasses,
 /obj/structure/stone_tile{
@@ -2004,20 +1659,7 @@
 /obj/item/stack/sheet/mineral/coal,
 /obj/item/stack/sheet/mineral/coal,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"sN" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"tp" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
+/area/ruin/unpowered/ash_walkers)
 "ty" = (
 /obj/structure/stone_tile,
 /obj/structure/stone_tile{
@@ -2039,18 +1681,6 @@
 /obj/item/construction/rcd/loaded/upgraded,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"tM" = (
-/obj/machinery/door/poddoor/preopen{
-	id = "labor";
-	name = "labor camp blast door"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"ug" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/turf/open/floor/plasteel/white,
-/area/mine/laborcamp)
 "ui" = (
 /obj/structure/stone_tile/cracked{
 	dir = 4
@@ -2070,36 +1700,12 @@
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered/ash_walkers)
-"up" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet/freezer/gulag_fridge,
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "uz" = (
 /obj/structure/stone_tile/block/cracked{
 	dir = 1
 	},
 /turf/closed/indestructible/riveted/boss,
 /area/lavaland/surface/outdoors)
-"uB" = (
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "Labor Camp APC";
-	pixel_y = 23
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp)
 "vi" = (
 /obj/structure/stone_tile/block{
 	dir = 1
@@ -2110,9 +1716,6 @@
 	},
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"vt" = (
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "vu" = (
 /obj/structure/stone_tile/surrounding_tile/cracked,
 /obj/structure/stone_tile/surrounding_tile/cracked{
@@ -2126,28 +1729,6 @@
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered/ash_walkers)
-"vz" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"vI" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"vP" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/machinery/door/airlock{
-	name = "Labor Camp External Access"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "vR" = (
 /obj/machinery/hydroponics/soil,
 /obj/structure/stone_tile/block/cracked{
@@ -2157,12 +1738,12 @@
 /area/lavaland/surface/outdoors)
 "wm" = (
 /obj/item/seeds/glowshroom{
+	potency = 50;
 	yield = 5
-	potency = 50
 	},
 /obj/item/seeds/glowshroom{
+	potency = 50;
 	yield = 5
-	potency = 50
 	},
 /mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck,
 /obj/structure/stone_tile/block{
@@ -2189,23 +1770,6 @@
 	},
 /turf/closed/indestructible/riveted/boss,
 /area/lavaland/surface/outdoors)
-"wN" = (
-/obj/machinery/mineral/processing_unit{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp)
-"wW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "xr" = (
 /obj/structure/stone_tile/cracked{
 	dir = 4
@@ -2224,30 +1788,14 @@
 	dir = 8
 	},
 /turf/closed/mineral/volcanic/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"xR" = (
-/obj/machinery/mineral/processing_unit_console,
-/turf/closed/wall,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "xX" = (
 /obj/structure/stone_tile/block{
 	dir = 8
 	},
 /obj/item/pickaxe,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"yd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
+/area/ruin/unpowered/ash_walkers)
 "yf" = (
 /obj/machinery/hydroponics/soil,
 /obj/structure/stone_tile/surrounding_tile/cracked{
@@ -2259,19 +1807,7 @@
 	},
 /obj/structure/stone_tile/center,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"yw" = (
-/obj/machinery/conveyor_switch/oneway{
-	id = "gulag"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"yW" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "zf" = (
 /obj/structure/stone_tile,
 /obj/structure/stone_tile{
@@ -2291,36 +1827,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"zx" = (
-/obj/structure/table,
-/obj/item/storage/fancy/donut_box,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"zQ" = (
-/obj/structure/toilet{
-	dir = 8
-	},
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
-"Aa" = (
-/obj/machinery/door/airlock{
-	name = "Labor Camp Storage"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "An" = (
 /obj/structure/stone_tile/slab,
 /obj/structure/table/wood,
@@ -2337,38 +1844,11 @@
 	},
 /obj/item/twohanded/bonespear,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"AP" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/machinery/camera{
-	c_tag = "Labor Camp Security Office";
-	dir = 1;
-	network = list("labor")
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"AR" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/machinery/button/door{
-	id = "labor";
-	name = "Labor Camp Lockdown";
-	pixel_y = 28;
-	req_access_txt = "2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "AU" = (
 /obj/structure/stone_tile,
 /turf/closed/mineral/volcanic/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"AX" = (
-/turf/open/lava/smooth/lava_land_surface,
-/area/lavaland/surface/outdoors/explored)
+/area/ruin/unpowered/ash_walkers)
 "AY" = (
 /obj/structure/stone_tile,
 /obj/structure/stone_tile{
@@ -2383,15 +1863,6 @@
 /obj/item/flashlight/lantern,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"Bg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "Bj" = (
 /obj/structure/stone_tile/block{
 	dir = 4
@@ -2418,15 +1889,6 @@
 /obj/item/flashlight/lantern,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
-"Bv" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Labor Camp Shuttle Prisoner Airlock"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "BF" = (
 /obj/structure/flora/rock/jungle,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -2478,13 +1940,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"Cy" = (
-/obj/structure/chair/office{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
+/area/ruin/unpowered/ash_walkers)
 "CG" = (
 /obj/structure/stone_tile/cracked{
 	dir = 4
@@ -2542,22 +1998,7 @@
 	name = "old rusty grill"
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"ED" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 5
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
+/area/ruin/unpowered/ash_walkers)
 "EQ" = (
 /obj/structure/stone_tile/surrounding/cracked,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -2571,31 +2012,6 @@
 	},
 /turf/closed/indestructible/riveted/boss,
 /area/lavaland/surface/outdoors)
-"Fq" = (
-/obj/effect/turf_decal/loading_area{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"Fs" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"Fw" = (
-/obj/machinery/conveyor{
-	dir = 10;
-	id = "gulag"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp)
 "Fz" = (
 /obj/structure/stone_tile/surrounding_tile{
 	dir = 8
@@ -2604,20 +2020,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"FC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/machinery/door/airlock/highsecurity{
-	name = "Labor Camp Monitoring";
-	req_access_txt = "2";
-	security_level = 6
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "FD" = (
 /obj/structure/stone_tile/cracked{
 	dir = 8
@@ -2625,9 +2028,6 @@
 /obj/structure/stone_tile/cracked,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"FQ" = (
-/turf/closed/wall,
-/area/mine/laborcamp)
 "Gc" = (
 /obj/structure/flora/junglebush/b,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -2658,22 +2058,6 @@
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered/ash_walkers)
-"GI" = (
-/obj/machinery/camera{
-	c_tag = "Labor Camp External";
-	dir = 4;
-	network = list("labor")
-	},
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"GX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
 "Hq" = (
 /obj/structure/stone_tile,
 /obj/structure/stone_tile{
@@ -2698,48 +2082,12 @@
 	dir = 1
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"Ik" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/red,
-/obj/machinery/recharger,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"IV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
+/area/ruin/unpowered/ash_walkers)
 "Jq" = (
 /obj/structure/stone_tile/slab/cracked,
 /obj/effect/decal/cleanable/blood,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"JI" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"JO" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "JP" = (
 /obj/structure/stone_tile,
 /obj/structure/stone_tile{
@@ -2754,23 +2102,10 @@
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
-"Ks" = (
-/obj/machinery/shower{
-	dir = 8
-	},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/white,
-/area/mine/laborcamp)
 "KA" = (
 /obj/structure/stone_tile/slab,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"KH" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "KJ" = (
 /obj/structure/stone_tile/block/cracked,
 /obj/structure/stone_tile{
@@ -2780,24 +2115,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"KO" = (
-/obj/machinery/computer/secure_data,
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"KR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
+/area/ruin/unpowered/ash_walkers)
 "KV" = (
 /obj/structure/stone_tile/cracked{
 	dir = 8
@@ -2808,14 +2126,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"Ld" = (
-/obj/machinery/light/small,
-/obj/effect/turf_decal/loading_area{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "LJ" = (
 /turf/open/water,
 /area/lavaland/surface/outdoors)
@@ -2848,32 +2159,6 @@
 /obj/structure/stone_tile/slab/cracked,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"Nl" = (
-/obj/structure/chair{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"NS" = (
-/obj/machinery/computer/prisoner,
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"Ol" = (
-/obj/structure/closet/crate/internals,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "Ou" = (
 /obj/structure/stone_tile/slab,
 /obj/structure/table/wood,
@@ -2893,10 +2178,7 @@
 /obj/structure/stone_tile/center,
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"OK" = (
-/turf/closed/wall/r_wall,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "Pj" = (
 /obj/structure/stone_tile/surrounding_tile/cracked,
 /obj/structure/stone_tile/surrounding_tile/cracked{
@@ -2907,25 +2189,7 @@
 	},
 /obj/structure/stone_tile/center,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"PF" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Labor Camp Shuttle Security Airlock";
-	req_access_txt = "2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"PM" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
-	dir = 1;
-	piping_layer = 3
-	},
-/obj/structure/lattice/catwalk,
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/mine/laborcamp/security)
+/area/ruin/unpowered/ash_walkers)
 "Qd" = (
 /obj/structure/stone_tile/block{
 	dir = 8
@@ -2939,24 +2203,6 @@
 /obj/item/twohanded/bonespear,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"Qe" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "Qk" = (
 /obj/structure/stone_tile{
 	dir = 4
@@ -2991,44 +2237,10 @@
 /obj/structure/stone_tile,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"QH" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "Labor Camp Security APC";
-	pixel_y = 23
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "QM" = (
 /obj/structure/stone_tile/surrounding_tile/cracked,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"QZ" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Labor Camp Shuttle Prisoner Airlock"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"Ra" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "Rb" = (
 /obj/structure/closet/crate,
 /obj/structure/stone_tile/block/cracked{
@@ -3055,13 +2267,7 @@
 	dir = 8
 	},
 /turf/closed/indestructible/riveted/boss,
-/area/lavaland/surface/outdoors)
-"Rs" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "RF" = (
 /obj/structure/stone_tile/block/cracked{
 	dir = 8
@@ -3079,15 +2285,6 @@
 /obj/effect/decal/cleanable/blood,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"Sc" = (
-/obj/structure/rack,
-/obj/item/storage/bag/ore,
-/obj/item/flashlight,
-/obj/item/pickaxe,
-/obj/item/clothing/glasses/meson,
-/obj/item/mining_scanner,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "Sh" = (
 /obj/structure/stone_tile/block,
 /turf/closed/mineral/volcanic/lava_land_surface,
@@ -3101,41 +2298,6 @@
 	},
 /turf/closed/indestructible/riveted/boss,
 /area/lavaland/surface/outdoors)
-"SI" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"ST" = (
-/obj/structure/closet/crate,
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors/explored)
-"SZ" = (
-/obj/machinery/door/airlock/maintenance{
-	name = "Mining Station Maintenance";
-	req_access_txt = "48"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
-"Tl" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "Tn" = (
 /obj/structure/stone_tile/block{
 	dir = 1
@@ -3149,17 +2311,6 @@
 /obj/item/book/granter/crafting_recipe/bone_bow,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
-"Tp" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/structure/table,
-/obj/item/restraints/handcuffs,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "TN" = (
 /obj/structure/stone_tile/surrounding_tile/cracked{
 	dir = 8
@@ -3175,13 +2326,6 @@
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered/ash_walkers)
-"TP" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "Uh" = (
 /obj/structure/stone_tile/slab,
 /obj/structure/table/wood,
@@ -3200,13 +2344,6 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"UC" = (
-/obj/structure/table,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/white,
-/area/mine/laborcamp)
 "UV" = (
 /obj/structure/stone_tile{
 	dir = 8
@@ -3229,11 +2366,9 @@
 /obj/item/storage/bag/plants,
 /obj/item/seeds/cotton{
 	yield = 5
-	potency = 50
 	},
 /obj/item/seeds/cotton{
 	yield = 5
-	potency = 50
 	},
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
@@ -3242,37 +2377,13 @@
 	dir = 1
 	},
 /turf/closed/mineral/volcanic/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"Vs" = (
-/obj/machinery/camera{
-	c_tag = "Labor Camp Central";
-	network = list("labor")
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
-	dir = 6
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
-"Vy" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "VI" = (
 /obj/structure/well_foundation,
 /obj/item/reagent_containers/glass/bucket/wood,
 /obj/item/reagent_containers/glass/bucket/wood,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"VV" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
+/area/ruin/unpowered/ash_walkers)
 "Wb" = (
 /obj/structure/stone_tile/block{
 	dir = 8
@@ -3291,28 +2402,12 @@
 "Wj" = (
 /obj/structure/stone_tile/surrounding_tile/cracked,
 /turf/closed/mineral/volcanic/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"Wq" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "WA" = (
 /obj/structure/stone_tile/block/cracked,
 /obj/item/book/granter/crafting_recipe/bone_bow,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
-"WI" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Labor Camp Shuttle Security Airlock";
-	req_access_txt = "2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
 "WL" = (
 /obj/structure/stone_tile{
 	dir = 4
@@ -3404,34 +2499,13 @@
 	dir = 4
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"XS" = (
-/obj/machinery/flasher{
-	id = "labor"
-	},
-/turf/closed/wall,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "Yg" = (
 /obj/structure/flora/rock/pile/largejungle{
 	light_range = null
 	},
 /turf/open/water,
-/area/lavaland/surface/outdoors)
-"Ym" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
-"Yu" = (
-/obj/structure/rack,
-/obj/item/storage/bag/ore,
-/obj/item/pickaxe,
-/obj/item/flashlight,
-/obj/item/clothing/glasses/meson,
-/obj/item/mining_scanner,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp)
+/area/ruin/unpowered/ash_walkers)
 "Yy" = (
 /obj/structure/stone_tile/block/cracked{
 	dir = 4
@@ -3439,10 +2513,6 @@
 /obj/item/flashlight/lantern,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
-"YD" = (
-/obj/effect/turf_decal/tile/red,
-/turf/open/floor/plasteel,
-/area/mine/laborcamp/security)
 "Zc" = (
 /obj/structure/stone_tile{
 	dir = 4
@@ -3466,23 +2536,6 @@
 	},
 /turf/closed/indestructible/riveted/boss,
 /area/ruin/unpowered/ash_walkers)
-"ZK" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp/security)
-"ZM" = (
-/turf/closed/wall,
-/area/mine/laborcamp/security)
-"ZP" = (
-/obj/machinery/conveyor{
-	id = "gulag"
-	},
-/turf/open/floor/plating,
-/area/mine/laborcamp)
 
 (1,1,1) = {"
 aa
@@ -3685,61 +2738,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+ol
 "}
 (2,1,1) = {"
 aa
@@ -3942,61 +2995,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (3,1,1) = {"
 aa
@@ -4199,61 +3252,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (4,1,1) = {"
 aa
@@ -4456,61 +3509,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ai
-ai
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (5,1,1) = {"
 aa
@@ -4713,61 +3766,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ai
-ai
-ai
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (6,1,1) = {"
 aa
@@ -4970,61 +4023,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ai
-gq
-ab
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (7,1,1) = {"
 aa
@@ -5126,10 +4179,10 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
+an
+an
+an
+an
 aj
 aj
 aj
@@ -5227,61 +4280,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-AX
-AX
-ab
-gq
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (8,1,1) = {"
 aa
@@ -5382,10 +4435,10 @@ ak
 ak
 ad
 aj
-aj
-aj
-aj
-aj
+ab
+ab
+ad
+an
 an
 an
 an
@@ -5484,61 +4537,61 @@ aj
 aj
 aj
 aj
-aj
-ab
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-AX
-AX
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (9,1,1) = {"
 aa
@@ -5640,133 +4693,72 @@ ak
 ai
 aj
 aj
-aj
-aj
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-aj
-ab
-ab
-aj
-aj
-aj
-aj
-AX
-AX
-aj
-aj
-AX
-AX
-aj
-aj
-AX
-aj
-ab
-aj
-aj
-aj
-aj
-aj
 ab
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
+an
 aj
 aj
 aj
@@ -5781,10 +4773,6 @@ aj
 aj
 aj
 aj
-ab
-ab
-aj
-ab
 aj
 aj
 aj
@@ -5796,6 +4784,71 @@ aj
 aj
 aj
 aj
+aj
+aj
+aj
+aj
+aj
+aj
+aj
+aj
+aj
+aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (10,1,1) = {"
 aa
@@ -5897,8 +4950,8 @@ ak
 ak
 ai
 aj
-aj
-aj
+ab
+ab
 an
 an
 an
@@ -5998,61 +5051,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-aj
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (11,1,1) = {"
 aa
@@ -6255,61 +5308,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-AX
-AX
-gq
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-AX
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (12,1,1) = {"
 aa
@@ -6512,61 +5565,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-AX
-AX
-AX
-gq
-AX
-AX
-AX
-AX
-AX
-gq
-AX
-AX
-gq
-AX
-AX
-AX
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (13,1,1) = {"
 aa
@@ -6769,61 +5822,61 @@ aj
 aj
 aj
 ab
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-AX
-AX
-AX
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-AX
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (14,1,1) = {"
 aa
@@ -7026,61 +6079,61 @@ aj
 aj
 ab
 ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-AX
-AX
-AX
-AX
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-AX
-AX
-ab
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-aj
-ab
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (15,1,1) = {"
 aa
@@ -7283,61 +6336,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-AX
-AX
-AX
-AX
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-AX
-AX
-AX
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (16,1,1) = {"
 aa
@@ -7540,61 +6593,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-AX
-AX
-AX
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-AX
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (17,1,1) = {"
 aa
@@ -7797,61 +6850,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-AX
-AX
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-dg
-gq
-gq
-gq
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-ab
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (18,1,1) = {"
 aa
@@ -8054,61 +7107,61 @@ aj
 aj
 ab
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-FQ
-FQ
-FQ
-FQ
-FQ
-WI
-FQ
-FQ
-FQ
-Bv
-FQ
-ZM
-ZM
-ZM
-aj
-aj
-aj
-aj
-ab
-ai
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (19,1,1) = {"
 aa
@@ -8311,61 +7364,61 @@ an
 an
 ab
 ab
-an
-ab
-aj
-aj
-aj
-aj
-aj
-ab
-FQ
-lL
-Wq
-aV
-FQ
-AR
-FQ
-bY
-FQ
-Rs
-FQ
-ch
-tp
-ZM
-aj
-iB
-aj
-ab
-ab
-ai
-ai
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (20,1,1) = {"
 aa
@@ -8568,61 +7621,61 @@ an
 an
 an
 an
-an
-an
-ab
-aj
-aj
-aj
-ab
-ab
-FQ
-Nl
-vt
-JO
-FQ
-PF
-FQ
-oW
-FQ
-QZ
-FQ
-hU
-iq
-ZM
-aj
-aj
-aj
-aj
-ab
-ai
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (21,1,1) = {"
 aa
@@ -8825,61 +7878,61 @@ an
 an
 an
 an
-an
-an
-an
-an
 aA
-pR
-Ra
-FQ
-FQ
-FQ
-ju
-FQ
-FQ
-tM
-FQ
-eW
-vt
-vt
-OK
-fC
-SZ
-fC
-lY
-fC
-nE
-aj
-aj
-aj
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (22,1,1) = {"
 aa
@@ -9082,61 +8135,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-ol
-gg
-UC
-FQ
-nC
-vt
-vt
-vt
-vt
-vt
-vt
-vz
-vt
-vt
-OK
-Tp
-SI
-up
-zx
-fC
-nE
-nE
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (23,1,1) = {"
 aa
@@ -9339,61 +8392,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-FQ
-ug
-dG
-bf
-cq
-cq
-cq
-pf
-XS
-Vs
-TP
-cV
-dj
-dj
-FC
-ao
-wW
-ED
-aD
-fC
-nE
-gq
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (24,1,1) = {"
 aa
@@ -9596,61 +8649,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-FQ
-eR
-yW
-FQ
-hG
-vt
-Vy
-vI
-TP
-Bg
-JO
-Fq
-vt
-vt
-OK
-cn
-nQ
-IV
-AP
-fC
-AX
-aj
-aj
-aj
-aj
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (25,1,1) = {"
 aa
@@ -9853,61 +8906,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-FQ
-FQ
-FQ
-FQ
-FQ
-vt
-vt
-Ks
-vt
-yw
-FQ
-hY
-OK
-OK
-OK
-QH
-nQ
-jD
-Tl
-lY
-gq
-aj
-aj
-aj
-aj
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (26,1,1) = {"
 aa
@@ -10110,61 +9163,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-FQ
-Yu
-Yu
-Yu
-FQ
-vt
-Ld
-FQ
-FQ
-xR
-FQ
-hY
-OK
-uB
-qr
-Fs
-Ym
-Qe
-cb
-yd
-PM
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (27,1,1) = {"
 aa
@@ -10367,61 +9420,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-FQ
-Sc
-vt
-vt
-Aa
-vt
-bd
-fc
-ZP
-wN
-ZP
-Fw
-OK
-zQ
-ZM
-KO
-nQ
-JI
-YD
-VV
-gq
-gq
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (28,1,1) = {"
 aa
@@ -10624,61 +9677,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-FQ
-FQ
-sN
-Ol
-FQ
-vP
-FQ
-FQ
-FQ
-FQ
-FQ
-FQ
-OK
-OK
-fC
-bP
-Cy
-KH
-bC
-fC
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (29,1,1) = {"
 aa
@@ -10881,61 +9934,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-FQ
-FQ
-FQ
-FQ
-vt
-FQ
-bG
-ST
-ST
-gq
-gq
-gq
-AX
-lY
-NS
-qe
-Ik
-oL
-fC
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (30,1,1) = {"
 aa
@@ -11059,7 +10112,6 @@ aj
 aj
 aj
 aj
-aj
 an
 an
 an
@@ -11139,60 +10191,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-FQ
-Rs
-FQ
-bG
-gq
-gq
-gq
-gq
-gq
-AX
-KR
-GX
-ZK
-rb
-pX
-fC
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (31,1,1) = {"
 aa
@@ -11318,7 +10371,7 @@ aj
 aj
 aj
 aj
-aj
+an
 aj
 aj
 an
@@ -11395,61 +10448,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-FQ
-eS
-FQ
-bG
-gq
-gq
-gq
-gq
-gq
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (32,1,1) = {"
 aa
@@ -11652,61 +10705,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-gq
-gq
-GI
-gq
-gq
-gq
-gq
-gq
-aj
-aj
-aj
-aj
-aj
-ab
-ad
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (33,1,1) = {"
 aa
@@ -11909,61 +10962,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-gq
-aj
-aj
-aj
-aj
-ab
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (34,1,1) = {"
 aa
@@ -12166,61 +11219,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-gq
-gq
-gq
-gq
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (35,1,1) = {"
 aa
@@ -12423,61 +11476,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-gq
-gq
-gq
-gq
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (36,1,1) = {"
 aa
@@ -12680,61 +11733,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-gq
-gq
-gq
-gq
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (37,1,1) = {"
 aa
@@ -12937,61 +11990,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-gq
-gq
-cv
-an
-ab
-an
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (38,1,1) = {"
 aa
@@ -13194,61 +12247,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-aj
-aj
-aj
-ai
-ad
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (39,1,1) = {"
 aa
@@ -13451,61 +12504,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-aj
-aj
-aj
-aj
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (40,1,1) = {"
 aa
@@ -13708,61 +12761,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (41,1,1) = {"
 aa
@@ -13965,61 +13018,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ad
-ai
-ai
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (42,1,1) = {"
 aa
@@ -14222,61 +13275,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ai
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (43,1,1) = {"
 aa
@@ -14479,61 +13532,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (44,1,1) = {"
 aa
@@ -14736,61 +13789,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-an
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (45,1,1) = {"
 aa
@@ -14993,61 +14046,61 @@ an
 an
 an
 an
-an
-an
-an
-an
-an
-an
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (46,1,1) = {"
 aa
@@ -15250,61 +14303,61 @@ aj
 aj
 aj
 aj
-an
-an
-an
-an
-an
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (47,1,1) = {"
 aa
@@ -15507,61 +14560,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ai
-ai
-aj
-ab
-aj
-aj
-ab
-ab
-aj
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (48,1,1) = {"
 aa
@@ -15764,61 +14817,61 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ai
-ai
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ai
-ad
-ad
-ab
-ab
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (49,1,1) = {"
 aa
@@ -16021,61 +15074,61 @@ aj
 aj
 ai
 ai
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ai
-ai
-ai
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ad
-ad
-ad
-ad
-ad
-ai
-ai
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (50,1,1) = {"
 aa
@@ -16278,61 +15331,61 @@ ab
 ab
 ai
 am
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-am
-ai
-ab
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-ab
-ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ab
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (51,1,1) = {"
 aa
@@ -16535,61 +15588,61 @@ ai
 ai
 am
 am
-am
-am
-am
-am
-am
-am
-am
-ai
-ab
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ab
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (52,1,1) = {"
 aa
@@ -16792,61 +15845,61 @@ am
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-ai
-ab
-aj
-aj
-ab
-ab
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ab
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (53,1,1) = {"
 aa
@@ -17049,61 +16102,61 @@ am
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-ai
-ab
-aj
-ab
-ab
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ad
-ad
-ai
-ad
-ab
-ab
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (54,1,1) = {"
 aa
@@ -17306,61 +16359,61 @@ am
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-ai
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (55,1,1) = {"
 aa
@@ -17563,61 +16616,61 @@ am
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (56,1,1) = {"
 aa
@@ -17820,61 +16873,61 @@ ak
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (57,1,1) = {"
 aa
@@ -18077,61 +17130,61 @@ ak
 ak
 am
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (58,1,1) = {"
 aa
@@ -18334,61 +17387,61 @@ ak
 ak
 ak
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-ai
-ai
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (59,1,1) = {"
 aa
@@ -18591,61 +17644,61 @@ ak
 ak
 ak
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (60,1,1) = {"
 aa
@@ -18848,61 +17901,61 @@ ak
 ak
 ak
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (61,1,1) = {"
 aa
@@ -19105,61 +18158,61 @@ ak
 ak
 ak
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (62,1,1) = {"
 aa
@@ -19362,61 +18415,61 @@ ak
 ak
 ak
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-aj
-aj
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (63,1,1) = {"
 aa
@@ -19619,61 +18672,61 @@ ak
 ak
 ak
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-ai
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ai
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (64,1,1) = {"
 aa
@@ -19876,61 +18929,61 @@ ak
 ak
 ak
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ap
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (65,1,1) = {"
 aa
@@ -20133,61 +19186,61 @@ ak
 ak
 am
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-bs
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (66,1,1) = {"
 aa
@@ -20390,61 +19443,61 @@ am
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ad
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (67,1,1) = {"
 aa
@@ -20647,61 +19700,61 @@ am
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (68,1,1) = {"
 aa
@@ -20904,61 +19957,61 @@ am
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (69,1,1) = {"
 aa
@@ -21161,61 +20214,61 @@ am
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-ai
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (70,1,1) = {"
 aa
@@ -21418,61 +20471,61 @@ am
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-ab
-ai
-ai
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (71,1,1) = {"
 aa
@@ -21675,61 +20728,61 @@ am
 am
 am
 am
-am
-am
-am
-am
-am
-am
-am
-am
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ai
-ai
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (72,1,1) = {"
 aa
@@ -21932,61 +20985,61 @@ am
 am
 am
 am
-am
-am
-ai
-ai
-am
-am
-am
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-ab
-aj
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (73,1,1) = {"
 aa
@@ -22189,61 +21242,61 @@ am
 am
 am
 am
-am
-ai
-ab
-ab
-ai
-ai
-am
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (74,1,1) = {"
 aa
@@ -22446,61 +21499,61 @@ am
 am
 am
 am
-ai
-ab
-ab
-ab
-ai
-ab
-ai
-am
-ai
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-ab
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-aj
-aj
-aj
-aj
-ab
-ab
-ab
-aj
-aj
-aj
-aj
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
+aA
 "}
 (75,1,1) = {"
 aa
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index e8b6f238f3..9031e9964b 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -12660,7 +12660,7 @@
 /area/maintenance/port/fore)
 "avQ" = (
 /obj/structure/table,
-/obj/item/clothing/under/rank/security,
+/obj/item/clothing/under/rank/security/officer,
 /obj/item/restraints/handcuffs,
 /obj/structure/cable/white,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -13692,7 +13692,7 @@
 /obj/structure/closet/secure_closet/personal/cabinet,
 /obj/item/clothing/suit/jacket/letterman_nanotrasen,
 /obj/item/clothing/suit/toggle/lawyer,
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/costume/maid,
 /obj/machinery/light/small{
 	dir = 1
 	},
@@ -13716,7 +13716,7 @@
 /obj/item/clothing/head/fedora{
 	icon_state = "detective"
 	},
-/obj/item/clothing/under/geisha,
+/obj/item/clothing/under/costume/geisha,
 /obj/machinery/light/small{
 	dir = 1
 	},
@@ -17365,7 +17365,7 @@
 /obj/item/clothing/head/fedora{
 	icon_state = "detective"
 	},
-/obj/item/clothing/under/lawyer/female,
+/obj/item/clothing/under/rank/civilian/lawyer/female,
 /obj/machinery/light/small,
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
@@ -17387,7 +17387,7 @@
 	},
 /obj/item/clothing/suit/toggle/lawyer/black,
 /obj/item/clothing/head/fedora,
-/obj/item/clothing/under/blacktango,
+/obj/item/clothing/under/dress/blacktango,
 /obj/machinery/light/small,
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/dorms)
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 04896d128e..637913adf1 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -18191,7 +18191,7 @@
 /obj/structure/chair/wood/normal{
 	dir = 8
 	},
-/obj/item/clothing/under/janimaid,
+/obj/item/clothing/under/rank/civilian/janitor/maid,
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
 	},
@@ -20830,7 +20830,7 @@
 /area/janitor)
 "aXP" = (
 /obj/structure/table,
-/obj/item/clothing/under/maid,
+/obj/item/clothing/under/costume/maid,
 /obj/item/key/janitor,
 /obj/item/grenade/clusterbuster/cleaner,
 /obj/item/grenade/chem_grenade/cleaner,
@@ -22591,9 +22591,9 @@
 "bbt" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/table/wood,
-/obj/item/clothing/under/sundress,
-/obj/item/clothing/under/waiter,
-/obj/item/clothing/under/blacktango,
+/obj/item/clothing/under/dress/sundress,
+/obj/item/clothing/under/suit/waiter,
+/obj/item/clothing/under/dress/blacktango,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/bar)
 "bbu" = (
@@ -22653,7 +22653,7 @@
 	pixel_x = 6;
 	pixel_y = -5
 	},
-/obj/item/clothing/under/rank/mailman,
+/obj/item/clothing/under/misc/mailman,
 /obj/item/clothing/head/mailman,
 /turf/open/floor/plasteel,
 /area/quartermaster/office)
@@ -35719,7 +35719,7 @@
 	icon_state = "2-4"
 	},
 /obj/structure/closet,
-/obj/item/clothing/under/rank/nursesuit,
+/obj/item/clothing/under/rank/medical/doctor/nurse,
 /obj/item/clothing/head/nursehat,
 /obj/effect/decal/cleanable/cobweb,
 /obj/machinery/airalarm{
@@ -51421,10 +51421,10 @@
 /turf/open/floor/carpet,
 /area/chapel/main/monastery)
 "cwz" = (
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
-/obj/item/clothing/under/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
+/obj/item/clothing/under/misc/burial,
 /obj/structure/table/wood,
 /turf/open/floor/plasteel/dark,
 /area/chapel/main/monastery)
@@ -55840,7 +55840,7 @@
 /turf/open/floor/plasteel,
 /area/hallway/secondary/exit/departure_lounge)
 "klV" = (
-/obj/item/clothing/under/rank/clown/sexy,
+/obj/item/clothing/under/rank/civilian/clown/sexy,
 /turf/open/floor/plasteel/dark,
 /area/maintenance/department/crew_quarters/dorms)
 "kmd" = (
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 905b2cdb1b..f9c3653b35 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -1711,14 +1711,14 @@
 /obj/structure/table,
 /obj/item/paper,
 /obj/item/pen,
-/obj/item/clothing/under/schoolgirl,
+/obj/item/clothing/under/costume/schoolgirl,
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
 "eD" = (
 /obj/structure/table,
 /obj/item/paper,
 /obj/item/pen,
-/obj/item/clothing/under/schoolgirl/green,
+/obj/item/clothing/under/costume/schoolgirl/green,
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
 "eE" = (
@@ -1832,14 +1832,14 @@
 /obj/structure/table,
 /obj/item/paper,
 /obj/item/pen,
-/obj/item/clothing/under/schoolgirl/orange,
+/obj/item/clothing/under/costume/schoolgirl/orange,
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
 "eU" = (
 /obj/structure/table,
 /obj/item/paper,
 /obj/item/pen,
-/obj/item/clothing/under/schoolgirl/red,
+/obj/item/clothing/under/costume/schoolgirl/red,
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
 "eV" = (
@@ -1934,7 +1934,7 @@
 /obj/structure/table,
 /obj/item/paper,
 /obj/item/pen,
-/obj/item/clothing/under/schoolgirl,
+/obj/item/clothing/under/costume/schoolgirl,
 /obj/item/toy/katana,
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
@@ -6839,8 +6839,8 @@
 /area/centcom/ferry)
 "pN" = (
 /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/rank/civilian/curator/treasure_hunter,
+/obj/item/clothing/under/dress/skirt,
 /obj/item/clothing/under/shorts/black,
 /obj/item/clothing/under/pants/track,
 /obj/item/clothing/accessory/armband/deputy,
@@ -17017,11 +17017,11 @@
 /turf/open/floor/plasteel/white,
 /area/centcom/holding)
 "OU" = (
-/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/indestructible/hotelwood,
 /area/centcom/holding)
 "OV" = (
diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm
index 7b4bcc71f5..0eea5ab1c8 100644
--- a/_maps/shuttles/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency_pubby.dmm
@@ -520,7 +520,7 @@
 /obj/structure/window/reinforced,
 /obj/structure/table,
 /obj/item/storage/bag/tray,
-/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/suit/waiter,
 /turf/open/floor/plasteel/cafeteria,
 /area/shuttle/escape)
 "bg" = (
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm
index 424436f1b3..f3a71b8f5c 100644
--- a/_maps/shuttles/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin_pirate_cutter.dmm
@@ -82,7 +82,7 @@
 	},
 /obj/item/clothing/head/collectable/pirate,
 /obj/item/clothing/suit/pirate,
-/obj/item/clothing/under/pirate,
+/obj/item/clothing/under/costume/pirate,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/head/bandana,
 /turf/open/floor/plasteel/dark/side{
@@ -387,7 +387,7 @@
 	},
 /obj/item/clothing/head/collectable/pirate,
 /obj/item/clothing/suit/pirate,
-/obj/item/clothing/under/pirate,
+/obj/item/clothing/under/costume/pirate,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/head/bandana,
 /obj/effect/turf_decal/tile/red{
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index 7ecbe59bf0..817f337503 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -909,11 +909,11 @@
 	dir = 1
 	},
 /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/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm
index 7bcca68713..01355173d2 100644
--- a/code/__DEFINES/citadel_defines.dm
+++ b/code/__DEFINES/citadel_defines.dm
@@ -39,15 +39,14 @@
 
 #define DEF_VAGINA_SHAPE	"Human"
 
-#define COCK_SIZE_MIN		1
 #define COCK_SIZE_DEF		6
-#define COCK_SIZE_MAX		20
 
 #define COCK_DIAMETER_RATIO_MAX		0.42
 #define COCK_DIAMETER_RATIO_DEF		0.25
 #define COCK_DIAMETER_RATIO_MIN		0.15
 
 #define DEF_COCK_SHAPE		"Human"
+
 #define BALLS_VOLUME_BASE	25
 #define BALLS_VOLUME_MULT	1
 
diff --git a/code/__HELPERS/_cit_helpers.dm b/code/__HELPERS/_cit_helpers.dm
index 1954a159b3..cc8ab0d250 100644
--- a/code/__HELPERS/_cit_helpers.dm
+++ b/code/__HELPERS/_cit_helpers.dm
@@ -60,7 +60,6 @@ GLOBAL_LIST_EMPTY(genitals_list)
 GLOBAL_LIST_EMPTY(cock_shapes_list)
 GLOBAL_LIST_EMPTY(gentlemans_organ_names)
 GLOBAL_LIST_EMPTY(balls_shapes_list)
-GLOBAL_LIST_EMPTY(breasts_size_list)
 GLOBAL_LIST_EMPTY(breasts_shapes_list)
 GLOBAL_LIST_EMPTY(vagina_shapes_list)
 GLOBAL_LIST_INIT(cum_into_containers_list, list(/obj/item/reagent_containers/food/snacks/pie)) //Yer fuggin snowflake name list jfc
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 8c73d32583..ff2559b661 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -54,7 +54,6 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/testicles, GLOB.balls_shapes_list)
-	GLOB.breasts_size_list = list ("a", "b", "c", "d", "e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing.
 	GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ",
 	"cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret",
 	"baloney pony", "schlanger", "Mutton dagger", "old blind bob","Hanging Johnny", "fishing rod", "Tally whacker", "polly rocket",
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index d847423853..b8edf3b0f4 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -194,7 +194,7 @@
 		"balls_efficiency"	= CUM_EFFICIENCY,
 		"has_breasts" 		= FALSE,
 		"breasts_color" 	= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
-		"breasts_size" 		= pick(GLOB.breasts_size_list),
+		"breasts_size" 		= pick(CONFIG_GET(keyed_list/breasts_cups_prefs)),
 		"breasts_shape"		= DEF_BREASTS_SHAPE,
 		"breasts_producing" = FALSE,
 		"has_vag"			= FALSE,
@@ -210,7 +210,8 @@
 		"ipc_screen"		= snowflake_ipc_antenna_list ? pick(snowflake_ipc_antenna_list) : "None",
 		"ipc_antenna"		= "None",
 		"flavor_text"		= "",
-		"meat_type"			= "Mammalian"
+		"meat_type"			= "Mammalian",
+		"body_model"		= MALE
 		))
 
 /proc/random_hair_style(gender)
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 914e45add5..e825233bca 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/clothing/head/welding = 1,
 	/obj/item/clothing/mask/gas = 15,
 	/obj/item/clothing/suit/hazardvest = 1,
-	/obj/item/clothing/under/rank/vice = 1,
+	/obj/item/clothing/under/misc/vice_officer = 1,
 	/obj/item/clothing/suit/hooded/flashsuit = 2,
 	/obj/item/clothing/accessory/medal/greytide	=	1,
 	/obj/item/assembly/prox_sensor = 4,
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 7e194d5889..d4ec44a641 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -20,7 +20,7 @@
 	var/override = 0
 
 	for(var/datum/mutation/human/HM in dna.mutations)
-		override += HM.on_attack_hand(src, A, proximity)
+		override += HM.on_attack_hand(A, proximity)
 
 	if(override)
 		return
@@ -95,7 +95,7 @@
 		return
 
 	for(var/datum/mutation/human/HM in dna.mutations)
-		HM.on_ranged_attack(src, A, mouseparams)
+		HM.on_ranged_attack(A, mouseparams)
 
 	if(isturf(A) && get_dist(src,A) <= 1)
 		src.Move_Pulled(A)
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 911b986367..bc290bedb9 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -423,3 +423,16 @@
 	config_entry_value = 3
 
 /datum/config_entry/flag/suicide_allowed
+
+/datum/config_entry/keyed_list/breasts_cups_prefs
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_FLAG
+	config_entry_value = list("a", "b", "c", "d", "e") //keep these lowercase
+
+/datum/config_entry/number/penis_min_inches_prefs
+	config_entry_value = 1
+	min_val = 0
+
+/datum/config_entry/number/penis_max_inches_prefs
+	config_entry_value = 20
+	min_val = 0
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index 1ad4a15ee7..0d854371aa 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -69,12 +69,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)),
 
@@ -87,15 +87,15 @@ 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/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/civilian/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/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/parade, /obj/item/clothing/under/rank/security/head_of_security/parade/female,
 												 /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,
@@ -103,8 +103,8 @@ SUBSYSTEM_DEF(traumas)
 					"robots"   = typecacheof(list(/obj/machinery/computer/upload, /obj/item/aiModule/, /obj/machinery/recharge_station,
 						/obj/item/aicard, /obj/item/deactivated_swarmer, /obj/effect/mob_spawn/swarmer)),
 
-					"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/doctor/nurse, /obj/item/clothing/under/rank/medical/chief_medical_officer,
 						/obj/item/reagent_containers/syringe, /obj/item/reagent_containers/pill/, /obj/item/reagent_containers/hypospray,
 						/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,
@@ -112,10 +112,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/captain,  /obj/item/clothing/under/rank/civilian/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)),
 
@@ -131,7 +131,7 @@ SUBSYSTEM_DEF(traumas)
 						/obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard, /obj/item/spellbook, /obj/item/staff,
 						/obj/item/clothing/suit/space/hardsuit/shielded/wizard, /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,
@@ -145,21 +145,21 @@ 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/twohanded/vibro_weapon,
 					   /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe)),
 
-					"mimes" = typecacheof(list(/obj/item/pda/mime, /obj/item/clothing/under/rank/mime, /obj/item/clothing/mask/gas/mime,
+					"mimes" = typecacheof(list(/obj/item/pda/mime, /obj/item/clothing/under/rank/civilian/mime, /obj/item/clothing/mask/gas/mime,
 						/obj/item/clothing/head/frenchberet, /obj/item/clothing/suit/suspenders, /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
 						/obj/item/storage/backpack/mime, /obj/item/reagent_containers/food/snacks/grown/banana/mime,
 						/obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime,
 						/obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime,
-						/obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
+						/obj/item/clothing/under/rank/civilian/mime/sexy, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
 
 					"cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty,
 						/obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)),
diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm
index 369cf2bbf4..5636be6b2a 100644
--- a/code/datums/components/crafting/recipes/recipes_clothing.dm
+++ b/code/datums/components/crafting/recipes/recipes_clothing.dm
@@ -8,7 +8,7 @@
 
 /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/lizardhat
diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm
index 38ae3560e5..ee72745016 100644
--- a/code/datums/components/crafting/recipes/recipes_misc.dm
+++ b/code/datums/components/crafting/recipes/recipes_misc.dm
@@ -278,7 +278,7 @@
 	result = /obj/item/banner/command/mundane
 	time = 40
 	reqs = list(/obj/item/stack/rods = 2,
-				/obj/item/clothing/under/captainparade = 1)
+				/obj/item/clothing/under/rank/captain/parade = 1)
 	category = CAT_MISC
 
 /datum/crafting_recipe/engineering_banner
@@ -286,7 +286,7 @@
 	result = /obj/item/banner/engineering/mundane
 	time = 40
 	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
 
 /datum/crafting_recipe/cargo_banner
@@ -294,7 +294,7 @@
 	result = /obj/item/banner/cargo/mundane
 	time = 40
 	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
 
 /datum/crafting_recipe/science_banner
@@ -302,7 +302,7 @@
 	result = /obj/item/banner/science/mundane
 	time = 40
 	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
 
 /datum/crafting_recipe/medical_banner
@@ -310,7 +310,7 @@
 	result = /obj/item/banner/medical/mundane
 	time = 40
 	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
 
 /datum/crafting_recipe/security_banner
@@ -318,7 +318,7 @@
 	result = /obj/item/banner/security/mundane
 	time = 40
 	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
 
 	/datum/crafting_recipe/bloodsucker/vassalrack
diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index 05a6e4f060..4ddf74fc0a 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -412,13 +412,13 @@
 
 	switch(deconstruct_block(getblock(dna.uni_identity, DNA_GENDER_BLOCK), 4))
 		if(G_MALE)
-			gender = MALE
+			set_gender(MALE, TRUE)
 		if(G_FEMALE)
-			gender = FEMALE
+			set_gender(FEMALE, TRUE)
 		if(G_PLURAL)
-			gender = PLURAL
+			set_gender(PLURAL, TRUE)
 		else
-			gender = NEUTER
+			set_gender(NEUTER, TRUE)
 
 /mob/living/carbon/human/updateappearance(icon_update=1, mutcolor_update=0, mutations_overlay_update=0)
 	..()
diff --git a/code/datums/mutations.dm b/code/datums/mutations/_mutations.dm
similarity index 83%
rename from code/datums/mutations.dm
rename to code/datums/mutations/_mutations.dm
index 9234e124c5..2156581cb1 100644
--- a/code/datums/mutations.dm
+++ b/code/datums/mutations/_mutations.dm
@@ -51,45 +51,46 @@
 	if(copymut && istype(copymut, /datum/mutation/human))
 		copy_mutation(copymut)
 
-/datum/mutation/human/proc/on_acquiring(mob/living/carbon/human/owner)
-	if(!owner || !istype(owner) || owner.stat == DEAD || (src in owner.dna.mutations))
+/datum/mutation/human/proc/on_acquiring(mob/living/carbon/human/H)
+	if(!H || !istype(H) || H.stat == DEAD || (src in H.dna.mutations))
 		return TRUE
-	if(species_allowed.len && !species_allowed.Find(owner.dna.species.id))
+	if(species_allowed.len && !species_allowed.Find(H.dna.species.id))
 		return TRUE
-	if(health_req && owner.health < health_req)
+	if(health_req && H.health < health_req)
 		return TRUE
-	if(limb_req && !owner.get_bodypart(limb_req))
+	if(limb_req && !H.get_bodypart(limb_req))
 		return TRUE
-	dna = owner.dna
+	owner = H
+	dna = H.dna
 	dna.mutations += src
 	if(text_gain_indication)
-		to_chat(owner, text_gain_indication)
+		to_chat(H, text_gain_indication)
 	if(visual_indicators.len)
-		var/list/mut_overlay = list(get_visual_indicator(owner))
-		if(owner.overlays_standing[layer_used])
-			mut_overlay = owner.overlays_standing[layer_used]
-			mut_overlay |= get_visual_indicator(owner)
-		owner.remove_overlay(layer_used)
-		owner.overlays_standing[layer_used] = mut_overlay
-		owner.apply_overlay(layer_used)
+		var/list/mut_overlay = list(get_visual_indicator())
+		if(H.overlays_standing[layer_used])
+			mut_overlay = H.overlays_standing[layer_used]
+			mut_overlay |= get_visual_indicator()
+		H.remove_overlay(layer_used)
+		H.overlays_standing[layer_used] = mut_overlay
+		H.apply_overlay(layer_used)
 
-	grant_spell(owner)
+	grant_spell()
 	if(!modified)
 		addtimer(CALLBACK(src, .proc/modify, 5)) //gonna want children calling ..() to run first
 
-/datum/mutation/human/proc/get_visual_indicator(mob/living/carbon/human/owner)
+/datum/mutation/human/proc/get_visual_indicator()
 	return
 
-/datum/mutation/human/proc/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity)
+/datum/mutation/human/proc/on_attack_hand(atom/target, proximity)
 	return
 
-/datum/mutation/human/proc/on_ranged_attack(mob/living/carbon/human/owner, atom/target)
+/datum/mutation/human/proc/on_ranged_attack(atom/target, mouseparams)
 	return
 
-/datum/mutation/human/proc/on_move(mob/living/carbon/human/owner, new_loc)
+/datum/mutation/human/proc/on_move(atom/new_loc)
 	return
 
-/datum/mutation/human/proc/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/proc/on_life()
 	return
 
 /datum/mutation/human/proc/on_losing(mob/living/carbon/human/owner)
@@ -172,7 +173,7 @@
 	else
 		qdel(src)
 
-/datum/mutation/human/proc/grant_spell(mob/living/carbon/human/owner)
+/datum/mutation/human/proc/grant_spell()
 	if(!ispath(power) || !owner)
 		return FALSE
 
@@ -180,4 +181,4 @@
 	power.action_background_icon_state = "bg_tech_blue_on"
 	power.panel = "Genetic"
 	owner.AddSpell(power)
-	return TRUE
\ No newline at end of file
+	return TRUE
diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm
index e3ee336097..f036b25518 100644
--- a/code/datums/mutations/actions.dm
+++ b/code/datums/mutations/actions.dm
@@ -111,7 +111,7 @@
 	energy_coeff = 1
 	synchronizer_coeff = 1
 
-/datum/mutation/human/void/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/void/on_life()
 	if(!isturf(owner.loc))
 		return
 	if(prob((0.5+((100-dna.stability)/20))) * GET_MUTATION_SYNCHRONIZER(src)) //very rare, but enough to annoy you hopefully. +0.5 probability for every 10 points lost in stability
diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm
index a2700f7862..978802fd80 100644
--- a/code/datums/mutations/antenna.dm
+++ b/code/datums/mutations/antenna.dm
@@ -36,7 +36,7 @@
 	if(!(type in visual_indicators))
 		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))//-MUTATIONS_LAYER+1
 
-/datum/mutation/human/antenna/get_visual_indicator(mob/living/carbon/human/owner)
+/datum/mutation/human/antenna/get_visual_indicator()
 	return visual_indicators[type][1]
 
 /datum/mutation/human/mindreader
@@ -104,5 +104,5 @@
 	if(!(type in visual_indicators))
 		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))
 
-/datum/mutation/human/mindreader/get_visual_indicator(mob/living/carbon/human/owner)
+/datum/mutation/human/mindreader/get_visual_indicator()
 	return visual_indicators[type][1]
diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
index e229fdde9a..cc286058f1 100644
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -9,7 +9,7 @@
 	synchronizer_coeff = 1
 	power_coeff = 1
 
-/datum/mutation/human/epilepsy/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/epilepsy/on_life()
 	if(prob(1 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS)
 		owner.visible_message("<span class='danger'>[owner] starts having a seizure!</span>", "<span class='userdanger'>You have a seizure!</span>")
 		owner.Unconscious(200 * GET_MUTATION_POWER(src))
@@ -57,7 +57,7 @@
 	synchronizer_coeff = 1
 	power_coeff = 1
 
-/datum/mutation/human/cough/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/cough/on_life()
 	if(prob(5 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS)
 		owner.drop_all_held_items()
 		owner.emote("cough")
@@ -118,7 +118,7 @@
 	text_gain_indication = "<span class='danger'>You twitch.</span>"
 	synchronizer_coeff = 1
 
-/datum/mutation/human/tourettes/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/tourettes/on_life()
 	if(prob(10 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS && !owner.IsStun())
 		owner.Stun(200)
 		switch(rand(1, 3))
@@ -212,7 +212,7 @@
 	synchronizer_coeff = 1
 	power_coeff = 1
 
-/datum/mutation/human/fire/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/fire/on_life()
 	if(prob((1+(100-dna.stability)/10)) * GET_MUTATION_SYNCHRONIZER(src))
 		owner.adjust_fire_stacks(2 * GET_MUTATION_POWER(src))
 		owner.IgniteMob()
@@ -268,7 +268,7 @@
 	text_gain_indication = "<span class='danger'>You feel screams echo through your mind...</span>"
 	text_lose_indication = "<span class'notice'>The screaming in your mind fades.</span>"
 
-/datum/mutation/human/paranoia/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/paranoia/on_life()
 	if(prob(5) && owner.stat == CONSCIOUS)
 		owner.emote("scream")
 		owner.jitteriness = min(max(0, owner.jitteriness + 5), 30)
diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm
index 7682351ebf..f552ccaa75 100644
--- a/code/datums/mutations/chameleon.dm
+++ b/code/datums/mutations/chameleon.dm
@@ -14,13 +14,13 @@
 		return
 	owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
 
-/datum/mutation/human/chameleon/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/chameleon/on_life()
 	owner.alpha = max(0, owner.alpha - 25)
 
-/datum/mutation/human/chameleon/on_move(mob/living/carbon/human/owner)
+/datum/mutation/human/chameleon/on_move(atom/new_loc)
 	owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
 
-/datum/mutation/human/chameleon/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity)
+/datum/mutation/human/chameleon/on_attack_hand(atom/target, proximity)
 	if(proximity) //stops tk from breaking chameleon
 		owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
 		return
diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm
index eb6c9665f3..4f8cd6b25e 100644
--- a/code/datums/mutations/hulk.dm
+++ b/code/datums/mutations/hulk.dm
@@ -19,11 +19,11 @@
 	SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk)
 	RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
 
-/datum/mutation/human/hulk/on_attack_hand(mob/living/carbon/human/owner,atom/target, proximity)
+/datum/mutation/human/hulk/on_attack_hand(atom/target, proximity)
 	if(proximity) //no telekinetic hulk attack
 		return target.attack_hulk(owner)
 
-/datum/mutation/human/hulk/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/hulk/on_life()
 	if(owner.health < 0)
 		on_losing(owner)
 		to_chat(owner, "<span class='danger'>You suddenly feel very weak.</span>")
diff --git a/code/datums/mutations/radioactive.dm b/code/datums/mutations/radioactive.dm
index f76e6885d0..df30aaa9d2 100644
--- a/code/datums/mutations/radioactive.dm
+++ b/code/datums/mutations/radioactive.dm
@@ -7,7 +7,7 @@
 	instability = 5
 	difficulty = 8
 
-/datum/mutation/human/radioactive/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/radioactive/on_life()
 	radiation_pulse(owner, 20)
 
 /datum/mutation/human/radioactive/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
diff --git a/code/datums/mutations/space_adaptation.dm b/code/datums/mutations/space_adaptation.dm
index 90535fbf6e..94c829d367 100644
--- a/code/datums/mutations/space_adaptation.dm
+++ b/code/datums/mutations/space_adaptation.dm
@@ -13,7 +13,7 @@
 	if(!(type in visual_indicators))
 		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "fire", -MUTATIONS_LAYER))
 
-/datum/mutation/human/space_adaptation/get_visual_indicator(mob/living/carbon/human/owner)
+/datum/mutation/human/space_adaptation/get_visual_indicator()
 	return visual_indicators[type][1]
 
 /datum/mutation/human/space_adaptation/on_acquiring(mob/living/carbon/human/owner)
diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm
index 5716b2595b..56ce3533fc 100644
--- a/code/datums/mutations/speech.dm
+++ b/code/datums/mutations/speech.dm
@@ -7,7 +7,7 @@
 	quality = MINOR_NEGATIVE
 	text_gain_indication = "<span class='danger'>You feel nervous.</span>"
 
-/datum/mutation/human/nervousness/on_life(mob/living/carbon/human/owner)
+/datum/mutation/human/nervousness/on_life()
 	if(prob(10))
 		owner.stuttering = max(10, owner.stuttering)
 
diff --git a/code/datums/mutations/telekinesis.dm b/code/datums/mutations/telekinesis.dm
index b03ac04027..5377829408 100644
--- a/code/datums/mutations/telekinesis.dm
+++ b/code/datums/mutations/telekinesis.dm
@@ -13,8 +13,8 @@
 	if(!(type in visual_indicators))
 		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "telekinesishead", -MUTATIONS_LAYER))
 
-/datum/mutation/human/telekinesis/get_visual_indicator(mob/living/carbon/human/owner)
+/datum/mutation/human/telekinesis/get_visual_indicator()
 	return visual_indicators[type][1]
 
-/datum/mutation/human/telekinesis/on_ranged_attack(mob/living/carbon/human/owner, atom/target)
-	target.attack_tk(owner)
\ No newline at end of file
+/datum/mutation/human/telekinesis/on_ranged_attack(atom/target, mouseparams)
+	target.attack_tk(owner)
diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
index 06d62dfd96..483c1e353f 100644
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -248,14 +248,4 @@
 	cost = 5
 	placement_weight = 3
 	always_place = TRUE
-	allow_duplicates = TRUE
-
-// Mining Base
-/datum/map_template/ruin/lavaland/mining_base //THIS IS THE MINING BASE. DO NOT FUCK WITH THIS UNLESS YOU ARE 100% CERTAIN YOU KNOW WHAT YOU'RE DOING, OR THE MINING BASE WILL DISAPPEAR
-	name = "Mining Base"
-	id = "miningbase"
-	description = "The mining base that Nanotrasen uses for their mining operations."
-	suffix = "miningbase.dmm"
-	cost = 0
-	always_place = TRUE
-	unpickable = TRUE
+	allow_duplicates = TRUE 
diff --git a/code/datums/ruins/station.dm b/code/datums/ruins/station.dm
index 9316a4b022..71cdf495e9 100644
--- a/code/datums/ruins/station.dm
+++ b/code/datums/ruins/station.dm
@@ -54,3 +54,10 @@
 	id = "engine_budget"
 	suffix = "Box/Engine/budget.dmm"
 	name = "Box P.A.C.M.A.N"
+
+// Lavaland
+	// Mining Base
+/datum/map_template/ruin/station/lavaland/mining_base
+	id = "mining_public_01"
+	suffix = "Lavaland/Mining_Station/Mining_Station_Public_01.dmm"
+	name = "Public Mining Base"
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index f9f9e22685..86afd2cc15 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -48,20 +48,24 @@
 	status_type = STATUS_EFFECT_REPLACE
 	alert_type = /obj/screen/alert/status_effect/vanguard
 	var/datum/progressbar/progbar
+	var/stamhealed = 0 //How much stamina did we regenerate?
 
 /obj/screen/alert/status_effect/vanguard
 	name = "Vanguard"
-	desc = "You're absorbing stuns! Your stamina is greatly increased, but not infinite. 25% of all stuns taken will affect you after this effect ends."
+	desc = "You're absorbing stuns aswell as quickly regenerating stamina, but be careful: 50% of stamina restored and 25% of stuns absorbed will affect you after this effect ends."
 	icon_state = "vanguard"
 	alerttooltipstyle = "clockcult"
 
 /obj/screen/alert/status_effect/vanguard/MouseEntered(location,control,params)
 	var/mob/living/L = usr
+	var/datum/status_effect/vanguard_shield/E = attached_effect
 	if(istype(L)) //this is probably more safety than actually needed
 		var/vanguard = L.stun_absorption["vanguard"]
 		desc = initial(desc)
 		desc += "<br><b>[FLOOR(vanguard["stuns_absorbed"] * 0.1, 1)]</b> seconds of stuns held back.\
-		[GLOB.ratvar_awakens ? "":"<br><b>[FLOOR(min(vanguard["stuns_absorbed"] * 0.025, 20), 1)]</b> seconds of stun will affect you."]"
+		<br><b>[E.stamhealed]</b> stamina regenerated.\
+		[GLOB.ratvar_awakens ? "":"<br><b>[FLOOR(min(vanguard["stuns_absorbed"] * 0.025, 20), 1)]</b> seconds of stun will affect you.\
+		<br>You will incur <b>[E.stamhealed * 0.5]</b> staminaloss."]"
 	..()
 
 /datum/status_effect/vanguard_shield/Destroy()
@@ -72,9 +76,8 @@
 /datum/status_effect/vanguard_shield/on_apply()
 	owner.log_message("gained Vanguard stun immunity", LOG_ATTACK)
 	owner.add_stun_absorption("vanguard", INFINITY, 1, "'s yellow aura momentarily intensifies!", "Your ward absorbs the stun!", " radiating with a soft yellow light!")
-	owner.visible_message("<span class='warning'>[owner] begins to faintly glow!</span>", "<span class='brass'>You will absorb all stuns for the next twenty seconds.</span>")
+	owner.visible_message("<span class='warning'>[owner] begins to faintly glow!</span>", "<span class='brass'>You will absorb all stuns aswell as quickly regenerate stamina for the next twenty seconds .</span>")
 	owner.SetAllImmobility(0, FALSE)
-	owner.setStaminaLoss(0, FALSE)
 	progbar = new(owner, duration, owner)
 	progbar.bar.color = list("#FAE48C", "#FAE48C", "#FAE48C", rgb(0,0,0))
 	progbar.update(duration - world.time)
@@ -82,6 +85,9 @@
 
 /datum/status_effect/vanguard_shield/tick()
 	progbar.update(duration - world.time)
+	var/oldstamloss = owner.getStaminaLoss()
+	owner.adjustStaminaLoss(-6) //up to 30 stam / second for now, lets see...
+	stamhealed += oldstamloss - owner.getStaminaLoss()
 
 /datum/status_effect/vanguard_shield/on_remove()
 	. = ..()
@@ -96,8 +102,9 @@
 		for(var/i in owner.stun_absorption)
 			if(owner.stun_absorption[i]["end_time"] > world.time && owner.stun_absorption[i]["priority"] > vanguard["priority"])
 				otheractiveabsorptions = TRUE
-		if(!GLOB.ratvar_awakens && stuns_blocked && !otheractiveabsorptions)
+		if(!GLOB.ratvar_awakens && (stuns_blocked && !otheractiveabsorptions || stamhealed))
 			owner.DefaultCombatKnockdown(stuns_blocked)
+			owner.adjustStaminaLoss(stamhealed * 0.5)
 			message_to_owner = "<span class='boldwarning'>The weight of the Vanguard's protection crashes down upon you!</span>"
 			if(stuns_blocked >= 300)
 				message_to_owner += "\n<span class='userdanger'>You faint from the exertion!</span>"
@@ -106,7 +113,7 @@
 		else
 			stuns_blocked = 0 //so logging is correct in cases where there were stuns blocked but we didn't stun for other reasons
 		owner.visible_message("<span class='warning'>[owner]'s glowing aura fades!</span>", message_to_owner)
-		owner.log_message("lost Vanguard stun immunity[stuns_blocked ? "and was stunned for [stuns_blocked]":""]", LOG_ATTACK)
+		owner.log_message("lost Vanguard stun immunity[stuns_blocked ? "and was stunned for [stuns_blocked]":""] [stamhealed ? ", incurring [stamhealed * 0.25] staminaloss" : ""]", LOG_ATTACK)
 
 /datum/status_effect/inathneqs_endowment
 	id = "inathneqs_endowment"
diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm
index a76e8234ba..c1baf0a77a 100644
--- a/code/game/gamemodes/clock_cult/clock_cult.dm
+++ b/code/game/gamemodes/clock_cult/clock_cult.dm
@@ -269,7 +269,7 @@ Credit where due:
 //Servant of Ratvar outfit
 /datum/outfit/servant_of_ratvar
 	name = "Servant of Ratvar"
-	uniform = /obj/item/clothing/under/rank/engineer //no more chameleon suit for them, as requested
+	uniform = /obj/item/clothing/under/rank/engineering/engineer //no more chameleon suit for them, as requested
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	back = /obj/item/storage/backpack
 	ears = /obj/item/radio/headset
diff --git a/code/game/gamemodes/clown_ops/bananium_bomb.dm b/code/game/gamemodes/clown_ops/bananium_bomb.dm
index baecd6a1de..ce864007f0 100644
--- a/code/game/gamemodes/clown_ops/bananium_bomb.dm
+++ b/code/game/gamemodes/clown_ops/bananium_bomb.dm
@@ -35,7 +35,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, SLOT_W_UNIFORM)
 
diff --git a/code/game/gamemodes/gangs/gang_datums.dm b/code/game/gamemodes/gangs/gang_datums.dm
index 9d6c03d9f6..c3a9cb0647 100644
--- a/code/game/gamemodes/gangs/gang_datums.dm
+++ b/code/game/gamemodes/gangs/gang_datums.dm
@@ -21,7 +21,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
@@ -33,13 +33,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" //shared color with cyber, but they can keep brown cause waffles.
-	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
@@ -87,7 +87,7 @@
 /datum/team/gang/tunnel
 	name = "Tunnel"
 	color = "#FF00FF" //Gave the leather jacket to the tunnel gang over diablo.
-	inner_outfits = list(/obj/item/clothing/under/villain)
+	inner_outfits = list(/obj/item/clothing/under/costume/villain)
 	outer_outfits = list(/obj/item/clothing/suit/jacket/leather)
 
 /datum/team/gang/diablo
@@ -123,13 +123,13 @@
 /datum/team/gang/h
 	name = "H"
 	color = "#993333"
-	inner_outfits = list(/obj/item/clothing/under/jabroni) //Why not?
+	inner_outfits = list(/obj/item/clothing/under/costume/jabroni) //Why not?
 	outer_outfits = list(/obj/item/clothing/suit/toggle/owlwings)
 
 /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
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 97edd35581..4ed6dc9dc9 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -506,3 +506,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 /obj/effect/landmark/stationroom/box/engine/New()
 	. = ..()
 	templates = CONFIG_GET(keyed_list/box_random_engine)
+
+// Landmark for the mining station
+/obj/effect/landmark/stationroom/lavaland/station
+	templates = list("Public Mining Base" = 3)
+	icon = 'icons/rooms/Lavaland/Mining.dmi'
diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm
index b9acba70d9..3f2701c03f 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/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/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/sunglasses/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,
 		/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
 		/obj/item/clothing/glasses/sunglasses/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/black,
 		/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,
 		/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/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index 787a5ad2d8..a2145e67ee 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -79,7 +79,7 @@
 /obj/item/storage/box/hero/PopulateContents()
 	new /obj/item/clothing/head/fedora/curator(src)
 	new /obj/item/clothing/suit/curator(src)
-	new /obj/item/clothing/under/rank/curator/treasure_hunter(src)
+	new /obj/item/clothing/under/rank/civilian/curator/treasure_hunter(src)
 	new /obj/item/clothing/shoes/workboots/mining(src)
 	new /obj/item/melee/curator_whip(src)
 
@@ -96,7 +96,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/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 2ffa38ea3c..65931db2f5 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), \
 	new/datum/stack_recipe("gondola bedsheet", /obj/item/bedsheet/gondola, 1), \
 	))
 
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 31886edf2b..a54d126abb 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -427,7 +427,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
  * Durathread
  */
 GLOBAL_LIST_INIT(durathread_recipes, list ( \
-	new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/durathread, 4, time = 40),
+	new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/misc/durathread, 4, time = 40),
 	new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
 	new/datum/stack_recipe("durathread beanie", /obj/item/clothing/head/beanie/durathread, 2, time = 40), \
 	new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/durathread, 1, time = 25), \
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index b4e0dab65b..a4d9636414 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -458,7 +458,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/suit/black(src)
 	new /obj/item/clothing/accessory/waistcoat(src)
 	new /obj/item/clothing/suit/toggle/lawyer/black(src)
 	new /obj/item/clothing/shoes/laceup(src)
@@ -630,7 +630,7 @@
 
 /obj/item/storage/backpack/duffelbag/clown/syndie/PopulateContents()
 	new /obj/item/pda/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/clothing/mask/gas/clown_hat(src)
 	new /obj/item/bikehorn(src)
diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm
index a0ec1c2306..826a00b90d 100644
--- a/code/game/objects/items/storage/briefcase.dm
+++ b/code/game/objects/items/storage/briefcase.dm
@@ -99,7 +99,7 @@
 	new /obj/item/ammo_box/magazine/m10mm(src)
 	new /obj/item/ammo_box/magazine/m10mm/soporific(src)
 	new /obj/item/ammo_box/c10mm/soporific(src)
-	new /obj/item/clothing/under/lawyer/blacksuit(src)
+	new /obj/item/clothing/under/suit/black(src)
 	new /obj/item/clothing/accessory/waistcoat(src)
 	new /obj/item/clothing/suit/toggle/lawyer/black/syndie(src)
 
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 68db9b4807..50620b90fe 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -177,7 +177,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	STR.max_items = 28
 
 /obj/item/storage/toolbox/brass/prefilled/PopulateContents()
-	new fabricator_type(src)
+	if(fabricator_type)
+		new fabricator_type(src)
 	new /obj/item/screwdriver/brass(src)
 	new /obj/item/wirecutters/brass(src)
 	new /obj/item/wrench/brass(src)
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index aeb7bc8f59..037ae51e30 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -49,7 +49,7 @@
 			new /obj/item/grenade/plastic/c4(src)
 			new /obj/item/clothing/gloves/color/latex/nitrile(src)
 			new /obj/item/clothing/mask/gas/clown_hat(src)
-			new /obj/item/clothing/under/suit_jacket/really_black(src)
+			new /obj/item/clothing/under/suit/black_really(src)
 			new /obj/item/screwdriver/power(src) //2 tc item
 
 		if("murder") // 35 tc
@@ -130,7 +130,7 @@
 			new /obj/item/clothing/glasses/thermal/syndi(src)
 			new /obj/item/clothing/gloves/color/latex/nitrile(src)
 			new /obj/item/clothing/mask/gas/clown_hat(src)
-			new /obj/item/clothing/under/suit_jacket/really_black(src)
+			new /obj/item/clothing/under/suit/black_really(src)
 
 		if("metaops") // 30 tc
 			new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
@@ -343,7 +343,7 @@
 	new /obj/item/implanter/radio/syndicate(src)
 
 /obj/item/storage/box/syndie_kit/centcom_costume/PopulateContents()
-	new /obj/item/clothing/under/rank/centcom_officer/syndicate(src)
+	new /obj/item/clothing/under/rank/centcom/officer/syndicate(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)
 	new /obj/item/clothing/gloves/color/black(src)
 	new /obj/item/radio/headset/headset_cent/empty(src)
@@ -481,13 +481,12 @@
 		/obj/item/storage/backpack/duffelbag/syndie/surgery,
 		/obj/item/encryptionkey/syndicate,
 		/obj/item/clothing/glasses/thermal/syndi,
-		/obj/item/slimepotion/slime/sentience/nuclear,
-		/obj/item/storage/box/syndie_kit/imp_radio,
 		/obj/item/storage/box/syndie_kit/imp_uplink,
 		/obj/item/clothing/gloves/krav_maga/combatglovesplus,
 		/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
 		/obj/item/reagent_containers/syringe/stimulants,
-		/obj/item/storage/box/syndie_kit/imp_freedom
+		/obj/item/storage/box/syndie_kit/imp_freedom,
+		/obj/item/storage/toolbox/infiltrator
 	)
 	var/obj/item1 = pick_n_take(item_list)
 	var/obj/item2 = pick_n_take(item_list)
diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
index 0adfe77853..89a3ccaa7e 100644
--- a/code/game/objects/structures/crates_lockers/closets/fitness.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -11,10 +11,10 @@
 	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/polychromic/shortpants(src)
-	new /obj/item/clothing/under/polychromic/shortpants(src)
-	new /obj/item/clothing/under/polychromic/shortpants(src)
+	new /obj/item/clothing/under/costume/jabroni(src)
+	new /obj/item/clothing/under/shorts/polychromic(src)
+	new /obj/item/clothing/under/shorts/polychromic(src)
+	new /obj/item/clothing/under/shorts/polychromic(src)
 
 
 /obj/structure/closet/boxinggloves
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 6719800340..83827b56b6 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 897e921e07..21b75e8af3 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -11,10 +11,10 @@
 	new /obj/item/radio/headset/headset_srv(src)
 	new /obj/item/radio/headset/headset_srv(src)
 	new /obj/item/clothing/head/that(src)
-	new /obj/item/clothing/under/sl_suit(src)
-	new /obj/item/clothing/under/sl_suit(src)
-	new /obj/item/clothing/under/rank/bartender(src)
-	new /obj/item/clothing/under/rank/bartender(src)
+	new /obj/item/clothing/under/suit/sl(src)
+	new /obj/item/clothing/under/suit/sl(src)
+	new /obj/item/clothing/under/rank/civilian/bartender(src)
+	new /obj/item/clothing/under/rank/civilian/bartender(src)
 	new /obj/item/clothing/accessory/waistcoat(src)
 	new /obj/item/clothing/accessory/waistcoat(src)
 	new /obj/item/clothing/head/soft/black(src)
@@ -37,8 +37,8 @@
 
 /obj/structure/closet/chefcloset/PopulateContents()
 	..()
-	new /obj/item/clothing/under/waiter(src)
-	new /obj/item/clothing/under/waiter(src)
+	new /obj/item/clothing/under/suit/waiter(src)
+	new /obj/item/clothing/under/suit/waiter(src)
 	new /obj/item/radio/headset/headset_srv(src)
 	new /obj/item/radio/headset/headset_srv(src)
 	new /obj/item/clothing/accessory/waistcoat(src)
@@ -51,7 +51,7 @@
 	new /obj/item/storage/box/mousetraps(src)
 	new /obj/item/circuitboard/machine/dish_drive(src)
 	new /obj/item/clothing/suit/toggle/chef(src)
-	new /obj/item/clothing/under/rank/chef(src)
+	new /obj/item/clothing/under/rank/civilian/chef(src)
 	new /obj/item/clothing/head/chefhat(src)
 	new /obj/item/reagent_containers/rag(src)
 
@@ -62,7 +62,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/cartridge/janitor(src)
 	new /obj/item/clothing/gloves/color/black(src)
 	new /obj/item/clothing/head/soft/purple(src)
@@ -87,14 +87,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/black(src)
 	new /obj/item/clothing/suit/toggle/lawyer/black(src)
 	new /obj/item/clothing/shoes/laceup(src)
 	new /obj/item/clothing/shoes/laceup(src)
@@ -109,7 +109,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/chaplain/nun(src)
 	new /obj/item/clothing/head/nun_hood(src)
@@ -130,9 +130,9 @@
 	new /obj/item/storage/backpack/duffelbag/sec(src)
 	new /obj/item/storage/backpack/duffelbag/sec(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/rank/security(src)
+		new /obj/item/clothing/under/rank/security/officer(src)
 	for(var/i in 1 to 2)
-		new /obj/item/clothing/under/rank/security/skirt(src)
+		new /obj/item/clothing/under/rank/security/officer/skirt(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/jackboots(src)
 	for(var/i in 1 to 3)
@@ -151,7 +151,7 @@
 /obj/structure/closet/wardrobe/cargotech/PopulateContents()
 	new /obj/item/clothing/suit/hooded/wintercoat/cargo(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/rank/cargotech(src)
+		new /obj/item/clothing/under/rank/cargo/tech(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/black(src)
 	for(var/i in 1 to 3)
@@ -172,7 +172,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/rank/atmospheric_technician(src)
+		new /obj/item/clothing/under/rank/engineering/atmospheric_technician(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/black(src)
 	return
@@ -188,7 +188,7 @@
 	new /obj/item/storage/backpack/satchel/eng(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/engineering(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/rank/engineer(src)
+		new /obj/item/clothing/under/rank/engineering/engineer(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/suit/hazardvest(src)
 	for(var/i in 1 to 3)
@@ -206,13 +206,13 @@
 	new /obj/item/storage/backpack/medic(src)
 	new /obj/item/storage/backpack/satchel/med(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/medical(src)
-	new /obj/item/clothing/under/rank/nursesuit(src)
+	new /obj/item/clothing/under/rank/medical/doctor/nurse(src)
 	new /obj/item/clothing/head/nursehat(src)
-	new /obj/item/clothing/under/rank/medical/blue(src)
-	new /obj/item/clothing/under/rank/medical/green(src)
-	new /obj/item/clothing/under/rank/medical/purple(src)
+	new /obj/item/clothing/under/rank/medical/doctor/blue(src)
+	new /obj/item/clothing/under/rank/medical/doctor/green(src)
+	new /obj/item/clothing/under/rank/medical/doctor/purple(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/rank/medical(src)
+		new /obj/item/clothing/under/rank/medical/doctor(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/suit/toggle/labcoat(src)
 	for(var/i in 1 to 3)
@@ -230,8 +230,8 @@
 /obj/structure/closet/wardrobe/robotics_black/PopulateContents()
 	new /obj/item/clothing/glasses/hud/diagnostic(src)
 	new /obj/item/clothing/glasses/hud/diagnostic(src)
-	new /obj/item/clothing/under/rank/roboticist(src)
-	new /obj/item/clothing/under/rank/roboticist(src)
+	new /obj/item/clothing/under/rank/rnd/roboticist(src)
+	new /obj/item/clothing/under/rank/rnd/roboticist(src)
 	new /obj/item/clothing/suit/toggle/labcoat(src)
 	new /obj/item/clothing/suit/toggle/labcoat(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)
@@ -252,8 +252,8 @@
 	icon_door = "white"
 
 /obj/structure/closet/wardrobe/chemistry_white/PopulateContents()
-	new /obj/item/clothing/under/rank/chemist(src)
-	new /obj/item/clothing/under/rank/chemist(src)
+	new /obj/item/clothing/under/rank/medical/chemist(src)
+	new /obj/item/clothing/under/rank/medical/chemist(src)
 	new /obj/item/clothing/shoes/sneakers/white(src)
 	new /obj/item/clothing/shoes/sneakers/white(src)
 	new /obj/item/clothing/suit/toggle/labcoat/chemist(src)
@@ -272,8 +272,8 @@
 	icon_door = "white"
 
 /obj/structure/closet/wardrobe/genetics_white/PopulateContents()
-	new /obj/item/clothing/under/rank/geneticist(src)
-	new /obj/item/clothing/under/rank/geneticist(src)
+	new /obj/item/clothing/under/rank/medical/geneticist(src)
+	new /obj/item/clothing/under/rank/medical/geneticist(src)
 	new /obj/item/clothing/shoes/sneakers/white(src)
 	new /obj/item/clothing/shoes/sneakers/white(src)
 	new /obj/item/clothing/suit/toggle/labcoat/genetics(src)
@@ -290,8 +290,8 @@
 	icon_door = "white"
 
 /obj/structure/closet/wardrobe/virology_white/PopulateContents()
-	new /obj/item/clothing/under/rank/virologist(src)
-	new /obj/item/clothing/under/rank/virologist(src)
+	new /obj/item/clothing/under/rank/medical/virologist(src)
+	new /obj/item/clothing/under/rank/medical/virologist(src)
 	new /obj/item/clothing/shoes/sneakers/white(src)
 	new /obj/item/clothing/shoes/sneakers/white(src)
 	new /obj/item/clothing/suit/toggle/labcoat/virologist(src)
@@ -316,7 +316,7 @@
 	new /obj/item/storage/backpack/satchel/tox(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/science(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/rank/scientist(src)
+		new /obj/item/clothing/under/rank/rnd/scientist(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/suit/toggle/labcoat/science(src)
 	for(var/i in 1 to 3)
@@ -342,7 +342,7 @@
 	new /obj/item/clothing/suit/apron/overalls(src)
 	new /obj/item/clothing/suit/apron/overalls(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/rank/hydroponics(src)
+		new /obj/item/clothing/under/rank/civilian/hydroponics(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/mask/bandana(src)
 
@@ -355,7 +355,7 @@
 	new /obj/item/clothing/accessory/pocketprotector/full(src)
 	new /obj/item/clothing/head/fedora/curator(src)
 	new /obj/item/clothing/suit/curator(src)
-	new /obj/item/clothing/under/rank/curator/treasure_hunter(src)
+	new /obj/item/clothing/under/rank/civilian/curator/treasure_hunter(src)
 	new /obj/item/clothing/shoes/workboots/mining(src)
 	new /obj/item/storage/backpack/satchel/explorer(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 e1537063bd..7f22a49df9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -8,8 +8,8 @@
 	new /obj/item/clothing/neck/cloak/qm(src)
 	new /obj/item/clothing/head/beret/qm(src)
 	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/qm(src)
+	new /obj/item/clothing/under/rank/cargo/qm/skirt(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/radio/headset/heads/qm(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index bdbc91554d..58d72e6ee0 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -7,8 +7,8 @@
 	..()
 	new /obj/item/clothing/neck/cloak/ce(src)
 	new /obj/item/clothing/head/beret/ce(src)
-	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/gloves/color/yellow(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 90b57471b4..a7ffef1a0c 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -60,8 +60,9 @@
 	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/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/shoes/sneakers/brown	(src)
 	new /obj/item/cartridge/cmo(src)
 	new /obj/item/radio/headset/heads/cmo(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 3e4497bb45..135e0685c1 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -10,12 +10,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/shoes/sneakers/brown(src)
 	new /obj/item/cartridge/rd(src)
 	new /obj/item/clothing/gloves/color/latex(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index bec1c893ae..e5c50af782 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -25,8 +25,8 @@
 /obj/structure/closet/secure_closet/hop/PopulateContents()
 	..()
 	new /obj/item/clothing/neck/cloak/hop(src)
-	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/civilian/head_of_personnel(src)
+	new /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt(src)
 	new /obj/item/clothing/head/hopcap(src)
 	new /obj/item/clothing/head/hopcap/beret(src)
 	new /obj/item/cartridge/hop(src)
@@ -57,17 +57,17 @@
 	new /obj/item/clothing/neck/cloak/hos(src)
 	new /obj/item/cartridge/hos(src)
 	new /obj/item/radio/headset/heads/hos(src)
-	new /obj/item/clothing/under/hosparadefem(src)
-	new /obj/item/clothing/under/hosparademale(src)
+	new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src)
+	new /obj/item/clothing/under/rank/security/head_of_security/parade(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/storage/lockbox/medal/sec(src)
 	new /obj/item/megaphone/sec(src)
 	new /obj/item/holosign_creator/security(src)
@@ -94,8 +94,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/formal(src)
+	new /obj/item/clothing/under/rank/security/warden/skirt(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/holosign_creator/security(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)
@@ -155,13 +155,13 @@
 
 /obj/structure/closet/secure_closet/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(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/head/fedora(src)
@@ -286,7 +286,7 @@
 	..()
 	new /obj/item/clothing/suit/armor/vest(src)
 	new /obj/item/clothing/head/helmet/sec(src)
-	new /obj/item/clothing/under/rank/security(src)
-	new /obj/item/clothing/under/rank/security/skirt(src)
+	new /obj/item/clothing/under/rank/security/officer(src)
+	new /obj/item/clothing/under/rank/security/officer/skirt(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/flashlight/seclite(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 1c09b2fd63..a8f3dc0676 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -170,7 +170,7 @@
 	if(prob(90))
 		new /obj/item/wirecutters(src)
 	new /obj/item/clothing/suit/bomb_suit/security(src)
-	new /obj/item/clothing/under/rank/security(src)
+	new /obj/item/clothing/under/rank/security/officer(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/head/bomb_hood/security(src)
 
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 63c8856ac3..fdf382b3ba 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -7,7 +7,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/blue(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/skirt/color/blue(src)
+		new /obj/item/clothing/under/color/jumpskirt/blue(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/brown(src)
 	return
@@ -18,7 +18,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/pink(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/skirt/color/pink(src)
+		new /obj/item/clothing/under/color/jumpskirt/pink(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/brown(src)
 	return
@@ -29,7 +29,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/black(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/skirt/color/black(src)
+		new /obj/item/clothing/under/color/jumpskirt/black(src)
 	if(prob(25))
 		new /obj/item/clothing/suit/jacket/leather(src)
 	if(prob(20))
@@ -52,7 +52,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/green(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/skirt/color/green(src)
+		new /obj/item/clothing/under/color/jumpskirt/green(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/black(src)
 	new /obj/item/clothing/mask/bandana/green(src)
@@ -77,7 +77,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/yellow(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/skirt/color/yellow(src)
+		new /obj/item/clothing/under/color/jumpskirt/yellow(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/orange(src)
 	new /obj/item/clothing/mask/bandana/gold(src)
@@ -90,7 +90,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/white(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/skirt/color/white(src)
+		new /obj/item/clothing/under/color/jumpskirt/white(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/white(src)
 	for(var/i in 1 to 3)
@@ -100,10 +100,10 @@
 	name = "pajama wardrobe"
 	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/misc/pj/red(src)
+	new /obj/item/clothing/under/misc/pj/red(src)
+	new /obj/item/clothing/under/misc/pj/blue(src)
+	new /obj/item/clothing/under/misc/pj/blue(src)
 	for(var/i in 1 to 4)
 		new /obj/item/clothing/shoes/sneakers/white(src)
 	return
@@ -114,7 +114,7 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/grey(src)
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/under/skirt/color/grey(src)
+		new /obj/item/clothing/under/color/jumpskirt/grey(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/black(src)
 	for(var/i in 1 to 3)
@@ -125,10 +125,10 @@
 		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/misc/assistantformal(src)
 		new /obj/item/clothing/suit/hooded/wintercoat/aformal(src)
 	if(prob(40))
-		new /obj/item/clothing/under/assistantformal(src)
+		new /obj/item/clothing/under/misc/assistantformal(src)
 		new /obj/item/clothing/suit/hooded/wintercoat/aformal(src)
 	if(prob(30))
 		new /obj/item/clothing/suit/hooded/wintercoat(src)
@@ -144,21 +144,21 @@
 		new /obj/item/clothing/suit/jacket(src)
 	if(prob(40))
 		new /obj/item/clothing/suit/jacket(src)
-	new /obj/item/clothing/under/polychromic/jumpsuit(src)
-	new /obj/item/clothing/under/polychromic/jumpsuit(src)
-	new /obj/item/clothing/under/polychromic/jumpsuit(src)
-	new /obj/item/clothing/under/polychromic/shirt(src)
-	new /obj/item/clothing/under/polychromic/shirt(src)
-	new /obj/item/clothing/under/polychromic/shirt(src)
-	new /obj/item/clothing/under/polychromic/kilt(src)
-	new /obj/item/clothing/under/polychromic/kilt(src)
-	new /obj/item/clothing/under/polychromic/kilt(src)
-	new /obj/item/clothing/under/polychromic/skirt(src)
-	new /obj/item/clothing/under/polychromic/skirt(src)
-	new /obj/item/clothing/under/polychromic/skirt(src)
-	new /obj/item/clothing/under/polychromic/shorts(src)
-	new /obj/item/clothing/under/polychromic/shorts(src)
-	new /obj/item/clothing/under/polychromic/shorts(src)
+	new /obj/item/clothing/under/misc/polyjumpsuit(src)
+	new /obj/item/clothing/under/misc/polyjumpsuit(src)
+	new /obj/item/clothing/under/misc/polyjumpsuit(src)
+	new /obj/item/clothing/under/misc/poly_shirt(src)
+	new /obj/item/clothing/under/misc/poly_shirt(src)
+	new /obj/item/clothing/under/misc/poly_shirt(src)
+	new /obj/item/clothing/under/costume/kilt/polychromic(src)
+	new /obj/item/clothing/under/costume/kilt/polychromic(src)
+	new /obj/item/clothing/under/costume/kilt/polychromic(src)
+	new /obj/item/clothing/under/dress/skirt/polychromic(src)
+	new /obj/item/clothing/under/dress/skirt/polychromic(src)
+	new /obj/item/clothing/under/dress/skirt/polychromic(src)
+	new /obj/item/clothing/under/misc/polyshorts(src)
+	new /obj/item/clothing/under/misc/polyshorts(src)
+	new /obj/item/clothing/under/misc/polyshorts(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/blue(src)
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 711bc09069..7469bd2e72 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -89,7 +89,7 @@
 /datum/outfit/ashwalker
 	name ="Ashwalker"
 	head = /obj/item/clothing/head/helmet/gladiator
-	uniform = /obj/item/clothing/under/gladiator/ash_walker
+	uniform = /obj/item/clothing/under/costume/gladiator/ash_walker
 
 
 //Timeless prisons: Spawns in Wish Granter prisons in lavaland. Ghosts become age-old users of the Wish Granter and are advised to seek repentance for their past.
@@ -243,7 +243,7 @@
 			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/misc/assistantformal
 			outfit.shoes = /obj/item/clothing/shoes/sneakers/black
 			outfit.back = /obj/item/storage/backpack
 		if(2)
@@ -256,7 +256,7 @@
 		if(3)
 			flavour_text += "you were a doctor on one of Nanotrasen's space stations, but you left behind that damn corporation's tyranny and everything it stood for. From a metaphorical hell \
 			to a literal one, you find yourself nonetheless missing the recycled air and warm floors of what you left behind... but you'd still rather be here than there."
-			outfit.uniform = /obj/item/clothing/under/rank/medical
+			outfit.uniform = /obj/item/clothing/under/rank/medical/doctor
 			outfit.suit = /obj/item/clothing/suit/toggle/labcoat
 			outfit.back = /obj/item/storage/backpack/medic
 			outfit.shoes = /obj/item/clothing/shoes/sneakers/black
@@ -351,7 +351,7 @@
 
 /datum/outfit/hotelstaff
 	name = "Hotel Staff"
-	uniform = /obj/item/clothing/under/telegram
+	uniform = /obj/item/clothing/under/suit/telegram
 	shoes = /obj/item/clothing/shoes/laceup
 	head = /obj/item/clothing/head/hotel
 	r_pocket = /obj/item/radio/off
@@ -371,7 +371,7 @@
 
 /datum/outfit/hotelstaff/security
 	name = "Hotel Secuirty"
-	uniform = /obj/item/clothing/under/rank/security/blueshirt
+	uniform = /obj/item/clothing/under/rank/security/officer/blueshirt
 	shoes = /obj/item/clothing/shoes/jackboots
 	suit = /obj/item/clothing/suit/armor/vest/blueshirt
 	head = /obj/item/clothing/head/helmet/blueshirt
@@ -433,7 +433,7 @@
 
 /datum/outfit/demonic_friend
 	name = "Demonic Friend"
-	uniform = /obj/item/clothing/under/assistantformal
+	uniform = /obj/item/clothing/under/misc/assistantformal
 	shoes = /obj/item/clothing/shoes/laceup
 	r_pocket = /obj/item/radio/off
 	back = /obj/item/storage/backpack
@@ -527,7 +527,7 @@
 	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/security
+	uniform = /obj/item/clothing/under/rank/security/officer
 	shoes = /obj/item/clothing/shoes/jackboots
 	id = /obj/item/card/id/away/old/sec
 	r_pocket = /obj/item/restraints/handcuffs
@@ -555,7 +555,7 @@
 	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
@@ -581,7 +581,7 @@
 	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
@@ -703,12 +703,12 @@
 		if(suited)
 			uniform = /obj/item/clothing/under/color/grey
 		else
-			uniform = /obj/item/clothing/under/skirt/color/grey
+			uniform = /obj/item/clothing/under/color/jumpskirt/grey
 	else
 		if(suited)
 			uniform = /obj/item/clothing/under/color/random
 		else
-			uniform = /obj/item/clothing/under/skirt/color/random
+			uniform = /obj/item/clothing/under/color/jumpskirt/random
 
 /obj/item/storage/box/syndie_kit/chameleon/ghostcafe
 	name = "ghost cafe costuming kit"
diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm
index 4d1cb1a7de..3336da7267 100644
--- a/code/modules/admin/create_mob.dm
+++ b/code/modules/admin/create_mob.dm
@@ -41,6 +41,7 @@
 	H.dna.features["deco_wings"] = pick(GLOB.deco_wings_list)
 	H.dna.features["insect_fluff"] = pick(GLOB.insect_fluffs_list)
 	H.dna.features["flavor_text"] = "" //Oh no.
+	H.dna.features["body_model"] = H.gender
 
 	SEND_SIGNAL(H, COMSIG_HUMAN_ON_RANDOMIZE)
 
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 68ae3568af..255b1a10fa 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -415,8 +415,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, SLOT_W_UNIFORM)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 51c2ba4fc6..d86211f216 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1880,7 +1880,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), SLOT_W_UNIFORM)
+			observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit/black(observer), SLOT_W_UNIFORM)
 			observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), SLOT_SHOES)
 		L.Unconscious(100)
 		sleep(5)
diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm
index 96bcd27a3b..ca6481bcfe 100644
--- a/code/modules/antagonists/abductor/machinery/experiment.dm
+++ b/code/modules/antagonists/abductor/machinery/experiment.dm
@@ -61,7 +61,7 @@
 
 /obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H)
 	var/icon/photo = null
-	var/g = (H.gender == FEMALE) ? "f" : "m"
+	var/g = (H.dna.features["body_model"] == FEMALE) ? "f" : "m"
 	if(H.dna.species.use_skintones)
 		photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.skin_tone]_[g]")
 	else
diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
index 4ab481cfe2..5d7a95222f 100644
--- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
+++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
@@ -138,11 +138,11 @@
 	quickbind_desc = "Applies handcuffs to a struck target."
 
 
-//Vanguard: Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker.
+//Vanguard: Provides twenty seconds of greatly increased stamina regeneration and stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed aswell as 50% of healed stamloss are applied to the invoker.
 /datum/clockwork_scripture/vanguard
 	descname = "Self Stun Immunity"
 	name = "Vanguard"
-	desc = "Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \
+	desc = "Provides twenty seconds of greatly increased stamina regeneration and stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed aswell as incurring 50% of the stamina regenerated as stamina loss \
 	Excessive absorption will cause unconsciousness."
 	invocations = list("Shield me...", "...from darkness!")
 	channel_time = 30
@@ -152,7 +152,7 @@
 	primary_component = VANGUARD_COGWHEEL
 	sort_priority = 7
 	quickbind = TRUE
-	quickbind_desc = "Allows you to temporarily have quickly regenerating stamina and absorb stuns. All stuns absorbed will affect you when disabled."
+	quickbind_desc = "Allows you to temporarily have quickly regenerating stamina and absorb stuns. Part of the stuns absorbed and staminaloss healed will affect you when disabled."
 
 /datum/clockwork_scripture/vanguard/check_special_requirements()
 	if(!GLOB.ratvar_awakens && islist(invoker.stun_absorption) && invoker.stun_absorption["vanguard"] && invoker.stun_absorption["vanguard"]["end_time"] > world.time)
diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm
index 84920eba00..1d0bfde322 100644
--- a/code/modules/antagonists/devil/devil.dm
+++ b/code/modules/antagonists/devil/devil.dm
@@ -414,11 +414,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/misc/burial))
 					return 1
 				return 0
 			else
-				for(var/obj/item/clothing/under/burial/B in range(0,body))
+				for(var/obj/item/clothing/under/misc/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
@@ -456,7 +456,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), SLOT_W_UNIFORM)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/lawyer/black(H), SLOT_W_UNIFORM)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), SLOT_SHOES)
 		H.equip_to_slot_or_del(new /obj/item/storage/briefcase(H), SLOT_HANDS)
 		H.equip_to_slot_or_del(new /obj/item/pen(H), SLOT_L_STORE)
diff --git a/code/modules/antagonists/devil/devil_helpers.dm b/code/modules/antagonists/devil/devil_helpers.dm
index d3445eac0f..51d480e64e 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/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/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/medical/geneticist = 1,
+						/obj/item/clothing/under/rank/medical/virologist = 1,
+						/obj/item/clothing/under/rank/medical/doctor/nurse = 1,
+						/obj/item/clothing/under/rank/medical/doctor = 1,
+						/obj/item/clothing/under/rank/security/detective = 1,
+						/obj/item/clothing/under/suit/white = 0.5,
+						/obj/item/clothing/under/misc/burial = 1
 					)
 					if(U && whiteness[U.type])
 						src.visible_message("<span class='warning'>[src] seems to have been harmed by the purity of [attacker]'s clothes.</span>", "<span class='notice'>Unsullied white clothing is disrupting your form.</span>")
diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index eccf7e3c60..bfd7b50cf8 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -45,7 +45,7 @@
 		qdel(I)
 	for(var/obj/item/I in H.held_items)
 		qdel(I)
-	H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt/highlander(H), SLOT_W_UNIFORM)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/kilt/highlander(H), SLOT_W_UNIFORM)
 	H.equip_to_slot_or_del(new /obj/item/radio/headset/heads/captain(H), SLOT_EARS)
 	H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(H), SLOT_HEAD)
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), SLOT_SHOES)
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index 74cfc61d0f..7c63266255 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -230,7 +230,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), SLOT_HEAD)
-	H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), SLOT_W_UNIFORM)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), SLOT_W_UNIFORM)
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_SHOES)
 	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 7421b9e09a..f740ed27dd 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -411,7 +411,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
@@ -467,7 +467,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
@@ -482,7 +482,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
@@ -502,7 +502,7 @@
 
 /datum/outfit/nanotrasensoldiercorpse
 	name = "NT Private Security Officer Corpse"
-	uniform = /obj/item/clothing/under/rank/security
+	uniform = /obj/item/clothing/under/rank/security/officer
 	suit = /obj/item/clothing/suit/armor/vest
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat
@@ -602,7 +602,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
@@ -639,7 +639,7 @@
 
 /datum/outfit/lavaknight
 	name = "Cydonian Knight"
-	uniform = /obj/item/clothing/under/assistantformal
+	uniform = /obj/item/clothing/under/misc/assistantformal
 	mask = /obj/item/clothing/mask/breath
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	r_pocket = /obj/item/melee/transforming/energy/sword/cx
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index 12bd609ff5..39bb737f1b 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -299,7 +299,7 @@
 
 /datum/outfit/butler
 	name = "Butler"
-	uniform = /obj/item/clothing/under/suit_jacket/really_black
+	uniform = /obj/item/clothing/under/suit/black_really
 	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/gear.dm b/code/modules/cargo/exports/gear.dm
index d15fc18b6e..10b3d4f707 100644
--- a/code/modules/cargo/exports/gear.dm
+++ b/code/modules/cargo/exports/gear.dm
@@ -582,18 +582,18 @@ datum/export/gear/glasses //glasses are not worth selling
 	cost = 10
 	unit_name = "fancy clothing"
 	k_elasticity = 1/90 //These will be what sells
-	export_types = list(/obj/item/clothing/under/scratch, /obj/item/clothing/under/sl_suit, /obj/item/clothing/under/rank/vice, /obj/item/clothing/under/suit_jacket, \
-						/obj/item/clothing/under/burial, /obj/item/clothing/under/skirt/black, /obj/item/clothing/under/captainparade, /obj/item/clothing/under/hosparademale, \
-						/obj/item/clothing/under/hosparadefem, /obj/item/clothing/under/assistantformal, /obj/item/clothing/under/stripeddress, /obj/item/clothing/under/redeveninggown, \
-						/obj/item/clothing/under/plaid_skirt, /obj/item/clothing/under/geisha, /obj/item/clothing/under/trek, /obj/item/clothing/under/rank)
+	export_types = list(/obj/item/clothing/under/suit/white_on_white, /obj/item/clothing/under/suit/sl, /obj/item/clothing/under/misc/vice_officer, /obj/item/clothing/under/suit/black, \
+						/obj/item/clothing/under/misc/burial, /obj/item/clothing/under/dress/skirt, /obj/item/clothing/under/rank/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/parade, \
+						/obj/item/clothing/under/rank/security/head_of_security/parade/female, /obj/item/clothing/under/misc/assistantformal, /obj/item/clothing/under/dress/striped, /obj/item/clothing/under/dress/redeveninggown, \
+						/obj/item/clothing/under/dress/skirt/plaid, /obj/item/clothing/under/costume/geisha, /obj/item/clothing/under/trek, /obj/item/clothing/under/rank)
 	include_subtypes = TRUE
 
 /datum/export/gear/armored_jumpsuit
 	cost = 15
 	unit_name = "armored_jumpsuit"
 	k_elasticity = 1/90 //These will be what sells
-	export_types = list(/obj/item/clothing/under/durathread, /obj/item/clothing/under/rank/security, /obj/item/clothing/under/plasmaman, /obj/item/clothing/under/syndicate, \
-						/obj/item/clothing/under/rank/det, /obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/rank/security/spacepol)
+	export_types = list(/obj/item/clothing/under/misc/durathread, /obj/item/clothing/under/rank/security/officer, /obj/item/clothing/under/plasmaman, /obj/item/clothing/under/syndicate, \
+						/obj/item/clothing/under/rank/security/detective, /obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/security/officer/spacepol)
 	exclude_types = list(/obj/item/clothing/under/syndicate/tacticool, /obj/item/clothing/under/syndicate/tacticool/skirt)
 	include_subtypes = TRUE
 
diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm
index fc95b05007..664030da33 100644
--- a/code/modules/cargo/packs/armory.dm
+++ b/code/modules/cargo/packs/armory.dm
@@ -188,7 +188,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,
diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm
index c559e7925a..dab8cad5b6 100644
--- a/code/modules/cargo/packs/costumes_toys.dm
+++ b/code/modules/cargo/packs/costumes_toys.dm
@@ -219,14 +219,14 @@
 	name = "Formalwear Crate"
 	desc = "You're gonna like the way you look, I guaranteed it. Contains an asston of fancy clothing."
 	cost = 4750 //Lots of fancy clothing that can be sold back!
-	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/misc/assistantformal,
+					/obj/item/clothing/under/misc/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/suit/black,
 					/obj/item/clothing/suit/toggle/lawyer/black,
 					/obj/item/clothing/accessory/waistcoat,
 					/obj/item/clothing/neck/tie/blue,
@@ -240,11 +240,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
@@ -277,9 +277,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,
diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm
index 80d6f76910..273acb10e2 100644
--- a/code/modules/cargo/packs/misc.dm
+++ b/code/modules/cargo/packs/misc.dm
@@ -274,7 +274,7 @@
 	name = "Funeral Supplies"
 	desc = "Mourn your dead properly buy sending them off with love filled notes, clean clothes, and a proper ceremony. Contains two candle packs, funeral garb, flowers, a paperbin , and crayons to help aid in religious rituals. Coffin included."
 	cost = 1200
-	contains = list(/obj/item/clothing/under/burial,
+	contains = list(/obj/item/clothing/under/misc/burial,
 					/obj/item/storage/fancy/candle_box,
 					/obj/item/storage/fancy/candle_box,
 					/obj/item/reagent_containers/food/snacks/grown/harebell,
@@ -419,8 +419,8 @@
 					/obj/item/dildo/custom,
 					/obj/item/vending_refill/kink,
 					/obj/item/vending_refill/kink,
-					/obj/item/clothing/under/maid,
-					/obj/item/clothing/under/maid,
+					/obj/item/clothing/under/costume/maid,
+					/obj/item/clothing/under/costume/maid,
 					/obj/item/electropack/shockcollar,
 					/obj/item/electropack/shockcollar,
 					/obj/item/restraints/handcuffs/fake/kinky,
diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm
index ffc0d757b5..97b7636f58 100644
--- a/code/modules/cargo/packs/organic.dm
+++ b/code/modules/cargo/packs/organic.dm
@@ -380,7 +380,7 @@
 					/obj/item/reagent_containers/food/drinks/bottle/cognac,
 					/obj/item/storage/fancy/cigarettes/cigars/havana,
 					/obj/item/clothing/gloves/color/white,
-					/obj/item/clothing/under/rank/curator,
+					/obj/item/clothing/under/rank/civilian/curator,
 					/obj/item/gun/ballistic/shotgun/lethal)
 	access = ACCESS_ARMORY
 	crate_name = "sporting crate"
diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm
index 90bc837767..aea7b95742 100644
--- a/code/modules/cargo/packs/security.dm
+++ b/code/modules/cargo/packs/security.dm
@@ -139,16 +139,16 @@
 	name = "Security Clothing Crate"
 	desc = "Contains appropriate outfits for the station's private security force. Contains outfits for the Warden, Head of Security, and two Security Officers. Each outfit comes with a rank-appropriate jumpsuit, suit, and beret. Requires Security access to open."
 	cost = 3250
-	contains = list(/obj/item/clothing/under/rank/security/navyblue,
-					/obj/item/clothing/under/rank/security/navyblue,
+	contains = list(/obj/item/clothing/under/rank/security/officer/formal,
+					/obj/item/clothing/under/rank/security/officer/formal,
 					/obj/item/clothing/suit/armor/navyblue,
 					/obj/item/clothing/suit/armor/navyblue,
 					/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/formal,
 					/obj/item/clothing/suit/armor/vest/warden/navyblue,
 					/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/formal,
 					/obj/item/clothing/suit/armor/hos/navyblue,
 					/obj/item/clothing/head/beret/sec/navyhos)
 	crate_name = "security clothing crate"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 4629ed5c35..87330ce42c 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -150,7 +150,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		"ipc_screen" = "Sunburst",
 		"ipc_antenna" = "None",
 		"flavor_text" = "",
-		"meat_type" = "Mammalian"
+		"meat_type" = "Mammalian",
+		"body_model" = MALE
 		)
 
 	var/list/custom_names = list()
@@ -343,6 +344,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "[TextPreview(features["flavor_text"])]...<BR>"
 			dat += "<h2>Body</h2>"
 			dat += "<b>Gender:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=gender'>[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]</a><BR>"
+			if(gender != NEUTER && pref_species.sexes)
+				dat += "<b>Body Model:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=body_model'>[features["body_model"] == MALE ? "Masculine" : "Feminine"]</a><BR>"
 			dat += "<b>Species:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=species;task=input'>[pref_species.name]</a><BR>"
 			dat += "<b>Custom Species Name:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=custom_species;task=input'>[custom_species ? custom_species : "None"]</a><BR>"
 			dat += "<b>Random Body:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=all;task=random'>Randomize!</A><BR>"
@@ -1924,9 +1927,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
 
 				if("cock_length")
-					var/new_length = input(user, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Character Preference") as num|null
+					var/min_D = CONFIG_GET(number/penis_min_inches_prefs)
+					var/max_D = CONFIG_GET(number/penis_max_inches_prefs)
+					var/new_length = input(user, "Penis length in inches:\n([min_D]-[max_D])", "Character Preference") as num|null
 					if(new_length)
-						features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
+						features["cock_length"] = CLAMP(round(new_length), min_D, max_D)
 
 				if("cock_shape")
 					var/new_shape
@@ -1952,8 +1957,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						features["balls_shape"] = new_shape
 
 				if("breasts_size")
-					var/new_size
-					new_size = input(user, "Breast Size", "Character Preference") as null|anything in GLOB.breasts_size_list
+					var/new_size = input(user, "Breast Size", "Character Preference") as null|anything in CONFIG_GET(keyed_list/breasts_cups_prefs)
 					if(new_size)
 						features["breasts_size"] = new_size
 
@@ -2126,16 +2130,23 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(unlock_content)
 						toggles ^= MEMBER_PUBLIC
 				if("gender")
-					var/chosengender = input(user, "Select your character's gender.", "Gender Selection", gender) in list(MALE,FEMALE,"nonbinary","object")
+					var/chosengender = input(user, "Select your character's gender.", "Gender Selection", gender) as null|anything in list(MALE,FEMALE,"nonbinary","object")
 					switch(chosengender)
 						if("nonbinary")
 							chosengender = PLURAL
+							features["body_model"] = pick(MALE, FEMALE)
 						if("object")
 							chosengender = NEUTER
+							features["body_model"] = MALE
+						else
+							features["body_model"] = chosengender
 					gender = chosengender
 					facial_hair_style = random_facial_hair_style(gender)
 					hair_style = random_hair_style(gender)
 
+				if("body_model")
+					features["body_model"] = features["body_model"] == MALE ? FEMALE : MALE
+
 				if("hotkeys")
 					hotkeys = !hotkeys
 					if(hotkeys)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 63a9ca40e9..69b8b5685f 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -375,6 +375,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["name_is_always_random"]	>> be_random_name
 	S["body_is_always_random"]	>> be_random_body
 	S["gender"]					>> gender
+	S["body_model"]				>> features["body_model"]
 	S["age"]					>> age
 	S["hair_color"]				>> hair_color
 	S["facial_hair_color"]		>> facial_hair_color
@@ -490,6 +491,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	real_name	= reject_bad_name(real_name)
 	gender		= sanitize_gender(gender, TRUE, TRUE)
+	features["body_model"] = sanitize_gender(features["body_model"], FALSE, FALSE, gender == FEMALE ? FEMALE : MALE)
 	if(!real_name)
 		real_name	= random_unique_name(gender)
 	custom_species	= reject_bad_name(custom_species)
@@ -545,10 +547,21 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	features["insect_markings"] 	= sanitize_inlist(features["insect_markings"], GLOB.insect_markings_list, "None")
 	features["insect_wings"] 		= sanitize_inlist(features["insect_wings"], GLOB.insect_wings_list)
 
-	features["breasts_size"]		= sanitize_inlist(features["breasts_size"], GLOB.breasts_size_list, BREASTS_SIZE_DEF)
+	var/static/list/B_sizes
+	if(!B_sizes)
+		B_sizes = CONFIG_GET(keyed_list/breasts_cups_prefs)
+		B_sizes = B_sizes.Copy()
+	var/static/min_D
+	if(!min_D)
+		min_D = CONFIG_GET(number/penis_min_inches_prefs)
+	var/static/max_D
+	if(!max_D)
+		max_D = CONFIG_GET(number/penis_max_inches_prefs)
+
+	features["breasts_size"]		= sanitize_inlist(features["breasts_size"], B_sizes, BREASTS_SIZE_DEF)
+	features["cock_length"]			= sanitize_integer(features["cock_length"], min_D, max_D, COCK_SIZE_DEF)
 	features["breasts_shape"]		= sanitize_inlist(features["breasts_shape"], GLOB.breasts_shapes_list, DEF_BREASTS_SHAPE)
 	features["cock_shape"]			= sanitize_inlist(features["cock_shape"], GLOB.cock_shapes_list, DEF_COCK_SHAPE)
-	features["cock_length"]			= sanitize_integer(features["cock_length"], COCK_SIZE_MIN, COCK_SIZE_MAX, COCK_SIZE_DEF)
 	features["balls_shape"]			= sanitize_inlist(features["balls_shape"], GLOB.balls_shapes_list, DEF_BALLS_SHAPE)
 	features["vag_shape"]			= sanitize_inlist(features["vag_shape"], GLOB.vagina_shapes_list, DEF_VAGINA_SHAPE)
 	features["breasts_color"]		= sanitize_hexcolor(features["breasts_color"], 3, FALSE, "FFF")
@@ -599,6 +612,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["name_is_always_random"]	, be_random_name)
 	WRITE_FILE(S["body_is_always_random"]	, be_random_body)
 	WRITE_FILE(S["gender"]					, gender)
+	WRITE_FILE(S["body_model"]				, features["body_model"])
 	WRITE_FILE(S["age"]						, age)
 	WRITE_FILE(S["hair_color"]				, hair_color)
 	WRITE_FILE(S["facial_hair_color"]		, facial_hair_color)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 6e2e655c1b..9ad05efb7a 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -261,7 +261,7 @@
 	desc = "An insidious armored combat helmet signed with Syndicate insignia. The visor is coated with a resistant paste guaranteed to withstand bright flashes perfectly."
 	icon_state = "infiltrator"
 	item_state = "infiltrator"
-	armor = list("melee" = 40, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	armor = list("melee" = 40, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	flash_protect = 2
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index a87c1cf82b..bfbd1d519b 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -22,7 +22,7 @@
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
 	visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
 	w_class = WEIGHT_CLASS_SMALL
-	armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 100, "acid" = 40)
+	armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 30, "acid" = 30)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	var/voice_unknown = TRUE ///This makes it so that your name shows up as unknown when wearing the mask.
 
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index bdbac1165e..48cc92db61 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -1,7 +1,7 @@
 /datum/outfit/ert
 	name = "ERT Common"
 
-	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
@@ -227,7 +227,7 @@
 /datum/outfit/centcom_official
 	name = "CentCom Official"
 
-	uniform = /obj/item/clothing/under/rank/centcom_officer
+	uniform = /obj/item/clothing/under/rank/centcom/officer
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	gloves = /obj/item/clothing/gloves/color/black
 	ears = /obj/item/radio/headset/headset_cent
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index ab2f89ffc4..b1f6e7696d 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -27,7 +27,7 @@
 /datum/outfit/tournament/gangster
 	name = "tournament gangster"
 
-	uniform = /obj/item/clothing/under/rank/det
+	uniform = /obj/item/clothing/under/rank/security/detective
 	suit = /obj/item/clothing/suit/det_suit
 	glasses = /obj/item/clothing/glasses/thermal/monocle
 	head = /obj/item/clothing/head/fedora/det_hat
@@ -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,7 +80,7 @@
 /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/bandana
@@ -113,7 +113,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
@@ -138,7 +138,7 @@
 /datum/outfit/psycho
 	name = "Masked Killer"
 
-	uniform = /obj/item/clothing/under/overalls
+	uniform = /obj/item/clothing/under/misc/overalls
 	shoes = /obj/item/clothing/shoes/sneakers/white
 	gloves = /obj/item/clothing/gloves/color/latex
 	mask = /obj/item/clothing/mask/surgical
@@ -160,7 +160,7 @@
 /datum/outfit/assassin
 	name = "Assassin"
 
-	uniform = /obj/item/clothing/under/suit_jacket
+	uniform = /obj/item/clothing/under/suit/black
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	gloves = /obj/item/clothing/gloves/color/black
 	ears = /obj/item/radio/headset
@@ -202,7 +202,7 @@
 /datum/outfit/centcom_commander
 	name = "CentCom Commander"
 
-	uniform = /obj/item/clothing/under/rank/centcom_commander
+	uniform = /obj/item/clothing/under/rank/centcom/commander
 	suit = /obj/item/clothing/suit/armor/bulletproof
 	shoes = /obj/item/clothing/shoes/combat/swat
 	gloves = /obj/item/clothing/gloves/combat
@@ -313,7 +313,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
@@ -340,7 +340,7 @@
 /datum/outfit/mobster
 	name = "Mobster"
 
-	uniform = /obj/item/clothing/under/suit_jacket/really_black
+	uniform = /obj/item/clothing/under/suit/black_really
 	head = /obj/item/clothing/head/fedora
 	shoes = /obj/item/clothing/shoes/laceup
 	gloves = /obj/item/clothing/gloves/color/black
@@ -426,7 +426,7 @@
 
 /datum/outfit/debug //Debug objs plus hardsuit
 	name = "Debug outfit"
-	uniform = /obj/item/clothing/under/patriotsuit
+	uniform = /obj/item/clothing/under/misc/patriotsuit
 	suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite/debug
 	glasses = /obj/item/clothing/glasses/debug
 	ears = /obj/item/radio/headset/headset_cent/commander
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 148837d999..a19dfaa889 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -197,7 +197,7 @@
 	desc = "An insidious combat vest designed using Syndicate nanofibers to absorb the supreme majority of kinetic blows. Although it doesn't look like it'll do too much for energy impacts."
 	icon_state = "infiltrator"
 	item_state = "infiltrator"
-	armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 30, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 30, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	strip_delay = 80
 
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index fe0bbb3ede..45aee9085c 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -20,13 +20,26 @@
 
 /obj/item/clothing/under/worn_overlays(isinhands = FALSE, icon_file, style_flags = NONE)
 	. = list()
-	if(!isinhands)
-		if(damaged_clothes)
-			. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
-		if(blood_DNA)
-			. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color())
-		if(accessory_overlay)
-			. += accessory_overlay
+	if(isinhands)
+		return
+	if(damaged_clothes)
+		. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
+	if(blood_DNA)
+		. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color())
+	if(accessory_overlay)
+		. += accessory_overlay
+	if(hasprimary)	//checks if overlays are enabled
+		var/mutable_appearance/primary_worn = mutable_appearance(icon_file, "[item_color]-primary")	//automagical sprite selection
+		primary_worn.color = primary_color	//colors the overlay
+		. += primary_worn	//adds the overlay onto the buffer list to draw on the mob sprite.
+	if(hassecondary)
+		var/mutable_appearance/secondary_worn = mutable_appearance(icon_file, "[item_color]-secondary")
+		secondary_worn.color = secondary_color
+		. += secondary_worn
+	if(hastertiary)
+		var/mutable_appearance/tertiary_worn = mutable_appearance(icon_file, "[item_color]-tertiary")
+		tertiary_worn.color = tertiary_color
+		. += tertiary_worn
 
 /obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
 	if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 3b9edc5494..f612138984 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -1,7 +1,7 @@
 /obj/item/clothing/under/color
 	desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
 
-/obj/item/clothing/under/skirt/color
+/obj/item/clothing/under/color/jumpskirt
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
@@ -11,7 +11,7 @@
 
 /obj/item/clothing/under/color/random/Initialize()
 	..()
-	var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - subtypesof(/obj/item/clothing/under/skirt/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
+	var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - subtypesof(/obj/item/clothing/under/color/jumpskirt) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
 
 	if(ishuman(loc))
 		var/mob/living/carbon/human/H = loc
@@ -20,12 +20,12 @@
 		new C(loc)
 	return INITIALIZE_HINT_QDEL
 
-/obj/item/clothing/under/skirt/color/random
+/obj/item/clothing/under/color/jumpskirt/random
 	icon_state = "random_jumpsuit"		//Skirt variant needed
 
-/obj/item/clothing/under/skirt/color/random/Initialize()
+/obj/item/clothing/under/color/jumpskirt/random/Initialize()
 	..()
-	var/obj/item/clothing/under/skirt/color/C = pick(subtypesof(/obj/item/clothing/under/skirt/color) - /obj/item/clothing/under/skirt/color/random)
+	var/obj/item/clothing/under/color/jumpskirt/C = pick(subtypesof(/obj/item/clothing/under/color/jumpskirt) - /obj/item/clothing/under/color/jumpskirt/random)
 	if(ishuman(loc))
 		var/mob/living/carbon/human/H = loc
 		H.equip_to_slot_or_del(new C(H), SLOT_W_UNIFORM)
@@ -45,7 +45,7 @@
 	desc = "A black jumpsuit that has its sensors removed."
 	has_sensor = NO_SENSORS
 
-/obj/item/clothing/under/skirt/color/black
+/obj/item/clothing/under/color/jumpskirt/black
 	name = "black jumpskirt"
 	icon_state = "black_skirt"
 	item_state = "bl_suit"
@@ -68,7 +68,7 @@
 	item_state = "gy_suit"
 	item_color = "grey"
 
-/obj/item/clothing/under/skirt/color/grey
+/obj/item/clothing/under/color/jumpskirt/grey
 	name = "grey jumpskirt"
 	desc = "A tasteful grey jumpskirt that reminds you of the good old days."
 	icon_state = "grey_skirt"
@@ -91,7 +91,7 @@
 	item_state = "b_suit"
 	item_color = "blue"
 
-/obj/item/clothing/under/skirt/color/blue
+/obj/item/clothing/under/color/jumpskirt/blue
 	name = "blue jumpskirt"
 	icon_state = "blue_skirt"
 	item_state = "b_suit"
@@ -103,7 +103,7 @@
 	item_state = "g_suit"
 	item_color = "green"
 
-/obj/item/clothing/under/skirt/color/green
+/obj/item/clothing/under/color/jumpskirt/green
 	name = "green jumpskirt"
 	icon_state = "green_skirt"
 	item_state = "g_suit"
@@ -116,7 +116,7 @@
 	item_state = "o_suit"
 	item_color = "orange"
 
-/obj/item/clothing/under/skirt/color/orange
+/obj/item/clothing/under/color/jumpskirt/orange
 	name = "orange jumpskirt"
 	icon_state = "orange_skirt"
 	item_state = "o_suit"
@@ -129,7 +129,7 @@
 	item_state = "p_suit"
 	item_color = "pink"
 
-/obj/item/clothing/under/skirt/color/pink
+/obj/item/clothing/under/color/jumpskirt/pink
 	name = "pink jumpskirt"
 	icon_state = "pink_skirt"
 	item_state = "p_suit"
@@ -141,7 +141,7 @@
 	item_state = "r_suit"
 	item_color = "red"
 
-/obj/item/clothing/under/skirt/color/red
+/obj/item/clothing/under/color/jumpskirt/red
 	name = "red jumpskirt"
 	icon_state = "red_skirt"
 	item_state = "r_suit"
@@ -153,7 +153,7 @@
 	item_state = "w_suit"
 	item_color = "white"
 
-/obj/item/clothing/under/skirt/color/white
+/obj/item/clothing/under/color/jumpskirt/white
 	name = "white jumpskirt"
 	icon_state = "white_skirt"
 	item_state = "w_suit"
@@ -165,7 +165,7 @@
 	item_state = "y_suit"
 	item_color = "yellow"
 
-/obj/item/clothing/under/skirt/color/yellow
+/obj/item/clothing/under/color/jumpskirt/yellow
 	name = "yellow jumpskirt"
 	icon_state = "yellow_skirt"
 	item_state = "y_suit"
@@ -177,7 +177,7 @@
 	item_state = "b_suit"
 	item_color = "darkblue"
 
-/obj/item/clothing/under/skirt/color/darkblue
+/obj/item/clothing/under/color/jumpskirt/darkblue
 	name = "darkblue jumpskirt"
 	icon_state = "darkblue_skirt"
 	item_state = "b_suit"
@@ -189,7 +189,7 @@
 	item_state = "b_suit"
 	item_color = "teal"
 
-/obj/item/clothing/under/skirt/color/teal
+/obj/item/clothing/under/color/jumpskirt/teal
 	name = "teal jumpskirt"
 	icon_state = "teal_skirt"
 	item_state = "b_suit"
@@ -205,7 +205,7 @@
 	desc = "A magically colored jumpsuit. No sensors are attached!"
 	has_sensor = NO_SENSORS
 
-/obj/item/clothing/under/skirt/color/lightpurple
+/obj/item/clothing/under/color/jumpskirt/lightpurple
 	name = "lightpurple jumpskirt"
 	icon_state = "lightpurple_skirt"
 	item_state = "p_suit"
@@ -217,7 +217,7 @@
 	item_state = "g_suit"
 	item_color = "darkgreen"
 
-/obj/item/clothing/under/skirt/color/darkgreen
+/obj/item/clothing/under/color/jumpskirt/darkgreen
 	name = "darkgreen jumpskirt"
 	icon_state = "darkgreen_skirt"
 	item_state = "g_suit"
@@ -229,7 +229,7 @@
 	item_state = "lb_suit"
 	item_color = "lightbrown"
 
-/obj/item/clothing/under/skirt/color/lightbrown
+/obj/item/clothing/under/color/jumpskirt/lightbrown
 	name = "lightbrown jumpskirt"
 	icon_state = "lightbrown_skirt"
 	item_state = "lb_suit"
@@ -241,7 +241,7 @@
 	item_state = "lb_suit"
 	item_color = "brown"
 
-/obj/item/clothing/under/skirt/color/brown
+/obj/item/clothing/under/color/jumpskirt/brown
 	name = "brown jumpskirt"
 	icon_state = "brown_skirt"
 	item_state = "lb_suit"
@@ -253,7 +253,7 @@
 	item_state = "r_suit"
 	item_color = "maroon"
 
-/obj/item/clothing/under/skirt/color/maroon
+/obj/item/clothing/under/color/jumpskirt/maroon
 	name = "maroon jumpskirt"
 	icon_state = "maroon_skirt"
 	item_state = "r_suit"
@@ -267,7 +267,7 @@
 	item_color = "rainbow"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/skirt/color/rainbow
+/obj/item/clothing/under/color/jumpskirt/rainbow
 	name = "rainbow jumpskirt"
 	desc = "A multi-colored jumpskirt!"
 	icon_state = "rainbow_skirt"
diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm
new file mode 100644
index 0000000000..be142a04ff
--- /dev/null
+++ b/code/modules/clothing/under/costume.dm
@@ -0,0 +1,351 @@
+/obj/item/clothing/under/costume/roman
+	name = "\improper Roman armor"
+	desc = "Ancient Roman armor. Made of metallic and leather straps."
+	icon_state = "roman"
+	item_color = "roman"
+	item_state = "armor"
+	can_adjust = FALSE
+	strip_delay = 100
+	resistance_flags = NONE
+
+/obj/item/clothing/under/costume/jabroni
+	name = "Jabroni Outfit"
+	desc = "The leather club is two sectors down."
+	icon_state = "darkholme"
+	item_state = "darkholme"
+	item_color = "darkholme"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/owl
+	name = "owl uniform"
+	desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction."
+	icon_state = "owl"
+	item_color = "owl"
+	can_adjust = FALSE
+
+/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"
+	item_color = "griffin"
+	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"
+	item_color = "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"
+	item_color = "schoolgirlred"
+
+/obj/item/clothing/under/costume/schoolgirl/green
+	name = "green schoolgirl uniform"
+	icon_state = "schoolgirlgreen"
+	item_state = "schoolgirlgreen"
+	item_color = "schoolgirlgreen"
+
+/obj/item/clothing/under/costume/schoolgirl/orange
+	name = "orange schoolgirl uniform"
+	icon_state = "schoolgirlorange"
+	item_state = "schoolgirlorange"
+	item_color = "schoolgirlorange"
+
+/obj/item/clothing/under/costume/pirate
+	name = "pirate outfit"
+	desc = "Yarr."
+	icon_state = "pirate"
+	item_state = "pirate"
+	item_color = "pirate"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/soviet
+	name = "soviet uniform"
+	desc = "For the Motherland!"
+	icon_state = "soviet"
+	item_state = "soviet"
+	item_color = "soviet"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/redcoat
+	name = "redcoat uniform"
+	desc = "Looks old."
+	icon_state = "redcoat"
+	item_state = "redcoat"
+	item_color = "redcoat"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/kilt
+	name = "kilt"
+	desc = "Includes shoes and plaid."
+	icon_state = "kilt"
+	item_state = "kilt"
+	item_color = "kilt"
+	body_parts_covered = CHEST|GROIN|LEGS|FEET
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/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()
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER)
+
+/obj/item/clothing/under/costume/kilt/polychromic
+	name = "polychromic kilt"
+	desc = "It's not a skirt!"
+	icon_state = "polykilt"
+	item_color = "polykilt"
+	hasprimary = TRUE
+	hassecondary = TRUE
+	primary_color = "#FFFFFF"
+	secondary_color = "#F08080"
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+	mutantrace_variation = NONE
+
+/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"
+	item_color = "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"
+	item_color = "maid"
+	body_parts_covered = CHEST|GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/maid/Initialize()
+	. = ..()
+	var/obj/item/clothing/accessory/maidapron/A = new (src)
+	attach_accessory(A)
+
+/obj/item/clothing/under/costume/singer/yellow
+	name = "yellow performer's outfit"
+	desc = "Just looking at this makes you want to sing."
+	icon_state = "ysing"
+	item_state = "ysing"
+	item_color = "ysing"
+	body_parts_covered = CHEST|GROIN|ARMS
+	fitted = NO_FEMALE_UNIFORM
+	alternate_worn_layer = ABOVE_SHOES_LAYER
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/singer/blue
+	name = "blue performer's outfit"
+	desc = "Just looking at this makes you want to sing."
+	icon_state = "bsing"
+	item_state = "bsing"
+	item_color = "bsing"
+	body_parts_covered = CHEST|GROIN|ARMS
+	alternate_worn_layer = ABOVE_SHOES_LAYER
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/geisha
+	name = "geisha suit"
+	desc = "Cute space ninja senpai not included."
+	icon_state = "geisha"
+	item_color = "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"
+	item_color = "villain"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/sailor
+	name = "sailor suit"
+	desc = "Skipper's in the wardroom drinkin gin'."
+	icon_state = "sailor"
+	item_state = "b_suit"
+	item_color = "sailor"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/russian_officer
+	name = "\improper Russian officer's uniform"
+	desc = "The latest in fashionable russian outfits."
+	icon_state = "hostanclothes"
+	item_state = "hostanclothes"
+	item_color = "hostanclothes"
+
+/obj/item/clothing/under/costume/mummy
+	name = "mummy wrapping"
+	desc = "Return the slab or suffer my stale references."
+	icon_state = "mummy"
+	item_state = "mummy"
+	item_color = "mummy"
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+	fitted = NO_FEMALE_UNIFORM
+	can_adjust = FALSE
+	resistance_flags = NONE
+
+/obj/item/clothing/under/costume/scarecrow
+	name = "scarecrow clothes"
+	desc = "Perfect camouflage for hiding in botany."
+	icon_state = "scarecrow"
+	item_state = "scarecrow"
+	item_color = "scarecrow"
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+	fitted = NO_FEMALE_UNIFORM
+	can_adjust = FALSE
+	resistance_flags = NONE
+
+/obj/item/clothing/under/costume/draculass
+	name = "draculass coat"
+	desc = "A dress inspired by the ancient \"Victorian\" era."
+	icon_state = "draculass"
+	item_state = "draculass"
+	item_color = "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"
+	item_color = "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"
+	item_color = "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"
+	item_color = "gondola"
+	can_adjust = FALSE
+
+/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"
+	item_color = "skeleton"
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+	fitted = NO_FEMALE_UNIFORM
+	can_adjust = FALSE
+	resistance_flags = NONE
+
+//Christmas Clothes
+/obj/item/clothing/under/costume/christmas
+	name = "red christmas suit"
+	desc = "A simple red christmas suit that looks close to Santa's!"
+	icon_state = "christmasmaler"
+	item_state = "christmasmaler"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/christmas/green
+	name = "green christmas suit"
+	desc = "A simple green christmas suit. Smells minty!"
+	icon_state = "christmasmaleg"
+	item_state = "christmasmaleg"
+
+/obj/item/clothing/under/costume/christmas/croptop
+	name = "red croptop christmas suit"
+	desc = "A simple red christmas suit that doesn't quite looks like Mrs Claus'."
+	icon_state = "christmasfemaler"
+	item_state = "christmasfemaler"
+	body_parts_covered = CHEST|GROIN
+
+/obj/item/clothing/under/costume/christmas/croptop/green
+	name = "green feminine christmas suit"
+	desc = "A simple green christmas suit. Smells minty!"
+	icon_state = "christmasfemaleg"
+	item_state = "christmasfemaleg"
+
+// Lunar Clothes
+/obj/item/clothing/under/costume/qipao
+	name = "Black Qipao"
+	desc = "A Qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is black."
+	icon_state = "qipao"
+	item_state = "qipao"
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/costume/qipao/white
+	name = "White Qipao"
+	desc = "A Qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is white."
+	icon_state = "qipao_white"
+	item_state = "qipao_white"
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/costume/qipao/red
+	name = "Red Qipao"
+	desc = "A Qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is red."
+	icon_state = "qipao_red"
+	item_state = "qipao_red"
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/costume/cheongsam
+	name = "Black Cheongsam"
+	desc = "A Cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is black."
+	icon_state = "cheong"
+	item_state = "cheong"
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/costume/cheongsam/white
+	name = "White Cheongsam"
+	desc = "A Cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is white."
+	icon_state = "cheongw"
+	item_state = "cheongw"
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/costume/cheongsam/red
+	name = "Red Cheongsam"
+	desc = "A Cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is red.."
+	icon_state = "cheongr"
+	item_state = "cheongr"
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/costume/cloud
+	name = "cloud"
+	desc = "cloud"
+	icon_state = "cloud"
+	item_color = "cloud"
+	can_adjust = FALSE
diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm
new file mode 100644
index 0000000000..5727ebc0e9
--- /dev/null
+++ b/code/modules/clothing/under/jobs/cargo.dm
@@ -0,0 +1,51 @@
+
+/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"
+	item_color = "qm"
+
+/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"
+	item_color = "qm_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/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"
+	item_color = "cargo"
+	body_parts_covered = CHEST|GROIN|ARMS
+	alt_covers_chest = TRUE
+
+/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"
+	item_color = "cargo_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/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"
+	item_color = "miner"
+
+/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"
+	item_color = "explorer"
+	can_adjust = FALSE
diff --git a/code/modules/clothing/under/jobs/centcom.dm b/code/modules/clothing/under/jobs/centcom.dm
new file mode 100644
index 0000000000..3ee210612e
--- /dev/null
+++ b/code/modules/clothing/under/jobs/centcom.dm
@@ -0,0 +1,17 @@
+/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"
+	item_color = "officer"
+	alt_covers_chest = TRUE
+
+/obj/item/clothing/under/rank/centcom/officer/syndicate
+	has_sensor = NO_SENSORS
+
+/obj/item/clothing/under/rank/centcom/commander
+	desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders."
+	name = "\improper CentCom officer's jumpsuit"
+	icon_state = "centcom"
+	item_state = "dg_suit"
+	item_color = "centcom"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
deleted file mode 100644
index 2d0e2055ab..0000000000
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ /dev/null
@@ -1,424 +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"
-	item_color = "barman"
-	alt_covers_chest = TRUE
-
-/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"
-	item_color = "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"
-	item_color = "barman_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "captain"
-	sensor_mode = SENSOR_COORDS
-	random_sensor = FALSE
-
-/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"
-	item_color = "captain_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "qm"
-
-/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"
-	item_color = "qm_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "cargo"
-	body_parts_covered = CHEST|GROIN|ARMS
-	alt_covers_chest = TRUE
-
-/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"
-	item_color = "cargo_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "chapblack"
-	can_adjust = FALSE
-
-/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"
-	item_color = "chapblack_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/rank/chef
-	name = "cook's suit"
-	desc = "A suit which is given only to the most <b>hardcore</b> cooks in space."
-	icon_state = "chef"
-	item_color = "chef"
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/rank/chef/skirt
-	name = "cook's skirt"
-	desc = "A skirt which is given only to the most <b>hardcore</b> cooks in space."
-	icon_state = "chef_skirt"
-	item_color = "chef_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/rank/clown
-	name = "clown suit"
-	desc = "<i>'HONK!'</i>"
-	icon_state = "clown"
-	item_state = "clown"
-	item_color = "clown"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-/obj/item/clothing/under/rank/blueclown
-	name = "blue clown suit"
-	desc = "<i>'BLUE HONK!'</i>"
-	icon_state = "blueclown"
-	item_state = "blueclown"
-	item_color = "blueclown"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/rank/greenclown
-	name = "green clown suit"
-	desc = "<i>'GREEN HONK!'</i>"
-	icon_state = "greenclown"
-	item_state = "greenclown"
-	item_color = "greenclown"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/rank/yellowclown
-	name = "yellow clown suit"
-	desc = "<i>'YELLOW HONK!'</i>"
-	icon_state = "yellowclown"
-	item_state = "yellowclown"
-	item_color = "yellowclown"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/rank/purpleclown
-	name = "purple clown suit"
-	desc = "<i>'PURPLE HONK!'</i>"
-	icon_state = "purpleclown"
-	item_state = "purpleclown"
-	item_color = "purpleclown"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/rank/orangeclown
-	name = "orange clown suit"
-	desc = "<i>'ORANGE HONK!'</i>"
-	icon_state = "orangeclown"
-	item_state = "orangeclown"
-	item_color = "orangeclown"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/rank/rainbowclown
-	name = "rainbow clown suit"
-	desc = "<i>'R A I N B O W HONK!'</i>"
-	icon_state = "rainbowclown"
-	item_state = "rainbowclown"
-	item_color = "rainbowclown"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/rank/clown/Initialize()
-	. = ..()
-	AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50)
-/obj/item/clothing/under/rank/head_of_personnel
-	desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
-	name = "head of personnel's jumpsuit"
-	icon_state = "hop"
-	item_state = "b_suit"
-	item_color = "hop"
-	can_adjust = FALSE
-
-/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"
-	item_color = "hop_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "hydroponics"
-	permeability_coefficient = 0.5
-
-/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"
-	item_color = "hydroponics_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "janitor"
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
-
-/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"
-	item_color = "janitor_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/lawyer
-	desc = "Slick threads."
-	name = "Lawyer suit"
-	can_adjust = FALSE
-/obj/item/clothing/under/lawyer/black
-	name = "lawyer black suit"
-	icon_state = "lawyer_black"
-	item_state = "lawyer_black"
-	item_color = "lawyer_black"
-
-/obj/item/clothing/under/lawyer/black/skirt
-	name = "lawyer black suitskirt"
-	icon_state = "lawyer_black_skirt"
-	item_state = "lawyer_black"
-	item_color = "lawyer_black_skirt"
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/lawyer/female
-	name = "female black suit"
-	icon_state = "black_suit_fem"
-	item_state = "bl_suit"
-	item_color = "black_suit_fem"
-
-/obj/item/clothing/under/lawyer/red
-	name = "lawyer red suit"
-	icon_state = "lawyer_red"
-	item_state = "lawyer_red"
-	item_color = "lawyer_red"
-
-/obj/item/clothing/under/lawyer/female/skirt
-	name = "female black suitskirt"
-	icon_state = "black_suit_fem_skirt"
-	item_state = "bl_suit"
-	item_color = "black_suit_fem_skirt"
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/lawyer/red/skirt
-	name = "lawyer red suitskirt"
-	icon_state = "lawyer_red_skirt"
-	item_state = "lawyer_red"
-	item_color = "lawyer_red_skirt"
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/lawyer/blue
-	name = "lawyer blue suit"
-	icon_state = "lawyer_blue"
-	item_state = "lawyer_blue"
-	item_color = "lawyer_blue"
-
-/obj/item/clothing/under/lawyer/blue/skirt
-	name = "lawyer blue suitskirt"
-	icon_state = "lawyer_blue_skirt"
-	item_state = "lawyer_blue"
-	item_color = "lawyer_blue_skirt"
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/lawyer/bluesuit
-	name = "blue suit"
-	desc = "A classy suit and tie."
-	icon_state = "bluesuit"
-	item_state = "b_suit"
-	item_color = "bluesuit"
-	can_adjust = TRUE
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/lawyer/bluesuit/skirt
-	name = "blue suitskirt"
-	desc = "A classy suitskirt and tie."
-	icon_state = "bluesuit_skirt"
-	item_state = "b_suit"
-	item_color = "bluesuit_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/lawyer/purpsuit
-	name = "purple suit"
-	icon_state = "lawyer_purp"
-	item_state = "p_suit"
-	item_color = "lawyer_purp"
-	fitted = NO_FEMALE_UNIFORM
-	can_adjust = TRUE
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/lawyer/purpsuit/skirt
-	name = "purple suitskirt"
-	icon_state = "lawyer_purp_skirt"
-	item_state = "p_suit"
-	item_color = "lawyer_purp_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "blacksuit"
-	can_adjust = TRUE
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/lawyer/blacksuit/skirt
-	name = "black suitskirt"
-	desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
-	icon_state = "blacksuit_skirt"
-	item_state = "bar_suit"
-	item_color = "blacksuit_skirt"
-	can_adjust = FALSE
-	alt_covers_chest = TRUE
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/rank/curator
-	name = "sensible suit"
-	desc = "It's very... sensible."
-	icon_state = "red_suit"
-	item_state = "red_suit"
-	item_color = "red_suit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/lawyer/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"
-	item_color = "really_black_suit"
-
-/obj/item/clothing/under/lawyer/really_black/skirt
-	name = "executive suitskirt"
-	desc = "A formal black suitskirt and red tie, intended for the station's finest."
-	icon_state = "really_black_suit_skirt"
-	item_state = "bl_suit"
-	item_color = "really_black_suit_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/rank/curator/skirt
-	name = "sensible suitskirt"
-	desc = "It's very... sensible."
-	icon_state = "red_suit_skirt"
-	item_state = "red_suit"
-	item_color = "red_suit_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "curator"
-
-/obj/item/clothing/under/rank/mime
-	name = "mime's outfit"
-	desc = "It's not very colourful."
-	icon_state = "mime"
-	item_state = "mime"
-	item_color = "mime"
-
-/obj/item/clothing/under/rank/mime/skirt
-	name = "mime's skirt"
-	desc = "It's not very colourful."
-	icon_state = "mime_skirt"
-	item_state = "mime"
-	item_color = "mime_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "miner"
-/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"
-	item_color = "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 0000000000..ac5f4f12fd
--- /dev/null
+++ b/code/modules/clothing/under/jobs/civilian/civilian.dm
@@ -0,0 +1,266 @@
+/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"
+	item_color = "barman"
+	alt_covers_chest = TRUE
+
+/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"
+	item_color = "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"
+	item_color = "barman_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/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"
+	item_color = "chapblack"
+	can_adjust = FALSE
+
+/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"
+	item_color = "chapblack_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/chef
+	name = "cook's suit"
+	desc = "A suit which is given only to the most <b>hardcore</b> cooks in space."
+	icon_state = "chef"
+	item_color = "chef"
+	alt_covers_chest = TRUE
+
+/obj/item/clothing/under/rank/civilian/chef/skirt
+	name = "cook's skirt"
+	desc = "A skirt which is given only to the most <b>hardcore</b> cooks in space."
+	icon_state = "chef_skirt"
+	item_color = "chef_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/head_of_personnel
+	desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
+	name = "head of personnel's jumpsuit"
+	icon_state = "hop"
+	item_state = "b_suit"
+	item_color = "hop"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/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"
+	item_color = "hop_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/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"
+	item_color = "teal_suit"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/civilian/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"
+	item_color = "teal_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/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"
+	item_color = "hydroponics"
+	permeability_coefficient = 0.5
+
+/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"
+	item_color = "hydroponics_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/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"
+	item_color = "janitor"
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
+
+/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"
+	item_color = "janitor_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/janitor/maid
+	name = "maid uniform"
+	desc = "A simple maid uniform for housekeeping."
+	icon_state = "janimaid"
+	item_state = "janimaid"
+	item_color = "janimaid"
+	body_parts_covered = CHEST|GROIN
+	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
+	name = "lawyer black suit"
+	icon_state = "lawyer_black"
+	item_state = "lawyer_black"
+	item_color = "lawyer_black"
+
+/obj/item/clothing/under/rank/civilian/lawyer/black/alt
+	name = "lawyer black suit"
+	desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
+	icon_state = "blacksuit"
+	item_state = "bar_suit"
+	item_color = "blacksuit"
+	can_adjust = TRUE
+	alt_covers_chest = TRUE
+
+/obj/item/clothing/under/rank/civilian/lawyer/black/alt/skirt
+	name = "lawyer black suitskirt"
+	icon_state = "blacksuit_skirt"
+	item_color = "blacksuit_skirt"
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/lawyer/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"
+	item_color = "really_black_suit"
+
+/obj/item/clothing/under/rank/civilian/lawyer/really_black/skirt
+	name = "executive suitskirt"
+	desc = "A formal black suitskirt and red tie, intended for the station's finest."
+	icon_state = "really_black_suit_skirt"
+	item_state = "bl_suit"
+	item_color = "really_black_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/lawyer/black/skirt
+	name = "lawyer black suitskirt"
+	icon_state = "lawyer_black_skirt"
+	item_state = "lawyer_black"
+	item_color = "lawyer_black_skirt"
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/lawyer/female
+	name = "female black suit"
+	icon_state = "black_suit_fem"
+	item_state = "bl_suit"
+	item_color = "black_suit_fem"
+
+/obj/item/clothing/under/rank/civilian/lawyer/red
+	name = "lawyer red suit"
+	icon_state = "lawyer_red"
+	item_state = "lawyer_red"
+	item_color = "lawyer_red"
+
+/obj/item/clothing/under/rank/civilian/lawyer/female/skirt
+	name = "female black suitskirt"
+	icon_state = "black_suit_fem_skirt"
+	item_state = "bl_suit"
+	item_color = "black_suit_fem_skirt"
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/lawyer/red/skirt
+	name = "lawyer red suitskirt"
+	icon_state = "lawyer_red_skirt"
+	item_state = "lawyer_red"
+	item_color = "lawyer_red_skirt"
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/lawyer/blue
+	name = "lawyer blue suit"
+	icon_state = "lawyer_blue"
+	item_state = "lawyer_blue"
+	item_color = "lawyer_blue"
+
+/obj/item/clothing/under/rank/civilian/lawyer/blue/skirt
+	name = "lawyer blue suitskirt"
+	icon_state = "lawyer_blue_skirt"
+	item_state = "lawyer_blue"
+	item_color = "lawyer_blue_skirt"
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit
+	name = "blue suit"
+	desc = "A classy suit and tie."
+	icon_state = "bluesuit"
+	item_state = "b_suit"
+	item_color = "bluesuit"
+	can_adjust = TRUE
+	alt_covers_chest = TRUE
+
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt
+	name = "blue suitskirt"
+	desc = "A classy suitskirt and tie."
+	icon_state = "bluesuit_skirt"
+	item_state = "b_suit"
+	item_color = "bluesuit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/lawyer/purpsuit
+	name = "purple suit"
+	icon_state = "lawyer_purp"
+	item_state = "p_suit"
+	item_color = "lawyer_purp"
+	fitted = NO_FEMALE_UNIFORM
+	can_adjust = TRUE
+	alt_covers_chest = TRUE
+
+/obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt
+	name = "purple suitskirt"
+	icon_state = "lawyer_purp_skirt"
+	item_state = "p_suit"
+	item_color = "lawyer_purp_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
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 0000000000..7e85d60dbc
--- /dev/null
+++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm
@@ -0,0 +1,118 @@
+
+/obj/item/clothing/under/rank/civilian/mime
+	name = "mime's outfit"
+	desc = "It's not very colourful."
+	icon_state = "mime"
+	item_state = "mime"
+	item_color = "mime"
+
+/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"
+	item_color = "mime_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/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"
+	item_color = "sexymime"
+	body_parts_covered = CHEST|GROIN|LEGS
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/civilian/clown
+	name = "clown suit"
+	desc = "<i>'HONK!'</i>"
+	icon_state = "clown"
+	item_state = "clown"
+	item_color = "clown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/civilian/clown/blue
+	name = "blue clown suit"
+	desc = "<i>'BLUE HONK!'</i>"
+	icon_state = "blueclown"
+	item_state = "blueclown"
+	item_color = "blueclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/green
+	name = "green clown suit"
+	desc = "<i>'GREEN HONK!'</i>"
+	icon_state = "greenclown"
+	item_state = "greenclown"
+	item_color = "greenclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/yellow
+	name = "yellow clown suit"
+	desc = "<i>'YELLOW HONK!'</i>"
+	icon_state = "yellowclown"
+	item_state = "yellowclown"
+	item_color = "yellowclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/purple
+	name = "purple clown suit"
+	desc = "<i>'PURPLE HONK!'</i>"
+	icon_state = "purpleclown"
+	item_state = "purpleclown"
+	item_color = "purpleclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/orange
+	name = "orange clown suit"
+	desc = "<i>'ORANGE HONK!'</i>"
+	icon_state = "orangeclown"
+	item_state = "orangeclown"
+	item_color = "orangeclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/rainbow
+	name = "rainbow clown suit"
+	desc = "<i>'R A I N B O W HONK!'</i>"
+	icon_state = "rainbowclown"
+	item_state = "rainbowclown"
+	item_color = "rainbowclown"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/civilian/clown/jester
+	name = "jester suit"
+	desc = "A jolly dress, well suited to entertain your master, nuncle."
+	icon_state = "jester"
+	item_color = "jester"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/civilian/clown/jester/alt
+	icon_state = "jester2"
+
+/obj/item/clothing/under/rank/civilian/clown/sexy
+	name = "sexy-clown suit"
+	desc = "It makes you look HONKable!"
+	icon_state = "sexyclown"
+	item_state = "sexyclown"
+	item_color = "sexyclown"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/civilian/clown/Initialize()
+	. = ..()
+	AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50)
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 0000000000..c02cc4b710
--- /dev/null
+++ b/code/modules/clothing/under/jobs/civilian/curator.dm
@@ -0,0 +1,41 @@
+/obj/item/clothing/under/rank/civilian/curator
+	name = "sensible suit"
+	desc = "It's very... sensible."
+	icon_state = "red_suit"
+	item_state = "red_suit"
+	item_color = "red_suit"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/civilian/curator/skirt
+	name = "sensible suitskirt"
+	desc = "It's very... sensible."
+	icon_state = "red_suit_skirt"
+	item_state = "red_suit"
+	item_color = "red_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/civilian/curator/treasure_hunter
+	name = "treasure hunter uniform"
+	desc = "A rugged uniform suitable for treasure hunting."
+	icon_state = "curator"
+	item_state = "curator"
+	item_color = "curator"
+
+/obj/item/clothing/under/rank/civilian/curator/nasa
+	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"
+	item_color = "black"
+	w_class = WEIGHT_CLASS_BULKY
+	gas_transfer_coefficient = 0.01
+	permeability_coefficient = 0.02
+	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
diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm
new file mode 100644
index 0000000000..30560e76b4
--- /dev/null
+++ b/code/modules/clothing/under/jobs/command.dm
@@ -0,0 +1,53 @@
+/obj/item/clothing/under/rank/captain
+	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"
+	item_color = "captain"
+	sensor_mode = SENSOR_COORDS
+	random_sensor = FALSE
+
+/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"
+	item_color = "captain_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/captain/suit
+	name = "captain's suit"
+	desc = "A green suit and yellow necktie. Exemplifies authority."
+	icon_state = "green_suit"
+	item_state = "dg_suit"
+	item_color = "green_suit"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/captain/suit/skirt
+	name = "green suitskirt"
+	desc = "A green suitskirt and yellow necktie. Exemplifies authority."
+	icon_state = "green_suit_skirt"
+	item_state = "dg_suit"
+	item_color = "green_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/rank/captain/parade
+	name = "captain's parade uniform"
+	desc = "A captain's luxury-wear, for special occasions."
+	icon_state = "captain_parade"
+	item_state = "by_suit"
+	item_color = "captain_parade"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/captain/femformal
+	name = "captain's female formal outfit"
+	desc = "An ironically skimpy blue dress with gold markings denoting the rank of \"Captain\"."
+	icon_state = "lewdcap"
+	item_state = "lewdcap"
+	item_color = "lewdcap"
+	can_adjust = FALSE
+	mutantrace_variation = NONE
diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm
index 1f74a572ed..ae0ded5888 100644
--- a/code/modules/clothing/under/jobs/engineering.dm
+++ b/code/modules/clothing/under/jobs/engineering.dm
@@ -1,5 +1,5 @@
 //Contains: Engineering department jumpsuits
-/obj/item/clothing/under/rank/chief_engineer
+/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,7 +8,7 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 80, "acid" = 40)
 	resistance_flags = NONE
 
-/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"
@@ -18,7 +18,7 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
-/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"
@@ -26,7 +26,7 @@
 	item_color = "atmos"
 	resistance_flags = NONE
 
-/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"
@@ -36,7 +36,7 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
-/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"
@@ -44,7 +44,8 @@
 	item_color = "engine"
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 60, "acid" = 20)
 	resistance_flags = NONE
-/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"
@@ -52,7 +53,7 @@
 	item_color = "hazard"
 	alt_covers_chest = TRUE
 
-/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"
@@ -61,21 +62,3 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "robotics"
-	resistance_flags = NONE
-
-/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"
-	item_color = "robotics_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP 
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medical.dm
similarity index 60%
rename from code/modules/clothing/under/jobs/medsci.dm
rename to code/modules/clothing/under/jobs/medical.dm
index 3f31fb4717..0c2b885bec 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medical.dm
@@ -1,107 +1,4 @@
-/*
- * 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"
-	item_color = "director"
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 35)
-	can_adjust = FALSE
-
-/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"
-	item_color = "director_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "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"
-	item_color = "rdwhimsy_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "rdturtle"
-	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"
-	item_color = "rdturtle_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "toxinswhite"
-	permeability_coefficient = 0.5
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-
-/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"
-	item_color = "toxinswhite_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/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"
-	item_color = "chemistrywhite"
-	permeability_coefficient = 0.5
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65)
-
-/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"
-	item_color = "chemistrywhite_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/*
- * Medical
- */
-/obj/item/clothing/under/rank/chief_medical_officer
+/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"
@@ -110,7 +7,7 @@
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
 
-/obj/item/clothing/under/rank/chief_medical_officer/skirt
+/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"
@@ -120,7 +17,18 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
-/obj/item/clothing/under/rank/geneticist
+/obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck
+	desc = "It's a turtleneck worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection, for an officer with a superior sense of style and practicality."
+	name = "chief medical officer's turtleneck"
+	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/turtlenecks.dmi'
+	icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
+	icon_state = "cmoturtle"
+	item_state = "w_suit"
+	item_color = "cmoturtle"
+	alt_covers_chest = TRUE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/rank/medical/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"
@@ -129,7 +37,7 @@
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
 
-/obj/item/clothing/under/rank/geneticist/skirt
+/obj/item/clothing/under/rank/medical/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"
@@ -139,7 +47,7 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
-/obj/item/clothing/under/rank/virologist
+/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"
@@ -148,7 +56,7 @@
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
 
-/obj/item/clothing/under/rank/virologist/skirt
+/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"
@@ -158,6 +66,25 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
+/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"
+	item_color = "chemistrywhite"
+	permeability_coefficient = 0.5
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65)
+
+/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"
+	item_color = "chemistrywhite_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/medical/paramedic
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a white cross on the chest denoting that the wearer is a trained paramedic."
 	name = "paramedic jumpsuit"
@@ -189,7 +116,7 @@
 	icon_state = "paramedic_skirt"
 	item_color = "paramedic_skirt"
 
-/obj/item/clothing/under/rank/nursesuit
+/obj/item/clothing/under/rank/medical/doctor/nurse
 	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
 	name = "nurse's suit"
 	icon_state = "nursesuit"
@@ -201,7 +128,7 @@
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
 
-/obj/item/clothing/under/rank/medical
+/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"
@@ -210,28 +137,28 @@
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
 
-/obj/item/clothing/under/rank/medical/blue
+/obj/item/clothing/under/rank/medical/doctor/blue
 	name = "blue 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"
 	item_color = "scrubsblue"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/rank/medical/green
+/obj/item/clothing/under/rank/medical/doctor/green
 	name = "green 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"
 	item_color = "scrubsgreen"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/rank/medical/purple
+/obj/item/clothing/under/rank/medical/doctor/purple
 	name = "purple 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"
 	item_color = "scrubspurple"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/rank/medical/skirt
+/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"
@@ -239,4 +166,4 @@
 	item_color = "medical_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP 
\ No newline at end of file
+	fitted = FEMALE_UNIFORM_TOP
\ No newline at end of file
diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm
new file mode 100644
index 0000000000..142cb8d8b1
--- /dev/null
+++ b/code/modules/clothing/under/jobs/rnd.dm
@@ -0,0 +1,95 @@
+/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"
+	item_color = "director"
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 35)
+	can_adjust = FALSE
+
+/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"
+	item_color = "director_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/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"
+	item_color = "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"
+	item_color = "rdwhimsy_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/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"
+	item_color = "rdturtle"
+	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"
+	item_color = "rdturtle_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/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"
+	item_color = "toxinswhite"
+	permeability_coefficient = 0.5
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
+/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"
+	item_color = "toxinswhite_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/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"
+	item_color = "robotics"
+	resistance_flags = NONE
+
+/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"
+	item_color = "robotics_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 186c377921..21e088f634 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -4,10 +4,12 @@
  *		Detective
  *		Navy uniforms
  */
+
 /*
  * Security
  */
-/obj/item/clothing/under/rank/security
+
+/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"
@@ -18,13 +20,15 @@
 	alt_covers_chest = TRUE
 	sensor_mode = SENSOR_COORDS
 	random_sensor = FALSE
-/obj/item/clothing/under/rank/security/grey
+
+/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"
 	item_color = "security"
-/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"
@@ -34,8 +38,35 @@
 	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
 
+/obj/item/clothing/under/rank/security/officer/formal
+	name = "security officer's formal uniform"
+	desc = "The latest in fashionable security outfits."
+	icon_state = "officerblueclothes"
+	item_state = "officerblueclothes"
+	item_color = "officerblueclothes"
+	alt_covers_chest = TRUE
 
-/obj/item/clothing/under/rank/warden
+/obj/item/clothing/under/rank/security/officer/blueshirt
+	name = "blue shirt and tie"
+	desc = "I'm a little busy right now, Calhoun."
+	icon_state = "blueshift"
+	item_state = "blueshift"
+	item_color = "blueshift"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/security/officer/spacepol
+	name = "police uniform"
+	desc = "Space not controlled by megacorporations, planets, or pirates is under the jurisdiction of Spacepol."
+	icon_state = "spacepol"
+	item_state = "spacepol"
+	item_color = "spacepol"
+	can_adjust = FALSE
+
+/*
+ * 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"
@@ -46,14 +77,15 @@
 	alt_covers_chest = TRUE
 	sensor_mode = 3
 	random_sensor = FALSE
-/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"
 	item_color = "warden"
 
-/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"
@@ -63,10 +95,19 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
+/obj/item/clothing/under/rank/security/warden/formal
+	desc = "The insignia on this uniform tells you that this uniform belongs to the Warden."
+	name = "warden's formal uniform"
+	icon_state = "wardenblueclothes"
+	item_state = "wardenblueclothes"
+	item_color = "wardenblueclothes"
+	alt_covers_chest = TRUE
+
 /*
  * 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"
@@ -78,7 +119,7 @@
 	sensor_mode = 3
 	random_sensor = FALSE
 
-/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"
@@ -88,7 +129,7 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
-/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"
@@ -96,7 +137,7 @@
 	item_color = "greydet"
 	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"
@@ -109,7 +150,8 @@
 /*
  * 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"
@@ -121,7 +163,7 @@
 	sensor_mode = 3
 	random_sensor = FALSE
 
-/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"
@@ -131,20 +173,21 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
-/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"
 	item_color = "hos"
-/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"
 	item_color = "hosalt"
 
-/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"
@@ -154,47 +197,27 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
-/*
- * Navy uniforms
- */
-/obj/item/clothing/under/rank/security/navyblue
-	name = "security officer's formal uniform"
-	desc = "The latest in fashionable security outfits."
-	icon_state = "officerblueclothes"
-	item_state = "officerblueclothes"
-	item_color = "officerblueclothes"
-	alt_covers_chest = TRUE
-/obj/item/clothing/under/rank/head_of_security/navyblue
+/obj/item/clothing/under/rank/security/head_of_security/formal
 	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"
 	item_color = "hosblueclothes"
 	alt_covers_chest = TRUE
-/obj/item/clothing/under/rank/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"
-	item_state = "wardenblueclothes"
-	item_color = "wardenblueclothes"
-	alt_covers_chest = TRUE
-/*
- *Blueshirt
- */
-/obj/item/clothing/under/rank/security/blueshirt
-	name = "blue shirt and tie"
-	desc = "I'm a little busy right now, Calhoun."
-	icon_state = "blueshift"
-	item_state = "blueshift"
-	item_color = "blueshift"
+
+/obj/item/clothing/under/rank/security/head_of_security/parade
+	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"
+	item_color = "hos_parade_male"
 	can_adjust = FALSE
-/*
- *Spacepol
- */
-/obj/item/clothing/under/rank/security/spacepol
-	name = "police uniform"
-	desc = "Space not controlled by megacorporations, planets, or pirates is under the jurisdiction of Spacepol."
-	icon_state = "spacepol"
-	item_state = "spacepol"
-	item_color = "spacepol"
+
+/obj/item/clothing/under/rank/security/head_of_security/parade/female
+	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"
+	item_color = "hos_parade_fem"
+	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index a3a2b6b97e..fb5ff7b0f4 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -1,4 +1,4 @@
-/obj/item/clothing/under/pj/red
+/obj/item/clothing/under/misc/pj/red
 	name = "red pj's"
 	desc = "Sleepwear."
 	icon_state = "red_pyjamas"
@@ -6,7 +6,7 @@
 	item_state = "w_suit"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/pj/blue
+/obj/item/clothing/under/misc/pj/blue
 	name = "blue pj's"
 	desc = "Sleepwear."
 	icon_state = "blue_pyjamas"
@@ -14,7 +14,7 @@
 	item_state = "w_suit"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/patriotsuit
+/obj/item/clothing/under/misc/patriotsuit
 	name = "Patriotic Suit"
 	desc = "Motorcycle not included."
 	icon_state = "ek"
@@ -22,49 +22,6 @@
 	item_color = "ek"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/scratch
-	name = "white suit"
-	desc = "A white suit, suitable for an excellent host."
-	icon_state = "scratch"
-	item_state = "scratch"
-	item_color = "scratch"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/scratch/skirt
-	name = "white suitskirt"
-	desc = "A white suitskirt, suitable for an excellent host."
-	icon_state = "white_suit_skirt"
-	item_state = "scratch"
-	item_color = "white_suit_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/sl_suit
-	desc = "It's a very amish looking suit."
-	name = "amish suit"
-	icon_state = "sl_suit"
-	item_color = "sl_suit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/roman
-	name = "\improper Roman armor"
-	desc = "Ancient Roman armor. Made of metallic and leather straps."
-	icon_state = "roman"
-	item_color = "roman"
-	item_state = "armor"
-	can_adjust = FALSE
-	strip_delay = 100
-	resistance_flags = NONE
-
-/obj/item/clothing/under/waiter
-	name = "waiter's outfit"
-	desc = "It's a very smart uniform with a special pocket for tip."
-	icon_state = "waiter"
-	item_state = "waiter"
-	item_color = "waiter"
-	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."
@@ -85,37 +42,21 @@
 	can_adjust = FALSE
 	fitted = FEMALE_UNIFORM_TOP
 
-/obj/item/clothing/under/rank/mailman
+/obj/item/clothing/under/misc/mailman
 	name = "mailman's jumpsuit"
 	desc = "<i>'Special delivery!'</i>"
 	icon_state = "mailman"
 	item_state = "b_suit"
 	item_color = "mailman"
 
-/obj/item/clothing/under/rank/psyche
+/obj/item/clothing/under/misc/psyche
 	name = "psychedelic jumpsuit"
 	desc = "Groovy!"
 	icon_state = "psyche"
 	item_state = "p_suit"
 	item_color = "psyche"
 
-/obj/item/clothing/under/rank/clown/sexy
-	name = "sexy-clown suit"
-	desc = "It makes you look HONKable!"
-	icon_state = "sexyclown"
-	item_state = "sexyclown"
-	item_color = "sexyclown"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/jabroni
-	name = "Jabroni Outfit"
-	desc = "The leather club is two sectors down."
-	icon_state = "darkholme"
-	item_state = "darkholme"
-	item_color = "darkholme"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/rank/vice
+/obj/item/clothing/under/misc/vice_officer
 	name = "vice officer's jumpsuit"
 	desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision."
 	icon_state = "vice"
@@ -123,42 +64,8 @@
 	item_color = "vice"
 	can_adjust = FALSE
 
-/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"
-	item_color = "officer"
-	alt_covers_chest = TRUE
 
-/obj/item/clothing/under/rank/centcom_officer/syndicate
-	has_sensor = NO_SENSORS
-
-/obj/item/clothing/under/rank/centcom_commander
-	desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders."
-	name = "\improper CentCom officer's jumpsuit"
-	icon_state = "centcom"
-	item_state = "dg_suit"
-	item_color = "centcom"
-
-/obj/item/clothing/under/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"
-	item_color = "black"
-	w_class = WEIGHT_CLASS_BULKY
-	gas_transfer_coefficient = 0.01
-	permeability_coefficient = 0.02
-	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
-
-/obj/item/clothing/under/acj
+/obj/item/clothing/under/misc/adminsuit
 	name = "administrative cybernetic jumpsuit"
 	icon_state = "syndicate"
 	item_state = "bl_suit"
@@ -175,143 +82,7 @@
 	can_adjust = FALSE
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 
-/obj/item/clothing/under/owl
-	name = "owl uniform"
-	desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction."
-	icon_state = "owl"
-	item_color = "owl"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/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"
-	item_color = "griffin"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/cloud
-	name = "cloud"
-	desc = "cloud"
-	icon_state = "cloud"
-	item_color = "cloud"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/gimmick/rank/captain/suit
-	name = "captain's suit"
-	desc = "A green suit and yellow necktie. Exemplifies authority."
-	icon_state = "green_suit"
-	item_state = "dg_suit"
-	item_color = "green_suit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/gimmick/rank/captain/suit/skirt
-	name = "green suitskirt"
-	desc = "A green suitskirt and yellow necktie. Exemplifies authority."
-	icon_state = "green_suit_skirt"
-	item_state = "dg_suit"
-	item_color = "green_suit_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/gimmick/rank/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"
-	item_color = "teal_suit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/gimmick/rank/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"
-	item_color = "teal_suit_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	fitted = FEMALE_UNIFORM_TOP
-
-/obj/item/clothing/under/suit_jacket
-	name = "black suit"
-	desc = "A black suit and red tie. Very formal."
-	icon_state = "black_suit"
-	item_state = "bl_suit"
-	item_color = "black_suit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/suit_jacket/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"
-	item_color = "really_black_suit"
-
-/obj/item/clothing/under/suit_jacket/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"
-	item_color = "black_suit_fem"
-
-/obj/item/clothing/under/suit_jacket/green
-	name = "green suit"
-	desc = "A green suit and yellow necktie. Baller."
-	icon_state = "green_suit"
-	item_state = "dg_suit"
-	item_color = "green_suit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/suit_jacket/red
-	name = "red suit"
-	desc = "A red suit and blue tie. Somewhat formal."
-	icon_state = "red_suit"
-	item_state = "r_suit"
-	item_color = "red_suit"
-
-/obj/item/clothing/under/suit_jacket/charcoal
-	name = "charcoal suit"
-	desc = "A charcoal suit and red tie. Very professional."
-	icon_state = "charcoal_suit"
-	item_state = "charcoal_suit"
-	item_color = "charcoal_suit"
-
-/obj/item/clothing/under/suit_jacket/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"
-	item_color = "navy_suit"
-
-/obj/item/clothing/under/suit_jacket/burgundy
-	name = "burgundy suit"
-	desc = "A burgundy suit and black tie. Somewhat formal."
-	icon_state = "burgundy_suit"
-	item_state = "burgundy_suit"
-	item_color = "burgundy_suit"
-
-/obj/item/clothing/under/suit_jacket/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"
-	item_color = "checkered_suit"
-
-/obj/item/clothing/under/suit_jacket/tan
-	name = "tan suit"
-	desc = "A tan suit with a yellow tie. Smart, but casual."
-	icon_state = "tan_suit"
-	item_state = "tan_suit"
-	item_color = "tan_suit"
-
-/obj/item/clothing/under/suit_jacket/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"
-	item_color = "white_suit"
-
-/obj/item/clothing/under/burial
+/obj/item/clothing/under/misc/burial
 	name = "burial garments"
 	desc = "Traditional burial garments from the early 22nd century."
 	icon_state = "burial"
@@ -319,74 +90,7 @@
 	item_color = "burial"
 	has_sensor = NO_SENSORS
 
-/obj/item/clothing/under/skirt/black
-	name = "black skirt"
-	desc = "A black skirt, very fancy!"
-	icon_state = "blackskirt"
-	item_color = "blackskirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/skirt/blue
-	name = "blue skirt"
-	desc = "A blue, casual skirt."
-	icon_state = "blueskirt"
-	item_color = "blueskirt"
-	item_state = "b_suit"
-	body_parts_covered = CHEST|GROIN|ARMS
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/skirt/red
-	name = "red skirt"
-	desc = "A red, casual skirt."
-	icon_state = "redskirt"
-	item_color = "redskirt"
-	item_state = "r_suit"
-	body_parts_covered = CHEST|GROIN|ARMS
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/skirt/purple
-	name = "purple skirt"
-	desc = "A purple, casual skirt."
-	icon_state = "purpleskirt"
-	item_color = "purpleskirt"
-	item_state = "p_suit"
-	body_parts_covered = CHEST|GROIN|ARMS
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/schoolgirl
-	name = "blue schoolgirl uniform"
-	desc = "It's just like one of my Japanese animes!"
-	icon_state = "schoolgirl"
-	item_state = "schoolgirl"
-	item_color = "schoolgirl"
-	body_parts_covered = CHEST|GROIN|ARMS
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/schoolgirl/red
-	name = "red schoolgirl uniform"
-	icon_state = "schoolgirlred"
-	item_state = "schoolgirlred"
-	item_color = "schoolgirlred"
-
-/obj/item/clothing/under/schoolgirl/green
-	name = "green schoolgirl uniform"
-	icon_state = "schoolgirlgreen"
-	item_state = "schoolgirlgreen"
-	item_color = "schoolgirlgreen"
-
-/obj/item/clothing/under/schoolgirl/orange
-	name = "orange schoolgirl uniform"
-	icon_state = "schoolgirlorange"
-	item_state = "schoolgirlorange"
-	item_color = "schoolgirlorange"
-
-/obj/item/clothing/under/overalls
+/obj/item/clothing/under/misc/overalls
 	name = "laborer's overalls"
 	desc = "A set of durable overalls for getting the job done."
 	icon_state = "overalls"
@@ -394,136 +98,7 @@
 	item_color = "overalls"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/pirate
-	name = "pirate outfit"
-	desc = "Yarr."
-	icon_state = "pirate"
-	item_state = "pirate"
-	item_color = "pirate"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/soviet
-	name = "soviet uniform"
-	desc = "For the Motherland!"
-	icon_state = "soviet"
-	item_state = "soviet"
-	item_color = "soviet"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/redcoat
-	name = "redcoat uniform"
-	desc = "Looks old."
-	icon_state = "redcoat"
-	item_state = "redcoat"
-	item_color = "redcoat"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/kilt
-	name = "kilt"
-	desc = "Includes shoes and plaid."
-	icon_state = "kilt"
-	item_state = "kilt"
-	item_color = "kilt"
-	body_parts_covered = CHEST|GROIN|LEGS|FEET
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/kilt/highlander
-	desc = "You're the only one worthy of this kilt."
-
-/obj/item/clothing/under/kilt/highlander/Initialize()
-	. = ..()
-	ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER)
-
-/obj/item/clothing/under/sexymime
-	name = "sexy mime outfit"
-	desc = "The only time when you DON'T enjoy looking at someone's rack."
-	icon_state = "sexymime"
-	item_state = "sexymime"
-	item_color = "sexymime"
-	body_parts_covered = CHEST|GROIN|LEGS
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/gladiator
-	name = "gladiator uniform"
-	desc = "Are you not entertained? Is that not why you are here?"
-	icon_state = "gladiator"
-	item_state = "gladiator"
-	item_color = "gladiator"
-	body_parts_covered = CHEST|GROIN|ARMS
-	fitted = NO_FEMALE_UNIFORM
-	can_adjust = FALSE
-	resistance_flags = NONE
-
-/obj/item/clothing/under/gladiator/ash_walker
-	desc = "This gladiator uniform appears to be covered in ash and fairly dated."
-	has_sensor = NO_SENSORS
-
-/obj/item/clothing/under/sundress
-	name = "sundress"
-	desc = "Makes you want to frolic in a field of daisies."
-	icon_state = "sundress"
-	item_state = "sundress"
-	item_color = "sundress"
-	body_parts_covered = CHEST|GROIN
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/sundresswhite
-	name = "white sundress"
-	desc = "Makes you want to frolic in a field of lillies."
-	icon_state = "sundress_white"
-	item_state = "sundress"
-	item_color = "sundress_white"
-	body_parts_covered = CHEST|GROIN
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/greendress
-	name = "green dress"
-	desc = "A tight green dress"
-	icon_state = "dress_green"
-	item_color = "dress_green"
-	body_parts_covered = CHEST|GROIN
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/pinkdress
-	name = "pink dress"
-	desc = "A tight pink dress"
-	icon_state = "dress_pink"
-	item_color = "dress_pink"
-	body_parts_covered = CHEST|GROIN
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/captainparade
-	name = "captain's parade uniform"
-	desc = "A captain's luxury-wear, for special occasions."
-	icon_state = "captain_parade"
-	item_state = "by_suit"
-	item_color = "captain_parade"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/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"
-	item_color = "hos_parade_male"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/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"
-	item_color = "hos_parade_fem"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/assistantformal
+/obj/item/clothing/under/misc/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"
@@ -531,7 +106,7 @@
 	item_color = "assistant_formal"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/staffassistant
+/obj/item/clothing/under/misc/staffassistant
 	name = "staff assistant's jumpsuit"
 	desc = "It's a generic grey jumpsuit. That's about what assistants are worth, anyway."
 	icon = 'goon/icons/obj/item_js_rank.dmi'
@@ -541,81 +116,6 @@
 	item_color = "assistant"
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/blacktango
-	name = "black tango dress"
-	desc = "Filled with Latin fire."
-	icon_state = "black_tango"
-	item_state = "wcoat"
-	item_color = "black_tango"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/westernbustle
-	name = "western bustle dress"
-	desc = "Filled with Western fire."
-	icon_state = "western_bustle"
-	item_state = "wcoat"
-	item_color = "western_bustle"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/flamenco
-	name = "flamenco dress"
-	desc = "Filled with Latin fire."
-	icon_state = "flamenco"
-	item_state = "wcoat"
-	item_color = "flamenco"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/stripeddress
-	name = "striped dress"
-	desc = "Fashion in space."
-	icon_state = "striped_dress"
-	item_state = "stripeddress"
-	item_color = "striped_dress"
-	body_parts_covered = CHEST|GROIN|ARMS
-	fitted = FEMALE_UNIFORM_FULL
-	can_adjust = FALSE
-
-/obj/item/clothing/under/sailordress
-	name = "sailor dress"
-	desc = "Formal wear for a leading lady."
-	icon_state = "sailor_dress"
-	item_state = "sailordress"
-	item_color = "sailor_dress"
-	body_parts_covered = CHEST|GROIN|ARMS
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/flowerdress
-	name = "flower dress"
-	desc = "Lovely dress"
-	icon_state = "flower_dress"
-	item_state = "sailordress"
-	item_color = "flower_dress"
-	body_parts_covered = CHEST|GROIN|LEGS
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/sweptskirt
-	name = "swept skirt"
-	desc = "Formal skirt"
-	icon_state = "skirt_swept"
-	item_color = "skirt_swept"
-	body_parts_covered = GROIN
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/corset
-	name = "black corset"
-	desc = "Nanotrasen is not resposible for any organ damage"
-	icon_state = "corset"
-	item_color = "corset"
-	body_parts_covered = CHEST|GROIN
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
 /obj/item/clothing/under/croptop
 	name = "crop top"
 	desc = "We've saved money by giving you half a shirt!"
@@ -625,135 +125,6 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
 
-/obj/item/clothing/under/redeveninggown
-	name = "red evening gown"
-	desc = "Fancy dress for space bar singers."
-	icon_state = "red_evening_gown"
-	item_state = "redeveninggown"
-	item_color = "red_evening_gown"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/maid
-	name = "maid costume"
-	desc = "Maid in China."
-	icon_state = "maid"
-	item_state = "maid"
-	item_color = "maid"
-	body_parts_covered = CHEST|GROIN
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/maid/Initialize()
-	. = ..()
-	var/obj/item/clothing/accessory/maidapron/A = new (src)
-	attach_accessory(A)
-
-/obj/item/clothing/under/janimaid
-	name = "maid uniform"
-	desc = "A simple maid uniform for housekeeping."
-	icon_state = "janimaid"
-	item_state = "janimaid"
-	item_color = "janimaid"
-	body_parts_covered = CHEST|GROIN
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/plaid_skirt
-	name = "red plaid skirt"
-	desc = "A preppy red skirt with a white blouse."
-	icon_state = "plaid_red"
-	item_state = "plaid_red"
-	item_color = "plaid_red"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = TRUE
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/plaid_skirt/blue
-	name = "blue plaid skirt"
-	desc = "A preppy blue skirt with a white blouse."
-	icon_state = "plaid_blue"
-	item_state = "plaid_blue"
-	item_color = "plaid_blue"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = TRUE
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/plaid_skirt/purple
-	name = "purple plaid skirt"
-	desc = "A preppy purple skirt with a white blouse."
-	icon_state = "plaid_purple"
-	item_state = "plaid_purple"
-	item_color = "plaid_purple"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = TRUE
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/singery
-	name = "yellow performer's outfit"
-	desc = "Just looking at this makes you want to sing."
-	icon_state = "ysing"
-	item_state = "ysing"
-	item_color = "ysing"
-	body_parts_covered = CHEST|GROIN|ARMS
-	fitted = NO_FEMALE_UNIFORM
-	alternate_worn_layer = ABOVE_SHOES_LAYER
-	can_adjust = FALSE
-
-/obj/item/clothing/under/singerb
-	name = "blue performer's outfit"
-	desc = "Just looking at this makes you want to sing."
-	icon_state = "bsing"
-	item_state = "bsing"
-	item_color = "bsing"
-	body_parts_covered = CHEST|GROIN|ARMS
-	alternate_worn_layer = ABOVE_SHOES_LAYER
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/plaid_skirt/green
-	name = "green plaid skirt"
-	desc = "A preppy green skirt with a white blouse."
-	icon_state = "plaid_green"
-	item_state = "plaid_green"
-	item_color = "plaid_green"
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = TRUE
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/jester
-	name = "jester suit"
-	desc = "A jolly dress, well suited to entertain your master, nuncle."
-	icon_state = "jester"
-	item_color = "jester"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/jester/alt
-	icon_state = "jester2"
-
-/obj/item/clothing/under/geisha
-	name = "geisha suit"
-	desc = "Cute space ninja senpai not included."
-	icon_state = "geisha"
-	item_color = "geisha"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-
-/obj/item/clothing/under/villain
-	name = "villain suit"
-	desc = "A change of wardrobe is necessary if you ever want to catch a real superhero."
-	icon_state = "villain"
-	item_color = "villain"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/sailor
-	name = "sailor suit"
-	desc = "Skipper's in the wardroom drinkin gin'."
-	icon_state = "sailor"
-	item_state = "b_suit"
-	item_color = "sailor"
-	can_adjust = FALSE
-
 /obj/item/clothing/under/plasmaman
 	name = "plasma envirosuit"
 	desc = "A special containment suit that allows plasma-based lifeforms to exist safely in an oxygenated environment, and automatically extinguishes them in a crisis. Despite being airtight, it's not spaceworthy."
@@ -808,82 +179,7 @@
 	icon_state = "plasmarefill"
 	icon = 'icons/obj/device.dmi'
 
-/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"
-	item_color = "hostanclothes"
-
-/obj/item/clothing/under/mummy
-	name = "mummy wrapping"
-	desc = "Return the slab or suffer my stale references."
-	icon_state = "mummy"
-	item_state = "mummy"
-	item_color = "mummy"
-	body_parts_covered = CHEST|GROIN|ARMS|LEGS
-	fitted = NO_FEMALE_UNIFORM
-	can_adjust = FALSE
-	resistance_flags = NONE
-
-/obj/item/clothing/under/scarecrow
-	name = "scarecrow clothes"
-	desc = "Perfect camouflage for hiding in botany."
-	icon_state = "scarecrow"
-	item_state = "scarecrow"
-	item_color = "scarecrow"
-	body_parts_covered = CHEST|GROIN|ARMS|LEGS
-	fitted = NO_FEMALE_UNIFORM
-	can_adjust = FALSE
-	resistance_flags = NONE
-
-/obj/item/clothing/under/draculass
-	name = "draculass coat"
-	desc = "A dress inspired by the ancient \"Victorian\" era."
-	icon_state = "draculass"
-	item_state = "draculass"
-	item_color = "draculass"
-	body_parts_covered = CHEST|GROIN|ARMS
-	fitted = FEMALE_UNIFORM_TOP
-	can_adjust = FALSE
-
-/obj/item/clothing/under/drfreeze
-	name = "doctor freeze's jumpsuit"
-	desc = "A modified scientist jumpsuit to look extra cool."
-	icon_state = "drfreeze"
-	item_state = "drfreeze"
-	item_color = "drfreeze"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/lobster
-	name = "foam lobster suit"
-	desc = "Who beheaded the college mascot?"
-	icon_state = "lobster"
-	item_state = "lobster"
-	item_color = "lobster"
-	fitted = NO_FEMALE_UNIFORM
-	can_adjust = FALSE
-
-/obj/item/clothing/under/gondola
-	name = "gondola hide suit"
-	desc = "Now you're cooking."
-	icon_state = "gondola"
-	item_state = "lb_suit"
-	item_color = "gondola"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/skeleton
-	name = "skeleton jumpsuit"
-	desc = "A black jumpsuit with a white bone pattern printed on it. Spooky!"
-	icon_state = "skeleton"
-	item_state = "skeleton"
-	item_color = "skeleton"
-	body_parts_covered = CHEST|GROIN|ARMS|LEGS
-	fitted = NO_FEMALE_UNIFORM
-	can_adjust = FALSE
-	resistance_flags = NONE
-
-/obj/item/clothing/under/gear_harness
+/obj/item/clothing/under/misc/gear_harness
 	name = "gear harness"
 	desc = "A simple, inconspicuous harness replacement for a jumpsuit."
 	icon_state = "gear_harness"
@@ -891,15 +187,7 @@
 	body_parts_covered = CHEST|GROIN
 	can_adjust = FALSE
 
-/obj/item/clothing/under/telegram
-	name = "telegram suit"
-	desc = "Bright and red, hard to miss. Mostly warn by hotel staff or singing telegram."
-	icon_state = "telegram"
-	item_state = "telegram"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-
-/obj/item/clothing/under/durathread
+/obj/item/clothing/under/misc/durathread
 	name = "durathread jumpsuit"
 	desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer."
 	icon_state = "durathread"
@@ -908,104 +196,15 @@
 	can_adjust = TRUE
 	armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)
 
-/obj/item/clothing/under/duraskirt
+/obj/item/clothing/under/misc/durathread/skirt
 	name = "durathread jumpskirt"
 	desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer. Being a short skirt, it naturally doesn't protect the legs."
 	icon_state = "duraskirt"
 	item_state = "duraskirt"
-	item_color = "durathread"
 	can_adjust = FALSE
 	body_parts_covered = CHEST|GROIN|ARMS
-	armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)
 
-/obj/item/clothing/under/christmas/christmasmaler
-	name = "red masculine christmas suit"
-	desc = "A simple red christmas suit that looks close to Santa's!"
-	icon_state = "christmasmaler"
-	item_state = "christmasmaler"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-
-/obj/item/clothing/under/christmas/christmasmaleg
-	name = "green masculine christmas suit"
-	desc = "A simple green christmas suit that smells minty!"
-	icon_state = "christmasmaleg"
-	item_state = "christmasmaleg"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-
-/obj/item/clothing/under/christmas/christmasfemaler
-	name = "red feminine christmas suit"
-	desc = "A simple red christmas suit that looks like Mrs Claus!"
-	icon_state = "christmasfemaler"
-	item_state = "christmasfemaler"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-
-/obj/item/clothing/under/christmas/christmasfemaleg
-	name = "green feminine christmas suit"
-	desc = "A simple green christmas suit that smells minty!"
-	icon_state = "christmasfemaleg"
-	item_state = "christmasfemaleg"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-
-// Lunar Clothes
-/obj/item/clothing/under/lunar/qipao
-	name = "Black Qipao"
-	desc = "A Qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is black."
-	icon_state = "qipao"
-	item_state = "qipao"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/lunar/qipao/white
-	name = "White Qipao"
-	desc = "A Qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is white."
-	icon_state = "qipao_white"
-	item_state = "qipao_white"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/lunar/qipao/red
-	name = "Red Qipao"
-	desc = "A Qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is red."
-	icon_state = "qipao_red"
-	item_state = "qipao_red"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/lunar/cheongsam
-	name = "Black Cheongsam"
-	desc = "A Cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is black."
-	icon_state = "cheong"
-	item_state = "cheong"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/lunar/cheongsam/white
-	name = "White Cheongsam"
-	desc = "A Cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is white."
-	icon_state = "cheongw"
-	item_state = "cheongw"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/lunar/cheongsam/red
-	name = "Red Cheongsam"
-	desc = "A Cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is red.."
-	icon_state = "cheongr"
-	item_state = "cheongr"
-	body_parts_covered = CHEST|GROIN
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/squatter_outfit
+/obj/item/clothing/under/misc/squatter
 	name = "slav squatter tracksuit"
 	desc = "Cyka blyat."
 	icon_state = "squatteroutfit"
@@ -1014,7 +213,7 @@
 	can_adjust = FALSE
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/russobluecamooutfit
+/obj/item/clothing/under/misc/blue_camo
 	name = "russian blue camo"
 	desc = "Drop and give me dvadtsat!"
 	icon_state = "russobluecamo"
@@ -1023,7 +222,7 @@
 	can_adjust = FALSE
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/keyholesweater
+/obj/item/clothing/under/misc/keyholesweater
 	name = "keyhole sweater"
 	desc = "What is the point of this, anyway?"
 	icon_state = "keyholesweater"
@@ -1032,60 +231,108 @@
 	can_adjust = FALSE
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/stripper_pink
+/obj/item/clothing/under/misc/stripper
 	name = "pink stripper outfit"
 	icon_state = "stripper_p"
 	item_state = "stripper_p"
 	item_color = "stripper_p"
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
 
-/obj/item/clothing/under/stripper_green
+/obj/item/clothing/under/misc/stripper/green
 	name = "green stripper outfit"
 	icon_state = "stripper_g"
 	item_state = "stripper_g"
 	item_color = "stripper_g"
-	can_adjust = FALSE
 
-/obj/item/clothing/under/mankini
+/obj/item/clothing/under/misc/stripper/mankini
 	name = "pink mankini"
 	icon_state = "mankini"
 	item_state = "mankini"
 	item_color = "mankini"
+
+/obj/item/clothing/under/misc/corporateuniform
+	name = "corporate uniform"
+	desc = "A comfortable, tight fitting jumpsuit made of premium materials. Not space-proof."
+	icon_state = "tssuit"
+	item_state = "r_suit"
 	can_adjust = FALSE
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/wedding
-	name = "white wedding dress"
-	desc = "A white wedding gown made from the finest silk."
-	icon_state = "bride_white"
-	item_state = "bride_white"
-	item_color = "bride_white"
+/obj/item/clothing/under/misc/poly_shirt
+	name = "polychromic button-up shirt"
+	desc = "A fancy button-up shirt made with polychromic threads."
+	icon_state = "polysuit"
+	item_color = "polysuit"
+	item_state = "sl_suit"
+	hasprimary = TRUE
+	hassecondary = TRUE
+	hastertiary = TRUE
+	primary_color = "#FFFFFF"
+	secondary_color = "#353535"
+	tertiary_color = "#353535"
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/misc/polyshorts
+	name = "polychromic shorts"
+	desc = "For ease of movement and style."
+	icon_state = "polyshorts"
+	item_color = "polyshorts"
+	item_state = "rainbow"
+	hasprimary = TRUE
+	hassecondary = TRUE
+	hastertiary = TRUE
+	primary_color = "#353535"
+	secondary_color = "#808080"
+	tertiary_color = "#808080"
+	can_adjust = FALSE
+	body_parts_covered = CHEST|GROIN|ARMS
+
+/obj/item/clothing/under/misc/polyjumpsuit
+	name = "polychromic tri-tone jumpsuit"
+	desc = "A fancy jumpsuit made with polychromic threads."
+	icon_state = "polyjump"
+	item_color = "polyjump"
+	item_state = "rainbow"
+	hasprimary = TRUE
+	hassecondary = TRUE
+	hastertiary = TRUE
+	primary_color = "#FFFFFF"
+	secondary_color = "#808080"
+	tertiary_color = "#FF3535"
 	can_adjust = FALSE
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/wedding/orange
-	name = "orange wedding dress"
-	desc = "A big and puffy orange dress."
-	icon_state = "bride_orange"
-	item_state = "bride_orange"
-	item_color = "bride_orange"
+/obj/item/clothing/under/misc/poly_bottomless
+	name = "polychromic bottomless shirt"
+	desc = "Great for showing off your junk in dubious style."
+	icon_state = "polybottomless"
+	item_color = "polybottomless"
+	item_state = "rainbow"
+	primary_color = "#808080"
+	secondary_color = "#FF3535"
+	body_parts_covered = CHEST|ARMS	//Because there's no bottom included
+	can_adjust = FALSE
+	mutantrace_variation = NONE
 
-/obj/item/clothing/under/wedding/purple
-	name = "purple wedding dress"
-	desc = "A big and puffy purple dress."
-	icon_state = "bride_purple"
-	item_state = "bride_purple"
-	item_color = "bride_purple"
+/obj/item/clothing/under/misc/poly_tanktop
+	name = "polychromic tank top"
+	desc = "For those lazy summer days."
+	icon_state = "polyshimatank"
+	item_color = "polyshimatank"
+	item_state = "rainbow"
+	primary_color = "#808080"
+	secondary_color = "#FFFFFF"
+	tertiary_color = "#8CC6FF"
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
+	mutantrace_variation = NONE
 
-/obj/item/clothing/under/wedding/blue
-	name = "blue wedding dress"
-	desc = "A big and puffy blue dress."
-	icon_state = "bride_blue"
-	item_state = "bride_blue"
-	item_color = "bride_blue"
-
-/obj/item/clothing/under/wedding/red
-	name = "red wedding dress"
-	desc = "A big and puffy red dress."
-	icon_state = "bride_red"
-	item_state = "bride_red"
-	item_color = "bride_red"
+/obj/item/clothing/under/misc/poly_tanktop/female
+	name = "polychromic feminine tank top"
+	desc = "Great for showing off your chest in style. Not recommended for males."
+	icon_state = "polyfemtankpantsu"
+	item_color = "polyfemtankpantsu"
+	hastertiary = FALSE
+	primary_color = "#808080"
+	secondary_color = "#FF3535"
diff --git a/code/modules/clothing/under/polychromic_clothes.dm b/code/modules/clothing/under/polychromic_clothes.dm
deleted file mode 100644
index 53011d42d1..0000000000
--- a/code/modules/clothing/under/polychromic_clothes.dm
+++ /dev/null
@@ -1,166 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//	Polychromic Uniforms:																							 					  //
-//																													 					  //
-//		Polychromic clothes simply consist of 4 sprites: A base, unrecoloured sprite, and up to 3 greyscaled sprites. 					  //
-//	In order to add more polychromic clothes, simply create a base sprite, and up to 3 recolourable overlays for it,  					  //
-//	and then name them as follows: [name], [name]-primary, [name]-secondary, [name]-tertiary. The sprites should	  					  //
-//	ideally be in 'icons/obj/clothing/uniform.dmi' and 'icons/mob/uniform.dmi' for the	  														  //
-//	worn sprites. After that, copy paste the code from any of the example clothes and 													  //
-//	change the names around. [name] should go in BOTH icon_state and item_color. You can preset colors and disable	  					  //
-//	any overlays using the self-explainatory vars.																	  					  //
-//																													  					  //
-//																								-Tori				  					  //
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/obj/item/clothing/under/polychromic	//enables all three overlays to reduce copypasta and defines basic stuff
-	name = "polychromic suit"
-	desc = "For when you want to show off your horrible colour coordination skills."
-	icon_state = "polysuit"
-	item_color = "polysuit"
-	item_state = "sl_suit"
-	hasprimary = TRUE
-	hassecondary = TRUE
-	hastertiary = TRUE
-	primary_color = "#FFFFFF" //RGB in hexcode
-	secondary_color = "#FFFFFF"
-	tertiary_color = "#808080"
-	can_adjust = FALSE
-	mutantrace_variation = NONE //Not all clothes are currently digi-compatible (only the shorts are as of time of writing)
-
-/obj/item/clothing/under/polychromic/worn_overlays(isinhands, icon_file, style_flags = NONE)	//this is where the main magic happens.
-	. = ..()
-	if(hasprimary | hassecondary | hastertiary)
-		if(!isinhands)	//prevents the worn sprites from showing up if you're just holding them
-			if(hasprimary)	//checks if overlays are enabled
-				var/mutable_appearance/primary_worn = mutable_appearance(icon_file, "[item_color]-primary")	//automagical sprite selection
-				primary_worn.color = primary_color	//colors the overlay
-				. += primary_worn	//adds the overlay onto the buffer list to draw on the mob sprite.
-			if(hassecondary)
-				var/mutable_appearance/secondary_worn = mutable_appearance(icon_file, "[item_color]-secondary")
-				secondary_worn.color = secondary_color
-				. += secondary_worn
-			if(hastertiary)
-				var/mutable_appearance/tertiary_worn = mutable_appearance(icon_file, "[item_color]-tertiary")
-				tertiary_worn.color = tertiary_color
-				. += tertiary_worn
-
-/obj/item/clothing/under/polychromic/shirt	//COPY PASTE THIS TO MAKE A NEW THING
-	name = "polychromic button-up shirt"
-	desc = "A fancy button-up shirt made with polychromic threads."
-	icon_state = "polysuit"
-	item_color = "polysuit"
-	item_state = "sl_suit"
-	primary_color = "#FFFFFF" //RGB in hexcode
-	secondary_color = "#353535"
-	tertiary_color = "#353535"
-
-/obj/item/clothing/under/polychromic/kilt
-	name = "polychromic kilt"
-	desc = "It's not a skirt!"
-	icon_state = "polykilt"
-	item_color = "polykilt"
-	item_state = "kilt"
-	primary_color = "#FFFFFF" //RGB in hexcode
-	secondary_color = "#F08080"
-	hastertiary = FALSE // so it doesn't futz with digilegs
-	body_parts_covered = CHEST|GROIN|ARMS
-
-/obj/item/clothing/under/polychromic/skirt
-	name = "polychromic skirt"
-	desc = "A fancy skirt made with polychromic threads."
-	icon_state = "polyskirt"
-	item_color = "polyskirt"
-	item_state = "rainbow"
-	primary_color = "#FFFFFF" //RGB in hexcode
-	secondary_color = "#F08080"
-	tertiary_color = "#808080"
-	body_parts_covered = CHEST|GROIN|ARMS
-
-/obj/item/clothing/under/polychromic/shorts
-	name = "polychromic shorts"
-	desc = "For ease of movement and style."
-	icon_state = "polyshorts"
-	item_color = "polyshorts"
-	item_state = "rainbow"
-	primary_color = "#353535" //RGB in hexcode
-	secondary_color = "#808080"
-	tertiary_color = "#808080"
-	body_parts_covered = CHEST|GROIN|ARMS
-	mutantrace_variation = STYLE_DIGITIGRADE //to enable digitigrade wearing
-
-/obj/item/clothing/under/polychromic/jumpsuit
-	name = "polychromic tri-tone jumpsuit"
-	desc = "A fancy jumpsuit made with polychromic threads."
-	icon_state = "polyjump"
-	item_color = "polyjump"
-	item_state = "rainbow"
-	primary_color = "#FFFFFF" //RGB in hexcode
-	secondary_color = "#808080"
-	tertiary_color = "#FF3535"
-
-/obj/item/clothing/under/polychromic/shortpants
-	name = "polychromic athletic shorts"
-	desc = "95% Polychrome, 5% Spandex!"
-	icon_state = "polyshortpants"
-	item_color = "polyshortpants"
-	item_state = "rainbow"
-	hastertiary = FALSE
-	primary_color = "#FFFFFF" //RGB in hexcode
-	secondary_color = "#F08080"
-	gender = PLURAL	//Because shortS
-	body_parts_covered = GROIN	//Because there's no shirt included
-
-/obj/item/clothing/under/polychromic/pleat
-	name = "polychromic pleated skirt"
-	desc = "A magnificent pleated skirt complements the woolen polychromatic sweater."
-	icon_state = "polypleat"
-	item_color = "polypleat"
-	item_state = "rainbow"
-	primary_color = "#8CC6FF" //RGB in hexcode
-	secondary_color = "#808080"
-	tertiary_color = "#FF3535"
-	body_parts_covered = CHEST|GROIN|ARMS
-
-/obj/item/clothing/under/polychromic/femtank
-	name = "polychromic feminine tank top"
-	desc = "Great for showing off your chest in style. Not recommended for males."
-	icon_state = "polyfemtankpantsu"
-	item_color = "polyfemtankpantsu"
-	item_state = "rainbow"
-	hastertiary = FALSE
-	primary_color = "#808080" //RGB in hexcode
-	secondary_color = "#FF3535"
-	body_parts_covered = CHEST|GROIN|ARMS
-
-/obj/item/clothing/under/polychromic/shortpants/pantsu
-	name = "polychromic panties"
-	desc = "Topless striped panties. Now with 120% more polychrome!"
-	icon_state = "polypantsu"
-	item_color = "polypantsu"
-	item_state = "rainbow"
-	hastertiary = FALSE
-	primary_color = "#FFFFFF" //RGB in hexcode
-	secondary_color = "#8CC6FF"
-	body_parts_covered = GROIN
-
-/obj/item/clothing/under/polychromic/bottomless
-	name = "polychromic bottomless shirt"
-	desc = "Great for showing off your junk in dubious style."
-	icon_state = "polybottomless"
-	item_color = "polybottomless"
-	item_state = "rainbow"
-	hastertiary = FALSE
-	primary_color = "#808080" //RGB in hexcode
-	secondary_color = "#FF3535"
-	body_parts_covered = CHEST|ARMS	//Because there's no bottom included
-
-/obj/item/clothing/under/polychromic/shimatank
-	name = "polychromic tank top"
-	desc = "For those lazy summer days."
-	icon_state = "polyshimatank"
-	item_color = "polyshimatank"
-	item_state = "rainbow"
-	primary_color = "#808080" //RGB in hexcode
-	secondary_color = "#FFFFFF"
-	tertiary_color = "#8CC6FF"
-	body_parts_covered = CHEST|GROIN
\ No newline at end of file
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index 14c408bfa8..b66df87347 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -34,4 +34,28 @@
 /obj/item/clothing/under/shorts/purple
 	name = "purple athletic shorts"
 	icon_state = "purpleshorts"
-	item_color = "purpleshorts"
\ No newline at end of file
+	item_color = "purpleshorts"
+
+/obj/item/clothing/under/shorts/polychromic
+	name = "polychromic athletic shorts"
+	desc = "95% Polychrome, 5% Spandex!"
+	icon_state = "polyshortpants"
+	item_color = "polyshortpants"
+	item_state = "rainbow"
+	hasprimary = TRUE
+	hassecondary = TRUE
+	primary_color = "#FFFFFF"
+	secondary_color = "#F08080"
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/shorts/polychromic/pantsu
+	name = "polychromic panties"
+	desc = "Topless striped panties. Now with 120% more polychrome!"
+	icon_state = "polypantsu"
+	item_color = "polypantsu"
+	item_state = "rainbow"
+	hastertiary = FALSE
+	primary_color = "#FFFFFF"
+	secondary_color = "#8CC6FF"
+	body_parts_covered = GROIN
+	mutantrace_variation = NONE
diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm
new file mode 100644
index 0000000000..02c2b06546
--- /dev/null
+++ b/code/modules/clothing/under/skirt_dress.dm
@@ -0,0 +1,259 @@
+
+/obj/item/clothing/under/dress/skirt
+	name = "black skirt"
+	desc = "A black skirt, very fancy!"
+	icon_state = "blackskirt"
+	item_color = "blackskirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/skirt/blue
+	name = "blue skirt"
+	desc = "A blue, casual skirt."
+	icon_state = "blueskirt"
+	item_color = "blueskirt"
+	item_state = "b_suit"
+	body_parts_covered = CHEST|GROIN|ARMS
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/skirt/red
+	name = "red skirt"
+	desc = "A red, casual skirt."
+	icon_state = "redskirt"
+	item_color = "redskirt"
+	item_state = "r_suit"
+	body_parts_covered = CHEST|GROIN|ARMS
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/skirt/purple
+	name = "purple skirt"
+	desc = "A purple, casual skirt."
+	icon_state = "purpleskirt"
+	item_color = "purpleskirt"
+	item_state = "p_suit"
+	body_parts_covered = CHEST|GROIN|ARMS
+	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"
+	item_color = "sundress"
+	body_parts_covered = CHEST|GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/sundress/white
+	name = "white sundress"
+	icon_state = "sundress_white"
+	item_color = "sundress_white"
+
+/obj/item/clothing/under/dress/green
+	name = "green dress"
+	desc = "A tight green dress"
+	icon_state = "dress_green"
+	item_color = "dress_green"
+	body_parts_covered = CHEST|GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/pink
+	name = "pink dress"
+	desc = "A tight pink dress"
+	icon_state = "dress_pink"
+	item_color = "dress_pink"
+	body_parts_covered = CHEST|GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/blacktango
+	name = "black tango dress"
+	desc = "Filled with Latin fire."
+	icon_state = "black_tango"
+	item_state = "wcoat"
+	item_color = "black_tango"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/westernbustle
+	name = "western bustle dress"
+	desc = "Filled with Western fire."
+	icon_state = "western_bustle"
+	item_state = "wcoat"
+	item_color = "western_bustle"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/flamenco
+	name = "flamenco dress"
+	desc = "Filled with Latin fire."
+	icon_state = "flamenco"
+	item_state = "wcoat"
+	item_color = "flamenco"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/striped
+	name = "striped dress"
+	desc = "Fashion in space."
+	icon_state = "striped_dress"
+	item_state = "stripeddress"
+	item_color = "striped_dress"
+	body_parts_covered = CHEST|GROIN|ARMS
+	fitted = FEMALE_UNIFORM_FULL
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/sailor
+	name = "sailor dress"
+	desc = "Formal wear for a leading lady."
+	icon_state = "sailor_dress"
+	item_state = "sailordress"
+	item_color = "sailor_dress"
+	body_parts_covered = CHEST|GROIN|ARMS
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/flower
+	name = "flower dress"
+	desc = "Lovely dress."
+	icon_state = "flower_dress"
+	item_state = "sailordress"
+	item_color = "flower_dress"
+	body_parts_covered = CHEST|GROIN|LEGS
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/skirt/swept
+	name = "swept skirt"
+	desc = "Formal skirt."
+	icon_state = "skirt_swept"
+	item_color = "skirt_swept"
+	body_parts_covered = GROIN
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/dress/corset
+	name = "black corset"
+	desc = "Nanotrasen is not resposible for any organ damage."
+	icon_state = "corset"
+	item_color = "corset"
+	body_parts_covered = CHEST|GROIN
+	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"
+	item_color = "red_evening_gown"
+	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"
+	item_color = "plaid_red"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = TRUE
+	alt_covers_chest = TRUE
+
+/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"
+	item_color = "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"
+	item_color = "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"
+	item_color = "plaid_green"
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = TRUE
+	alt_covers_chest = TRUE
+
+/obj/item/clothing/under/dress/wedding
+	name = "white wedding dress"
+	desc = "A white wedding gown made from the finest silk."
+	icon_state = "bride_white"
+	item_state = "bride_white"
+	item_color = "bride_white"
+	can_adjust = FALSE
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/dress/wedding/orange
+	name = "orange wedding dress"
+	desc = "A big and puffy orange dress."
+	icon_state = "bride_orange"
+	item_state = "bride_orange"
+	item_color = "bride_orange"
+
+/obj/item/clothing/under/dress/wedding/purple
+	name = "purple wedding dress"
+	desc = "A big and puffy purple dress."
+	icon_state = "bride_purple"
+	item_state = "bride_purple"
+	item_color = "bride_purple"
+
+/obj/item/clothing/under/dress/wedding/blue
+	name = "blue wedding dress"
+	desc = "A big and puffy blue dress."
+	icon_state = "bride_blue"
+	item_state = "bride_blue"
+	item_color = "bride_blue"
+
+/obj/item/clothing/under/dress/wedding/red
+	name = "red wedding dress"
+	desc = "A big and puffy red dress."
+	icon_state = "bride_red"
+	item_state = "bride_red"
+	item_color = "bride_red"
+
+/obj/item/clothing/under/dress/skirt/polychromic
+	name = "polychromic skirt"
+	desc = "A fancy skirt made with polychromic threads."
+	icon_state = "polyskirt"
+	item_color = "polyskirt"
+	item_state = "rainbow"
+	hasprimary = TRUE
+	hassecondary = TRUE
+	hastertiary = TRUE
+	primary_color = "#FFFFFF"
+	secondary_color = "#F08080"
+	tertiary_color = "#808080"
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/dress/skirt/polychromic/pleated
+	name = "polychromic pleated skirt"
+	desc = "A magnificent pleated skirt complements the woolen polychromatic sweater."
+	icon_state = "polypleat"
+	item_color = "polypleat"
+	item_state = "rainbow"
+	primary_color = "#8CC6FF"
+	secondary_color = "#808080"
+	tertiary_color = "#FF3535"
+	body_parts_covered = CHEST|GROIN|ARMS
+	mutantrace_variation = NONE
diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm
new file mode 100644
index 0000000000..1b99fbc549
--- /dev/null
+++ b/code/modules/clothing/under/suits.dm
@@ -0,0 +1,135 @@
+
+/obj/item/clothing/under/suit/white_on_white
+	name = "white suit"
+	desc = "A white suit, suitable for an excellent host."
+	icon_state = "scratch"
+	item_state = "scratch"
+	item_color = "scratch"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/suit/white_on_white/skirt
+	name = "white suitskirt"
+	desc = "A white suitskirt, suitable for an excellent host."
+	icon_state = "white_suit_skirt"
+	item_state = "scratch"
+	item_color = "white_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
+/obj/item/clothing/under/suit/sl
+	desc = "It's a very amish looking suit."
+	name = "amish suit"
+	icon_state = "sl_suit"
+	item_color = "sl_suit"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/suit/waiter
+	name = "waiter's outfit"
+	desc = "It's a very smart uniform with a special pocket for tip."
+	icon_state = "waiter"
+	item_state = "waiter"
+	item_color = "waiter"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/suit/black
+	name = "black suit"
+	desc = "A black suit and red tie. Very formal."
+	icon_state = "black_suit"
+	item_state = "bl_suit"
+	item_color = "black_suit"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/suit/black_really
+	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"
+	item_color = "really_black_suit"
+
+/obj/item/clothing/under/suit/black/skirt
+	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"
+	item_color = "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"
+	item_color = "green_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"
+	item_color = "red_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"
+	item_color = "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"
+	item_color = "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"
+	item_color = "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"
+	item_color = "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"
+	item_color = "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"
+	item_color = "white_suit"
+
+/obj/item/clothing/under/suit/telegram
+	name = "telegram suit"
+	desc = "Bright and red, hard to miss. Mostly warn by hotel staff or singing telegram."
+	icon_state = "telegram"
+	item_state = "telegram"
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
+
+/obj/item/clothing/under/suit/polychromic	//enables all three overlays to reduce copypasta and defines basic stuff
+	name = "polychromic suit"
+	desc = "For when you want to show off your horrible colour coordination skills."
+	icon_state = "polysuit"
+	item_color = "polysuit"
+	item_state = "sl_suit"
+	hasprimary = TRUE
+	hassecondary = TRUE
+	hastertiary = TRUE
+	primary_color = "#FFFFFF"
+	secondary_color = "#FFFFFF"
+	tertiary_color = "#808080"
+	can_adjust = FALSE
+	mutantrace_variation = NONE
diff --git a/code/modules/clothing/under/sweaters.dm b/code/modules/clothing/under/sweaters.dm
new file mode 100644
index 0000000000..13f336bfbd
--- /dev/null
+++ b/code/modules/clothing/under/sweaters.dm
@@ -0,0 +1,41 @@
+/obj/item/clothing/under/sweater
+	name = "cream sweater"
+	desc = "Why trade style for comfort? Now you can go commando down south and still be cozy up north."
+	icon_state = "bb_turtle"
+	item_state = "w_suit"
+	item_color = "bb_turtle"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = TRUE
+	icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
+	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
+	mutantrace_variation = NONE
+
+/obj/item/clothing/under/sweater/black
+	name = "black sweater"
+	icon_state = "bb_turtleblk"
+	item_state = "bl_suit"
+	item_color = "bb_turtleblk"
+
+/obj/item/clothing/under/sweater/purple
+	name = "purple sweater"
+	icon_state = "bb_turtlepur"
+	item_state = "p_suit"
+	item_color = "bb_turtlepur"
+
+/obj/item/clothing/under/sweater/green
+	name = "green sweater"
+	icon_state = "bb_turtlegrn"
+	item_state = "g_suit"
+	item_color = "bb_turtlegrn"
+
+/obj/item/clothing/under/sweater/red
+	name = "red sweater"
+	icon_state = "bb_turtlered"
+	item_state = "r_suit"
+	item_color = "bb_turtlered"
+
+/obj/item/clothing/under/sweater/blue
+	name = "blue sweater"
+	icon_state = "bb_turtleblu"
+	item_state = "b_suit"
+	item_color = "bb_turtleblu"
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 1250f4ed19..676138d734 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -55,6 +55,16 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
 	fitted = FEMALE_UNIFORM_TOP
 
+/obj/item/clothing/under/syndicate/cosmetic
+	name = "tactitool turtleneck"
+	desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
+	icon_state = "tactifool"
+	item_state = "bl_suit"
+	item_color = "tactifool"
+	has_sensor = TRUE
+	mutantrace_variation = NONE
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+
 /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."
diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm
index 20852dbe62..2fb33d1b19 100644
--- a/code/modules/clothing/under/trek.dm
+++ b/code/modules/clothing/under/trek.dm
@@ -2,20 +2,23 @@
 
 
 /obj/item/clothing/under/trek
-	can_adjust = FALSE
+	name = "Section 31 Uniform"
+	desc = "Oooh... right."
+	item_state = ""
+	can_adjust = FALSE	//to prevent you from "wearing it casually"
 
 
 //TOS
 /obj/item/clothing/under/trek/command
 	name = "command uniform"
-	desc = "The uniform worn by command officers."
+	desc = "The uniform worn by command officers in the mid 2260s."
 	icon_state = "trek_command"
 	item_color = "trek_command"
 	item_state = "y_suit"
 
 /obj/item/clothing/under/trek/engsec
-	name = "engsec uniform"
-	desc = "The uniform worn by engineering/security officers."
+	name = "operations uniform"
+	desc = "The uniform worn by operations officers of the mid 2260s. You feel strangely vulnerable just seeing this..."
 	icon_state = "trek_engsec"
 	item_color = "trek_engsec"
 	item_state = "r_suit"
@@ -23,45 +26,86 @@
 
 /obj/item/clothing/under/trek/medsci
 	name = "medsci uniform"
-	desc = "The uniform worn by medical/science officers."
+	desc = "The uniform worn by medsci officers in the mid 2260s."
 	icon_state = "trek_medsci"
 	item_color = "trek_medsci"
 	item_state = "b_suit"
+	permeability_coefficient = 0.50
 
 
 //TNG
 /obj/item/clothing/under/trek/command/next
+	desc = "The uniform worn by command officers. This one's from the mid 2360s."
 	icon_state = "trek_next_command"
 	item_color = "trek_next_command"
 	item_state = "r_suit"
 
 /obj/item/clothing/under/trek/engsec/next
+	desc = "The uniform worn by operation officers. This one's from the mid 2360s."
 	icon_state = "trek_next_engsec"
 	item_color = "trek_next_engsec"
 	item_state = "y_suit"
 
 /obj/item/clothing/under/trek/medsci/next
+	desc = "The uniform worn by medsci officers. This one's from the mid 2360s."
 	icon_state = "trek_next_medsci"
 	item_color = "trek_next_medsci"
 
 
 //ENT
 /obj/item/clothing/under/trek/command/ent
+	desc = "The uniform worn by command officers of the 2140s."
 	icon_state = "trek_ent_command"
 	item_color = "trek_ent_command"
 	item_state = "bl_suit"
 
 /obj/item/clothing/under/trek/engsec/ent
+	desc = "The uniform worn by operations officers of the 2140s."
 	icon_state = "trek_ent_engsec"
 	item_color = "trek_ent_engsec"
 	item_state = "bl_suit"
 
 /obj/item/clothing/under/trek/medsci/ent
+	desc = "The uniform worn by medsci officers of the 2140s."
 	icon_state = "trek_ent_medsci"
 	item_color = "trek_ent_medsci"
 	item_state = "bl_suit"
 
 
+//VOY
+/obj/item/clothing/under/trek/command/voy
+	desc = "The uniform worn by command officers of the 2370s."
+	icon_state = "trek_voy_command"
+	item_state = "trek_voy_command"
+
+/obj/item/clothing/under/trek/engsec/voy
+	desc = "The uniform worn by operations officers of the 2370s."
+	icon_state = "trek_voy_engsec"
+	item_state = "trek_voy_engsec"
+
+/obj/item/clothing/under/trek/medsci/voy
+	desc = "The uniform worn by medsci officers of the 2370s."
+	icon_state = "trek_voy_medsci"
+	item_state = "trek_voy_medsci"
+
+
+//DS9
+/obj/item/clothing/under/trek/command/ds9
+	desc = "The uniform worn by command officers of the 2380s."
+	icon_state = "trek_ds9_command"
+	item_state = "trek_ds9_command"
+
+/obj/item/clothing/under/trek/engsec/ds9
+	desc = "The uniform worn by operations officers of the 2380s."
+	icon_state = "trek_ds9_engsec"
+	item_state = "trek_ds9_engsec"
+
+/obj/item/clothing/under/trek/medsci/ds9
+	desc = "The uniform undershirt worn by medsci officers of the 2380s."
+	icon_state = "trek_ds9_medsci"
+	item_state = "trek_ds9_medsci"
+
+
 //Q
 /obj/item/clothing/under/trek/Q
 	name = "french marshall's uniform"
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 270e8cff6c..1592efb032 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -375,6 +375,11 @@
 				name = "grape juice box"
 				desc = "Tasty grape juice in a fun little container. Non-alcoholic!"
 				foodtype = FRUIT | BREAKFAST
+			if(/datum/reagent/consumable/pineapplejuice)
+				icon_state = "pineapplebox"
+				name = "pineapple juice box"
+				desc = "Why would you even want this?"
+				foodtype = FRUIT | PINEAPPLE
 			if("chocolate_milk")
 				icon_state = "chocolatebox"
 				name = "carton of chocolate milk"
@@ -498,6 +503,13 @@
 	. = ..()
 	name = "lemon-lime soda"
 
+/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry
+	name = "Sol Dry"
+	desc = "Maybe this will help your tummy feel better. Maybe not."
+	icon_state = "ginger_ale"
+	list_reagents = list(/datum/reagent/consumable/sol_dry = 30)
+	foodtype = SUGAR
+
 /obj/item/reagent_containers/food/drinks/soda_cans/space_up
 	name = "Space-Up!"
 	desc = "Tastes like a hull breach in your mouth."
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index b38250e39d..95b9f92873 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -429,6 +429,28 @@
 	list_reagents = list(/datum/reagent/consumable/limejuice = 100)
 	foodtype = FRUIT
 
+/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice
+	name = "pineapple juice"
+	desc = "Extremely tart, yellow juice."
+	icon_state = "pineapplejuice"
+	item_state = "carton"
+	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
+	isGlass = FALSE
+	list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100)
+	foodtype = FRUIT | PINEAPPLE
+
+/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice
+	name = "strawberry juice"
+	desc = "Slushy, reddish juice."
+	icon_state = "strawberryjuice"
+	item_state = "carton"
+	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
+	isGlass = FALSE
+	list_reagents = list(/datum/reagent/consumable/strawberryjuice = 100)
+	foodtype = FRUIT
+
 /obj/item/reagent_containers/food/drinks/bottle/menthol
 	name = "menthol"
 	desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm
index 0bcfe340aa..b699477245 100644
--- a/code/modules/food_and_drinks/food/snacks_frozen.dm
+++ b/code/modules/food_and_drinks/food/snacks_frozen.dm
@@ -197,7 +197,7 @@
 	name = "pineapple snowcone"
 	desc = "Pineapple syrup drizzled over a snowball in a paper cup."
 	icon_state = "pineapple_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/water = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pineapplejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "pineapples" = 5)
 	foodtype = PINEAPPLE //Pineapple to allow all that like pineapple to enjoy
 
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index 83a03ed2d9..a7cad1d7bb 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -149,6 +149,8 @@
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("meat" = 1)
+	slices_num = 6
+	slice_path = /obj/item/reagent_containers/food/snacks/salami
 	foodtype = MEAT | BREAKFAST
 	var/roasted = FALSE
 
@@ -156,6 +158,15 @@
 	. = ..()
 	eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
 
+/obj/item/reagent_containers/food/snacks/salami
+	name = "salami"
+	filling_color = "#CD4122"
+	desc = "A slice of cured salami."
+	icon_state = "salami"
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1)
+	tastes = list("meat" = 1, "smoke" = 1)
+	foodtype = MEAT
+
 /obj/item/reagent_containers/food/snacks/kebab
 	trash = /obj/item/stack/rods
 	icon_state = "kebab"
@@ -228,6 +239,7 @@
 		M.DefaultCombatKnockdown(40)
 		M.adjustBruteLoss(60)
 		Expand()
+		return TRUE
 	return ..()
 
 /obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index 6c71318807..6feb2df524 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -173,7 +173,7 @@
 	list_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	filling_color = "#F0E68C"
 	tastes = list("egg" = 1)
-	foodtype = MEAT | GRAIN
+	foodtype = MEAT
 
 /obj/item/reagent_containers/food/snacks/beans
 	name = "tin of beans"
@@ -542,6 +542,7 @@
 	desc = "A sliced piece of juicy pineapple."
 	icon_state = "pineapple_slice"
 	filling_color = "#F6CB0B"
+	juice_results = list(/datum/reagent/consumable/pineapplejuice = 3)
 	tastes = list("pineapple" = 1)
 	foodtype = FRUIT | PINEAPPLE
 
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 2cb0141728..e1c0646e80 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -234,6 +234,12 @@
 	results = list(/datum/reagent/consumable/ethanol/black_russian = 5)
 	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 3, /datum/reagent/consumable/ethanol/kahlua = 2)
 
+/datum/chemical_reaction/hiveminderaser
+	name = "Hivemind Eraser"
+	id = /datum/reagent/consumable/ethanol/hiveminderaser
+	results = list(/datum/reagent/consumable/ethanol/hiveminderaser = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/thirteenloko = 1, /datum/reagent/consumable/grenadine = 1)
+
 /datum/chemical_reaction/manhattan
 	name = "Manhattan"
 	id = /datum/reagent/consumable/ethanol/manhattan
@@ -259,10 +265,10 @@
 	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/bahama_mama
-	name = "Bahama mama"
+	name = "Bahama Mama"
 	id = /datum/reagent/consumable/ethanol/bahama_mama
-	results = list(/datum/reagent/consumable/ethanol/bahama_mama = 6)
-	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/orangejuice = 2, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ice = 1)
+	results = list(/datum/reagent/consumable/ethanol/bahama_mama = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/pineapplejuice = 1)
 
 /datum/chemical_reaction/singulo
 	name = "Singulo"
@@ -300,6 +306,24 @@
 	results = list(/datum/reagent/consumable/ethanol/barefoot = 3)
 	required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/ethanol/vermouth = 1)
 
+/datum/chemical_reaction/moscow_mule
+	name = "Moscow Mule"
+	id = /datum/reagent/consumable/ethanol/moscow_mule
+	results = list(/datum/reagent/consumable/ethanol/moscow_mule = 10)
+	required_reagents = list(/datum/reagent/consumable/sol_dry = 5, /datum/reagent/consumable/ethanol/vodka = 5, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ice = 1)
+	mix_sound = 'sound/effects/bubbles2.ogg'
+
+/datum/chemical_reaction/painkiller
+	name = "Painkiller"
+	id = /datum/reagent/consumable/ethanol/painkiller
+	results = list(/datum/reagent/consumable/ethanol/painkiller = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/consumable/pineapplejuice = 4, /datum/reagent/consumable/orangejuice = 1)
+
+/datum/chemical_reaction/pina_colada
+	name = "Pina Colada"
+	id = /datum/reagent/consumable/ethanol/pina_colada
+	results = list(/datum/reagent/consumable/ethanol/pina_colada = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/pineapplejuice = 3, /datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/limejuice = 1)
 
 ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
 
@@ -729,14 +753,14 @@
 /datum/chemical_reaction/pinkmilk
 	name = "Strawberry Milk"
 	id = /datum/reagent/consumable/pinkmilk
-	results = list(/datum/reagent/consumable/pinkmilk = 5)
-	required_reagents = list(/datum/reagent/drug/aphrodisiacplus = 1, /datum/reagent/consumable/milk = 1)
+	results = list(/datum/reagent/consumable/pinkmilk = 2)
+	required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/milk = 1)
 
 /datum/chemical_reaction/pinktea
 	name = "Strawberry Tea"
 	id = /datum/reagent/consumable/pinktea
 	results = list(/datum/reagent/consumable/pinktea = 5)
-	required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
+	required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/blank_paper
 	name = "Blank Paper"
@@ -822,6 +846,63 @@
 	results = list(/datum/reagent/consumable/red_queen = 10)
 	required_reagents = list(/datum/reagent/consumable/tea = 6, /datum/reagent/mercury = 2, /datum/reagent/consumable/blackpepper = 1, /datum/reagent/growthserum = 1)
 
+/datum/chemical_reaction/gunfire
+	name = "Gunfire"
+	id = /datum/reagent/consumable/ethanol/gunfire
+	results = list(/datum/reagent/consumable/ethanol/gunfire = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/tea = 3)
+	mix_message = "A loud popping begins to fill the air as the drink is mixed."
+
+/datum/chemical_reaction/hellfire
+	name = "Hellfire"
+	id = /datum/reagent/consumable/ethanol/hellfire
+	results = list(/datum/reagent/consumable/ethanol/hellfire = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/ethanol/crevice_spike = 1)
+	mix_message = "The liquid begins to churn as it changes to an amber orange and catches on fire."
+
+/datum/chemical_reaction/sins_delight
+	name = "Sins Delight"
+	id = /datum/reagent/consumable/ethanol/sins_delight
+	results = list(/datum/reagent/consumable/ethanol/sins_delight = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/demonsblood = 2, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/ethanol/martini = 1, /datum/reagent/consumable/ethanol/changelingsting = 1)
+	mix_message = "The liquid starts swirling, before forming a pink cloud that dissipates in the air."
+
+/datum/chemical_reaction/strawberry_daiquiri
+	name = "Strawberry Daiquiri"
+	id = /datum/reagent/consumable/ethanol/strawberry_daiquiri
+	results = list(/datum/reagent/consumable/ethanol/strawberry_daiquiri = 7)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/strawberryjuice = 2, /datum/reagent/consumable/ice = 1)
+
+/datum/chemical_reaction/miami_vice
+	name = "Miami Vice"
+	id = /datum/reagent/consumable/ethanol/miami_vice
+	results = list(/datum/reagent/consumable/ethanol/miami_vice = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/pina_colada = 1, /datum/reagent/consumable/ethanol/strawberry_daiquiri = 1)
+
+/datum/chemical_reaction/malibu_sunset
+	name = "Malibu Sunset"
+	id = /datum/reagent/consumable/ethanol/malibu_sunset
+	results = list(/datum/reagent/consumable/ethanol/malibu_sunset = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/painkiller = 2, /datum/reagent/consumable/grenadine = 1, /datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/ice = 1)
+
+/datum/chemical_reaction/liz_fizz
+	name = "Liz Fizz"
+	id = /datum/reagent/consumable/ethanol/liz_fizz
+	results = list(/datum/reagent/consumable/ethanol/liz_fizz = 5)
+	required_reagents = list(/datum/reagent/consumable/triple_citrus = 3, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1)
+
+/datum/chemical_reaction/hotlime_miami
+	name = "Hotlime Miami"
+	id = /datum/reagent/consumable/ethanol/hotlime_miami
+	results = list(/datum/reagent/consumable/ethanol/hotlime_miami = 2)
+	required_reagents = list(/datum/reagent/medicine/ephedrine = 1, /datum/reagent/consumable/ethanol/pina_colada = 1)
+
+/datum/chemical_reaction/mauna_loa
+	name = "Mauna Loa"
+	id = /datum/reagent/consumable/ethanol/mauna_loa
+	results = list(/datum/reagent/consumable/ethanol/mauna_loa = 5)
+	required_reagents = list(/datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/bahama_mama = 2)
+
 /datum/chemical_reaction/catnip_tea
 	name = "Catnip Tea"
 	id = /datum/reagent/consumable/catnip_tea
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
index 6d443c99f0..3e47904e6e 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
@@ -211,7 +211,7 @@
 	reqs = list(
 		/obj/item/reagent_containers/food/drinks/sillycup = 1,
 		/datum/reagent/consumable/ice = 15,
-		/obj/item/reagent_containers/food/snacks/pineappleslice = 2
+		/datum/reagent/consumable/pineapplejuice = 5
 	)
 	result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple
 	subcategory = CAT_ICE
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
index e155a1bd23..2256e7c633 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
@@ -100,12 +100,3 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/cubannachos
 	subcategory = CAT_MEXICAN
-
-/datum/crafting_recipe/food/wrap
-	name = "Wrap"
-	reqs = list(/datum/reagent/consumable/soysauce = 10,
-		/obj/item/reagent_containers/food/snacks/friedegg = 1,
-		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
-	)
-	result = /obj/item/reagent_containers/food/snacks/eggwrap
-	subcategory = CAT_MEXICAN
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index 479e116801..528fc61156 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -14,6 +14,15 @@
 	result = /obj/item/reagent_containers/food/snacks/chawanmushi
 	subcategory = CAT_MISCFOOD
 
+/datum/crafting_recipe/food/wrap
+	name = "Egg Wrap"
+	reqs = list(/datum/reagent/consumable/soysauce = 10,
+		/obj/item/reagent_containers/food/snacks/friedegg = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/eggwrap
+	subcategory = CAT_MISCFOOD
+
 /datum/crafting_recipe/food/khachapuri
 	name = "Khachapuri"
 	reqs = list(
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index 0646ae1a8c..80792538d6 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -261,6 +261,7 @@
 	seed = /obj/item/seeds/strawberry
 	name = "strawberry"
 	icon_state = "strawberry"
-	filling_color = "#7FFF00"
+	filling_color = "#E50D31"
+	juice_results = list(/datum/reagent/consumable/strawberryjuice = 0)
 	tastes = list("strawberries" = 1)
 	wine_power = 20
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index 6ebfd3254f..a2278f0f12 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -266,6 +266,7 @@
 	throwforce = 5
 	hitsound = 'sound/weapons/klonk.ogg'
 	attack_verb = list("klonked", "donked", "bonked")
+	distill_reagent = "creme_de_coconut"
 	var/opened = FALSE
 	var/carved = FALSE
 	var/chopped = FALSE
diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm
index 40b3a67573..79df8aa75e 100644
--- a/code/modules/hydroponics/grown/pineapple.dm
+++ b/code/modules/hydroponics/grown/pineapple.dm
@@ -30,5 +30,6 @@
 	filling_color = "#F6CB0B"
 	w_class = WEIGHT_CLASS_NORMAL
 	foodtype = FRUIT | PINEAPPLE
+	juice_results = list(/datum/reagent/consumable/pineapplejuice = 0)
 	tastes = list("pineapple" = 1)
 	wine_power = 40
diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm
index 6a4221479d..eec6e77578 100644
--- a/code/modules/jobs/job_types/assistant.dm
+++ b/code/modules/jobs/job_types/assistant.dm
@@ -35,9 +35,9 @@ Assistant
 		if(suited)
 			uniform = /obj/item/clothing/under/color/grey
 		else
-			uniform = /obj/item/clothing/under/skirt/color/grey
+			uniform = /obj/item/clothing/under/color/jumpskirt/grey
 	else
 		if(suited)
 			uniform = /obj/item/clothing/under/color/random
 		else
-			uniform = /obj/item/clothing/under/skirt/color/random
+			uniform = /obj/item/clothing/under/color/jumpskirt/random
diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm
index 300fcc7109..97d73db5ce 100644
--- a/code/modules/jobs/job_types/atmospheric_technician.dm
+++ b/code/modules/jobs/job_types/atmospheric_technician.dm
@@ -26,7 +26,7 @@
 	belt = /obj/item/storage/belt/utility/atmostech
 	l_pocket = /obj/item/pda/atmos
 	ears = /obj/item/radio/headset/headset_eng
-	uniform = /obj/item/clothing/under/rank/atmospheric_technician
+	uniform = /obj/item/clothing/under/rank/engineering/atmospheric_technician
 	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 cffeceea9c..f542e96d50 100644
--- a/code/modules/jobs/job_types/bartender.dm
+++ b/code/modules/jobs/job_types/bartender.dm
@@ -23,7 +23,7 @@
 	glasses = /obj/item/clothing/glasses/sunglasses/reagent
 	belt = /obj/item/pda/bar
 	ears = /obj/item/radio/headset/headset_srv
-	uniform = /obj/item/clothing/under/rank/bartender
+	uniform = /obj/item/clothing/under/rank/civilian/bartender
 	suit = /obj/item/clothing/suit/armor/vest
 	backpack_contents = list(/obj/item/storage/box/beanbag=1,/obj/item/book/granter/action/drink_fling=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 e6338d9b0a..916783fe60 100644
--- a/code/modules/jobs/job_types/botanist.dm
+++ b/code/modules/jobs/job_types/botanist.dm
@@ -21,7 +21,7 @@
 
 	belt = /obj/item/pda/botanist
 	ears = /obj/item/radio/headset/headset_srv
-	uniform = /obj/item/clothing/under/rank/hydroponics
+	uniform = /obj/item/clothing/under/rank/civilian/hydroponics
 	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/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm
index d6fbe5551f..74b06adff7 100644
--- a/code/modules/jobs/job_types/cargo_technician.dm
+++ b/code/modules/jobs/job_types/cargo_technician.dm
@@ -23,6 +23,6 @@
 
 	belt = /obj/item/pda/cargo
 	ears = /obj/item/radio/headset/headset_cargo
-	uniform = /obj/item/clothing/under/rank/cargotech
+	uniform = /obj/item/clothing/under/rank/cargo/tech
 	l_hand = /obj/item/export_scanner
 
diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm
index 97b1edc8c2..70d8af317e 100644
--- a/code/modules/jobs/job_types/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain.dm
@@ -115,7 +115,7 @@
 
 	belt = /obj/item/pda/chaplain
 	ears = /obj/item/radio/headset/headset_srv
-	uniform = /obj/item/clothing/under/rank/chaplain
+	uniform = /obj/item/clothing/under/rank/civilian/chaplain
 	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 4614feba8d..66167a3827 100644
--- a/code/modules/jobs/job_types/chemist.dm
+++ b/code/modules/jobs/job_types/chemist.dm
@@ -25,7 +25,7 @@
 	glasses = /obj/item/clothing/glasses/science
 	belt = /obj/item/pda/chemist
 	ears = /obj/item/radio/headset/headset_med
-	uniform = /obj/item/clothing/under/rank/chemist
+	uniform = /obj/item/clothing/under/rank/medical/chemist
 	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 0aa1f2f05f..d031653a31 100644
--- a/code/modules/jobs/job_types/chief_engineer.dm
+++ b/code/modules/jobs/job_types/chief_engineer.dm
@@ -38,7 +38,7 @@
 	belt = /obj/item/storage/belt/utility/chief/full
 	l_pocket = /obj/item/pda/heads/ce
 	ears = /obj/item/radio/headset/heads/ce
-	uniform = /obj/item/clothing/under/rank/chief_engineer
+	uniform = /obj/item/clothing/under/rank/engineering/chief_engineer
 	shoes = /obj/item/clothing/shoes/sneakers/brown
 	head = /obj/item/clothing/head/hardhat/white
 	gloves = /obj/item/clothing/gloves/color/black/ce
diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm
index 69eead70f7..4a80975bb9 100644
--- a/code/modules/jobs/job_types/chief_medical_officer.dm
+++ b/code/modules/jobs/job_types/chief_medical_officer.dm
@@ -36,7 +36,7 @@
 	belt = /obj/item/pda/heads/cmo
 	l_pocket = /obj/item/pinpointer/crew
 	ears = /obj/item/radio/headset/heads/cmo
-	uniform = /obj/item/clothing/under/rank/chief_medical_officer
+	uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer
 	shoes = /obj/item/clothing/shoes/sneakers/brown
 	suit = /obj/item/clothing/suit/toggle/labcoat/cmo
 	l_hand = /obj/item/storage/firstaid/regular
diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm
index f8a7e70473..a18aee474c 100644
--- a/code/modules/jobs/job_types/clown.dm
+++ b/code/modules/jobs/job_types/clown.dm
@@ -24,7 +24,7 @@
 
 	belt = /obj/item/pda/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 b5def54061..db76af4d32 100644
--- a/code/modules/jobs/job_types/cook.dm
+++ b/code/modules/jobs/job_types/cook.dm
@@ -23,7 +23,7 @@
 
 	belt = /obj/item/pda/cook
 	ears = /obj/item/radio/headset/headset_srv
-	uniform = /obj/item/clothing/under/rank/chef
+	uniform = /obj/item/clothing/under/rank/civilian/chef
 	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/curator.dm b/code/modules/jobs/job_types/curator.dm
index dc4b23662a..9e0a91e6aa 100644
--- a/code/modules/jobs/job_types/curator.dm
+++ b/code/modules/jobs/job_types/curator.dm
@@ -23,7 +23,7 @@
 	shoes = /obj/item/clothing/shoes/laceup
 	belt = /obj/item/pda/curator
 	ears = /obj/item/radio/headset/headset_srv
-	uniform = /obj/item/clothing/under/rank/curator
+	uniform = /obj/item/clothing/under/rank/civilian/curator
 	l_hand = /obj/item/storage/bag/books
 	r_pocket = /obj/item/key/displaycase
 	l_pocket = /obj/item/laser_pointer
diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm
index 13cb5e01e3..0c586d47a6 100644
--- a/code/modules/jobs/job_types/detective.dm
+++ b/code/modules/jobs/job_types/detective.dm
@@ -29,7 +29,7 @@
 
 	belt = /obj/item/pda/detective
 	ears = /obj/item/radio/headset/headset_sec/alt
-	uniform = /obj/item/clothing/under/rank/det
+	uniform = /obj/item/clothing/under/rank/security/detective
 	neck = /obj/item/clothing/neck/tie/black
 	shoes = /obj/item/clothing/shoes/sneakers/brown
 	suit = /obj/item/clothing/suit/det_suit
diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm
index 6efa95cd91..35586c0bc8 100644
--- a/code/modules/jobs/job_types/geneticist.dm
+++ b/code/modules/jobs/job_types/geneticist.dm
@@ -24,7 +24,7 @@
 
 	belt = /obj/item/pda/geneticist
 	ears = /obj/item/radio/headset/headset_medsci
-	uniform = /obj/item/clothing/under/rank/geneticist
+	uniform = /obj/item/clothing/under/rank/medical/geneticist
 	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 86b9cafa25..cf8310504d 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -42,7 +42,7 @@
 	id = /obj/item/card/id/silver
 	belt = /obj/item/pda/heads/hop
 	ears = /obj/item/radio/headset/heads/hop
-	uniform = /obj/item/clothing/under/rank/head_of_personnel
+	uniform = /obj/item/clothing/under/rank/civilian/head_of_personnel
 	shoes = /obj/item/clothing/shoes/sneakers/brown
 	head = /obj/item/clothing/head/hopcap
 	backpack_contents = list(/obj/item/storage/box/ids=1,\
diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm
index e20315a1ca..926eb0b068 100644
--- a/code/modules/jobs/job_types/head_of_security.dm
+++ b/code/modules/jobs/job_types/head_of_security.dm
@@ -38,7 +38,7 @@
 	id = /obj/item/card/id/silver
 	belt = /obj/item/pda/heads/hos
 	ears = /obj/item/radio/headset/heads/hos/alt
-	uniform = /obj/item/clothing/under/rank/head_of_security
+	uniform = /obj/item/clothing/under/rank/security/head_of_security
 	shoes = /obj/item/clothing/shoes/jackboots
 	suit = /obj/item/clothing/suit/armor/hos/trenchcoat
 	gloves = /obj/item/clothing/gloves/color/black/hos
diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm
index e42da10362..bc3d2b8abd 100644
--- a/code/modules/jobs/job_types/janitor.dm
+++ b/code/modules/jobs/job_types/janitor.dm
@@ -22,5 +22,5 @@
 
 	belt = /obj/item/pda/janitor
 	ears = /obj/item/radio/headset/headset_srv
-	uniform = /obj/item/clothing/under/rank/janitor
+	uniform = /obj/item/clothing/under/rank/civilian/janitor
 	backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm
index 654af6a05d..7bf9c39d45 100644
--- a/code/modules/jobs/job_types/lawyer.dm
+++ b/code/modules/jobs/job_types/lawyer.dm
@@ -25,7 +25,7 @@
 
 	belt = /obj/item/pda/lawyer
 	ears = /obj/item/radio/headset/headset_sec
-	uniform = /obj/item/clothing/under/lawyer/bluesuit
+	uniform = /obj/item/clothing/under/rank/civilian/lawyer/bluesuit
 	suit = /obj/item/clothing/suit/toggle/lawyer
 	shoes = /obj/item/clothing/shoes/laceup
 	l_hand = /obj/item/storage/briefcase/lawyer
@@ -43,5 +43,5 @@
 	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
diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm
index 2a8814f29c..605727cf80 100644
--- a/code/modules/jobs/job_types/medical_doctor.dm
+++ b/code/modules/jobs/job_types/medical_doctor.dm
@@ -22,7 +22,7 @@
 
 	belt = /obj/item/pda/medical
 	ears = /obj/item/radio/headset/headset_med
-	uniform = /obj/item/clothing/under/rank/medical
+	uniform = /obj/item/clothing/under/rank/medical/doctor
 	shoes = /obj/item/clothing/shoes/sneakers/white
 	suit =  /obj/item/clothing/suit/toggle/labcoat
 	l_hand = /obj/item/storage/firstaid/regular
diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm
index a5eb2032fa..f38b4edf52 100644
--- a/code/modules/jobs/job_types/mime.dm
+++ b/code/modules/jobs/job_types/mime.dm
@@ -26,7 +26,7 @@
 
 	belt = /obj/item/pda/mime
 	ears = /obj/item/radio/headset/headset_srv
-	uniform = /obj/item/clothing/under/rank/mime
+	uniform = /obj/item/clothing/under/rank/civilian/mime
 	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 ad57d05cdc..04460936af 100644
--- a/code/modules/jobs/job_types/quartermaster.dm
+++ b/code/modules/jobs/job_types/quartermaster.dm
@@ -34,7 +34,7 @@
 
 	belt = /obj/item/pda/quartermaster
 	ears = /obj/item/radio/headset/heads/qm
-	uniform = /obj/item/clothing/under/rank/cargo
+	uniform = /obj/item/clothing/under/rank/cargo/qm
 	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 ebf3b3eb40..9cc2f4b8bf 100644
--- a/code/modules/jobs/job_types/research_director.dm
+++ b/code/modules/jobs/job_types/research_director.dm
@@ -39,7 +39,7 @@
 	id = /obj/item/card/id/silver
 	belt = /obj/item/pda/heads/rd
 	ears = /obj/item/radio/headset/heads/rd
-	uniform = /obj/item/clothing/under/rank/research_director
+	uniform = /obj/item/clothing/under/rank/rnd/research_director
 	shoes = /obj/item/clothing/shoes/sneakers/brown
 	suit = /obj/item/clothing/suit/toggle/labcoat
 	l_hand = /obj/item/clipboard
diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm
index 782b175ad4..345b1ac3d3 100644
--- a/code/modules/jobs/job_types/roboticist.dm
+++ b/code/modules/jobs/job_types/roboticist.dm
@@ -25,7 +25,7 @@
 	belt = /obj/item/storage/belt/utility/full
 	l_pocket = /obj/item/pda/roboticist
 	ears = /obj/item/radio/headset/headset_sci
-	uniform = /obj/item/clothing/under/rank/roboticist
+	uniform = /obj/item/clothing/under/rank/rnd/roboticist
 	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 f40a25d6ba..ce9a628ae0 100644
--- a/code/modules/jobs/job_types/scientist.dm
+++ b/code/modules/jobs/job_types/scientist.dm
@@ -24,7 +24,7 @@
 
 	belt = /obj/item/pda/toxins
 	ears = /obj/item/radio/headset/headset_sci
-	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
 
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index ae50f71c0c..92cc15673f 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -115,7 +115,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
 
 	belt = /obj/item/pda/security
 	ears = /obj/item/radio/headset/headset_sec/alt
-	uniform = /obj/item/clothing/under/rank/security
+	uniform = /obj/item/clothing/under/rank/security/officer
 	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 915e9d1cea..4ba1fc9ac1 100644
--- a/code/modules/jobs/job_types/shaft_miner.dm
+++ b/code/modules/jobs/job_types/shaft_miner.dm
@@ -27,7 +27,7 @@
 	ears = /obj/item/radio/headset/headset_cargo/mining
 	shoes = /obj/item/clothing/shoes/workboots/mining
 	gloves = /obj/item/clothing/gloves/color/black
-	uniform = /obj/item/clothing/under/rank/miner/lavaland
+	uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland
 	l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival
 	r_pocket = /obj/item/storage/bag/ore	//causes issues if spawned in backpack
 	backpack_contents = list(
@@ -46,7 +46,7 @@
 
 /datum/outfit/job/miner/asteroid
 	name = "Shaft Miner (Asteroid)"
-	uniform = /obj/item/clothing/under/rank/miner
+	uniform = /obj/item/clothing/under/rank/cargo/miner
 	shoes = /obj/item/clothing/shoes/workboots
 
 /datum/outfit/job/miner/equipped
diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm
index 55381549ba..144693aba1 100644
--- a/code/modules/jobs/job_types/station_engineer.dm
+++ b/code/modules/jobs/job_types/station_engineer.dm
@@ -27,7 +27,7 @@
 	belt = /obj/item/storage/belt/utility/full/engi
 	l_pocket = /obj/item/pda/engineering
 	ears = /obj/item/radio/headset/headset_eng
-	uniform = /obj/item/clothing/under/rank/engineer
+	uniform = /obj/item/clothing/under/rank/engineering/engineer
 	shoes = /obj/item/clothing/shoes/workboots
 	head = /obj/item/clothing/head/hardhat
 	r_pocket = /obj/item/t_scanner
diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm
index dcc13af627..c5a9c9e9fb 100644
--- a/code/modules/jobs/job_types/virologist.dm
+++ b/code/modules/jobs/job_types/virologist.dm
@@ -24,7 +24,7 @@
 
 	belt = /obj/item/pda/viro
 	ears = /obj/item/radio/headset/headset_med
-	uniform = /obj/item/clothing/under/rank/virologist
+	uniform = /obj/item/clothing/under/rank/medical/virologist
 	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 9c529f45f3..8ddcf1ad91 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -34,7 +34,7 @@
 
 	belt = /obj/item/pda/warden
 	ears = /obj/item/radio/headset/headset_sec/alt
-	uniform = /obj/item/clothing/under/rank/warden
+	uniform = /obj/item/clothing/under/rank/security/warden
 	shoes = /obj/item/clothing/shoes/jackboots
 	suit = /obj/item/clothing/suit/armor/vest/warden/alt
 	gloves = /obj/item/clothing/gloves/color/black
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index 9ee358af62..916fb50844 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -119,7 +119,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)
@@ -127,7 +127,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/machine_vending.dm b/code/modules/mining/machine_vending.dm
index dd3b13d8dd..0182dec254 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -303,7 +303,7 @@
 
 /obj/item/storage/backpack/duffelbag/mining_cloned/PopulateContents()
 	new /obj/item/pickaxe/mini(src)
-	new /obj/item/clothing/under/rank/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/gloves/color/black(src)
 	new /obj/item/implanter/tracking/gps(src)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index ac4cee8c42..c212c22c98 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/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index 14cd7be547..a7fdf2d914 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -23,6 +23,10 @@
 		var/rando_race = pick(GLOB.roundstart_races)
 		pref_species = new rando_race()
 	features = random_features(pref_species?.id)
+	if(gender == MALE || gender != FEMALE)
+		features["body_model"] = gender
+	else if(gender == PLURAL)
+		features["body_model"] = pick(MALE,FEMALE)
 	age = rand(AGE_MIN,AGE_MAX)
 
 /datum/preferences/proc/update_preview_icon(equip_job = TRUE)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index f5f9a734ae..938f6531f1 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -1025,3 +1025,19 @@
 
 /mob/living/carbon/can_hold_items()
 	return TRUE
+
+/mob/living/carbon/set_gender(ngender = NEUTER, silent = FALSE, update_icon = TRUE, forced = FALSE)
+	var/bender = gender != ngender
+	. = ..()
+	if(!.)
+		return
+	if(dna && bender)
+		if(ngender == MALE || ngender == FEMALE)
+			dna.features["body_model"] = ngender
+			if(!silent)
+				var/adj = ngender == MALE ? "masculine" : "feminine"
+				visible_message("<span class='boldnotice'>[src] suddenly looks more [adj]!</span>", "<span class='boldwarning'>You suddenly feel more [adj]!</span>")
+		else if(ngender == NEUTER)
+			dna.features["body_model"] = MALE
+	if(update_icon)
+		update_body()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index b2691f4474..57667293e7 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -621,13 +621,14 @@
 
 //Used for new human mobs created by cloning/goleming/podding
 /mob/living/carbon/human/proc/set_cloned_appearance()
-	if(gender == MALE)
+	if(dna.features["body_model"] == MALE)
 		facial_hair_style = "Full Beard"
 	else
 		facial_hair_style = "Shaved"
 	hair_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
 	underwear = "Nude"
 	undershirt = "Nude"
+	socks = "Nude"
 	update_body()
 	update_hair()
 	update_genitals()
@@ -707,7 +708,7 @@
 
 /mob/living/carbon/human/wash_cream()
 	if(creamed) //clean both to prevent a rare bug
-		cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_snout"))
+		cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_lizard"))
 		cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_human"))
 		creamed = FALSE
 
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index b6cf0f5a82..a26bdd99cd 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -52,7 +52,7 @@
 	var/oldpseudoheight = pseudo_z_axis
 	. = ..()
 	for(var/datum/mutation/human/HM in dna.mutations)
-		HM.on_move(src, NewLoc)
+		HM.on_move(NewLoc)
 	if(. && (combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) && !(movement_type & FLYING) && CHECK_ALL_MOBILITY(src, MOBILITY_MOVE|MOBILITY_STAND) && m_intent == MOVE_INTENT_RUN && has_gravity(loc) && !pulledby)
 		if(!HAS_TRAIT(src, TRAIT_FREESPRINT))
 			doSprintLossTiles(1)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index b5453598ee..70285beaf5 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -585,7 +585,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 				if(T)
 					var/state = "[T.icon_state][((DIGITIGRADE in species_traits) && T.has_digitigrade) ? "_d" : ""]"
 					var/mutable_appearance/MA
-					if(H.dna.species.sexes && H.gender == FEMALE)
+					if(H.dna.species.sexes && H.dna.features["body_model"] == FEMALE)
 						MA = wear_female_version(state, T.icon, BODY_LAYER)
 					else
 						MA = mutable_appearance(T.icon, state, -BODY_LAYER)
@@ -746,7 +746,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	if(!bodyparts_to_add)
 		return
 
-	var/g = (H.gender == FEMALE) ? "f" : "m"
+	var/g = (H.dna.features["body_model"] == FEMALE) ? "f" : "m"
 
 	for(var/layer in relevent_layers)
 		var/layertext = mutant_bodyparts_layertext(layer)
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index cf2950ff6f..147cb30772 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -603,10 +603,11 @@
 	else if (select_alteration == "Penis Length")
 		for(var/obj/item/organ/genital/penis/X in H.internal_organs)
 			qdel(X)
-		var/new_length
-		new_length = input(owner, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Genital Alteration") as num|null
+		var/min_D = CONFIG_GET(number/penis_min_inches_prefs)
+		var/max_D = CONFIG_GET(number/penis_max_inches_prefs)
+		var/new_length = input(owner, "Penis length in inches:\n([min_D]-[max_D])", "Genital Alteration") as num|null
 		if(new_length)
-			H.dna.features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
+			H.dna.features["cock_length"] = CLAMP(round(new_length), min_D, max_D)
 		H.update_genitals()
 		H.apply_overlay()
 		H.give_genital(/obj/item/organ/genital/testicles)
@@ -615,8 +616,7 @@
 	else if (select_alteration == "Breast Size")
 		for(var/obj/item/organ/genital/breasts/X in H.internal_organs)
 			qdel(X)
-		var/new_size
-		new_size = input(owner, "Breast Size", "Genital Alteration") as null|anything in GLOB.breasts_size_list
+		var/new_size = input(owner, "Breast Size", "Genital Alteration") as null|anything in CONFIG_GET(keyed_list/breasts_cups_prefs)
 		if(new_size)
 			H.dna.features["breasts_size"] = new_size
 		H.update_genitals()
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index f1b1570e24..66233f7243 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -132,7 +132,7 @@ There are several things that need to be remembered:
 		var/mutable_appearance/uniform_overlay
 
 		if(dna && dna.species.sexes)
-			var/G = (gender == FEMALE) ? "f" : "m"
+			var/G = (dna.features["body_model"] == FEMALE) ? "f" : "m"
 			if(G == "f" && U.fitted != NO_FEMALE_UNIFORM)
 				uniform_overlay = U.build_worn_icon(t_color, UNIFORM_LAYER, alt_worn, FALSE, U.fitted, variant_flag, FALSE)
 
@@ -648,12 +648,11 @@ generate/load female uniform sprites matching all previously decided variables
 	else
 		. += "-not_coloured"
 
-	. += "-[gender]"
+	. += "-[dna.features["body_model"]]"
 
 
 	var/is_taur = FALSE
-	var/mob/living/carbon/human/H = src
-	if(("taur" in H.dna.species.mutant_bodyparts) && (H.dna.features["taur"] != "None"))
+	if(("taur" in dna.species.mutant_bodyparts) && (dna.features["taur"] != "None"))
 		is_taur = TRUE
 
 
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 265d520749..1309fae60c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1192,3 +1192,9 @@
 
 /mob/living/canface()
 	return ..() && CHECK_MOBILITY(src, MOBILITY_MOVE)
+
+/mob/living/proc/set_gender(ngender = NEUTER, silent = FALSE, update_icon = TRUE, forced = FALSE)
+	if(forced || (!ckey || client?.prefs.cit_toggles & (ngender == FEMALE ? FORCED_FEM : FORCED_MASC)))
+		gender = ngender
+		return TRUE
+	return FALSE
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 9f3e44fee7..2e0e9dadb4 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/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
@@ -142,7 +142,7 @@
 
 /datum/outfit/russiancorpse/officer
 	name = "Russian Officer Corpse"
-	uniform = /obj/item/clothing/under/rank/security/navyblue/russian
+	uniform = /obj/item/clothing/under/costume/russian_officer
 	suit = /obj/item/clothing/suit/armor/navyblue/russian
 	shoes = /obj/item/clothing/shoes/combat
 	ears = /obj/item/radio/headset
@@ -174,7 +174,7 @@
 
 /datum/outfit/nanotrasensoldiercorpse2
 	name = "NT Private Security Officer Corpse"
-	uniform = /obj/item/clothing/under/rank/security
+	uniform = /obj/item/clothing/under/rank/security/officer
 	suit = /obj/item/clothing/suit/armor/vest
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat
@@ -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/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index eb0b2948e5..f8ba050864 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -14,8 +14,8 @@ The colossus' true danger lies in its ranged capabilities. It fires immensely da
 At 33% health, the colossus gains an additional attack:
  4. The colossus fires two spirals of death bolts, spinning in opposite directions.
 
-When a colossus dies, it leaves behind a chunk of glowing crystal known as a black box. Anything placed inside will carry over into future rounds.
-For instance, you could place a bag of holding into the black box, and then kill another colossus next round and retrieve the bag of holding from inside.
+When a colossus dies, it leaves behind an anomalous crystal structure. This crystal can be activated in one of multiple ways and has an effect randomly chosen from a list.
+It also drops its vocal cords, which, when inserted into someone's mouth, allow them to activate some specific phrases that cause effects, such as sleeping to people nearby.
 
 Difficulty: Very Hard
 
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 d940305080..800c35493b 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
@@ -287,7 +287,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))
@@ -306,7 +306,7 @@
 				l_pocket = pickweight(list(/obj/item/stack/spacecash/c1000 = 7, /obj/item/reagent_containers/hypospray/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
@@ -346,7 +346,7 @@
 				l_pocket = pick(list(/obj/item/crowbar/power, /obj/item/wrench/power, /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
@@ -369,7 +369,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
@@ -378,7 +378,7 @@
 			glasses =  /obj/item/clothing/glasses/hud/health/night/cultblind
 			backpack_contents = list(/obj/item/reagent_containers/glass/beaker/unholywater = 1, /obj/item/cult_shift = 1, /obj/item/flashlight/flare/culttorch = 1, /obj/item/stack/sheet/runed_metal = 15)
 		if("Lavaknight")
-			uniform = /obj/item/clothing/under/assistantformal
+			uniform = /obj/item/clothing/under/misc/assistantformal
 			mask = /obj/item/clothing/mask/breath
 			shoes = /obj/item/clothing/shoes/sneakers/black
 			r_pocket = /obj/item/melee/transforming/energy/sword/cx/broken
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index 03fc7a2ed2..01e6abaa6a 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -124,7 +124,7 @@ Contents:
 	return TRUE
 
 /obj/item/clothing/suit/space/space_ninja/proc/lockIcons(mob/living/carbon/human/H)
-	icon_state = H.gender==FEMALE ? "s-ninjanf" : "s-ninjan"
+	icon_state = H.dna.features["body_model"] == FEMALE ? "s-ninjanf" : "s-ninjan"
 	H.gloves.icon_state = "s-ninjan"
 	H.gloves.item_state = "s-ninjan"
 
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 2b09954f08..ca5219375f 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -194,7 +194,7 @@
 		w_class = initial(w_class)
 		name = initial(name)
 		hitsound = initial(hitsound)
-		embedding = embedding.setRating(embed_chance = EMBED_CHANCE)
+		embedding = null
 		throwforce = initial(throwforce)
 		playsound(user, 'sound/weapons/saberoff.ogg', 5, 1)
 		to_chat(user, "<span class='warning'>[src] can now be concealed.</span>")
@@ -204,7 +204,7 @@
 		w_class = WEIGHT_CLASS_NORMAL
 		name = "energy dagger"
 		hitsound = 'sound/weapons/blade1.ogg'
-		embedding = list("embed_chance" = 100, "embedded_fall_chance" = 0)//rule of cool
+		embedding = getEmbeddingBehavior(embed_chance = 100, embedded_fall_chance = 0) //rule of cool
 		throwforce = 35
 		playsound(user, 'sound/weapons/saberon.ogg', 5, 1)
 		to_chat(user, "<span class='warning'>[src] is now active.</span>")
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 97d28d7674..8db531aa5e 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -121,11 +121,10 @@
 					if(isalienadult(ass) || istype(ass, /mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro.
 						temp_img = icon('icons/ass/assalien.png')
 					else if(ishuman(ass)) //Suit checks are in check_ass
-						if(ass.gender == MALE)
-							temp_img = icon('icons/ass/assmale.png')
-						else if(ass.gender == FEMALE)
+						var/mob/living/carbon/human/H = ass
+						if(H.dna.features["body_model"] == FEMALE)
 							temp_img = icon('icons/ass/assfemale.png')
-						else 									//In case anyone ever makes the generic ass. For now I'll be using male asses.
+						else
 							temp_img = icon('icons/ass/assmale.png')
 					else if(isdrone(ass)) //Drones are hot
 						temp_img = icon('icons/ass/assdrone.png')
diff --git a/code/modules/pool/pool_main.dm b/code/modules/pool/pool_main.dm
index 40aac0e88d..b45c0f36a2 100644
--- a/code/modules/pool/pool_main.dm
+++ b/code/modules/pool/pool_main.dm
@@ -173,7 +173,7 @@
 	if(istype(W, /obj/item/mop) && filled)
 		W.reagents.add_reagent("water", 5)
 		to_chat(user, "<span class='notice'>You wet [W] in [src].</span>")
-		playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
+		playsound(src, 'sound/effects/slosh.ogg', 25, TRUE)
 	else
 		return ..()
 
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 2974df29a6..eb2a6ad162 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -486,6 +486,7 @@
 		/datum/reagent/consumable/pwr_game,
 		/datum/reagent/consumable/shamblers,
 		/datum/reagent/consumable/sugar,
+		/datum/reagent/consumable/pineapplejuice,
 		/datum/reagent/consumable/orangejuice,
 		/datum/reagent/consumable/grenadine,
 		/datum/reagent/consumable/limejuice,
@@ -494,15 +495,22 @@
 		/datum/reagent/consumable/menthol
 	)
 	upgrade_reagents = list(
-		/datum/reagent/drug/mushroomhallucinogen,
-		/datum/reagent/consumable/nothing,
-		/datum/reagent/medicine/cryoxadone
+		/datum/reagent/consumable/banana,
+		/datum/reagent/consumable/berryjuice,
+		/datum/reagent/consumable/strawberryjuice
 	)
 	upgrade_reagents2 = list(
-		/datum/reagent/consumable/banana,
-		/datum/reagent/consumable/berryjuice
+		/datum/reagent/consumable/applejuice,
+		/datum/reagent/consumable/carrotjuice,
+		/datum/reagent/consumable/pumpkinjuice,
+		/datum/reagent/consumable/watermelonjuice
+	)
+	upgrade_reagents3 = list(
+		/datum/reagent/drug/mushroomhallucinogen,
+		/datum/reagent/consumable/nothing,
+		/datum/reagent/medicine/cryoxadone,
+		/datum/reagent/consumable/peachjuice
 	)
-	upgrade_reagents3 = null
 	emagged_reagents = list(
 		/datum/reagent/consumable/ethanol/thirteenloko,
 		/datum/reagent/consumable/ethanol/changelingsting,
@@ -551,6 +559,7 @@
 		/datum/reagent/consumable/ethanol/hcider,
 		/datum/reagent/consumable/ethanol/creme_de_menthe,
 		/datum/reagent/consumable/ethanol/creme_de_cacao,
+		/datum/reagent/consumable/ethanol/creme_de_coconut,
 		/datum/reagent/consumable/ethanol/triple_sec,
 		/datum/reagent/consumable/ethanol/sake,
 		/datum/reagent/consumable/ethanol/applejack
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index e22f8caf89..b7f32421aa 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -958,14 +958,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bahama_mama
 	name = "Bahama Mama"
-	description = "Tropical cocktail."
+	description = "A tropical cocktail with a complex blend of flavors."
 	color = "#FF7F3B" // rgb: 255, 127, 59
 	boozepwr = 35
 	quality = DRINK_GOOD
-	taste_description = "lime and orange"
+	taste_description = "pineapple, coconut, and a hint of coffee"
 	glass_icon_state = "bahama_mama"
 	glass_name = "Bahama Mama"
-	glass_desc = "Tropical cocktail."
+	glass_desc = "A tropical cocktail with a complex blend of flavors."
 	value = 2
 
 /datum/reagent/consumable/ethanol/singulo
@@ -1156,6 +1156,17 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		playsound(get_turf(M), 'sound/effects/explosionfar.ogg', 100, 1)
 	return ..()
 
+/datum/reagent/consumable/ethanol/hiveminderaser
+	name = "Hivemind Eraser"
+	description = "A vessel of pure flavor."
+	color = "#FF80FC" // rgb: 255, 128, 252
+	boozepwr = 40
+	quality = DRINK_GOOD
+	taste_description = "psychic links"
+	glass_icon_state = "hiveminderaser"
+	glass_name = "Hivemind Eraser"
+	glass_desc = "For when even mindshields can't save you."
+
 /datum/reagent/consumable/ethanol/erikasurprise
 	name = "Erika Surprise"
 	description = "The surprise is, it's green!"
@@ -1563,6 +1574,16 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient."
 	value = 1
 
+/datum/reagent/consumable/ethanol/creme_de_coconut
+	name = "Creme de Coconut"
+	description = "A coconut liqueur for smooth, creamy, tropical drinks."
+	color = "#F7F0D0"
+	boozepwr = 20
+	taste_description = "a sweet milky flavor with notes of toasted sugar"
+	glass_icon_state = "glass_white"
+	glass_name = "Creme de Coconut"
+	glass_desc = "An unintimidating glass of coconut liqueur."
+
 /datum/reagent/consumable/ethanol/quadruple_sec
 	name = "Quadruple Sec"
 	description = "Kicks just as hard as licking the powercell on a baton, but tastier."
@@ -1604,6 +1625,28 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		. = 1
 	return ..()
 
+/datum/reagent/consumable/ethanol/painkiller
+	name = "Painkiller"
+	description = "Dulls your pain. Your emotional pain, that is."
+	boozepwr = 20
+	color = "#EAD677"
+	quality = DRINK_NICE
+	taste_description = "sugary tartness"
+	glass_icon_state = "painkiller"
+	glass_name = "Painkiller"
+	glass_desc = "A combination of tropical juices and rum. Surely this will make you feel better."
+
+/datum/reagent/consumable/ethanol/pina_colada
+	name = "Pina Colada"
+	description = "A fresh pineapple drink with coconut rum. Yum."
+	boozepwr = 40
+	color = "#FFF1B2"
+	quality = DRINK_FANTASTIC
+	taste_description = "pineapple, coconut, and a hint of the ocean"
+	glass_icon_state = "pina_colada"
+	glass_name = "Pina Colada"
+	glass_desc = "If you like pina coladas, and getting caught in the rain... well, you'll like this drink."
+	
 /datum/reagent/consumable/ethanol/grasshopper
 	name = "Grasshopper"
 	description = "A fresh and sweet dessert shooter. Difficult to look manly while drinking this."
@@ -1852,6 +1895,17 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_desc = "A drink that looks as refreshing as it tastes."
 	value = 1
 
+/datum/reagent/consumable/ethanol/moscow_mule
+	name = "Moscow Mule"
+	description = "A chilly drink that reminds you of the Derelict."
+	color = "#EEF1AA"
+	boozepwr = 30
+	quality = DRINK_GOOD
+	taste_description = "refreshing spiciness"
+	glass_icon_state = "moscow_mule"
+	glass_name = "Moscow Mule"
+	glass_desc = "A chilly drink that reminds you of the Derelict."
+
 /datum/reagent/consumable/ethanol/fernet
 	name = "Fernet"
 	description = "An incredibly bitter herbal liqueur used as a digestif."
@@ -2159,6 +2213,25 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_desc = "Although historians believe the drink was originally created to commemorate the end of an important conflict in man's past, its origins have largely been forgotten and it is today seen more as a general symbol of human supremacy."
 	value = 1
 
+/datum/reagent/consumable/ethanol/mauna_loa
+	name = "Mauna Loa"
+	description = "Extremely hot; not for the faint of heart!"
+	boozepwr = 40
+	color = "#fe8308" // 254, 131, 8
+	quality = DRINK_FANTASTIC
+	taste_description = "fiery, with an aftertaste of burnt flesh"
+	glass_icon_state = "mauna_loa"
+	glass_name = "Mauna Loa"
+	glass_desc = "Lavaland in a drink... mug... volcano... thing."
+
+/datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/M)
+	// Heats the user up while the reagent is in the body. Occasionally makes you burst into flames.
+	M.adjust_bodytemperature(25 * TEMPERATURE_DAMAGE_COEFFICIENT)
+	if (prob(5))
+		M.adjust_fire_stacks(1)
+		M.IgniteMob()
+	..()
+
 /datum/reagent/consumable/ethanol/commander_and_chief
 	name = "Commander and Chief"
 	description = "A cocktail for the captain on the go."
@@ -2182,6 +2255,107 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		. = 1
 	return ..()
 
+/datum/reagent/consumable/ethanol/gunfire
+	name = "Gunfire"
+	description = "A drink that tastes like tiny explosions."
+	color = "#e4830d"
+	boozepwr = 40
+	quality = DRINK_GOOD
+	taste_description = "tiny explosions"
+	glass_icon_state = "gunfire"
+	glass_name = "Gunfire"
+	glass_desc = "It pops constantly as you look at it, giving off tiny sparks."
+
+/datum/reagent/consumable/ethanol/gunfire/on_mob_life(mob/living/carbon/M)
+	if (prob(3))
+		to_chat(M,"<span class='notice'>You feel the gunfire pop in your mouth.</span>")
+	return ..()
+
+/datum/reagent/consumable/ethanol/hellfire
+	name = "Hellfire"
+	description = "A nice drink that isn't quite as hot as it looks."
+	color = "#fb2203"
+	boozepwr = 60
+	quality = DRINK_VERYGOOD
+	taste_description = "cold flames that lick at the top of your mouth"
+	glass_icon_state = "hellfire"
+	glass_name = "Hellfire"
+	glass_desc = "An amber colored drink that isn't quite as hot as it looks."
+
+/datum/reagent/consumable/ethanol/hellfire/on_mob_life(mob/living/carbon/M)
+	M.adjust_bodytemperature(30 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL + 30)
+	return ..()
+
+/datum/reagent/consumable/ethanol/sins_delight
+	name = "Sin's Delight"
+	description = "The drink smells like the seven sins."
+	color = "#330000"
+	boozepwr = 66
+	quality = DRINK_FANTASTIC
+	taste_description = "sin"
+	glass_icon_state = "sins_delight"
+	glass_name = "Sin's Delight"
+	glass_desc = "You can smell the seven sins rolling off the top of the glass."
+
+/datum/reagent/consumable/ethanol/strawberry_daiquiri
+	name = "Strawberry Daiquiri"
+	description = "Pink looking alcoholic drink."
+	boozepwr = 20
+	color = "#FF4A74"
+	quality = DRINK_NICE
+	taste_description = "sweet strawberry, lime and the ocean breeze"
+	glass_icon_state = "strawberry_daiquiri"
+	glass_name = "Strawberry Daiquiri"
+	glass_desc = "Pink looking drink with flowers and a big straw to sip it. Looks sweet and refreshing, perfect for warm days."
+
+/datum/reagent/consumable/ethanol/liz_fizz
+	name = "Liz Fizz"
+	description = "Triple citrus layered with some ice and cream."
+	boozepwr = 0
+	color = "#D8FF59"
+	taste_description = "brain freezing sourness"
+	glass_icon_state = "liz_fizz"
+	glass_name = "Liz Fizz"
+	glass_desc = "Looks like a citrus sherbet seperated in layers? Why would anyone want that is beyond you."
+
+/datum/reagent/consumable/ethanol/miami_vice
+	name = "Miami Vice"
+	description = "A drink layering Pina Colada and Strawberry Daiquiri"
+	boozepwr = 30
+	color = "#D8FF59"
+	quality = DRINK_FANTASTIC
+	taste_description = "sweet and refreshing flavor, complemented with strawberries and coconut, and hints of citrus"
+	glass_icon_state = "miami_vice"
+	glass_name = "Miami Vice"
+	glass_desc = "Strawberries and coconut, like yin and yang."
+
+/datum/reagent/consumable/ethanol/malibu_sunset
+	name = "Malibu Sunset"
+	description = "A drink consisting of creme de coconut and tropical juices"
+	boozepwr = 20
+	color = "#FF9473"
+	quality = DRINK_NICE
+	taste_description = "coconut, with orange and grenadine accents"
+	glass_icon_state = "malibu_sunset"
+	glass_name = "Malibu Sunset"
+	glass_desc = "Tropical looking drinks, with ice cubes hovering on the surface and grenadine coloring the bottom."
+
+/datum/reagent/consumable/ethanol/hotlime_miami
+	name = "Hotlime Miami"
+	description = "The essence of the 90's, if they were a bloody mess that is."
+	boozepwr = 40
+	color = "#A7FAE8"
+	quality = DRINK_FANTASTIC
+	taste_description = "coconut and aesthetic violence"
+	glass_icon_state = "hotlime_miami"
+	glass_name = "Hotlime Miami"
+	glass_desc = "This looks very aesthetically pleasing."
+
+/datum/reagent/consumable/ethanol/hotlime_miami/on_mob_life(mob/living/carbon/M)
+	M.set_drugginess(50)
+	M.adjustStaminaLoss(-2)
+	return ..() 
+
 /datum/reagent/consumable/ethanol/fruit_wine
 	name = "Fruit Wine"
 	description = "A wine made from grown plants."
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 6a191bd2ab..482dfde1d6 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -136,6 +136,14 @@
 		. = 1
 	..()
 
+/datum/reagent/consumable/strawberryjuice
+	name = "Strawberry Juice"
+	description = "Refreshing seasonal summer drink."
+	color = "#E50D31"
+	taste_description = "strawberry"
+	glass_name = "glass of strawberry juice"
+	glass_desc = "Refreshing seasonal summer drink."
+
 /datum/reagent/consumable/nothing
 	name = "Nothing"
 	description = "Absolutely nothing."
@@ -812,6 +820,14 @@
 	taste_description = "peaches"
 	glass_name = "glass of peach juice"
 
+/datum/reagent/consumable/pineapplejuice
+	name = "Pineapple Juice"
+	description = "Tart, tropical, and hotly debated."
+	color = "#F7D435"
+	taste_description = "pineapple"
+	glass_name = "glass of pineapple juice"
+	glass_desc = "Tart, tropical, and hotly debated."
+
 /datum/reagent/consumable/cream_soda
 	name = "Cream Soda"
 	description = "A classic space-American vanilla flavored soft drink."
@@ -826,6 +842,19 @@
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
 	..()
 
+/datum/reagent/consumable/sol_dry
+	name = "Sol Dry"
+	description = "A soothing, mellow drink made from ginger."
+	color = "#f7d26a"
+	quality = DRINK_NICE
+	taste_description = "sweet ginger spice"
+	glass_name = "Sol Dry"
+	glass_desc = "A soothing, mellow drink made from ginger."
+
+/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/M)
+	M.adjust_disgust(-5)
+	..()
+
 /datum/reagent/consumable/red_queen
 	name = "Red Queen"
 	description = "DRINK ME."
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 5038a4b68c..1fbb3cc346 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -231,6 +231,7 @@
 	description = "An ubiquitous chemical substance that is composed of hydrogen and oxygen."
 	color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha)
 	taste_description = "water"
+	overdose_threshold = 150 //Imagine drinking a gallon of water
 	var/cooling_temperature = 2
 	glass_icon_state = "glass_clear"
 	glass_name = "glass of water"
@@ -297,6 +298,10 @@
 		M.ExtinguishMob()
 	..()
 
+/datum/reagent/water/overdose_start(mob/living/M)
+	metabolization_rate = 45 * REAGENTS_METABOLISM
+	. = 1
+
 /datum/reagent/water/holywater
 	name = "Holy Water"
 	description = "Water blessed by some deity."
@@ -378,6 +383,7 @@
 
 /datum/reagent/fuel/unholywater	//if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
 	name = "Unholy Water"
+	overdose_threshold = 150 //Same as normal water
 	description = "Something that shouldn't exist on this plane of existence."
 	taste_description = "suffering"
 	pH = 6.5
@@ -409,6 +415,10 @@
 	holder.remove_reagent(type, 1)
 	return TRUE
 
+/datum/reagent/fuel/unholywater/overdose_start(mob/living/M)
+	metabolization_rate = 60 * REAGENTS_METABOLISM
+	. = 1
+
 /datum/reagent/hellwater			//if someone has this in their system they've really pissed off an eldrich god
 	name = "Hell Water"
 	description = "YOUR FLESH! IT BURNS!"
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index 15842299e3..2c8be10ace 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -114,12 +114,9 @@
 
 /datum/chemical_reaction/emp_pulse/on_reaction(datum/reagents/holder, multiplier)
 	var/location = get_turf(holder.my_atom)
-	// 50 multiplier = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
-	// 100 multiplier = 5 heavy range & 10 light range.
-	// 200 multiplier = 7 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
-	// 300 multiplier = 8 heavy range & 17 light range. Still rather significant, considering that you can get dozens of bluespace beakers 30 minutes in with a competent crew.
-	// 900 multiplier = 12 heavy range & 30 light range. Still less than 300 before this commit.
-	empulse(location, round(multiplier ** (3/8)), round(multiplier ** (1/2)), 1)
+	// 100 multiplier = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
+	// 200 multiplier = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
+	empulse(location, round(multiplier / 12), round(multiplier / 7), 1)
 	holder.clear_reagents()
 
 
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 00e22742e5..a346cd697f 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -342,12 +342,7 @@
 				to_chat(user, "<span class='warning'>You can't swap your gender!</span>")
 				return
 
-			if(user.gender == MALE)
-				user.gender = FEMALE
-				user.visible_message("<span class='boldnotice'>[user] suddenly looks more feminine!</span>", "<span class='boldwarning'>You suddenly feel more feminine!</span>")
-			else
-				user.gender = MALE
-				user.visible_message("<span class='boldnotice'>[user] suddenly looks more masculine!</span>", "<span class='boldwarning'>You suddenly feel more masculine!</span>")
+			user.set_gender(user.gender == MALE ? FEMALE : MALE, forced = TRUE) //You are doing this to yourself.
 			return 100
 
 		if(SLIME_ACTIVATE_MAJOR)
@@ -910,16 +905,9 @@
 		to_chat(user, "<span class='warning'>The potion can only be used on gendered things!</span>")
 		return
 
-	if(L.gender == MALE && (L.client?.prefs.cit_toggles & FORCED_FEM))
-		L.gender = FEMALE
-		L.visible_message("<span class='boldnotice'>[L] suddenly looks more feminine!</span>", "<span class='boldwarning'>You suddenly feel more feminine!</span>")
-	else if(L.gender == FEMALE && (L.client?.prefs.cit_toggles & FORCED_MASC))
-		L.gender = MALE
-		L.visible_message("<span class='boldnotice'>[L] suddenly looks more masculine!</span>", "<span class='boldwarning'>You suddenly feel more masculine!</span>")
-	else
+	if(!L.set_gender(L.gender == MALE ? FEMALE : MALE))
 		to_chat(user,"<span class='warning'>It won't work on [L]!</span>")
 		return
-	L.regenerate_icons()
 	qdel(src)
 
 /obj/item/slimepotion/slime/renaming
diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
index b6e39e98dc..a60d564631 100644
--- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
@@ -463,7 +463,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/spells/spell_types/area_teleport.dm b/code/modules/spells/spell_types/area_teleport.dm
index cd3d471efc..17a895490e 100644
--- a/code/modules/spells/spell_types/area_teleport.dm
+++ b/code/modules/spells/spell_types/area_teleport.dm
@@ -82,10 +82,7 @@
 		switch(invocation_type)
 			if("shout")
 				user.say("[invocation] [uppertext(chosenarea.name)]", forced = "spell")
-				if(user.gender==MALE)
-					playsound(user.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
-				else
-					playsound(user.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1)
+				playsound(user.loc, pick('sound/misc/null.ogg'), 100, 1)
 			if("whisper")
 				user.whisper("[invocation] [uppertext(chosenarea.name)]")
 
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 4b56ab6cb8..210a5e349d 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -347,7 +347,7 @@
 		else
 			skin_tone = ""
 
-		body_gender = H.gender
+		body_gender = H.dna.features["body_model"]
 		should_draw_gender = S.sexes
 
 		if(MUTCOLORS in S.species_traits)
@@ -358,7 +358,7 @@
 			base_bp_icon = (base_bp_icon == DEFAULT_BODYPART_ICON) ? DEFAULT_BODYPART_ICON_ORGANIC : base_bp_icon
 		else
 			species_color = ""
-		
+
 		if(base_bp_icon != DEFAULT_BODYPART_ICON)
 			color_src = MUTCOLORS //TODO - Add color matrix support to base limbs
 
diff --git a/code/modules/uplink/uplink_items/uplink_bundles.dm b/code/modules/uplink/uplink_items/uplink_bundles.dm
index 1c7d3393ab..2fc996c1ed 100644
--- a/code/modules/uplink/uplink_items/uplink_bundles.dm
+++ b/code/modules/uplink/uplink_items/uplink_bundles.dm
@@ -41,6 +41,16 @@
 	player_minimum = 15
 	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
 
+/datum/uplink_item/suits/infiltrator_bundle
+	name = "Insidious Infiltration Gear Case"
+	desc = "Developed by Roseus Galactic in conjunction with the Gorlex Marauders to produce a functional suit for urban operations, \
+			this suit proves to be cheaper than your standard issue hardsuit, with none of the movement restrictions (or the space proofing) of the outdated spacesuits employed by the company. \
+			Comes with an armored vest, helmet, blood-red sneaksuit, sneakboots, specialized combat gloves and a high-tech balaclava which obfuscates both your voice and your face. The case is also rather useful as a storage container and bludgeoning implement."
+	item = /obj/item/storage/toolbox/infiltrator
+	cost = 3
+	limited_stock = 1 //you only get one so you don't end up with too many gun cases
+	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
 /datum/uplink_item/bundles_TC/cybernetics_bundle
 	name = "Cybernetic Implants Bundle"
 	desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. Comes with an autosurgeon."
diff --git a/code/modules/uplink/uplink_items/uplink_clothing.dm b/code/modules/uplink/uplink_items/uplink_clothing.dm
index 2a3fd9b8bd..aad9834612 100644
--- a/code/modules/uplink/uplink_items/uplink_clothing.dm
+++ b/code/modules/uplink/uplink_items/uplink_clothing.dm
@@ -21,16 +21,6 @@
 	cost = 1
 	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) //They already get these
 
-/datum/uplink_item/suits/infiltrator_bundle
-	name = "Insidious Infiltration Gear Case"
-	desc = "Developed by Roseus Galactic in conjunction with the Gorlex Marauders to produce a functional suit for urban operations, \
-			this suit proves to be cheaper than your standard issue hardsuit, with none of the movement restrictions (or the space proofing) of the outdated spacesuits employed by the company. \
-			Comes with an armored vest, helmet, blood-red sneaksuit, sneakboots, specialized combat gloves and a high-tech balaclava which obfuscates both your voice and your face. The case is also rather useful as a storage container and bludgeoning implement."
-	item = /obj/item/storage/toolbox/infiltrator
-	cost = 3
-	limited_stock = 1 //you only get one so you don't end up with too many gun cases
-	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
 /datum/uplink_item/suits/padding
 	name = "Soft Padding"
 	desc = "An inconspicious soft padding meant to be worn underneath jumpsuits, will cushion the user from melee harm."
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 0911258692..2eaf24c493 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -8,67 +8,67 @@
 	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/gladiator = 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/rank/captain/suit = 1,
 						/obj/item/clothing/head/flatcap = 1,
 						/obj/item/clothing/suit/toggle/labcoat/mad = 1,
 						/obj/item/clothing/shoes/jackboots = 1,
-						/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 = 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/black = 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 = 1,
 						/obj/item/clothing/accessory/waistcoat = 1,
 						/obj/item/clothing/glasses/monocle =1,
 						/obj/item/clothing/head/bowler = 1,
 						/obj/item/cane = 1,
-						/obj/item/clothing/under/sl_suit = 1,
+						/obj/item/clothing/under/suit/sl = 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/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/bandana = 1,
 						/obj/item/clothing/head/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,
 						/obj/item/clothing/suit/chaplain/holidaypriest = 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,
 						/obj/item/clothing/head/wizard/fake = 1,
 						/obj/item/staff = 3,
-						/obj/item/clothing/under/rank/mime/skirt = 1,
-						/obj/item/clothing/under/gimmick/rank/captain/suit/skirt = 1,
+						/obj/item/clothing/under/rank/civilian/mime/skirt = 1,
+						/obj/item/clothing/under/rank/captain/suit/skirt = 1,
 						/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/rank/civilian/mime/sexy = 1,
 						/obj/item/clothing/mask/rat/bat = 1,
 						/obj/item/clothing/mask/rat/bee = 1,
 						/obj/item/clothing/mask/rat/bear = 1,
@@ -85,18 +85,18 @@
 						/obj/item/clothing/suit/poncho = 1,
 						/obj/item/clothing/suit/poncho/green = 1,
 						/obj/item/clothing/suit/poncho/red = 1,
-						/obj/item/clothing/under/maid = 1,
-						/obj/item/clothing/under/janimaid = 1,
+						/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/rank/civilian/clown/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/singer/yellow = 1,
 						/obj/item/clothing/shoes/singerb = 1,
-						/obj/item/clothing/under/singerb = 1,
+						/obj/item/clothing/under/costume/singer/blue = 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,
@@ -104,8 +104,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/white_on_white = 1,
+						/obj/item/clothing/under/costume/sailor = 1,
 						/obj/item/clothing/ears/headphones = 2,
 						/obj/item/clothing/head/wig/random = 3,
 						/obj/item/clothing/suit/ran = 2,
@@ -120,24 +120,24 @@
 					/obj/item/clothing/head/pirate/captain = 2,
 					/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/skub = 1,
-					/obj/item/clothing/under/lobster = 1,	 // CIT CHANGES
+					/obj/item/clothing/under/costume/lobster = 1,	 // CIT CHANGES
 					/obj/item/clothing/head/lobsterhat = 1,
 					/obj/item/clothing/head/drfreezehat = 1,
 					/obj/item/clothing/suit/dracula = 1,
 					/obj/item/clothing/suit/drfreeze_coat = 1,
 					/obj/item/clothing/suit/gothcoat = 2,
-					/obj/item/clothing/under/draculass = 1,
-					/obj/item/clothing/under/christmas/christmasmaler = 3,
-					/obj/item/clothing/under/christmas/christmasmaleg = 3,
-					/obj/item/clothing/under/christmas/christmasfemaler = 3,
-					/obj/item/clothing/under/christmas/christmasfemaleg = 3,
+					/obj/item/clothing/under/costume/draculass = 1,
+					/obj/item/clothing/under/costume/christmas = 3,
+					/obj/item/clothing/under/costume/christmas/green = 3,
+					/obj/item/clothing/under/costume/christmas/croptop = 3,
+					/obj/item/clothing/under/costume/christmas/croptop/green = 3,
 					/obj/item/clothing/head/christmashat = 3,
 					/obj/item/clothing/head/christmashatg = 3,
-					/obj/item/clothing/under/drfreeze = 1)    //End of Cit Changes
+					/obj/item/clothing/under/costume/drfreeze = 1)    //End of Cit Changes
 	refill_canister = /obj/item/vending_refill/autodrobe
 
 /obj/machinery/vending/autodrobe/all_access
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index f6e3d8261a..5a6380c322 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -3,7 +3,9 @@
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
 	icon_state = "boozeomat"
 	icon_deny = "boozeomat-deny"
-	products = list(/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
+	products = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 30,
+					/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,		
+					/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
 					/obj/item/reagent_containers/food/drinks/bottle/whiskey = 5,
 					/obj/item/reagent_containers/food/drinks/bottle/tequila = 5,
 					/obj/item/reagent_containers/food/drinks/bottle/vodka = 5,
@@ -26,9 +28,8 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8,
 					/obj/item/reagent_containers/food/drinks/soda_cans/cola = 8,
 					/obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 15,
-					/obj/item/reagent_containers/food/drinks/drinkingglass = 30,
+					/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 8,
 					/obj/item/reagent_containers/food/drinks/ice = 10,
-					/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,
 					/obj/item/reagent_containers/food/drinks/flask = 3,
 					/obj/item/reagent_containers/food/drinks/beer = 6)
 	contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12,
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index e74e82351b..521c1e0999 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -17,20 +17,20 @@
 					/obj/item/clothing/suit/jacket/puffer/vest = 4,
 					/obj/item/clothing/suit/jacket/puffer = 4,
 					/obj/item/clothing/suit/hooded/cloak/david = 4,
-					/obj/item/clothing/under/suit_jacket/navy = 3,
-					/obj/item/clothing/under/suit_jacket/really_black = 3,
-					/obj/item/clothing/under/suit_jacket/burgundy = 3,
-					/obj/item/clothing/under/suit_jacket/charcoal = 3,
-					/obj/item/clothing/under/suit_jacket/white = 3,
-					/obj/item/clothing/under/kilt = 3,
-					/obj/item/clothing/under/overalls = 3,
-					/obj/item/clothing/under/sl_suit = 3,
-					/obj/item/clothing/under/bb_sweater = 3,
-					/obj/item/clothing/under/bb_sweater/black = 3,
-					/obj/item/clothing/under/bb_sweater/purple = 3,
-					/obj/item/clothing/under/bb_sweater/green = 3,
-					/obj/item/clothing/under/bb_sweater/red = 3,
-					/obj/item/clothing/under/bb_sweater/blue = 3,
+					/obj/item/clothing/under/suit/navy = 3,
+					/obj/item/clothing/under/suit/black_really = 3,
+					/obj/item/clothing/under/suit/burgundy = 3,
+					/obj/item/clothing/under/suit/charcoal = 3,
+					/obj/item/clothing/under/suit/white = 3,
+					/obj/item/clothing/under/costume/kilt = 3,
+					/obj/item/clothing/under/misc/overalls = 3,
+					/obj/item/clothing/under/suit/sl = 3,
+					/obj/item/clothing/under/sweater = 3,
+					/obj/item/clothing/under/sweater/black = 3,
+					/obj/item/clothing/under/sweater/purple = 3,
+					/obj/item/clothing/under/sweater/green = 3,
+					/obj/item/clothing/under/sweater/red = 3,
+					/obj/item/clothing/under/sweater/blue = 3,
 					/obj/item/clothing/under/pants/jeans = 5,
 					/obj/item/clothing/under/pants/classicjeans = 5,
 					/obj/item/clothing/under/pants/camo = 3,
@@ -42,9 +42,9 @@
 					/obj/item/clothing/under/pants/tan = 4,
 					/obj/item/clothing/under/pants/track = 3,
 					/obj/item/clothing/suit/jacket/miljacket = 5,
-					/obj/item/clothing/under/scratch/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/suit/white_on_white/skirt = 2,
+					/obj/item/clothing/under/rank/captain/suit/skirt = 2,
+					/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2,
 					/obj/item/clothing/neck/tie/blue = 3,
 					/obj/item/clothing/neck/tie/red = 3,
 					/obj/item/clothing/neck/tie/black = 3,
@@ -65,26 +65,26 @@
 					/obj/item/clothing/neck/stripedbluescarf = 3,
 					/obj/item/clothing/neck/stripedgreenscarf = 3,
 					/obj/item/clothing/accessory/waistcoat = 2,
-					/obj/item/clothing/under/skirt/black = 3,
-					/obj/item/clothing/under/skirt/blue = 3,
-					/obj/item/clothing/under/skirt/red = 3,
-					/obj/item/clothing/under/skirt/purple = 3,
-					/obj/item/clothing/under/sundress = 4,
-					/obj/item/clothing/under/sundresswhite = 4,
-					/obj/item/clothing/under/stripeddress = 3,
-					/obj/item/clothing/under/sailordress = 3,
-					/obj/item/clothing/under/sweptskirt = 3,
-					/obj/item/clothing/under/greendress = 3,
-					/obj/item/clothing/under/pinkdress = 3,
-					/obj/item/clothing/under/redeveninggown = 3,
-					/obj/item/clothing/under/blacktango = 3,
-					/obj/item/clothing/under/westernbustle = 3,
-					/obj/item/clothing/under/flamenco = 3,
-					/obj/item/clothing/under/flowerdress = 3,
-					/obj/item/clothing/under/plaid_skirt = 3,
-					/obj/item/clothing/under/plaid_skirt/blue = 3,
-					/obj/item/clothing/under/plaid_skirt/purple = 3,
-					/obj/item/clothing/under/plaid_skirt/green = 3,
+					/obj/item/clothing/under/dress/skirt = 3,
+					/obj/item/clothing/under/dress/skirt/blue = 3,
+					/obj/item/clothing/under/dress/skirt/red = 3,
+					/obj/item/clothing/under/dress/skirt/purple = 3,
+					/obj/item/clothing/under/dress/sundress = 4,
+					/obj/item/clothing/under/dress/sundress/white = 4,
+					/obj/item/clothing/under/dress/striped = 3,
+					/obj/item/clothing/under/dress/sailor = 3,
+					/obj/item/clothing/under/dress/skirt/swept = 3,
+					/obj/item/clothing/under/dress/green = 3,
+					/obj/item/clothing/under/dress/pink = 3,
+					/obj/item/clothing/under/dress/redeveninggown = 3,
+					/obj/item/clothing/under/dress/blacktango = 3,
+					/obj/item/clothing/under/dress/westernbustle = 3,
+					/obj/item/clothing/under/dress/flamenco = 3,
+					/obj/item/clothing/under/dress/flower = 3,
+					/obj/item/clothing/under/dress/skirt/plaid = 3,
+					/obj/item/clothing/under/dress/skirt/plaid/blue = 3,
+					/obj/item/clothing/under/dress/skirt/plaid/purple = 3,
+					/obj/item/clothing/under/dress/skirt/plaid/green = 3,
 					/obj/item/clothing/under/croptop = 3,
 					/obj/item/clothing/glasses/regular = 2,
 					/obj/item/clothing/glasses/regular/jamjar = 2,
@@ -122,12 +122,12 @@
 					/obj/item/clothing/suit/jacket/letterman_red = 3,
 					/obj/item/clothing/ears/headphones = 10,
 					/obj/item/clothing/suit/apron/purple_bartender = 4,
-					/obj/item/clothing/under/rank/bartender/purple = 4,
+					/obj/item/clothing/under/rank/civilian/bartender/purple = 4,
 					/* Commenting out until next Christmas or made automatic
-					/obj/item/clothing/under/christmas/christmasmaler = 3,
-					/obj/item/clothing/under/christmas/christmasmaleg = 3,
-					/obj/item/clothing/under/christmas/christmasfemaler = 3,
-					/obj/item/clothing/under/christmas/christmasfemaleg = 3,
+					/obj/item/clothing/under/costume/christmas = 3,
+					/obj/item/clothing/under/costume/christmas/green = 3,
+					/obj/item/clothing/under/costume/christmas/croptop = 3,
+					/obj/item/clothing/under/costume/christmas/croptop/green = 3,
 					*/
 					/obj/item/clothing/suit/hooded/wintercoat/christmascoatr = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/christmascoatg = 3,
@@ -145,27 +145,27 @@
 					/obj/item/clothing/head/cowboyhat/pink = 3,
 					/obj/item/clothing/shoes/cowboyboots = 3,
 					/obj/item/clothing/shoes/cowboyboots/black = 3,
-					/obj/item/clothing/under/lunar/qipao = 3,
-					/obj/item/clothing/under/lunar/qipao/white = 3,
-					/obj/item/clothing/under/lunar/qipao/red = 3,
-					/obj/item/clothing/under/lunar/cheongsam = 3,
-					/obj/item/clothing/under/lunar/cheongsam/white = 3,
-					/obj/item/clothing/under/lunar/cheongsam/red = 3)
+					/obj/item/clothing/under/costume/qipao = 3,
+					/obj/item/clothing/under/costume/qipao/white = 3,
+					/obj/item/clothing/under/costume/qipao/red = 3,
+					/obj/item/clothing/under/costume/cheongsam = 3,
+					/obj/item/clothing/under/costume/cheongsam/white = 3,
+					/obj/item/clothing/under/costume/cheongsam/red = 3)
 	contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
 					/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
 					/obj/item/clothing/mask/balaclava = 3,
 					/obj/item/clothing/head/ushanka = 3,
-					/obj/item/clothing/under/soviet = 3,
+					/obj/item/clothing/under/costume/soviet = 3,
 					/obj/item/storage/belt/fannypack/black = 3,
 					/obj/item/clothing/suit/jacket/letterman_syndie = 5,
-					/obj/item/clothing/under/jabroni = 2,
+					/obj/item/clothing/under/costume/jabroni = 2,
 					/obj/item/clothing/suit/vapeshirt = 2,
-					/obj/item/clothing/under/geisha = 4,
-					/obj/item/clothing/under/keyholesweater = 3,
-					/obj/item/clothing/under/staffassistant = 5)
-	premium = list(/obj/item/clothing/under/suit_jacket/checkered = 4,
+					/obj/item/clothing/under/costume/geisha = 4,
+					/obj/item/clothing/under/misc/keyholesweater = 3,
+					/obj/item/clothing/under/misc/staffassistant = 5)
+	premium = list(/obj/item/clothing/under/suit/checkered = 4,
 					/obj/item/clothing/head/mailman = 2,
-					/obj/item/clothing/under/rank/mailman = 2,
+					/obj/item/clothing/under/misc/mailman = 2,
 					/obj/item/clothing/suit/jacket/leather = 4,
 					/obj/item/clothing/suit/jacket/leather/overcoat = 4,
 					/obj/item/clothing/under/pants/mustangjeans = 3,
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index 502a25ba4e..57cf315209 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -12,6 +12,7 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
+					/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
 					/obj/item/reagent_containers/glass/beaker/waterbottle = 10)
 	contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
 					/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6)
@@ -80,6 +81,7 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
+					/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10)
 	product_slogans = "~Shake me up some of that Shambler's Juice!~"
 	product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp."
@@ -95,6 +97,7 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
+					/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 5,
 					/obj/item/reagent_containers/food/drinks/soda_cans/buzz_fuzz = 5,)
 	contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6)
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index be74cc675b..8f257d07ec 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -3,7 +3,8 @@
 	desc = "A kitchen and restaurant equipment vendor."
 	product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..."
 	icon_state = "dinnerware"
-	products = list(/obj/item/storage/bag/tray = 8,
+	products = list(/obj/item/reagent_containers/glass/bowl = 30,
+					/obj/item/storage/bag/tray = 8,
 					/obj/item/kitchen/fork = 6,
 					/obj/item/kitchen/knife = 6,
 					/obj/item/kitchen/rollingpin = 4,
@@ -17,8 +18,7 @@
 					/obj/item/reagent_containers/food/condiment/pack/bbqsauce = 5,
 					/obj/item/reagent_containers/food/condiment/pack/soysauce = 5,
 					/obj/item/reagent_containers/food/condiment/saltshaker = 5,
-					/obj/item/reagent_containers/food/condiment/peppermill = 5,
-					/obj/item/reagent_containers/glass/bowl = 30)
+					/obj/item/reagent_containers/food/condiment/peppermill = 5)
 	contraband = list(
 					/obj/item/reagent_containers/food/snacks/monkeycube = 1,
 					/obj/item/kitchen/knife/butcher = 2,
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index 52586e1cc9..e067c094f6 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -5,8 +5,8 @@
 	icon_state = "engi"
 	icon_deny = "engi-deny"
 	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/kinkmate.dm b/code/modules/vending/kinkmate.dm
index 39d5db8de8..acfeeddaa9 100644
--- a/code/modules/vending/kinkmate.dm
+++ b/code/modules/vending/kinkmate.dm
@@ -6,18 +6,18 @@
 	product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
 	vend_reply = "Have fun, you shameless pervert!"
 	products = list(
-				/obj/item/clothing/under/maid = 5,
-				/obj/item/clothing/under/janimaid = 5,
+				/obj/item/clothing/under/costume/maid = 5,
+				/obj/item/clothing/under/rank/civilian/janitor/maid = 5,
 				/obj/item/clothing/neck/petcollar = 5,
 				/obj/item/clothing/neck/petcollar/choker = 5,
 				/obj/item/clothing/neck/petcollar/leather = 5,
 				/obj/item/restraints/handcuffs/fake/kinky = 5,
 				/obj/item/clothing/glasses/sunglasses/blindfold = 4,
 				/obj/item/clothing/mask/muzzle = 4,
-				/obj/item/clothing/under/stripper_pink = 3,
-				/obj/item/clothing/under/stripper_green = 3,
-				/obj/item/clothing/under/corset = 3,
-				/obj/item/clothing/under/gear_harness = 10,
+				/obj/item/clothing/under/misc/stripper = 3,
+				/obj/item/clothing/under/misc/stripper/green = 3,
+				/obj/item/clothing/under/dress/corset = 3,
+				/obj/item/clothing/under/misc/gear_harness = 10,
 				/obj/item/dildo/custom = 5,
 				/obj/item/electropack/shockcollar = 3,
 				/obj/item/assembly/signaler = 3
@@ -27,9 +27,9 @@
 				/obj/item/key/collar = 2,
 				/obj/item/clothing/head/kitty = 3,
 				/obj/item/clothing/head/rabbitears = 3,
-				/obj/item/clothing/under/keyholesweater = 2,
-				/obj/item/clothing/under/mankini = 2,
-				/obj/item/clothing/under/jabroni = 2,
+				/obj/item/clothing/under/misc/keyholesweater = 2,
+				/obj/item/clothing/under/misc/stripper/mankini = 2,
+				/obj/item/clothing/under/costume/jabroni = 2,
 				/obj/item/dildo/flared/huge = 3,
 				/obj/item/reagent_containers/glass/bottle/crocin = 5,
 				/obj/item/reagent_containers/glass/bottle/camphor = 5
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index bcdc13b062..affc1dfed7 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -23,7 +23,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/misc/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 de62ec4af9..40b709f5b5 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,
diff --git a/code/modules/vending/robotics.dm b/code/modules/vending/robotics.dm
index 9311fe496d..852b7d65f0 100644
--- a/code/modules/vending/robotics.dm
+++ b/code/modules/vending/robotics.dm
@@ -6,7 +6,7 @@
 	icon_deny = "robotics-deny"
 	req_access = list(ACCESS_ROBOTICS)
 	products = list(/obj/item/clothing/suit/toggle/labcoat = 4,
-					/obj/item/clothing/under/rank/roboticist = 4,
+					/obj/item/clothing/under/rank/rnd/roboticist = 4,
 					/obj/item/stack/cable_coil = 4,
 					/obj/item/assembly/flash/handheld = 4,
 					/obj/item/stock_parts/cell/high = 12,
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 666071e254..09681def64 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -20,7 +20,7 @@
 	premium = list(/obj/item/coin/antagtoken = 1,
 					/obj/item/clothing/head/helmet/blueshirt = 1,
 					/obj/item/clothing/suit/armor/vest/blueshirt = 1,
-					/obj/item/clothing/under/rank/security/blueshirt = 1,
+					/obj/item/clothing/under/rank/security/officer/blueshirt = 1,
 					/obj/item/ssword_kit = 1)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	resistance_flags = FIRE_PROOF
diff --git a/code/modules/vending/sovietvend.dm b/code/modules/vending/sovietvend.dm
index c62cf53612..c555362fb6 100644
--- a/code/modules/vending/sovietvend.dm
+++ b/code/modules/vending/sovietvend.dm
@@ -5,12 +5,12 @@
 	vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!"
 	product_slogans = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink! ; Craftink in Motherland herself!"
 	products = list(
-		/obj/item/clothing/under/soviet = 20,
+		/obj/item/clothing/under/costume/soviet = 20,
 		/obj/item/clothing/head/ushanka = 20,
 		/obj/item/clothing/shoes/jackboots = 20,
 		/obj/item/clothing/head/squatter_hat = 20,
-		/obj/item/clothing/under/squatter_outfit = 20,
-		/obj/item/clothing/under/russobluecamooutfit = 20,
+		/obj/item/clothing/under/misc/squatter = 20,
+		/obj/item/clothing/under/misc/blue_camo = 20,
 		/obj/item/clothing/head/russobluecamohat = 20
 		)
 	contraband = list(
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 30680af48e..acd58959f1 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -11,15 +11,15 @@
 					/obj/item/storage/backpack/security = 2,
 					/obj/item/storage/backpack/satchel/sec = 2,
 					/obj/item/storage/backpack/duffelbag/sec = 3,
-					/obj/item/clothing/under/rank/security = 5,
+					/obj/item/clothing/under/rank/security/officer = 5,
 					/obj/item/clothing/shoes/jackboots = 5,
 					/obj/item/clothing/head/beret/sec =5,
 					/obj/item/clothing/head/soft/sec = 5,
 					/obj/item/clothing/mask/bandana/red = 5,
-					/obj/item/clothing/under/rank/security/skirt = 5,
-					/obj/item/clothing/under/rank/security/grey = 5,
+					/obj/item/clothing/under/rank/security/officer/skirt = 5,
+					/obj/item/clothing/under/rank/security/officer/grey = 5,
 					/obj/item/clothing/under/pants/khaki = 5)
-	premium = list(/obj/item/clothing/under/rank/security/navyblue = 5,
+	premium = list(/obj/item/clothing/under/rank/security/officer/formal = 5,
 					/obj/item/clothing/head/beret/sec/navyofficer = 5)
 	refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
 
@@ -38,13 +38,13 @@
 					/obj/item/storage/backpack/medic = 5,
 					/obj/item/storage/backpack/satchel/med = 5,
 					/obj/item/clothing/suit/hooded/wintercoat/medical = 5,
-					/obj/item/clothing/under/rank/nursesuit = 5,
+					/obj/item/clothing/under/rank/medical/doctor/nurse = 5,
 					/obj/item/clothing/head/nursehat = 5,
-					/obj/item/clothing/under/rank/medical/skirt= 5,
-					/obj/item/clothing/under/rank/medical/blue = 5,
-					/obj/item/clothing/under/rank/medical/green = 5,
-					/obj/item/clothing/under/rank/medical/purple = 5,
-					/obj/item/clothing/under/rank/medical = 5,
+					/obj/item/clothing/under/rank/medical/doctor/skirt= 5,
+					/obj/item/clothing/under/rank/medical/doctor/blue = 5,
+					/obj/item/clothing/under/rank/medical/doctor/green = 5,
+					/obj/item/clothing/under/rank/medical/doctor/purple = 5,
+					/obj/item/clothing/under/rank/medical/doctor = 5,
 					/obj/item/clothing/under/rank/medical/paramedic = 5,
 					/obj/item/clothing/under/rank/medical/paramedic/light = 5,
 					/obj/item/clothing/under/rank/medical/paramedic/skirt = 5,
@@ -73,8 +73,8 @@
 					/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 = 5,
-					/obj/item/clothing/under/rank/engineer/skirt = 5,
+					/obj/item/clothing/under/rank/engineering/engineer = 5,
+					/obj/item/clothing/under/rank/engineering/engineer/skirt = 5,
 					/obj/item/clothing/suit/hazardvest = 5,
 					/obj/item/clothing/shoes/workboots = 5,
 					/obj/item/clothing/head/hardhat = 5,
@@ -97,8 +97,8 @@
 					/obj/item/storage/backpack/industrial = 3,
 					/obj/item/clothing/head/hardhat/weldhat/dblue = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
-					/obj/item/clothing/under/rank/atmospheric_technician = 5,
-					/obj/item/clothing/under/rank/atmospheric_technician/skirt = 5,
+					/obj/item/clothing/under/rank/engineering/atmospheric_technician = 5,
+					/obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 5,
 					/obj/item/clothing/shoes/sneakers/black = 5)
 	refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe
 
@@ -112,8 +112,8 @@
 	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 = 5,
-					/obj/item/clothing/under/rank/cargotech/skirt = 5,
+					/obj/item/clothing/under/rank/cargo/tech = 5,
+					/obj/item/clothing/under/rank/cargo/tech/skirt = 5,
 					/obj/item/clothing/shoes/sneakers/black = 5,
 					/obj/item/clothing/gloves/fingerless = 5,
 					/obj/item/clothing/head/soft = 5,
@@ -131,8 +131,8 @@
 	vend_reply = "Thank you for using the RoboDrobe!"
 	products = list(/obj/item/clothing/glasses/hud/diagnostic = 3,
 					/obj/item/clothing/head/beret/robo = 3,
-					/obj/item/clothing/under/rank/roboticist = 3,
-					/obj/item/clothing/under/rank/roboticist/skirt = 3,
+					/obj/item/clothing/under/rank/rnd/roboticist = 3,
+					/obj/item/clothing/under/rank/rnd/roboticist/skirt = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/robotics = 3,
 					/obj/item/clothing/suit/toggle/labcoat = 3,
 					/obj/item/clothing/shoes/sneakers/black = 3,
@@ -156,8 +156,8 @@
 					/obj/item/storage/backpack/science = 3,
 					/obj/item/storage/backpack/satchel/tox = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/science = 3,
-					/obj/item/clothing/under/rank/scientist = 4,
-					/obj/item/clothing/under/rank/scientist/skirt = 4,
+					/obj/item/clothing/under/rank/rnd/scientist = 4,
+					/obj/item/clothing/under/rank/rnd/scientist/skirt = 4,
 					/obj/item/clothing/suit/toggle/labcoat/science = 4,
 					/obj/item/clothing/shoes/sneakers/white = 4,
 					/obj/item/radio/headset/headset_sci = 4,
@@ -178,8 +178,8 @@
 					/obj/item/clothing/suit/hooded/wintercoat/hydro = 2,
 					/obj/item/clothing/suit/apron = 3,
 					/obj/item/clothing/suit/apron/overalls = 5,
-					/obj/item/clothing/under/rank/hydroponics = 5,
-					/obj/item/clothing/under/rank/hydroponics/skirt = 5,
+					/obj/item/clothing/under/rank/civilian/hydroponics = 5,
+					/obj/item/clothing/under/rank/civilian/hydroponics/skirt = 5,
 					/obj/item/clothing/mask/bandana = 4)
 	refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe
 
@@ -198,9 +198,9 @@
 					/obj/item/pen/fourcolor = 1,
 					/obj/item/pen/fountain = 2,
 					/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/civilian/curator/skirt = 2,
+					/obj/item/clothing/under/rank/captain/suit/skirt = 2,
+					/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2,
 					/obj/item/storage/backpack/satchel/explorer = 1,
 					/obj/item/clothing/glasses/regular = 2,
 					/obj/item/clothing/glasses/regular/jamjar = 1,
@@ -218,10 +218,10 @@
 	vend_reply = "Thank you for using the BarDrobe!"
 	products = list(/obj/item/clothing/head/that = 3,
 					/obj/item/radio/headset/headset_srv = 3,
-					/obj/item/clothing/under/sl_suit = 3,
-					/obj/item/clothing/under/rank/bartender = 3,
-					/obj/item/clothing/under/rank/bartender/skirt = 2,
-					/obj/item/clothing/under/rank/bartender/purple = 2,
+					/obj/item/clothing/under/suit/sl = 3,
+					/obj/item/clothing/under/rank/civilian/bartender = 3,
+					/obj/item/clothing/under/rank/civilian/bartender/skirt = 2,
+					/obj/item/clothing/under/rank/civilian/bartender/purple = 2,
 					/obj/item/clothing/accessory/waistcoat = 3,
 					/obj/item/clothing/suit/apron/purple_bartender = 2,
 					/obj/item/clothing/head/soft/black = 4,
@@ -244,7 +244,7 @@
 	icon_state = "chefdrobe"
 	product_ads = "Our clothes are guaranteed to protect you from food splatters!;Now stocking recipe books!"
 	vend_reply = "Thank you for using the ChefDrobe!;Just like your grandmother's old recipes!"
-	products = list(/obj/item/clothing/under/waiter = 3,
+	products = list(/obj/item/clothing/under/suit/waiter = 3,
 					/obj/item/radio/headset/headset_srv = 4,
 					/obj/item/clothing/accessory/waistcoat = 3,
 					/obj/item/clothing/suit/apron/chef = 3,
@@ -252,8 +252,8 @@
 					/obj/item/storage/box/mousetraps = 2,
 					/obj/item/circuitboard/machine/dish_drive = 1,
 					/obj/item/clothing/suit/toggle/chef = 2,
-					/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 = 2,
 					/obj/item/reagent_containers/rag = 3,
 					/obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 2,
@@ -269,8 +269,8 @@
 	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,
-					/obj/item/clothing/under/rank/janitor/skirt = 2,
+	products = list(/obj/item/clothing/under/rank/civilian/janitor = 2,
+					/obj/item/clothing/under/rank/civilian/janitor/skirt = 2,
 					/obj/item/clothing/suit/hooded/wintercoat/janitor = 3,
 					/obj/item/cartridge/janitor = 3,
 					/obj/item/clothing/gloves/color/black = 2,
@@ -300,23 +300,23 @@
 	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/bluesuit/skirt = 3,
-					/obj/item/clothing/under/lawyer/purpsuit/skirt = 3,
-					/obj/item/clothing/under/lawyer/blacksuit/skirt = 3,
-					/obj/item/clothing/under/lawyer/female = 3,
-					/obj/item/clothing/under/lawyer/female/skirt = 3,
-					/obj/item/clothing/under/lawyer/really_black = 3,
-					/obj/item/clothing/under/lawyer/really_black/skirt = 3,
-					/obj/item/clothing/under/lawyer/blue = 3,
-					/obj/item/clothing/under/lawyer/blue/skirt = 3,
-					/obj/item/clothing/under/lawyer/red = 3,
-					/obj/item/clothing/under/lawyer/red/skirt = 3,
-					/obj/item/clothing/under/lawyer/black = 3,
-					/obj/item/clothing/under/lawyer/black/skirt = 3,
+	products = list(/obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/purpsuit = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/female = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/female/skirt = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/really_black = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/really_black/skirt = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/blue = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/blue/skirt = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/red = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/red/skirt = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/black = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/black/skirt = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/black/alt = 3,
+					/obj/item/clothing/under/rank/civilian/lawyer/black/alt/skirt = 3,
 					/obj/item/clothing/suit/toggle/lawyer = 3,
-					/obj/item/clothing/under/lawyer/purpsuit = 3,
 					/obj/item/clothing/suit/toggle/lawyer/purple = 3,
-					/obj/item/clothing/under/lawyer/blacksuit = 3,
 					/obj/item/clothing/suit/toggle/lawyer/black = 3,
 					/obj/item/clothing/shoes/laceup = 3,
 					/obj/item/clothing/accessory/lawyers_badge = 3)
@@ -334,8 +334,8 @@
 	products = list(/obj/item/choice_beacon/holy = 1,
 					/obj/item/storage/backpack/cultpack = 2,
 					/obj/item/clothing/accessory/pocketprotector/cosmetology = 2,
-					/obj/item/clothing/under/rank/chaplain = 2,
-					/obj/item/clothing/under/rank/chaplain/skirt = 2,
+					/obj/item/clothing/under/rank/civilian/chaplain = 2,
+					/obj/item/clothing/under/rank/civilian/chaplain/skirt = 2,
 					/obj/item/clothing/shoes/sneakers/black = 2,
 					/obj/item/clothing/suit/chaplain/nun = 2,
 					/obj/item/clothing/head/nun_hood = 2,
@@ -357,9 +357,9 @@
 	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 = 3,
+	products = list(/obj/item/clothing/under/rank/medical/chemist = 3,
 					/obj/item/clothing/head/beret/chem = 3,
-					/obj/item/clothing/under/rank/chemist/skirt = 3,
+					/obj/item/clothing/under/rank/medical/chemist/skirt = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/chemistry = 3,
 					/obj/item/clothing/shoes/sneakers/white = 3,
 					/obj/item/clothing/suit/toggle/labcoat/chemist = 3,
@@ -378,8 +378,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 = 3,
-					/obj/item/clothing/under/rank/geneticist/skirt = 3,
+	products = list(/obj/item/clothing/under/rank/medical/geneticist = 3,
+					/obj/item/clothing/under/rank/medical/geneticist/skirt = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/genetics = 3,
 					/obj/item/clothing/shoes/sneakers/white = 3,
 					/obj/item/clothing/suit/toggle/labcoat/genetics = 3,
@@ -397,8 +397,8 @@
 	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/head/beret/viro = 3,
-					/obj/item/clothing/under/rank/virologist = 3,
-					/obj/item/clothing/under/rank/virologist/skirt = 3,
+					/obj/item/clothing/under/rank/medical/virologist = 3,
+					/obj/item/clothing/under/rank/medical/virologist/skirt = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/viro = 3,
 					/obj/item/clothing/shoes/sneakers/white = 3,
 					/obj/item/clothing/suit/toggle/labcoat/virologist = 3,
@@ -430,7 +430,7 @@
 					/obj/item/clothing/head/caphat/parade = 1,
 					/obj/item/clothing/head/caphat/beret = 1,
 					/obj/item/clothing/head/caphat/beret/white = 1,
-					/obj/item/clothing/under/captainparade = 1,
+					/obj/item/clothing/under/rank/captain/parade = 1,
 					/obj/item/clothing/suit/captunic = 1,
 					/obj/item/clothing/under/rank/captain/femformal = 1,
 					/obj/item/clothing/glasses/sunglasses/gar/supergar = 1,
diff --git a/config/game_options.txt b/config/game_options.txt
index 4113a90e6d..c3930fd325 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -609,3 +609,14 @@ DROPPED_MODES 3
 
 ## Whether the suicide verb is allowed.
 # SUICIDE_ALLOWED
+
+## Breast cups selectable from the character creation menu. Keep em lowercase.
+BREASTS_CUPS_PREFS a
+BREASTS_CUPS_PREFS b
+BREASTS_CUPS_PREFS c
+BREASTS_CUPS_PREFS d
+BREASTS_CUPS_PREFS e
+
+## Minimum and maximum limits for penis length from the character creation menu.
+PENIS_MIN_INCHES_PREFS 1
+PENIS_MAX_INCHES_PREFS 20
diff --git a/html/changelogs/AutoChangeLog-pr-11375.yml b/html/changelogs/AutoChangeLog-pr-11375.yml
deleted file mode 100644
index 3e1fd45ac7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-11375.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Auris456852"
-delete-after: True
-changes: 
-  - balance: "Made EMP reaction growth logarithmic."
diff --git a/html/changelogs/AutoChangeLog-pr-11524.yml b/html/changelogs/AutoChangeLog-pr-11524.yml
new file mode 100644
index 0000000000..b7ffb68a71
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11524.yml
@@ -0,0 +1,4 @@
+author: "actioninja (ported by Ghommie)"
+delete-after: True
+changes: 
+  - refactor: "repathed all under clothing, keep an eye out for errors."
diff --git a/html/changelogs/AutoChangeLog-pr-11536.yml b/html/changelogs/AutoChangeLog-pr-11536.yml
new file mode 100644
index 0000000000..0d2eaea6d7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11536.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes: 
+  - balance: "Water, Holywater and Unholywater will now now quickly purge itself if you have 151u in your system"
diff --git a/html/changelogs/AutoChangeLog-pr-11565.yml b/html/changelogs/AutoChangeLog-pr-11565.yml
deleted file mode 100644
index ce1f59aa61..0000000000
--- a/html/changelogs/AutoChangeLog-pr-11565.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes: 
-  - bugfix: "Fixed permanent slapstick comedy pie'd overlay for snouted humanoids."
diff --git a/html/changelogs/AutoChangeLog-pr-11570.yml b/html/changelogs/AutoChangeLog-pr-11570.yml
new file mode 100644
index 0000000000..b4191c5116
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11570.yml
@@ -0,0 +1,6 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes: 
+  - rscadd: "sneaksuit to contractor items"
+  - tweak: "sneaksuit is a bundle"
+  - rscdel: "intel potion and radio implant from contractor items"
diff --git a/html/changelogs/AutoChangeLog-pr-11572.yml b/html/changelogs/AutoChangeLog-pr-11572.yml
new file mode 100644
index 0000000000..56aea9f04d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11572.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes: 
+  - balance: "clockie vanguard now quickly regenerates stam while active (as its description always told you,)"
diff --git a/html/changelogs/AutoChangeLog-pr-11573.yml b/html/changelogs/AutoChangeLog-pr-11573.yml
new file mode 100644
index 0000000000..3773f1c43a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11573.yml
@@ -0,0 +1,4 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes: 
+  - balance: "sneaksuit is not fireproof"
diff --git a/html/changelogs/AutoChangeLog-pr-11576.yml b/html/changelogs/AutoChangeLog-pr-11576.yml
new file mode 100644
index 0000000000..e252fd3a04
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11576.yml
@@ -0,0 +1,11 @@
+author: "Owai-Seek"
+delete-after: True
+changes: 
+  - rscadd: "Port Pina Colada, Painkiller, Moscow Mule, Hivemind Eraser, Moana Lou Drinks"
+  - rscadd: "Gunfire, Hellfire, Sins Delight, Strawberry Daiquiri, Miami Vice, Malibu Sunset, Lizz Fizz, Hotline Miami"
+  - rscadd: "Strawberry and Pineapple Juice"
+  - rscadd: "Salami Slices"
+  - tweak: "Soda Dispenser Juices"
+  - tweak: "Reorganize Vendor Objects (Bowls, Glasses, Shot Glasses)"
+  - tweak: "Strawberry Milk and Tea actually use strawberry Juice."
+  - tweak: "Lizards can eat egg wraps. Moved Egg Wraps to Misc"
diff --git a/html/changelogs/AutoChangeLog-pr-11578.yml b/html/changelogs/AutoChangeLog-pr-11578.yml
new file mode 100644
index 0000000000..fb382c4d76
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11578.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - bugfix: "Fixed a few mutations not working correctly."
diff --git a/html/changelogs/AutoChangeLog-pr-11581.yml b/html/changelogs/AutoChangeLog-pr-11581.yml
new file mode 100644
index 0000000000..af90ea28bb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11581.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - rscadd: "Added M/F body preferences."
diff --git a/html/changelogs/AutoChangeLog-pr-11582.yml b/html/changelogs/AutoChangeLog-pr-11582.yml
new file mode 100644
index 0000000000..13646012af
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-11582.yml
@@ -0,0 +1,4 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - tweak: "Reverts Mining Base RNG Placement"
diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi
index ab30929727..3ecfc7bb0c 100644
Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 2e8fde527a..1845e75d26 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 66f3811a81..edcd2ff9b6 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 17d6024586..07e7bf1da8 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 9518640416..37173beadb 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index 92a1b26f01..8ecc6151a1 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -57,7 +57,7 @@
 /datum/gear/geisha
 	name = "Geisha suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/geisha
+	path = /obj/item/clothing/under/costume/geisha
 	ckeywhitelist = list("atiefling")
 
 /datum/gear/specialscarf
@@ -123,7 +123,7 @@
 /datum/gear/mankini
 	name = "Mankini"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/mankini
+	path = /obj/item/clothing/under/misc/stripper/mankini
 	ckeywhitelist = list("zigfie")
 
 /datum/gear/pinkshoes
@@ -160,7 +160,7 @@
 /datum/gear/performersoutfit
 	name = "Bluish performer's outfit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/singery/custom
+	path = /obj/item/clothing/under/costume/singer/yellow/custom
 	ckeywhitelist = list("killer402402")
 
 /datum/gear/vermillion
@@ -184,7 +184,7 @@
 /datum/gear/naomisweater
 	name = "worn black sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/black/naomi
+	path = /obj/item/clothing/under/sweater/black/naomi
 	ckeywhitelist = list("technicalmagi")
 
 /datum/gear/naomicollar
@@ -196,7 +196,7 @@
 /datum/gear/gladiator
 	name = "Gladiator Armor"
 	category = SLOT_WEAR_SUIT
-	path = /obj/item/clothing/under/gladiator
+	path = /obj/item/clothing/under/costume/gladiator
 	ckeywhitelist = list("aroche")
 
 /datum/gear/bloodredtie
@@ -330,7 +330,7 @@ datum/gear/darksabresheath
 /datum/gear/Divine_robes
 	name = "Divine robes"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunasune
+	path = /obj/item/clothing/under/custom/lunasune
 	ckeywhitelist = list("invader4352")
 
 /datum/gear/gothcoat
@@ -348,7 +348,7 @@ datum/gear/darksabresheath
 /datum/gear/sharkcloth
 	name = "Leon's Skimpy Outfit"
 	category = SLOT_WEAR_SUIT
-	path = /obj/item/clothing/under/leoskimpy
+	path = /obj/item/clothing/under/custom/leoskimpy
 	ckeywhitelist = list("spectrosis")
 
 /datum/gear/mimemask
@@ -360,7 +360,7 @@ datum/gear/darksabresheath
 /datum/gear/mimeoveralls
 	name = "Mime's Overalls"
 	category = SLOT_WEAR_SUIT
-	path = /obj/item/clothing/under/mimeoveralls
+	path = /obj/item/clothing/under/custom/mimeoveralls
 	ckeywhitelist = list("pireamaineach")
 
 /datum/gear/soulneck
@@ -408,7 +408,7 @@ datum/gear/darksabresheath
 /datum/gear/mw2_russian_para
 	name = "Russian Paratrooper Jumper"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/mw2_russian_para
+	path = /obj/item/clothing/under/custom/mw2_russian_para
 	ckeywhitelist = list("investigator77")
 
 /datum/gear/longblackgloves
@@ -420,13 +420,13 @@ datum/gear/darksabresheath
 /datum/gear/trendy_fit
 	name = "Trendy Fit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/trendy_fit
+	path = /obj/item/clothing/under/custom/trendy_fit
 	ckeywhitelist = list("midgetdragon")
 
 /datum/gear/singery
 	name = "Yellow Performer Outfit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/singery
+	path = /obj/item/clothing/under/costume/singer/yellow
 	ckeywhitelist = list("maxlynchy")
 
 /datum/gear/csheet
@@ -462,7 +462,7 @@ datum/gear/darksabresheath
 /datum/gear/mikubikini
 	name = "starlight singer bikini"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/mikubikini
+	path = /obj/item/clothing/under/custom/mikubikini
 	ckeywhitelist = list("grandvegeta")
 
 /datum/gear/mikujacket
diff --git a/modular_citadel/code/modules/client/loadout/_medical.dm b/modular_citadel/code/modules/client/loadout/_medical.dm
index b1b5c9a62e..604a0f96ae 100644
--- a/modular_citadel/code/modules/client/loadout/_medical.dm
+++ b/modular_citadel/code/modules/client/loadout/_medical.dm
@@ -14,21 +14,21 @@
 /datum/gear/bluescrubs
 	name = "Blue Scrubs"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/medical/blue
+	path = /obj/item/clothing/under/rank/medical/doctor/blue
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
 	
 /datum/gear/greenscrubs
 	name = "Green Scrubs"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/medical/green
+	path = /obj/item/clothing/under/rank/medical/doctor/green
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
 
 /datum/gear/purplescrubs
 	name = "Purple Scrubs"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/medical/purple
+	path = /obj/item/clothing/under/rank/medical/doctor/purple
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
 
@@ -42,6 +42,6 @@
 /datum/gear/nursesuit
 	name = "Nurse Suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/nursesuit
+	path = /obj/item/clothing/under/rank/medical/doctor/nurse
 	restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist")
 	restricted_desc = "Medical"
\ No newline at end of file
diff --git a/modular_citadel/code/modules/client/loadout/_security.dm b/modular_citadel/code/modules/client/loadout/_security.dm
index c9591540e6..72a6aab394 100644
--- a/modular_citadel/code/modules/client/loadout/_security.dm
+++ b/modular_citadel/code/modules/client/loadout/_security.dm
@@ -1,7 +1,7 @@
 /datum/gear/navyblueuniformhos
  	name = "Head of Security navyblue uniform"
  	category = SLOT_W_UNIFORM
- 	path = /obj/item/clothing/under/rank/head_of_security/navyblue
+ 	path = /obj/item/clothing/under/rank/security/head_of_security/formal
  	restricted_roles = list("Head of Security")
 
 /datum/gear/navybluehosberet
@@ -31,7 +31,7 @@
 /datum/gear/navyblueuniformofficer
  	name = "Security officer navyblue uniform"
  	category = SLOT_W_UNIFORM
- 	path = /obj/item/clothing/under/rank/security/navyblue
+ 	path = /obj/item/clothing/under/rank/security/officer/formal
  	restricted_roles = list("Security Officer")
 
 /datum/gear/navybluejacketwarden
@@ -49,19 +49,19 @@
 /datum/gear/navyblueuniformwarden
  	name = "Warden navyblue uniform"
  	category = SLOT_W_UNIFORM
- 	path = /obj/item/clothing/under/rank/warden/navyblue
+ 	path = /obj/item/clothing/under/rank/security/warden/formal
  	restricted_roles = list("Warden")
 
 /datum/gear/secskirt
 	name = "Security skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/security/skirt
+	path = /obj/item/clothing/under/rank/security/officer/skirt
 	restricted_roles = list("Security Officer", "Warden", "Head of Security")
 
 /datum/gear/hosskirt
 	name = "Head of security's skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/head_of_security/skirt
+	path = /obj/item/clothing/under/rank/security/head_of_security/skirt
 	restricted_roles = list("Head of Security")
 
 /datum/gear/sechud
diff --git a/modular_citadel/code/modules/client/loadout/_service.dm b/modular_citadel/code/modules/client/loadout/_service.dm
index e5910d3d5d..ab3daa5f3c 100644
--- a/modular_citadel/code/modules/client/loadout/_service.dm
+++ b/modular_citadel/code/modules/client/loadout/_service.dm
@@ -1,7 +1,7 @@
 /datum/gear/greytidestationwide
 	name = "Staff Assistant's jumpsuit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/staffassistant
+	path = /obj/item/clothing/under/misc/staffassistant
 	restricted_roles = list("Assistant")
 
 /datum/gear/neetsuit
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index b6b72669c2..4c66522df8 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -1,136 +1,136 @@
 /datum/gear/suitblack
 	name = "Black suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket
+	path = /obj/item/clothing/under/suit/black
 
 /datum/gear/suitgreen
 	name = "Green suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/green
+	path = /obj/item/clothing/under/suit/green
 
 /datum/gear/suitred
 	name = "Red suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/red
+	path = /obj/item/clothing/under/suit/red
 
 /datum/gear/suitcharcoal
 	name = "Charcoal suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/charcoal
+	path = /obj/item/clothing/under/suit/charcoal
 
 /datum/gear/suitnavy
 	name = "Navy suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/navy
+	path = /obj/item/clothing/under/suit/navy
 
 /datum/gear/suitburgundy
 	name = "Burgundy suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/burgundy
+	path = /obj/item/clothing/under/suit/burgundy
 
 /datum/gear/suittan
 	name = "Tan suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/tan
+	path = /obj/item/clothing/under/suit/tan
 
 /datum/gear/suitwhite
 	name = "White suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/suit_jacket/white
+	path = /obj/item/clothing/under/suit/white
 
 /datum/gear/assistantformal
 	name = "Assistant's formal uniform"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/assistantformal
+	path = /obj/item/clothing/under/misc/assistantformal
 
 /datum/gear/maidcostume
 	name = "Maid costume"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/maid
+	path = /obj/item/clothing/under/costume/maid
 
 /datum/gear/mailmanuniform
 	name = "Mailman's jumpsuit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/mailman
+	path = /obj/item/clothing/under/misc/mailman
 
 /datum/gear/skirtblack
 	name = "Black skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/skirt/black
+	path = /obj/item/clothing/under/dress/skirt
 
 /datum/gear/skirtblue
 	name = "Blue skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/skirt/blue
+	path = /obj/item/clothing/under/dress/skirt/blue
 
 /datum/gear/skirtred
 	name = "Red skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/skirt/red
+	path = /obj/item/clothing/under/dress/skirt/red
 
 /datum/gear/skirtpurple
 	name = "Purple skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/skirt/purple
+	path = /obj/item/clothing/under/dress/skirt/purple
 
 /datum/gear/skirtplaid
 	name = "Plaid skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/plaid_skirt
+	path = /obj/item/clothing/under/dress/skirt/plaid
 
 /datum/gear/schoolgirlblue
 	name = "Blue Schoolgirl Uniform"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/schoolgirl
+	path = /obj/item/clothing/under/costume/schoolgirl
 
 /datum/gear/schoolgirlred
 	name = "Red Schoolgirl Uniform"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/schoolgirl/red
+	path = /obj/item/clothing/under/costume/schoolgirl/red
 
 /datum/gear/schoolgirlgreen
 	name = "Green Schoolgirl Uniform"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/schoolgirl/green
+	path = /obj/item/clothing/under/costume/schoolgirl/green
 
 /datum/gear/schoolgirlorange
 	name = "Orange Schoolgirl Uniform"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/schoolgirl/orange
+	path = /obj/item/clothing/under/costume/schoolgirl/orange
 
 /datum/gear/stripeddress
 	name = "Striped Dress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/stripeddress
+	path = /obj/item/clothing/under/dress/striped
 
 /datum/gear/sundresswhite
 	name = "White Sundress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/sundresswhite
+	path = /obj/item/clothing/under/dress/sundress/white
 
 /datum/gear/sundress
 	name = "Sundress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/sundress
+	path = /obj/item/clothing/under/dress/sundress
 
 /datum/gear/greendress
 	name = "Green Dress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/greendress
+	path = /obj/item/clothing/under/dress/green
 
 /datum/gear/pinkdress
 	name = "Pink Dress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/pinkdress
+	path = /obj/item/clothing/under/dress/pink
 /datum/gear/flowerdress
 	name = "Flower Dress"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/flowerdress
+	path = /obj/item/clothing/under/dress/flower
 
 /datum/gear/sweptskirt
 	name = "Swept skirt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/sweptskirt
+	path = /obj/item/clothing/under/dress/skirt/swept
 
 /datum/gear/croptop
 	name = "Croptop"
@@ -145,7 +145,7 @@
 /datum/gear/kilt
 	name = "Kilt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/kilt
+	path = /obj/item/clothing/under/costume/kilt
 
 /datum/gear/camoshorts
 	name = "Camo Pants"
@@ -222,54 +222,54 @@
 /datum/gear/creamsweater
 	name = "Cream Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater
+	path = /obj/item/clothing/under/sweater
 
 /datum/gear/blacksweater
 	name = "Black Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/black
+	path = /obj/item/clothing/under/sweater/black
 
 /datum/gear/purpsweater
 	name = "Purple Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/purple
+	path = /obj/item/clothing/under/sweater/purple
 
 /datum/gear/greensweater
 	name = "Green Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/green
+	path = /obj/item/clothing/under/sweater/green
 
 /datum/gear/redsweater
 	name = "Red Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/red
+	path = /obj/item/clothing/under/sweater/red
 
 /datum/gear/bluesweater
 	name =  "Navy Commando Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/bb_sweater/blue
+	path = /obj/item/clothing/under/sweater/blue
 
 /datum/gear/keyholesweater
 	name =  "Keyhole Sweater"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/keyholesweater
+	path = /obj/item/clothing/under/misc/keyholesweater
 
 /datum/gear/polykilt
 	name = "Polychromic Kilt"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/polychromic/kilt
+	path = /obj/item/clothing/under/costume/kilt/polychromic
 	cost = 3
 
 /datum/gear/polyshorts
 	name = "Polychromic Shorts"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/polychromic/shorts
+	path = /obj/item/clothing/under/misc/polyshorts
 	cost = 3
 
 /datum/gear/polyshortpants
 	name = "Polychromic Athletic Shorts"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/polychromic/shortpants
+	path = /obj/item/clothing/under/shorts/polychromic
 	cost = 2
 
 // Trekie things
@@ -277,21 +277,21 @@
 /datum/gear/trekcmdtos
 	name = "TOS uniform, cmd"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/command
+	path = /obj/item/clothing/under/trek/command
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
 /datum/gear/trekmedscitos
 	name = "TOS uniform, med/sci"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/medsci
+	path = /obj/item/clothing/under/trek/medsci
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/trekengtos
 	name = "TOS uniform, ops/sec"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/engsec
+	path = /obj/item/clothing/under/trek/engsec
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -299,21 +299,21 @@
 /datum/gear/trekcmdtng
 	name = "TNG uniform, cmd"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/command/next
+	path = /obj/item/clothing/under/trek/command/next
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
 /datum/gear/trekmedscitng
 	name = "TNG uniform, med/sci"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/medsci/next
+	path = /obj/item/clothing/under/trek/medsci/next
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/trekengtng
 	name = "TNG uniform, ops/sec"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/engsec/next
+	path = /obj/item/clothing/under/trek/engsec/next
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -321,21 +321,21 @@
 /datum/gear/trekcmdvoy
 	name = "VOY uniform, cmd"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/command/voy
+	path = /obj/item/clothing/under/trek/command/voy
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
 /datum/gear/trekmedscivoy
 	name = "VOY uniform, med/sci"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/medsci/voy
+	path = /obj/item/clothing/under/trek/medsci/voy
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/trekengvoy
 	name = "VOY uniform, ops/sec"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/engsec/voy
+	path = /obj/item/clothing/under/trek/engsec/voy
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -343,21 +343,21 @@
 /datum/gear/trekcmdds9
 	name = "DS9 uniform, cmd"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/command/ds9
+	path = /obj/item/clothing/under/trek/command/ds9
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
 /datum/gear/trekmedscids9
 	name = "DS9 uniform, med/sci"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/medsci/ds9
+	path = /obj/item/clothing/under/trek/medsci/ds9
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/trekengds9
 	name = "DS9 uniform, ops/sec"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/engsec/ds9
+	path = /obj/item/clothing/under/trek/engsec/ds9
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -365,21 +365,21 @@
 /datum/gear/trekcmdent
 	name = "ENT uniform, cmd"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/command/ent
+	path = /obj/item/clothing/under/trek/command/ent
 	restricted_desc = "Heads of Staff"
 	restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster")
 
 /datum/gear/trekmedscient
 	name = "ENT uniform, med/sci"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/medsci/ent
+	path = /obj/item/clothing/under/trek/medsci/ent
 	restricted_desc = "Medical and Science"
 	restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
 
 /datum/gear/trekengent
 	name = "ENT uniform, ops/sec"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/rank/trek/engsec/ent
+	path = /obj/item/clothing/under/trek/engsec/ent
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
@@ -387,75 +387,75 @@
 /datum/gear/gear_harnesses
 	name = "Gear Harness"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/gear_harness
+	path = /obj/item/clothing/under/misc/gear_harness
 
 //Christmas
 /*Commenting out Until next Christmas or made automatic
 /datum/gear/christmasmaler
 	name = "Red Masculine Christmas Suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/christmas/christmasmaler
+	path = /obj/item/clothing/under/costume/christmas
 
 /datum/gear/christmasmaleg
 	name = "Green Masculine Christmas Suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/christmas/christmasmaleg
+	path = /obj/item/clothing/under/costume/christmas/green
 
 /datum/gear/christmasfemaler
 	name = "Red Feminine Christmas Suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/christmas/christmasfemaler
+	path = /obj/item/clothing/under/costume/christmas/croptop
 
 /datum/gear/christmasfemaleg
 	name = "Green Feminine Christmas Suit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/christmas/christmasfemaleg
+	path = /obj/item/clothing/under/costume/christmas/croptop/green
 
 /datum/gear/pinkstripper
 	name = "Pink stripper outfit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/stripper_pink
+	path = /obj/item/clothing/under/misc/stripper
 	cost = 3
 */
 
 /datum/gear/greenstripper
 	name = "Green stripper outfit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/stripper_green
+	path = /obj/item/clothing/under/misc/stripper/green
 	cost = 3
 
 /datum/gear/qipao
 	name = "Qipao, Black"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/qipao
+	path = /obj/item/clothing/under/costume/qipao
 	cost = 3
 
 /datum/gear/qipao/white
 	name = "Qipao, White"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/qipao/white
+	path = /obj/item/clothing/under/costume/qipao/white
 	cost = 3
 
 /datum/gear/qipao/red
 	name = "Qipao, Red"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/qipao/red
+	path = /obj/item/clothing/under/costume/qipao/red
 	cost = 3
 
 /datum/gear/cheongsam
 	name = "Cheongsam, Black"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/cheongsam
+	path = /obj/item/clothing/under/costume/cheongsam
 	cost = 3
 
 /datum/gear/cheongsam/white
 	name = "Cheongsam, White"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/cheongsam/white
+	path = /obj/item/clothing/under/costume/cheongsam/white
 	cost = 3
 
 /datum/gear/cheongsam/red
 	name = "Cheongsam, Red"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/lunar/cheongsam/red
+	path = /obj/item/clothing/under/costume/cheongsam/red
 	cost = 3
\ No newline at end of file
diff --git a/modular_citadel/code/modules/clothing/under/trek_under.dm b/modular_citadel/code/modules/clothing/trek.dm
similarity index 65%
rename from modular_citadel/code/modules/clothing/under/trek_under.dm
rename to modular_citadel/code/modules/clothing/trek.dm
index 6cacf5921b..c6b0b80f22 100644
--- a/modular_citadel/code/modules/clothing/under/trek_under.dm
+++ b/modular_citadel/code/modules/clothing/trek.dm
@@ -8,85 +8,6 @@
 // Armor lists for even Heads of Staff is Nulled out do round start armor as well most armor going onto the suit itself rather then a armor slot - Trilby
 ///////////////////////////////////////////////////////////////////////////////////
 
-
-/obj/item/clothing/under/rank/trek
-	name = "Section 31 Uniform"
-	desc = "Oooh... right."
-	icon = 'modular_citadel/icons/obj/clothing/trek_item_icon.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
-	mutantrace_variation = NONE
-	item_state = ""
-	can_adjust = FALSE	//to prevent you from "wearing it casually"
-
-//TOS
-/obj/item/clothing/under/rank/trek/command
-	name = "Command Uniform"
-	desc = "The uniform worn by command officers in the mid 2260s."
-	icon_state = "trek_command"
-	item_state = "trek_command"
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-
-/obj/item/clothing/under/rank/trek/engsec
-	name = "Operations Uniform"
-	desc = "The uniform worn by operations officers of the mid 2260s. You feel strangely vulnerable just seeing this..."
-	icon_state = "trek_engsec"
-	item_state = "trek_engsec"
-
-/obj/item/clothing/under/rank/trek/medsci
-	name = "MedSci Uniform"
-	desc = "The uniform worn by medsci officers in the mid 2260s."
-	icon_state = "trek_medsci"
-	item_state = "trek_medsci"
-	permeability_coefficient = 0.50
-
-//TNG
-/obj/item/clothing/under/rank/trek/command/next
-	desc = "The uniform worn by command officers. This one's from the mid 2360s."
-	icon_state = "trek_next_command"
-	item_state = "trek_next_command"
-
-/obj/item/clothing/under/rank/trek/engsec/next
-	desc = "The uniform worn by operation officers. This one's from the mid 2360s."
-	icon_state = "trek_next_engsec"
-	item_state = "trek_next_engsec"
-
-/obj/item/clothing/under/rank/trek/medsci/next
-	desc = "The uniform worn by medsci officers. This one's from the mid 2360s."
-	icon_state = "trek_next_medsci"
-	item_state = "trek_next_medsci"
-
-//ENT
-/obj/item/clothing/under/rank/trek/command/ent
-	desc = "The uniform worn by command officers of the 2140s."
-	icon_state = "trek_ent_command"
-	item_state = "trek_ent_command"
-
-/obj/item/clothing/under/rank/trek/engsec/ent
-	desc = "The uniform worn by operations officers of the 2140s."
-	icon_state = "trek_ent_engsec"
-	item_state = "trek_ent_engsec"
-
-/obj/item/clothing/under/rank/trek/medsci/ent
-	desc = "The uniform worn by medsci officers of the 2140s."
-	icon_state = "trek_ent_medsci"
-	item_state = "trek_ent_medsci"
-
-//VOY
-/obj/item/clothing/under/rank/trek/command/voy
-	desc = "The uniform worn by command officers of the 2370s."
-	icon_state = "trek_voy_command"
-	item_state = "trek_voy_command"
-
-/obj/item/clothing/under/rank/trek/engsec/voy
-	desc = "The uniform worn by operations officers of the 2370s."
-	icon_state = "trek_voy_engsec"
-	item_state = "trek_voy_engsec"
-
-/obj/item/clothing/under/rank/trek/medsci/voy
-	desc = "The uniform worn by medsci officers of the 2370s."
-	icon_state = "trek_voy_medsci"
-	item_state = "trek_voy_medsci"
-
 //DS9
 
 /obj/item/clothing/suit/storage/trek/ds9
@@ -116,21 +37,6 @@
 	permeability_coefficient = 0.01
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50,"energy" = 50, "bomb" = 50, "bio" = 50, "rad" = 50, "fire" = 50, "acid" = 50)
 
-/obj/item/clothing/under/rank/trek/command/ds9
-	desc = "The uniform worn by command officers of the 2380s."
-	icon_state = "trek_ds9_command"
-	item_state = "trek_ds9_command"
-
-/obj/item/clothing/under/rank/trek/engsec/ds9
-	desc = "The uniform worn by operations officers of the 2380s."
-	icon_state = "trek_ds9_engsec"
-	item_state = "trek_ds9_engsec"
-
-/obj/item/clothing/under/rank/trek/medsci/ds9
-	desc = "The uniform undershirt worn by medsci officers of the 2380s."
-	icon_state = "trek_ds9_medsci"
-	item_state = "trek_ds9_medsci"
-
 //MODERN ish Joan sqrl sprites. I think
 
 //For general use
diff --git a/modular_citadel/code/modules/clothing/under/turtlenecks.dm b/modular_citadel/code/modules/clothing/under/turtlenecks.dm
deleted file mode 100644
index 84cfa97a59..0000000000
--- a/modular_citadel/code/modules/clothing/under/turtlenecks.dm
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *	Turtlenecks in general go here!
- */
-
-//CMO's Turtleneck, because they don't have any unique clothes!
-
-/obj/item/clothing/under/rank/chief_medical_officer/turtleneck
-	desc = "It's a turtleneck worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection, for an officer with a superior sense of style and practicality."
-	name = "chief medical officer's turtleneck"
-	alternate_worn_icon = 'modular_citadel/icons/mob/clothing/turtlenecks.dmi'
-	icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
-	icon_state = "cmoturtle"
-	item_state = "w_suit"
-	item_color = "cmoturtle"
-	permeability_coefficient = 0.5
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
-	can_adjust = TRUE
-	alt_covers_chest = TRUE
-	mutantrace_variation = NONE
-
-/obj/structure/closet/secure_closet/CMO/PopulateContents()	//This is placed here because it's a very specific addition for a very specific niche
-	..()
-	new /obj/item/clothing/under/rank/chief_medical_officer/turtleneck(src)
-
-/obj/item/clothing/under/syndicate/cosmetic
-	name = "tactitool turtleneck"
-	desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
-	icon_state = "tactifool"
-	item_state = "bl_suit"
-	item_color = "tactifool"
-	has_sensor = TRUE
-	mutantrace_variation = NONE
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
-
-/obj/item/clothing/under/syndicate/tacticool
-	has_sensor = TRUE
-
-// Sweaters are good enough for this category too.
-
-/obj/item/clothing/under/bb_sweater
-	name = "cream sweater"
-	desc = "Why trade style for comfort? Now you can go commando down south and still be cozy up north."
-	icon_state = "bb_turtle"
-	item_state = "w_suit"
-	item_color = "bb_turtle"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = TRUE
-	icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/bb_sweater/black
-	name = "black sweater"
-	icon_state = "bb_turtleblk"
-	item_state = "bl_suit"
-	item_color = "bb_turtleblk"
-
-/obj/item/clothing/under/bb_sweater/purple
-	name = "purple sweater"
-	icon_state = "bb_turtlepur"
-	item_state = "p_suit"
-	item_color = "bb_turtlepur"
-
-/obj/item/clothing/under/bb_sweater/green
-	name = "green sweater"
-	icon_state = "bb_turtlegrn"
-	item_state = "g_suit"
-	item_color = "bb_turtlegrn"
-
-/obj/item/clothing/under/bb_sweater/red
-	name = "red sweater"
-	icon_state = "bb_turtlered"
-	item_state = "r_suit"
-	item_color = "bb_turtlered"
-
-/obj/item/clothing/under/bb_sweater/blue
-	name = "blue sweater"
-	icon_state = "bb_turtleblu"
-	item_state = "b_suit"
-	item_color = "bb_turtleblu"
diff --git a/modular_citadel/code/modules/clothing/under/under.dm b/modular_citadel/code/modules/clothing/under/under.dm
deleted file mode 100644
index 40db06ba56..0000000000
--- a/modular_citadel/code/modules/clothing/under/under.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-/*/////////////////////////////////////////////////////////////////////////////////
-///////																		///////
-///////			Cit's exclusive jumpsuits, uniforms, etc. go here			///////
-///////																		///////
-*//////////////////////////////////////////////////////////////////////////////////
-
-
-/obj/item/clothing/under/corporateuniform
-	name = "corporate uniform"
-	desc = "A comfortable, tight fitting jumpsuit made of premium materials. Not space-proof."
-	icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
-	icon_state = "tssuit"
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	item_state = "r_suit"
-	can_adjust = FALSE
-	mutantrace_variation = NONE
-
-/obj/item/clothing/under/rank/captain/femformal
-	name ="captain's female formal outfit"
-	desc = ""
-	icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
-	icon_state = "lewdcap"
-	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-	item_state = "lewdcap"
-	item_color = "lewdcap"
-	can_adjust = FALSE
-	sensor_mode = SENSOR_COORDS  //it's still a captain's suit nerd
-	random_sensor = FALSE
-	mutantrace_variation = NONE
diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index e1d204c74d..62145616ad 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -266,7 +266,7 @@
 	item_state = "petcollar-stripe"
 	tagname = null
 
-/obj/item/clothing/under/singery/custom
+/obj/item/clothing/under/costume/singer/yellow/custom
 	name = "bluish performer's outfit"
 	desc = "Just looking at this makes you want to sing."
 	icon = 'icons/obj/custom.dmi'
@@ -313,7 +313,7 @@
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/bb_sweater/black/naomi
+/obj/item/clothing/under/sweater/black/naomi
 	name = "worn black sweater"
 	mutantrace_variation = NONE
 	desc = "A well-loved sweater, showing signs of several cleanings and re-stitchings. And a few stains. Is that cat fur?"
@@ -382,7 +382,7 @@
 	icon_state = "luckyjack"
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/lunasune
+/obj/item/clothing/under/custom/lunasune
 	name = "Divine Robes"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
@@ -391,7 +391,7 @@
 	icon_state = "Divine_robes"
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/leoskimpy
+/obj/item/clothing/under/custom/leoskimpy
 	name = "Leon's Skimpy Outfit"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
@@ -400,7 +400,7 @@
 	icon_state = "shark_cloth"
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/mimeoveralls
+/obj/item/clothing/under/custom/mimeoveralls
 	name = "Mime's Overalls"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
@@ -461,7 +461,7 @@
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	mutantrace_variation = NONE
 
-/obj/item/clothing/under/mw2_russian_para
+/obj/item/clothing/under/custom/mw2_russian_para
 	name = "Russian Paratrooper Jumper"
 	desc = "A Russian made old paratrooper jumpsuit, has many pockets for easy storage of gear from a by gone era. As bulky as it looks, its shockingly light!"
 	icon_state = "mw2_russian_para"
@@ -478,7 +478,7 @@
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 
-/obj/item/clothing/under/trendy_fit
+/obj/item/clothing/under/custom/trendy_fit
 	name = "Trendy Fitting Clothing"
 	desc = "An outfit straight from the boredom of space, its the type of thing only someone trying to entertain themselves on the way to their next destination would wear."
 	icon_state = "trendy_fit"
@@ -512,7 +512,7 @@
 	item_state = "onion"
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 
-/obj/item/clothing/under/mikubikini
+/obj/item/clothing/under/custom/mikubikini
 	name = "starlight singer bikini"
 	desc = " "
 	icon_state = "mikubikini"
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index c173d3775b..28a776082f 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -104,8 +104,7 @@
 	var/obj/item/organ/genital/womb/W = M.getorganslot(ORGAN_SLOT_WOMB)
 
 	if(M.gender == MALE)
-		M.gender = FEMALE
-		M.visible_message("<span class='boldnotice'>[M] suddenly looks more feminine!</span>", "<span class='boldwarning'>You suddenly feel more feminine!</span>")
+		M.set_gender(FEMALE)
 
 	if(P)
 		P.modify_size(-0.05)
@@ -251,8 +250,7 @@
 	var/obj/item/organ/genital/womb/W = M.getorganslot(ORGAN_SLOT_WOMB)
 
 	if(M.gender == FEMALE)
-		M.gender = MALE
-		M.visible_message("<span class='boldnotice'>[M] suddenly looks more masculine!</span>", "<span class='boldwarning'>You suddenly feel more masculine!</span>")
+		M.set_gender(MALE)
 
 	if(B)
 		B.modify_size(-0.05)
diff --git a/modular_citadel/icons/mob/citadel/uniforms.dmi b/modular_citadel/icons/mob/citadel/uniforms.dmi
index 717999c9f0..0a82392960 100644
Binary files a/modular_citadel/icons/mob/citadel/uniforms.dmi and b/modular_citadel/icons/mob/citadel/uniforms.dmi differ
diff --git a/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi b/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi
index d3ebc31b6a..60f6223078 100644
Binary files a/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi and b/modular_citadel/icons/mob/clothing/trek_mob_icon.dmi differ
diff --git a/modular_citadel/icons/mob/mam_markings.dmi b/modular_citadel/icons/mob/mam_markings.dmi
index af916d2fd0..946f17abb8 100644
Binary files a/modular_citadel/icons/mob/mam_markings.dmi and b/modular_citadel/icons/mob/mam_markings.dmi differ
diff --git a/modular_citadel/icons/obj/clothing/cit_clothes.dmi b/modular_citadel/icons/obj/clothing/cit_clothes.dmi
deleted file mode 100644
index 8cc6ca2950..0000000000
Binary files a/modular_citadel/icons/obj/clothing/cit_clothes.dmi and /dev/null differ
diff --git a/modular_citadel/icons/obj/clothing/trek_item_icon.dmi b/modular_citadel/icons/obj/clothing/trek_item_icon.dmi
index 570acbf4cf..7477e2ebf1 100644
Binary files a/modular_citadel/icons/obj/clothing/trek_item_icon.dmi and b/modular_citadel/icons/obj/clothing/trek_item_icon.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index d8564ba307..2c3b192290 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -338,7 +338,6 @@
 #include "code\datums\map_config.dm"
 #include "code\datums\mind.dm"
 #include "code\datums\mutable_appearance.dm"
-#include "code\datums\mutations.dm"
 #include "code\datums\numbered_display.dm"
 #include "code\datums\outfit.dm"
 #include "code\datums\position_point_vector.dm"
@@ -537,6 +536,7 @@
 #include "code\datums\mood_events\generic_positive_events.dm"
 #include "code\datums\mood_events\mood_event.dm"
 #include "code\datums\mood_events\needs_events.dm"
+#include "code\datums\mutations\_mutations.dm"
 #include "code\datums\mutations\actions.dm"
 #include "code\datums\mutations\antenna.dm"
 #include "code\datums\mutations\body.dm"
@@ -1758,16 +1758,25 @@
 #include "code\modules\clothing\under\_under.dm"
 #include "code\modules\clothing\under\accessories.dm"
 #include "code\modules\clothing\under\color.dm"
+#include "code\modules\clothing\under\costume.dm"
 #include "code\modules\clothing\under\miscellaneous.dm"
 #include "code\modules\clothing\under\pants.dm"
-#include "code\modules\clothing\under\polychromic_clothes.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\sweaters.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\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\civilian_service.dm"
 #include "code\modules\clothing\under\jobs\Plasmaman\engineering.dm"
 #include "code\modules\clothing\under\jobs\Plasmaman\medsci.dm"
@@ -3249,12 +3258,10 @@
 #include "modular_citadel\code\modules\client\loadout\uniform.dm"
 #include "modular_citadel\code\modules\client\verbs\who.dm"
 #include "modular_citadel\code\modules\clothing\neck.dm"
+#include "modular_citadel\code\modules\clothing\trek.dm"
 #include "modular_citadel\code\modules\clothing\spacesuits\flightsuit.dm"
 #include "modular_citadel\code\modules\clothing\suits\polychromic_cloaks.dm"
 #include "modular_citadel\code\modules\clothing\suits\suits.dm"
-#include "modular_citadel\code\modules\clothing\under\trek_under.dm"
-#include "modular_citadel\code\modules\clothing\under\turtlenecks.dm"
-#include "modular_citadel\code\modules\clothing\under\under.dm"
 #include "modular_citadel\code\modules\custom_loadout\custom_items.dm"
 #include "modular_citadel\code\modules\custom_loadout\load_to_mob.dm"
 #include "modular_citadel\code\modules\custom_loadout\read_from_file.dm"
diff --git a/tools/mapmerge2/map_scripts/clothingunderrepath.txt b/tools/mapmerge2/map_scripts/clothingunderrepath.txt
new file mode 100644
index 0000000000..58a38633b3
--- /dev/null
+++ b/tools/mapmerge2/map_scripts/clothingunderrepath.txt
@@ -0,0 +1,254 @@
+/obj/item/clothing/under/rank/vice : /obj/item/clothing/under/misc/vice_officer
+/obj/item/clothing/under/durathread : /obj/item/cloning/under/misc/durathread
+/obj/item/clothing/under/duraskirt : /obj/item/cloning/under/misc/durathread/skirt
+/obj/item/clothing/under/burial : /obj/item/clothing/under/misc/burial
+/obj/item/clothing/under/overalls : /obj/item/clothing/under/misc/overalls
+/obj/item/clothing/under/assistantformal : /obj/item/clothing/under/misc/assistantformal
+/obj/item/clothing/under/staffassistant : /obj/item/clothing/under/misc/staffassistant
+/obj/item/clothing/under/pj/red : /obj/item/clothing/under/misc/pj
+/obj/item/clothing/under/pj/blue : /obj/item/clothing/under/misc/pj/blue
+/obj/item/clothing/under/patriotsuit : /obj/item/clothing/under/misc/patriotsuit
+/obj/item/clothing/under/rank/mailman : /obj/item/clothing/under/misc/mailman
+/obj/item/clothing/under/rank/psyche : /obj/item/clothing/under/misc/psyche
+/obj/item/clothing/under/acj : /obj/item/clothing/under/misc/adminsuit
+/obj/item/clothing/under/croptop : /obj/item/clothing/under/misc/croptop
+/obj/item/clothing/under/gear_harness : /obj/item/clothing/under/misc/gear_harness
+/obj/item/clothing/under/stripper_pink : /obj/item/clothing/under/misc/stripper
+/obj/item/clothing/under/stripper_green : /obj/item/clothing/under/misc/stripper/green
+/obj/item/clothing/under/mankini : /obj/item/clothing/under/misc/stripper/mankini
+/obj/item/clothing/under/squatter_outfit : /obj/item/clothing/under/misc/squatter
+/obj/item/clothing/under/russobluecamooutfit : /obj/item/clothing/under/misc/blue_camo
+/obj/item/clothing/under/keyholesweater : /obj/item/clothing/under/misc/keyholesweater
+/obj/item/clothing/under/polychromic/shirt : /obj/item/clothing/under/misc/poly_shirt
+/obj/item/clothing/under/polychromic/jumpsuit : /obj/item/clothing/under/misc/polyjumpsuit
+/obj/item/clothing/under/polychromic/shimatank : /obj/item/clothing/under/misc/poly_tanktop
+/obj/item/clothing/under/polychromic/femtank : /obj/item/clothing/under/misc/poly_tanktop/female
+/obj/item/clothing/under/polychromic/shorts : /obj/item/clothing/under/misc/polyshorts
+/obj/item/clothing/under/polychromic/shorts/pantsu : /obj/item/clothing/under/misc/polyshorts/pantsu
+/obj/item/clothing/under/polychromic/bottomless : /obj/item/clothing/under/misc/poly_bottomless
+/obj/item/clothing/under/corporateuniform : /obj/item/clothing/under/misc/corporateuniform
+
+/obj/item/clothing/under/polychromic/shortpants : /obj/item/clothing/under/shorts/polychromic
+
+/obj/item/clothing/under/scratch : /obj/item/clothing/under/suit/white_on_white
+/obj/item/clothing/under/scratch/skirt : /obj/item/clothing/under/suit/white/skirt
+/obj/item/clothing/under/sl_suit : /obj/item/clothing/under/suit/sl
+/obj/item/clothing/under/waiter : /obj/item/clothing/under/suit/waiter
+/obj/item/clothing/under/suit_jacket : /obj/item/clothing/under/suit/black
+/obj/item/clothing/under/suit_jacket/female : /obj/item/clothing/under/suit/black/skirt
+/obj/item/clothing/under/suit_jacket/really_black : /obj/item/clothing/under/suit/black_really
+/obj/item/clothing/under/suit_jacket/green : /obj/item/clothing/under/suit/green
+/obj/item/clothing/under/suit_jacket/red : /obj/item/clothing/under/suit/red
+/obj/item/clothing/under/suit_jacket/charcoal : /obj/item/clothing/under/suit/charcoal
+/obj/item/clothing/under/suit_jacket/navy : /obj/item/clothing/under/suit/navy
+/obj/item/clothing/under/suit_jacket/burgundy : /obj/item/clothing/under/suit/burgundy
+/obj/item/clothing/under/suit_jacket/checkered : /obj/item/clothing/under/suit/checkered
+/obj/item/clothing/under/suit_jacket/tan : /obj/item/clothing/under/suit/tan
+/obj/item/clothing/under/suit_jacket/white : /obj/item/clothing/under/suit/white
+/obj/item/clothing/under/telegram : /obj/item/clothing/under/suit/telegram
+/obj/item/clothing/under/polychromic : /obj/item/clothing/under/suit/polychromic
+
+/obj/item/clothing/under/skirt/black : /obj/item/clothing/under/dress/skirt
+/obj/item/clothing/under/skirt/blue : /obj/item/clothing/under/dress/skirt/blue
+/obj/item/clothing/under/skirt/red : /obj/item/clothing/under/dress/skirt/red
+/obj/item/clothing/under/skirt/purple : /obj/item/clothing/under/dress/skirt/purple
+/obj/item/clothing/under/sweptskirt : /obj/item/clothing/under/skirt/swept
+/obj/item/clothing/under/sundress : /obj/item/clothing/under/dress/sundress
+/obj/item/clothing/under/sundresswhite : /obj/item/clothing/under/dress/sundress/white
+/obj/item/clothing/under/greendress : /obj/item/clothing/under/dress/green
+/obj/item/clothing/under/pinkdress : /obj/item/clothing/under/dress/pink
+/obj/item/clothing/under/blacktango : /obj/item/clothing/under/dress/blacktango
+/obj/item/clothing/under/westernbustle : /obj/item/clothing/under/dress/westernbustle
+/obj/item/clothing/under/flamenco : /obj/item/clothing/under/dress/flamenco
+/obj/item/clothing/under/stripeddress : /obj/item/clothing/under/dress/striped
+/obj/item/clothing/under/sailordress : /obj/item/clothing/under/dress/sailor
+/obj/item/clothing/under/flowerdress : /obj/item/clothing/under/dress/flower
+/obj/item/clothing/under/redeveninggown : /obj/item/clothing/under/dress/redeveninggown
+/obj/item/clothing/under/corset : /obj/item/clothing/under/dress/corset
+/obj/item/clothing/under/plaid_skirt : /obj/item/clothing/under/dress/skirt/plaid
+/obj/item/clothing/under/plaid_skirt/blue : /obj/item/clothing/under/dress/skirt/plaid/blue
+/obj/item/clothing/under/plaid_skirt/purple : /obj/item/clothing/under/dress/skirt/plaid/purple
+/obj/item/clothing/under/plaid_skirt/green : /obj/item/clothing/under/dress/skirt/plaid/green
+/obj/item/clothing/under/wedding : /obj/item/clothing/under/dress/wedding
+/obj/item/clothing/under/wedding/orange : /obj/item/clothing/under/dress/wedding/orange
+/obj/item/clothing/under/wedding/purple : /obj/item/clothing/under/dress/wedding/purple
+/obj/item/clothing/under/wedding/blue : /obj/item/clothing/under/dress/wedding/blue
+/obj/item/clothing/under/wedding/red : /obj/item/clothing/under/dress/wedding/red
+/obj/item/clothing/under/polychromic/skirt : /obj/item/clothing/under/dress/skirt/polychromic
+/obj/item/clothing/under/polychromic/pleat : /obj/item/clothing/under/dress/skirt/polychromic/pleated
+
+/obj/item/clothing/under/roman : /obj/item/clothing/under/costume/roman
+/obj/item/clothing/under/jabroni : /obj/item/clothing/under/costume/jabroni
+/obj/item/clothing/under/owl : /obj/item/clothing/under/costume/owl
+/obj/item/clothing/under/griffin : /obj/item/clothing/under/costume/griffin
+/obj/item/clothing/under/cloud : /obj/item/clothing/under/costume/cloud
+/obj/item/clothing/under/schoolgirl : /obj/item/clothing/under/costume/schoolgirl
+/obj/item/clothing/under/schoolgirl/red : /obj/item/clothing/under/costume/schoolgirl/red
+/obj/item/clothing/under/schoolgirl/green : /obj/item/clothing/under/costume/schoolgirl/green
+/obj/item/clothing/under/schoolgirl/orange : /obj/item/clothing/under/costume/schoolgirl/orange
+/obj/item/clothing/under/pirate : /obj/item/clothing/under/costume/pirate
+/obj/item/clothing/under/soviet : /obj/item/clothing/under/costume/soviet
+/obj/item/clothing/under/redcoat : /obj/item/clothing/under/costume/redcoat
+/obj/item/clothing/under/kilt : /obj/item/clothing/under/costume/kilt
+/obj/item/clothing/under/kilt/highlander : /obj/item/clothing/under/costume/kilt/highlander
+/obj/item/clothing/under/polychromic/kilt : /obj/item/clothing/under/costume/kilt/polychromic
+/obj/item/clothing/under/gladiator : /obj/item/clothing/under/costume/gladiator
+/obj/item/clothing/under/gladiator/ash_walker : /obj/item/clothing/under/costume/gladiator/ash_walker
+/obj/item/clothing/under/maid : /obj/item/clothing/under/costume/maid
+/obj/item/clothing/under/singery : /obj/item/clothing/under/costume/singer/yellow
+/obj/item/clothing/under/singerb : /obj/item/clothing/under/costume/singer/blue
+/obj/item/clothing/under/geisha : /obj/item/clothing/under/costume/geisha
+/obj/item/clothing/under/villain : /obj/item/clothing/under/costume/villain
+/obj/item/clothing/under/sailor : /obj/item/clothing/under/costume/sailor
+/obj/item/clothing/under/rank/security/navyblue/russian : /obj/item/clothing/under/costume/russian_officer
+/obj/item/clothing/under/mummy : /obj/item/clothing/under/costume/mummy
+/obj/item/clothing/under/scarecrow : /obj/item/clothing/under/costume/scarecrow
+/obj/item/clothing/under/draculass : /obj/item/clothing/under/costume/draculass
+/obj/item/clothing/under/drfreeze : /obj/item/clothing/under/costume/drfreeze
+/obj/item/clothing/under/lobster : /obj/item/clothing/under/costume/lobster
+/obj/item/clothing/under/skeleton : /obj/item/clothing/under/costume/skeleton
+/obj/item/clothing/under/mech_suit : /obj/item/clothing/under/costume/mech_suit
+/obj/item/clothing/under/mech_suit/white : /obj/item/clothing/under/costume/mech_suit/white
+/obj/item/clothing/under/mech_suit/blue : /obj/item/clothing/under/costume/mech_suit/blue
+/obj/item/clothing/under/gondola : /obj/item/clothing/under/costume/gondola
+/obj/item/clothing/under/christmas/christmasmaler : /obj/item/clothing/under/costume/christmas
+/obj/item/clothing/under/christmas/christmasmaleg : /obj/item/clothing/under/costume/christmas/green
+/obj/item/clothing/under/christmas/christmasfemaler : /obj/item/clothing/under/costume/christmas/croptop
+/obj/item/clothing/under/christmas/christmasfemaleg : /obj/item/clothing/under/costume/christmas/croptop/green
+/obj/item/clothing/under/lunar/qipao : /obj/item/clothing/under/costume/qipao
+/obj/item/clothing/under/lunar/qipao/white : /obj/item/clothing/under/costume/qipao/red
+/obj/item/clothing/under/lunar/qipao/red : /obj/item/clothing/under/costume/qipao/red
+/obj/item/clothing/under/lunar/cheongsam : /obj/item/clothing/under/costume/cheongsam
+/obj/item/clothing/under/lunar/cheongsam/white : /obj/item/clothing/under/costume/cheongsam/white
+/obj/item/clothing/under/lunar/cheongsam/red : /obj/item/clothing/under/costume/cheongsam/red
+
+/obj/item/clothing/under/lunasune : /obj/item/clothing/under/custom/lunasune
+/obj/item/clothing/under/leoskimpy : /obj/item/clothing/under/custom/leoskimpy
+/obj/item/clothing/under/mimeoveralls : /obj/item/clothing/under/custom/mimeoveralls
+/obj/item/clothing/under/mw2_russian_para : /obj/item/clothing/under/custom/mw2_russian_para
+/obj/item/clothing/under/trendy_fit : /obj/item/clothing/under/custom/trendy_fit
+/obj/item/clothing/under/mikubikini : /obj/item/clothing/under/custom/mikubikini
+
+/obj/item/clothing/under/rank/bartender : /obj/item/clothing/under/rank/civilian/bartender
+/obj/item/clothing/under/rank/bartender/purple : /obj/item/clothing/under/rank/civilian/bartender/purple
+/obj/item/clothing/under/rank/bartender/skirt : /obj/item/clothing/under/rank/civilian/bartender/skirt
+/obj/item/clothing/under/rank/chaplain : /obj/item/clothing/under/rank/civilian/chaplain
+/obj/item/clothing/under/rank/chaplain/skirt : /obj/item/clothing/under/rank/civilian/chaplain/skirt
+/obj/item/clothing/under/rank/chef : /obj/item/clothing/under/rank/civilian/chef
+/obj/item/clothing/under/rank/chef/skirt : /obj/item/clothing/under/rank/civilian/chef/skirt
+/obj/item/clothing/under/rank/curator : /obj/item/clothing/under/rank/civilian/curator
+/obj/item/clothing/under/rank/curator/skirt: /obj/item/clothing/under/rank/civilian/curator/skirt
+/obj/item/clothing/under/rank/curator/treasure_hunter : /obj/item/clothing/under/rank/civilian/curator/treasure_hunter
+/obj/item/clothing/under/space : /obj/item/clothing/under/rank/civilian/curator/nasa
+/obj/item/clothing/under/rank/hydroponics : /obj/item/clothing/under/rank/civilian/hydroponics
+/obj/item/clothing/under/rank/hydroponics/skirt : /obj/item/clothing/under/rank/civilian/hydroponics/skirt
+/obj/item/clothing/under/rank/janitor : /obj/item/clothing/under/rank/civilian/janitor
+/obj/item/clothing/under/rank/janitor/skirt : /obj/item/clothing/under/rank/civilian/janitor/skirt
+/obj/item/clothing/under/janimaid : /obj/item/clothing/under/rank/civilian/janitor/maid
+/obj/item/clothing/under/rank/mime : /obj/item/clothing/under/rank/civilian/mime
+/obj/item/clothing/under/rank/mime/skirt : /obj/item/clothing/under/rank/civilian/mime/skirt
+/obj/item/clothing/under/sexymime : /obj/item/clothing/under/rank/civilian/mime/sexy
+/obj/item/clothing/under/rank/clown : /obj/item/clothing/under/rank/civilian/clown
+/obj/item/clothing/under/rank/blueclown : /obj/item/clothing/under/rank/civilian/clown/blue
+/obj/item/clothing/under/rank/greenclown : /obj/item/clothing/under/rank/civilian/clown/green
+/obj/item/clothing/under/rank/yellowclown : /obj/item/clothing/under/rank/civilian/clown/yellow
+/obj/item/clothing/under/rank/purpleclown : /obj/item/clothing/under/rank/civilian/clown/purple
+/obj/item/clothing/under/rank/orangeclown : /obj/item/clothing/under/rank/civilian/clown/orange
+/obj/item/clothing/under/rank/rainbowclown : /obj/item/clothing/under/rank/civilian/clown/rainbow
+/obj/item/clothing/under/jester : /obj/item/clothing/under/rank/civilian/clown/jester
+/obj/item/clothing/under/jester/alt : /obj/item/clothing/under/rank/civilian/clown/jester/alt
+/obj/item/clothing/under/rank/clown/sexy : /obj/item/clothing/under/rank/civilian/clown/sexy
+/obj/item/clothing/under/lawyer : /obj/item/clothing/under/rank/civilian/lawyer
+/obj/item/clothing/under/lawyer/black : /obj/item/clothing/under/rank/civilian/lawyer/black
+/obj/item/clothing/under/lawyer/black/skirt : /obj/item/clothing/under/rank/civilian/lawyer/black/skirt
+/obj/item/clothing/under/lawyer/female : /obj/item/clothing/under/rank/civilian/lawyer/female
+/obj/item/clothing/under/lawyer/female/skirt : /obj/item/clothing/under/rank/civilian/lawyer/female/skirt
+/obj/item/clothing/under/lawyer/red : /obj/item/clothing/under/rank/civilian/lawyer/red
+/obj/item/clothing/under/lawyer/red/skirt : /obj/item/clothing/under/rank/civilian/lawyer/red/skirt
+/obj/item/clothing/under/lawyer/blue : /obj/item/clothing/under/rank/civilian/lawyer/blue
+/obj/item/clothing/under/lawyer/blue/skirt : /obj/item/clothing/under/rank/civilian/lawyer/blue/skirt
+/obj/item/clothing/under/lawyer/bluesuit : /obj/item/clothing/under/rank/civilian/lawyer/bluesuit
+/obj/item/clothing/under/lawyer/bluesuit/skirt : /obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt
+/obj/item/clothing/under/lawyer/purpsuit : /obj/item/clothing/under/rank/civilian/lawyer/purpsuit
+/obj/item/clothing/under/lawyer/purpsuit/skirt : /obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt
+/obj/item/clothing/under/lawyer/blacksuit : /obj/item/clothing/under/rank/civilian/lawyer/black/alt
+/obj/item/clothing/under/lawyer/blacksuit/skirt : /obj/item/clothing/under/rank/civilian/lawyer/black/alt/skirt
+/obj/item/clothing/under/lawyer/really_black : /obj/item/clothing/under/suit/black_really
+/obj/item/clothing/under/lawyer/really_black/skirt : /obj/item/clothing/under/suit/black_really/skirt
+/obj/item/clothing/under/rank/head_of_personnel : /obj/item/clothing/under/rank/civilian/head_of_personnel
+/obj/item/clothing/under/rank/head_of_personnel/skirt : /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt
+/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit : /obj/item/clothing/under/rank/civilian/head_of_personnel/suit
+/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt : /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt
+
+/obj/item/clothing/under/rank/cargo : /obj/item/clothing/under/rank/cargo/qm
+/obj/item/clothing/under/rank/cargo/skirt : /obj/item/clothing/under/rank/cargo/qm/skirt
+/obj/item/clothing/under/rank/cargotech : /obj/item/clothing/under/rank/cargo/tech
+/obj/item/clothing/under/rank/cargotech/skirt : /obj/item/clothing/under/rank/cargo/tech/skirt
+/obj/item/clothing/under/rank/miner : /obj/item/clothing/under/rank/cargo/miner
+/obj/item/clothing/under/rank/miner/lavaland : /obj/item/clothing/under/rank/cargo/miner/lavaland
+
+/obj/item/clothing/under/rank/research_director : /obj/item/clothing/under/rank/rnd/research_director
+/obj/item/clothing/under/rank/research_director/skirt : /obj/item/clothing/under/rank/rnd/research_director/skirt
+/obj/item/clothing/under/rank/research_director/alt : /obj/item/clothing/under/rank/rnd/research_director/alt
+/obj/item/clothing/under/rank/research_director/alt/skirt : /obj/item/clothing/under/rank/rnd/research_director/alt/skirt
+/obj/item/clothing/under/rank/research_director/turtleneck : /obj/item/clothing/under/rank/rnd/research_director/turtleneck
+/obj/item/clothing/under/rank/research_director/turtleneck/skirt : /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt
+/obj/item/clothing/under/rank/scientist : /obj/item/clothing/under/rank/rnd/scientist
+/obj/item/clothing/under/rank/scientist/skirt : /obj/item/clothing/under/rank/rnd/scientist/skirt
+/obj/item/clothing/under/rank/roboticist : /obj/item/clothing/under/rank/rnd/roboticist
+/obj/item/clothing/under/rank/roboticist/skirt : /obj/item/clothing/under/rank/rnd/roboticist/skirt
+
+/obj/item/clothing/under/rank/chief_medical_officer : /obj/item/clothing/under/rank/medical/chief_medical_officer
+/obj/item/clothing/under/rank/chief_medical_officer/skirt : /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
+/obj/item/clothing/under/rank/chief_medical_officer/turtleneck : /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck
+/obj/item/clothing/under/rank/medical : /obj/item/clothing/under/rank/medical/doctor/nurse
+/obj/item/clothing/under/rank/medical/blue : /obj/item/clothing/under/rank/medical/doctor/blue
+/obj/item/clothing/under/rank/medical/green : /obj/item/clothing/under/rank/medical/doctor/green
+/obj/item/clothing/under/rank/medical/purple : /obj/item/clothing/under/rank/medical/doctor/purple
+/obj/item/clothing/under/rank/medical/skirt : /obj/item/clothing/under/rank/medical/doctor/skirt
+/obj/item/clothing/under/rank/nursesuit : /obj/item/clothing/under/rank/medical/doctor
+/obj/item/clothing/under/rank/geneticist : /obj/item/clothing/under/rank/medical/geneticist
+/obj/item/clothing/under/rank/geneticist/skirt : /obj/item/clothing/under/rank/medical/geneticist/skirt
+/obj/item/clothing/under/rank/virologist : /obj/item/clothing/under/rank/medical/virologist
+/obj/item/clothing/under/rank/virologist/skirt : /obj/item/clothing/under/rank/medical/virologist/skirt
+/obj/item/clothing/under/rank/chemist : /obj/item/clothing/under/rank/medical/chemist
+/obj/item/clothing/under/rank/chemist/skirt : /obj/item/clothing/under/rank/medical/chemist/skirt
+
+/obj/item/clothing/under/rank/chief_engineer : /obj/item/clothing/under/rank/engineering/chief_engineer
+/obj/item/clothing/under/rank/chief_engineer/skirt : /obj/item/clothing/under/rank/engineering/chief_engineer/skirt
+/obj/item/clothing/under/rank/atmospheric_technician : /obj/item/clothing/under/rank/engineering/atmospheric_technician
+/obj/item/clothing/under/rank/atmospheric_technician/skirt : /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt
+/obj/item/clothing/under/rank/engineer : /obj/item/clothing/under/rank/engineering/engineer
+/obj/item/clothing/under/rank/engineer/hazard : /obj/item/clothing/under/rank/engineering/engineer/hazard
+/obj/item/clothing/under/rank/engineer/skirt : /obj/item/clothing/under/rank/engineering/engineer/skirt
+
+/obj/item/clothing/under/rank/centcom_officer : /obj/item/clothing/under/rank/centcom/officer
+/obj/item/clothing/under/rank/centcom_commander : /obj/item/clothing/under/rank/centcom/commander
+
+/obj/item/clothing/under/gimmick/rank/captain/suit : /obj/item/clothing/under/rank/captain/suit
+/obj/item/clothing/under/gimmick/rank/captain/suit/skirt : /obj/item/clothing/under/rank/captain/suit/skirt
+/obj/item/clothing/under/captainparade : /obj/item/clothing/under/rank/captain/parade
+
+/obj/item/clothing/under/rank/security : /obj/item/clothing/under/rank/security/officer
+/obj/item/clothing/under/rank/security/grey : /obj/item/clothing/under/rank/security/officer/grey
+/obj/item/clothing/under/rank/security/skirt : /obj/item/clothing/under/rank/security/officer/skirt
+/obj/item/clothing/under/rank/security/blueshirt : /obj/item/clothing/under/rank/security/officer/blueshirt
+/obj/item/clothing/under/rank/security/navyblue : /obj/item/clothing/under/rank/security/officer/formal
+/obj/item/clothing/under/rank/warden : /obj/item/clothing/under/rank/security/warden
+/obj/item/clothing/under/rank/warden/grey : /obj/item/clothing/under/rank/security/warden/grey
+/obj/item/clothing/under/rank/warden/skirt : /obj/item/clothing/under/rank/security/warden/skirt
+/obj/item/clothing/under/rank/warden/navyblue : /obj/item/clothing/under/rank/security/warden/formal
+/obj/item/clothing/under/rank/det : /obj/item/clothing/under/rank/security/detective
+/obj/item/clothing/under/rank/det/skirt : /obj/item/clothing/under/rank/security/detective/skirt
+/obj/item/clothing/under/rank/det/grey : /obj/item/clothing/under/rank/security/detective/grey
+/obj/item/clothing/under/rank/det/grey/skirt : /obj/item/clothing/under/rank/security/detective/grey/skirt
+/obj/item/clothing/under/rank/head_of_security : /obj/item/clothing/under/rank/security/head_of_security
+/obj/item/clothing/under/rank/head_of_security/skirt : /obj/item/clothing/under/rank/security/head_of_security/skirt
+/obj/item/clothing/under/rank/head_of_security/grey : /obj/item/clothing/under/rank/security/head_of_security/grey
+/obj/item/clothing/under/rank/head_of_security/alt : /obj/item/clothing/under/rank/security/head_of_security/alt
+/obj/item/clothing/under/rank/head_of_security/alt/skirt : /obj/item/clothing/under/rank/security/head_of_security/alt/skirt
+/obj/item/clothing/under/rank/head_of_security/navyblue : /obj/item/clothing/under/rank/security/head_of_security/formal
+/obj/item/clothing/under/hosparademale : /obj/item/clothing/under/rank/security/head_of_security/parade
+/obj/item/clothing/under/hosparadefem : /obj/item/clothing/under/rank/security/head_of_security/parade/female
+/obj/item/clothing/under/rank/security/spacepol : /obj/item/clothing/under/rank/security/officer/spacepol
+