diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
index 26475d0d4daf..9385aa142bef 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -379,7 +379,7 @@
 /area/ruin/space/spacehotelv1/cargostorage)
 "de" = (
 /obj/structure/rack,
-/obj/random/toolbox,
+/obj/effect/spawner/random/engineering/toolbox,
 /obj/effect/spawner/random/dirt/often,
 /obj/structure/sign/poster/random{
 	pixel_x = -32
@@ -2409,7 +2409,7 @@
 /obj/effect/spawner/random/cobweb/left/rare,
 /obj/effect/spawner/random/dirt/often,
 /obj/structure/rack,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/effect/spawner/random/maintenance,
 /turf/simulated/floor/plating,
 /area/ruin/space/spacehotelv1/engi1)
@@ -2911,7 +2911,7 @@
 /area/ruin/space/spacehotelv1/guestroom4)
 "wK" = (
 /obj/structure/rack,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/effect/spawner/random/maintenance,
 /obj/effect/spawner/random/dirt/often,
 /turf/simulated/floor/plating,
@@ -3783,8 +3783,8 @@
 /area/ruin/space/spacehotelv1/kitchen)
 "Dx" = (
 /obj/structure/rack,
-/obj/random/toolbox,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/toolbox,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plating,
 /area/ruin/space/spacehotelv1/engi1)
 "Dy" = (
@@ -4362,7 +4362,7 @@
 /obj/structure/sign/vacuum{
 	pixel_x = 32
 	},
-/obj/random/toolbox,
+/obj/effect/spawner/random/engineering/toolbox,
 /obj/effect/spawner/random/dirt/often,
 /turf/simulated/floor/plating,
 /area/ruin/space/spacehotelv1/forestarboardmaints)
@@ -4470,7 +4470,7 @@
 /area/ruin/space/spacehotelv1/forehallway)
 "IB" = (
 /obj/structure/rack,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/machinery/light/small/directional/north,
 /obj/effect/spawner/random/dirt/often,
 /turf/simulated/floor/plating,
@@ -5441,8 +5441,8 @@
 /area/ruin/space/spacehotelv1/restoraunt2)
 "PO" = (
 /obj/structure/rack,
-/obj/random/toolbox,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/toolbox,
+/obj/effect/spawner/random/engineering/tools,
 /obj/effect/spawner/random/dirt/often,
 /turf/simulated/floor/plating,
 /area/ruin/space/spacehotelv1/engi2)
diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/syndie_space_base.dmm
index 3766a75eee9b..6176737b253a 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/syndie_space_base.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/syndie_space_base.dmm
@@ -3432,7 +3432,7 @@
 	},
 /area/ruin/unpowered/syndicate_space_base/storage)
 "uy" = (
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "darkred"
@@ -7943,7 +7943,7 @@
 /obj/item/storage/belt/medical,
 /obj/item/crowbar,
 /obj/item/clothing/glasses/hud/health,
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/structure/table,
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue"
diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm
index b561d0031027..6dea3a509a25 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm
@@ -1484,7 +1484,7 @@
 /obj/machinery/atmospherics/unary/passive_vent{
 	dir = 1
 	},
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/item/flashlight/pen,
 /obj/item/food/grown/apple{
 	desc = "An apple a day - keeps doctor away...";
diff --git a/_maps/map_files220/RandomZLevels/beach.dmm b/_maps/map_files220/RandomZLevels/beach.dmm
index a58060d9d1b1..442d49900c7a 100644
--- a/_maps/map_files220/RandomZLevels/beach.dmm
+++ b/_maps/map_files220/RandomZLevels/beach.dmm
@@ -3092,7 +3092,7 @@
 	pixel_x = -4
 	},
 /obj/structure/table/glass,
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 4;
 	pixel_x = 4
 	},
diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm
index bc7dbb355aee..18d543c14567 100644
--- a/_maps/map_files220/RandomZLevels/caves.dmm
+++ b/_maps/map_files220/RandomZLevels/caves.dmm
@@ -3704,7 +3704,7 @@
 /turf/simulated/floor/wood/lavaland_air,
 /area/awaymission/caves)
 "tK" = (
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/awaymission/caves)
 "tL" = (
@@ -6777,8 +6777,8 @@
 /area/awaymission/caves)
 "Ku" = (
 /obj/structure/table,
-/obj/random/toolbox,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/toolbox,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plating,
 /area/awaymission/caves/build/reqpower_build)
 "Kw" = (
@@ -6807,7 +6807,7 @@
 /area/awaymission/caves/build/reqpower_build)
 "Kz" = (
 /obj/structure/table,
-/obj/random/toolbox,
+/obj/effect/spawner/random/engineering/toolbox,
 /obj/effect/spawner/random/dirt/often,
 /turf/simulated/floor/plating,
 /area/awaymission/caves/build/reqpower_build)
@@ -7038,7 +7038,7 @@
 /area/awaymission/caves)
 "LJ" = (
 /obj/structure/table,
-/obj/item/gun/projectile/revolver/russian,
+/obj/item/toy/russian_revolver,
 /obj/effect/spawner/random/dirt/often,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/caves/build/reqpower_build)
@@ -7573,10 +7573,8 @@
 /area/awaymission/caves/build/reqpower_build)
 "Po" = (
 /obj/structure/table,
-/obj/random/toolbox,
-/obj/random/toolbox{
-	pixel_y = 8
-	},
+/obj/effect/spawner/random/engineering/toolbox,
+/obj/effect/spawner/random/engineering/toolbox,
 /turf/simulated/floor/plasteel,
 /area/awaymission/caves/build)
 "Pp" = (
@@ -7752,7 +7750,7 @@
 /area/awaymission/caves)
 "Qm" = (
 /obj/structure/table_frame,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/effect/spawner/random/dirt/often,
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -8379,7 +8377,7 @@
 /obj/structure/closet/crate/wooden,
 /obj/item/kitchen/knife/ritual,
 /obj/item/staff/broom,
-/obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace,
+/obj/item/clothing/accessory/locket/fluff/fethasnecklace,
 /obj/effect/spawner/random/dirt/often,
 /obj/item/salvage/ruin/tablet,
 /turf/simulated/floor/wood/lavaland_air,
@@ -8805,7 +8803,7 @@
 "VP" = (
 /obj/item/clothing/glasses/night,
 /obj/structure/closet,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/item/storage/toolbox/emergency,
 /turf/simulated/floor/plasteel,
 /area/awaymission/caves/build)
diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm
index 67c68484ec4d..2078507ab1ce 100644
--- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm
+++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm
@@ -243,7 +243,7 @@
 	pixel_x = 16;
 	pixel_y = -9
 	},
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/machinery/door_control/shutter/west{
 	id = "CMDgate";
 	req_access = list(301)
@@ -535,10 +535,10 @@
 /turf/simulated/floor/indestructible/grass,
 /area/awaymission/jungle_planet/outside/waterfall)
 "aOn" = (
-/obj/item/clothing/accessory/necklace/skullcodpiece,
-/obj/item/clothing/accessory/necklace/talisman,
-/obj/item/clothing/accessory/necklace/skullcodpiece,
-/obj/item/clothing/accessory/necklace/talisman,
+/obj/item/clothing/accessory/skullcodpiece,
+/obj/item/clothing/accessory/talisman,
+/obj/item/clothing/accessory/skullcodpiece,
+/obj/item/clothing/accessory/talisman,
 /obj/structure/closet/crate/wooden,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/jungle_planet/outside/cave)
@@ -886,7 +886,7 @@
 /obj/item/clothing/gloves/color/fyellow/old,
 /obj/item/multitool,
 /obj/item/clothing/head/welding,
-/obj/random/toolbox,
+/obj/effect/spawner/random/engineering/toolbox,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -1008,7 +1008,7 @@
 /obj/item/stack/sheet/leather,
 /obj/item/stack/sheet/leather,
 /obj/item/stack/sheet/leather,
-/obj/item/clothing/accessory/necklace/dope,
+/obj/item/clothing/neck/necklace/dope,
 /obj/structure/closet/crate/wooden,
 /turf/simulated/floor/engine/cult,
 /area/awaymission/jungle_planet/outside/cave)
@@ -2676,7 +2676,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/jungle_planet/inside)
 "dxA" = (
-/obj/random/toolbox,
+/obj/effect/spawner/random/engineering/toolbox,
 /obj/machinery/door/window/reinforced/normal{
 	dir = 8
 	},
@@ -3468,8 +3468,8 @@
 	pixel_x = -9;
 	pixel_y = 11
 	},
-/obj/item/clothing/accessory/necklace,
-/obj/item/clothing/accessory/necklace/locket,
+/obj/item/clothing/neck/necklace,
+/obj/item/clothing/neck/necklace/locket,
 /obj/structure/stone_tile/slab,
 /obj/item/stack/ore/plasma,
 /turf/simulated/floor/engine/cult,
@@ -5377,7 +5377,7 @@
 	pixel_x = 12
 	},
 /obj/item/pen/multi/gold,
-/obj/item/clothing/accessory/necklace,
+/obj/item/clothing/neck/necklace,
 /obj/structure/stone_tile/surrounding_tile/cracked,
 /obj/item/stack/ore/plasma,
 /obj/item/stack/sheet/mineral/gold{
@@ -7212,7 +7212,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/jungle_planet/outside/river)
 "jvT" = (
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/effect/light_emitter{
 	light_color = "#FFFFFF";
 	set_cap = 1;
@@ -7733,7 +7733,7 @@
 	},
 /area/awaymission/jungle_planet/outside)
 "kcJ" = (
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plating/asteroid/ancient{
 	name = "ground"
 	},
@@ -10263,7 +10263,7 @@
 /area/awaymission/jungle_planet/outside/cave)
 "ncb" = (
 /obj/item/clothing/gloves/ring/gold,
-/obj/item/clothing/accessory/necklace/locket,
+/obj/item/clothing/neck/necklace/locket,
 /obj/item/coin/gold,
 /obj/effect/spawner/random/dirt/often,
 /obj/structure/closet/crate/wooden,
@@ -10550,7 +10550,7 @@
 	},
 /area/awaymission/jungle_planet/inside/complex)
 "nAu" = (
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/indestructible/grass,
 /area/awaymission/jungle_planet/outside/river)
 "nAK" = (
@@ -12491,7 +12491,7 @@
 /obj/item/coin/gold{
 	pixel_x = -9
 	},
-/obj/item/clothing/accessory/necklace/locket{
+/obj/item/clothing/neck/necklace/locket{
 	pixel_x = 9
 	},
 /obj/item/stack/ore/plasma,
@@ -13668,7 +13668,7 @@
 	},
 /area/awaymission/jungle_planet/inside/complex)
 "rDj" = (
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plating,
 /area/awaymission/jungle_planet/inside/complex)
 "rEW" = (
@@ -14006,7 +14006,7 @@
 /turf/simulated/floor/indestructible/grass,
 /area/awaymission/jungle_planet/outside/river)
 "rVt" = (
-/obj/random/toolbox,
+/obj/effect/spawner/random/engineering/toolbox,
 /turf/simulated/floor/plating,
 /area/awaymission/jungle_planet/outside/abandoned)
 "rVw" = (
@@ -15438,7 +15438,7 @@
 "tMG" = (
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/cobweb2,
-/obj/random/toolbox,
+/obj/effect/spawner/random/engineering/toolbox,
 /turf/simulated/floor/plating,
 /area/awaymission/jungle_planet/inside/complex)
 "tNq" = (
@@ -16467,7 +16467,7 @@
 "val" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /obj/structure/sign/poster/contraband/random/west,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/effect/spawner/random/dirt/often,
 /turf/simulated/floor/plating,
 /area/awaymission/jungle_planet/inside)
@@ -16819,8 +16819,8 @@
 "vvz" = (
 /obj/item/clothing/shoes/sandal,
 /obj/item/clothing/shoes/sandal,
-/obj/item/clothing/suit/unathi/mantle,
-/obj/item/clothing/suit/unathi/mantle,
+/obj/item/clothing/neck/cloak/unathi,
+/obj/item/clothing/neck/cloak/unathi,
 /obj/item/clothing/suit/unathi/robe,
 /obj/item/clothing/suit/unathi/robe,
 /obj/structure/closet/crate/wooden,
@@ -17755,10 +17755,10 @@
 	pixel_y = 11
 	},
 /obj/structure/stone_tile/slab,
-/obj/item/clothing/accessory/necklace/locket{
+/obj/item/clothing/neck/necklace/locket{
 	pixel_x = 9
 	},
-/obj/item/clothing/accessory/necklace/locket,
+/obj/item/clothing/neck/necklace/locket,
 /turf/simulated/floor/engine/cult,
 /area/awaymission/jungle_planet/outside/cave)
 "wEF" = (
diff --git a/_maps/map_files220/RandomZLevels/wildwest.dmm b/_maps/map_files220/RandomZLevels/wildwest.dmm
index fe4da4c2723c..de62efb0c7bb 100644
--- a/_maps/map_files220/RandomZLevels/wildwest.dmm
+++ b/_maps/map_files220/RandomZLevels/wildwest.dmm
@@ -1970,7 +1970,7 @@
 /area/awaymission/wildwest/wildwest_mines)
 "sg" = (
 /obj/structure/table/glass,
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /turf/simulated/floor/wood/oak,
 /area/awaymission/wildwest/wildwest_mines)
 "sq" = (
diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm
index 4460addb6e52..b0079e3887f0 100644
--- a/_maps/map_files220/generic/Admin_Zone.dmm
+++ b/_maps/map_files220/generic/Admin_Zone.dmm
@@ -1349,7 +1349,6 @@
 "eD" = (
 /obj/structure/table,
 /obj/item/tank/internals/oxygen/yellow,
-/obj/random/bomb_supply,
 /obj/item/clothing/head/sombrero/shamebrero,
 /turf/simulated/floor/wood/oak,
 /area/admin)
@@ -4510,7 +4509,7 @@
 /area/ghost_bar/outdoor)
 "pJ" = (
 /obj/structure/table/wood,
-/obj/item/toy/russian_revolver/trick_revolver,
+/obj/item/toy/russian_revolver/soul,
 /turf/simulated/floor/carpet/arcade,
 /area/admin)
 "pL" = (
@@ -4622,8 +4621,7 @@
 /area/ghost_bar/indoor)
 "qh" = (
 /obj/structure/table,
-/obj/random/toolbox,
-/obj/random/bomb_supply,
+/obj/effect/spawner/random/engineering/toolbox,
 /obj/machinery/syndicatebomb/badmin/clown,
 /turf/simulated/floor/wood/oak,
 /area/admin)
@@ -9060,7 +9058,7 @@
 /area/shuttle/trade/sol)
 "ES" = (
 /obj/structure/table/wood,
-/obj/item/gun/projectile/revolver/russian/soul,
+/obj/item/toy/russian_revolver/soul,
 /turf/simulated/floor/wood/oak,
 /area/admin)
 "ET" = (
@@ -10724,7 +10722,7 @@
 /area/ghost_bar/indoor)
 "KG" = (
 /obj/structure/table,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/item/clothing/gloves/color/yellow,
 /obj/item/pinpointer/advpinpointer,
 /turf/simulated/floor/wood/oak,
@@ -14608,7 +14606,7 @@
 /area/admin)
 "Yd" = (
 /obj/structure/table/wood,
-/obj/item/gun/projectile/revolver/russian,
+/obj/item/toy/russian_revolver,
 /turf/simulated/floor/wood/oak,
 /area/admin)
 "Ye" = (
diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm
index 6d668d52241b..f712cd48fc5a 100644
--- a/_maps/map_files220/generic/Lavaland.dmm
+++ b/_maps/map_files220/generic/Lavaland.dmm
@@ -1691,7 +1691,7 @@
 /area/lavaland/surface/outdoors)
 "dU" = (
 /obj/structure/rack,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plating,
 /area/mine/outpost/maintenance/south)
 "dV" = (
diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm
index 7d4ef101a522..9a0142b7a5ff 100644
--- a/_maps/map_files220/generic/centcomm.dmm
+++ b/_maps/map_files220/generic/centcomm.dmm
@@ -5413,8 +5413,8 @@
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/item/storage/backpack/satchel,
 /obj/item/clothing/under/color/black,
-/obj/item/clothing/accessory/blue,
-/obj/item/clothing/accessory/black,
+/obj/item/clothing/neck/tie/blue,
+/obj/item/clothing/neck/tie/black,
 /obj/item/clothing/accessory/holster,
 /obj/effect/turf_decal/tile/neutral/full{
 	color = "#000000"
@@ -7014,8 +7014,8 @@
 	name = "Supreme Judge ID card";
 	registered_name = "Supreme Judge"
 	},
-/obj/item/clothing/accessory/blue,
-/obj/item/clothing/accessory/black,
+/obj/item/clothing/neck/tie/blue,
+/obj/item/clothing/neck/tie/black,
 /obj/item/clothing/accessory/holster,
 /obj/effect/turf_decal/tile/neutral/full{
 	color = "#000000"
@@ -9044,19 +9044,19 @@
 /area/shuttle/administration)
 "frP" = (
 /obj/structure/rack/holorack,
-/obj/item/clothing/accessory/black{
+/obj/item/clothing/neck/tie/black{
 	desc = null;
 	name = "Black tie"
 	},
-/obj/item/clothing/accessory/blue{
+/obj/item/clothing/neck/tie/blue{
 	desc = null;
 	name = "Blue tie"
 	},
-/obj/item/clothing/accessory/blue{
+/obj/item/clothing/neck/tie/blue{
 	desc = null;
 	name = "Blue tie"
 	},
-/obj/item/clothing/accessory/black{
+/obj/item/clothing/neck/tie/black{
 	desc = null;
 	name = "Black tie"
 	},
@@ -18785,8 +18785,8 @@
 /obj/structure/rack,
 /obj/item/reagent_containers/applicator/dual,
 /obj/item/reagent_containers/applicator/dual,
-/obj/item/clothing/accessory/stethoscope,
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/item/storage/firstaid/tactical,
 /obj/item/storage/firstaid/tactical,
 /turf/simulated/floor/plasteel{
@@ -39631,7 +39631,7 @@
 /obj/item/folder/blue{
 	pixel_y = 2
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 3
 	},
 /turf/simulated/floor/plasteel{
diff --git a/_maps/map_files220/generic/centcomm_test.dmm b/_maps/map_files220/generic/centcomm_test.dmm
index 101b14c0aff7..b18797c9a1e6 100644
--- a/_maps/map_files220/generic/centcomm_test.dmm
+++ b/_maps/map_files220/generic/centcomm_test.dmm
@@ -294,7 +294,6 @@
 "eD" = (
 /obj/structure/table,
 /obj/item/tank/internals/oxygen/yellow,
-/obj/random/bomb_supply,
 /obj/item/clothing/head/sombrero/shamebrero,
 /turf/simulated/floor/wood/oak,
 /area/admin)
@@ -1053,7 +1052,7 @@
 /area/admin)
 "pJ" = (
 /obj/structure/table/wood,
-/obj/item/toy/russian_revolver/trick_revolver,
+/obj/item/toy/russian_revolver/soul,
 /turf/simulated/floor/carpet/arcade,
 /area/admin)
 "pN" = (
@@ -1074,8 +1073,7 @@
 /area/admin)
 "qh" = (
 /obj/structure/table,
-/obj/random/toolbox,
-/obj/random/bomb_supply,
+/obj/effect/spawner/random/engineering/toolbox,
 /obj/machinery/syndicatebomb/badmin/clown,
 /turf/simulated/floor/wood/oak,
 /area/admin)
@@ -1997,7 +1995,7 @@
 /area/admin)
 "ES" = (
 /obj/structure/table/wood,
-/obj/item/gun/projectile/revolver/russian/soul,
+/obj/item/toy/russian_revolver/soul,
 /turf/simulated/floor/wood/oak,
 /area/admin)
 "ET" = (
@@ -2478,7 +2476,7 @@
 /area/shuttle/escape)
 "KG" = (
 /obj/structure/table,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/item/clothing/gloves/color/yellow,
 /obj/item/pinpointer/advpinpointer,
 /turf/simulated/floor/wood/oak,
@@ -3489,7 +3487,7 @@
 /area/admin)
 "Yd" = (
 /obj/structure/table/wood,
-/obj/item/gun/projectile/revolver/russian,
+/obj/item/toy/russian_revolver,
 /turf/simulated/floor/wood/oak,
 /area/admin)
 "Yl" = (
diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm
index bf869712ef3c..3a1cf144e846 100644
--- a/_maps/map_files220/stations/boxstation.dmm
+++ b/_maps/map_files220/stations/boxstation.dmm
@@ -3310,8 +3310,7 @@
 /area/station/engineering/atmos)
 "apy" = (
 /obj/machinery/door/window/reinforced/normal{
-	dir = 8;
-	req_access = list(63)
+	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/windoor/access/any/security/general{
@@ -4226,8 +4225,7 @@
 /area/station/security/processing)
 "atp" = (
 /obj/machinery/door/window/reinforced/normal{
-	dir = 8;
-	req_access = list(63)
+	dir = 8
 	},
 /obj/effect/mapping_helpers/airlock/windoor/access/any/security/general{
 	dir = 8
@@ -13649,8 +13647,7 @@
 "baB" = (
 /obj/structure/closet/coffin,
 /obj/machinery/door/window/classic/normal{
-	name = "Coffin Storage";
-	req_access = list(22)
+	name = "Coffin Storage"
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -14243,7 +14240,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/light/directional/north,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
 "bcL" = (
@@ -14261,6 +14257,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/light/directional/north,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
 "bcN" = (
@@ -14455,7 +14452,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
 "bdq" = (
-/obj/machinery/light/directional/north,
 /obj/structure/sign/electricshock{
 	pixel_y = 32
 	},
@@ -14463,9 +14459,6 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
-/obj/machinery/camera{
-	c_tag = "Port Hallway 2"
-	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/port)
 "bdr" = (
@@ -15123,7 +15116,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
 "bgn" = (
-/obj/machinery/light/directional/north,
 /obj/structure/sign/directions/cargo{
 	dir = 4;
 	pixel_y = 25
@@ -15274,7 +15266,6 @@
 	},
 /area/station/hallway/secondary/entry)
 "bgJ" = (
-/obj/machinery/light/directional/north,
 /obj/machinery/firealarm/directional/north,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/plasteel,
@@ -15428,8 +15419,7 @@
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/window/classic/reversed{
 	dir = 4;
-	name = "Hydroponics Delivery";
-	req_access = list(35)
+	name = "Hydroponics Delivery"
 	},
 /obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{
 	dir = 4
@@ -16641,13 +16631,13 @@
 	},
 /area/station/service/chapel)
 "bmW" = (
-/obj/structure/sign/poster/official/random/south,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
 "bnd" = (
@@ -17125,13 +17115,15 @@
 	},
 /area/station/hallway/secondary/entry)
 "boT" = (
-/obj/machinery/firealarm/directional/south,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
 "boU" = (
@@ -17164,7 +17156,10 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
@@ -17339,16 +17334,6 @@
 /obj/item/storage/fancy/donut_box,
 /turf/simulated/floor/plasteel,
 /area/station/command/bridge)
-"bpF" = (
-/obj/machinery/alarm/directional/south,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/entry)
 "bpM" = (
 /obj/effect/landmark/start/chaplain,
 /obj/structure/disposalpipe/segment,
@@ -17467,7 +17452,7 @@
 /area/station/hallway/primary/central/nw)
 "bqr" = (
 /turf/simulated/wall,
-/area/station/public/vacant_office)
+/area/station/procedure/trainer_office)
 "bqs" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -17805,8 +17790,13 @@
 	},
 /area/station/command/bridge)
 "brU" = (
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreenfull"
+	},
+/area/station/procedure/trainer_office)
 "bsc" = (
 /obj/effect/spawner/random/cobweb/right/frequent,
 /obj/structure/rack,
@@ -17843,7 +17833,7 @@
 	},
 /area/station/hallway/secondary/entry)
 "bsi" = (
-/obj/random/plushie,
+/obj/effect/spawner/random/plushies,
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
 "bsk" = (
@@ -17906,6 +17896,9 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
 "bst" = (
@@ -18180,16 +18173,20 @@
 "btA" = (
 /obj/structure/table/wood,
 /obj/item/storage/briefcase,
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "btB" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp{
 	pixel_x = -2;
 	pixel_y = 4
 	},
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "btE" = (
 /obj/effect/spawner/random/barrier/grille_maybe,
 /obj/structure/cable{
@@ -18200,25 +18197,32 @@
 /area/station/maintenance/asmaint)
 "btF" = (
 /obj/item/kirbyplants,
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/obj/machinery/firealarm/directional/south,
+/turf/simulated/floor/plasteel{
+	dir = 10;
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "btG" = (
 /obj/structure/table/wood,
 /obj/item/taperecorder{
 	pixel_x = -4;
 	pixel_y = 2
 	},
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
-"btH" = (
-/obj/machinery/power/apc/directional/east,
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/machinery/door/window/classic/normal{
+	name = "Glass Door";
+	dir = 4
+	},
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer{
+	dir = 4
 	},
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
+"btH" = (
 /obj/structure/table/wood,
 /obj/item/camera,
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "btK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/start/explorer,
@@ -18409,25 +18413,20 @@
 	},
 /area/station/public/dorms)
 "buX" = (
-/obj/structure/computerframe,
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/obj/machinery/economy/vending/traindrobe,
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "bva" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass,
 /obj/effect/mapping_helpers/airlock/autoname,
 /turf/simulated/floor/carpet,
 /area/station/service/chapel)
-"bvb" = (
-/obj/structure/chair/comfy/black,
-/obj/machinery/newscaster/directional/north,
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
 "bvc" = (
 /obj/structure/table/wood,
 /obj/item/hand_labeler,
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "bve" = (
 /obj/structure/sign/poster/random{
 	pixel_y = 32
@@ -18465,14 +18464,18 @@
 "bvm" = (
 /obj/machinery/light_switch/west,
 /obj/machinery/light/directional/west,
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/obj/machinery/door/window/classic/normal{
+	name = "Glass Door"
+	},
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer,
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "bvn" = (
 /obj/structure/chair/comfy/black{
 	dir = 1
 	},
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "bvo" = (
 /obj/machinery/atmospherics/unary/tank/air{
 	dir = 4
@@ -18721,12 +18724,12 @@
 /turf/simulated/floor/plasteel,
 /area/station/science/robotics/chargebay)
 "bwM" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/machinery/firealarm/directional/east,
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/turf/simulated/floor/plasteel{
+	dir = 5;
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "bwN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -19074,15 +19077,18 @@
 /area/station/command/bridge)
 "byh" = (
 /obj/item/radio/intercom/directional/south,
+/obj/structure/chair/office/dark{
+	dir = 8
+	},
 /obj/machinery/camera{
-	c_tag = "Vacant Office";
+	c_tag = "Career Trainer's Office";
 	dir = 1
 	},
-/obj/structure/chair/office/dark{
-	dir = 8
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen"
 	},
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/area/station/procedure/trainer_office)
 "byj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel,
@@ -19686,20 +19692,23 @@
 	},
 /area/station/hallway/primary/central/west)
 "bBr" = (
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/command/glass{
+	id_tag = "nct"
+	},
 /obj/effect/mapping_helpers/airlock/autoname,
 /obj/machinery/door/firedoor,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
+/obj/effect/mapping_helpers/airlock/polarized{
+	id = "NCT"
+	},
+/turf/simulated/floor/plasteel,
+/area/station/procedure/trainer_office)
 "bBy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -20072,9 +20081,6 @@
 /area/station/maintenance/aft)
 "bDu" = (
 /obj/machinery/light/directional/east,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel,
@@ -20220,9 +20226,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/service/chapel)
 "bEm" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/status_display/directional/east,
@@ -21138,9 +21141,6 @@
 /turf/simulated/wall,
 /area/station/science/robotics)
 "bIb" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
@@ -21496,9 +21496,6 @@
 /area/station/science/rnd)
 "bJs" = (
 /obj/structure/extinguisher_cabinet/directional/east,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel,
@@ -22610,13 +22607,13 @@
 /obj/item/clipboard{
 	pixel_y = 3
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 3
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 6
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 9
 	},
 /obj/machinery/light_switch/west,
@@ -22915,8 +22912,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/classic/normal{
 	dir = 8;
-	name = "Cargo Desk";
-	req_access = list(50)
+	name = "Cargo Desk"
 	},
 /obj/structure/noticeboard{
 	pixel_y = 27
@@ -26069,6 +26065,10 @@
 "cdN" = (
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/south)
+"cdO" = (
+/obj/structure/closet,
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "cdP" = (
 /obj/effect/turf_decal/stripes/corner,
 /obj/structure/cable{
@@ -26534,7 +26534,7 @@
 	pixel_x = -6;
 	pixel_y = 2
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_x = 4;
 	pixel_y = 6
 	},
@@ -27340,8 +27340,7 @@
 "cjG" = (
 /obj/machinery/door/window/classic/reversed{
 	dir = 8;
-	name = "Do Not Revive";
-	req_access = list(6)
+	name = "Do Not Revive"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/morgue{
@@ -29287,8 +29286,6 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	d1 = 2;
-	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -32562,8 +32559,6 @@
 	dir = 4
 	},
 /obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -34260,8 +34255,7 @@
 /area/station/engineering/tech_storage)
 "cKD" = (
 /obj/machinery/door/airlock/medical{
-	locked = 1;
-	req_access = list(33)
+	locked = 1
 	},
 /obj/effect/mapping_helpers/airlock/autoname,
 /obj/effect/mapping_helpers/airlock/access/any/medical/chemistry,
@@ -38379,16 +38373,9 @@
 /turf/simulated/floor/wood/fancy/cherry,
 /area/station/command/office/captain)
 "dab" = (
-/obj/structure/table,
+/obj/machinery/autolathe,
 /obj/machinery/light/directional/east,
 /obj/item/radio/intercom/directional/east,
-/obj/item/stack/rods{
-	amount = 50
-	},
-/obj/item/stack/rods{
-	amount = 50;
-	pixel_y = -6
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkyellowfull"
 	},
@@ -38770,6 +38757,13 @@
 /obj/structure/table,
 /obj/machinery/firealarm/directional/east,
 /obj/item/crowbar/large,
+/obj/item/stack/rods{
+	amount = 50
+	},
+/obj/item/stack/rods{
+	amount = 50;
+	pixel_y = -6
+	},
 /obj/item/crowbar/large{
 	pixel_y = 4
 	},
@@ -45179,11 +45173,26 @@
 /turf/simulated/wall/r_wall,
 /area/station/maintenance/aft)
 "ehb" = (
-/obj/machinery/door/airlock/public/glass,
+/obj/machinery/door/airlock/command/glass{
+	id_tag = "nct"
+	},
 /obj/effect/mapping_helpers/airlock/autoname,
 /obj/machinery/door/firedoor,
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
+/obj/effect/mapping_helpers/airlock/polarized{
+	id = "NCT"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plasteel,
+/area/station/procedure/trainer_office)
 "ehi" = (
 /obj/effect/spawner/window/reinforced/polarized/grilled{
 	id = "conference"
@@ -45583,6 +45592,7 @@
 /obj/structure/disposalpipe/segment/corner{
 	dir = 8
 	},
+/obj/machinery/light/directional/south,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/port)
 "epT" = (
@@ -45621,14 +45631,15 @@
 "eqL" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin{
-	pixel_x = -2;
+	pixel_x = -6;
 	pixel_y = 4
 	},
 /obj/item/pen{
-	pixel_y = 8
+	pixel_x = 6
 	},
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/obj/structure/window/reinforced,
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "eqO" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel,
@@ -47711,6 +47722,18 @@
 /obj/machinery/seed_extractor,
 /turf/simulated/floor/grass,
 /area/station/security/permabrig)
+"ffQ" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+	id = "NCT"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
 "ffY" = (
 /obj/machinery/atmospherics/pipe/simple/visible/universal{
 	dir = 4
@@ -49306,6 +49329,11 @@
 	icon_state = "dark"
 	},
 /area/station/engineering/secure_storage)
+"fKq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/entry)
 "fKw" = (
 /obj/structure/sign/poster/random{
 	pixel_y = 32
@@ -49547,6 +49575,18 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
+"fQP" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+	id = "NCT"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
 "fRo" = (
 /obj/effect/spawner/random/cobweb/right/frequent,
 /obj/structure/chair,
@@ -52372,6 +52412,16 @@
 	icon_state = "dark"
 	},
 /area/station/engineering/equipmentstorage)
+"gQu" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/camera{
+	c_tag = "Port Hallway";
+	dir = 1
+	},
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/port)
 "gQD" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -52787,13 +52837,11 @@
 /area/station/hallway/primary/aft)
 "gXL" = (
 /obj/machinery/door/window/classic/reversed{
-	name = "Toxins Launcher";
-	req_access = list(7)
+	name = "Toxins Launcher"
 	},
 /obj/machinery/door/window/classic/reversed{
 	dir = 1;
-	name = "Toxins Launcher";
-	req_access = list(7)
+	name = "Toxins Launcher"
 	},
 /obj/machinery/door/poddoor/preopen{
 	id_tag = "Biohazard";
@@ -53466,16 +53514,13 @@
 /area/station/service/chapel/office)
 "hjH" = (
 /obj/machinery/light/directional/east,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/table/wood,
 /obj/item/toner,
 /obj/item/toner{
 	pixel_y = 6
 	},
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "hjO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -55758,8 +55803,9 @@
 /obj/structure/chair/office/dark{
 	dir = 4
 	},
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "ibM" = (
 /obj/machinery/power/apc/directional/south,
 /obj/structure/cable{
@@ -57058,9 +57104,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/command/glass{
-	req_access = list(16)
-	},
+/obj/machinery/door/airlock/command/glass,
 /obj/effect/mapping_helpers/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -57502,10 +57546,6 @@
 /turf/simulated/floor/carpet,
 /area/station/maintenance/asmaint)
 "iPh" = (
-/obj/machinery/camera{
-	c_tag = "Port Hallway";
-	dir = 1
-	},
 /obj/machinery/light/directional/south,
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -58122,8 +58162,13 @@
 /area/station/maintenance/asmaint2)
 "jcg" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreenfull"
+	},
+/area/station/procedure/trainer_office)
 "jcp" = (
 /obj/structure/musician/piano{
 	dir = 8
@@ -58432,9 +58477,6 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
@@ -58672,11 +58714,11 @@
 	},
 /area/station/public/toilet/lockerroom)
 "joq" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen";
+	dir = 1
 	},
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/area/station/procedure/trainer_office)
 "jot" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -59606,6 +59648,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint2)
+"jGi" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+	id = "NCT"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
 "jGG" = (
 /obj/structure/grille/broken,
 /obj/item/stack/rods,
@@ -59894,6 +59945,12 @@
 	},
 /turf/space,
 /area/space/nearstation)
+"jMX" = (
+/obj/structure/filingcabinet,
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "jNd" = (
 /obj/machinery/alarm/directional/south,
 /turf/simulated/floor/plasteel{
@@ -63841,6 +63898,13 @@
 	icon_state = "bluecorner"
 	},
 /area/station/hallway/primary/fore)
+"lnP" = (
+/obj/item/kirbyplants,
+/turf/simulated/floor/plasteel{
+	dir = 6;
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "lnQ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -65351,7 +65415,6 @@
 /obj/structure/window/reinforced,
 /obj/machinery/door/window/classic/normal{
 	layer = 3;
-	req_access = list(50);
 	dir = 1;
 	name = "Delivery Chute"
 	},
@@ -67474,7 +67537,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/random/hampter,
+/obj/effect/spawner/random/toy/hampter,
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
 	},
@@ -69188,8 +69251,8 @@
 /area/station/command/office/blueshield)
 "nmJ" = (
 /obj/structure/chair/comfy/black,
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "nmO" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -69623,8 +69686,6 @@
 	dir = 8
 	},
 /obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -70120,7 +70181,7 @@
 "nDi" = (
 /obj/structure/bed,
 /obj/machinery/light/small/directional/east,
-/obj/random/hampter,
+/obj/effect/spawner/random/toy/hampter,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
 "nDq" = (
@@ -71494,6 +71555,16 @@
 /obj/item/radio/intercom/directional/west,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/se)
+"ofH" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/camera{
+	c_tag = "Port Hallway 2";
+	dir = 1
+	},
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/port)
 "ofP" = (
 /obj/structure/sign/restroom{
 	pixel_x = 32
@@ -72474,6 +72545,21 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
+"owW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen";
+	dir = 1
+	},
+/area/station/procedure/trainer_office)
 "oxe" = (
 /obj/effect/spawner/random/maintenance,
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -72524,9 +72610,18 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "oyG" = (
-/obj/machinery/alarm/directional/west,
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/obj/machinery/door_control/normal/west{
+	id = "nct";
+	name = "Office Door Control";
+	req_access = list(80);
+	pixel_y = 6
+	},
+/obj/machinery/button/windowtint/west{
+	pixel_y = -6;
+	id = "NCT"
+	},
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "oyH" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -73678,18 +73773,20 @@
 /turf/simulated/floor/plasteel,
 /area/station/command/bridge)
 "oTT" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/hologram/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen";
+	dir = 1
+	},
+/area/station/procedure/trainer_office)
 "oUf" = (
 /obj/effect/turf_decal/delivery/red/hollow,
 /obj/machinery/economy/vending/secdrobe,
@@ -74044,7 +74141,7 @@
 /obj/structure/safe/floor{
 	known_by = list("captain")
 	},
-/obj/item/gun/projectile/revolver/russian,
+/obj/item/toy/russian_revolver,
 /obj/item/reagent_containers/drinks/bottle/absinthe/premium,
 /obj/item/storage/fancy/cigarettes/cigpack_robustgold,
 /obj/item/toy/figure/crew/captain,
@@ -74571,8 +74668,11 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/obj/machinery/alarm/directional/south,
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "pkf" = (
 /obj/machinery/door/airlock/external{
 	locked = 1
@@ -75565,7 +75665,7 @@
 "pAM" = (
 /obj/structure/table,
 /obj/item/soap/deluxe,
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
@@ -77857,8 +77957,14 @@
 /area/station/maintenance/fsmaint)
 "qtA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/obj/machinery/hologram/holopad,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreenfull"
+	},
+/area/station/procedure/trainer_office)
 "qtC" = (
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -79127,8 +79233,11 @@
 /area/station/maintenance/asmaint)
 "qON" = (
 /obj/machinery/photocopier,
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/obj/machinery/newscaster/directional/south,
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "qOP" = (
 /obj/machinery/door/airlock/atmos,
 /obj/effect/mapping_helpers/airlock/autoname,
@@ -80146,21 +80255,14 @@
 	icon_state = "whitepurple"
 	},
 /area/station/science/xenobiology)
-"rjP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/light/directional/south,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/entry)
 "rjY" = (
 /obj/structure/table/wood,
 /obj/item/paicard,
-/turf/simulated/floor/carpet,
-/area/station/public/vacant_office)
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "rkb" = (
 /obj/effect/spawner/random/oil/maybe,
 /obj/structure/cable{
@@ -80202,6 +80304,21 @@
 	icon_state = "purple"
 	},
 /area/station/science/hallway)
+"rkX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen";
+	dir = 1
+	},
+/area/station/procedure/trainer_office)
 "rlm" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 9
@@ -80437,9 +80554,13 @@
 /turf/simulated/floor/plasteel,
 /area/station/supply/warehouse)
 "rrL" = (
-/obj/structure/bookcase,
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/obj/machinery/papershredder,
+/obj/machinery/power/apc/directional/south,
+/obj/structure/cable,
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "rsv" = (
 /obj/machinery/atmospherics/unary/outlet_injector/on{
 	dir = 8
@@ -81116,8 +81237,6 @@
 /area/station/engineering/utility)
 "rIw" = (
 /obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -83351,17 +83470,17 @@
 /turf/simulated/floor/plasteel,
 /area/station/public/locker)
 "sAq" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/wood/oak,
-/area/station/public/vacant_office)
+/turf/simulated/floor/plasteel{
+	dir = 9;
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "sAy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 4
@@ -84208,7 +84327,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint2)
 "sPu" = (
-/obj/item/clothing/suit/mantle/old,
+/obj/item/clothing/neck/cloak/old,
 /turf/simulated/floor/carpet,
 /area/station/maintenance/asmaint)
 "sPx" = (
@@ -86571,7 +86690,7 @@
 "tMs" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/spawner/random/blood/often,
-/obj/random/mech,
+/obj/effect/spawner/random/toy/mech_figure,
 /turf/simulated/floor/plating,
 /area/station/maintenance/disposal)
 "tMx" = (
@@ -87058,7 +87177,7 @@
 /area/station/command/bridge)
 "tUd" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/item/crowbar,
 /obj/effect/landmark/spawner/nukedisc_respawn,
 /obj/effect/spawner/random/cobweb/left/frequent,
@@ -88995,6 +89114,20 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
+"uDF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/alarm/directional/south,
+/obj/machinery/light/directional/south,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/entry)
 "uDJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/random{
@@ -89118,9 +89251,6 @@
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
 "uGE" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
@@ -90192,7 +90322,7 @@
 /area/station/maintenance/fsmaint)
 "vbD" = (
 /obj/structure/bed/psych,
-/obj/random/therapy,
+/obj/effect/spawner/random/toy/therapy_doll,
 /obj/machinery/newscaster/directional/east,
 /turf/simulated/floor/wood/oak,
 /area/station/medical/psych)
@@ -92477,6 +92607,15 @@
 	},
 /turf/simulated/floor/carpet/green,
 /area/station/public/arcade)
+"vSt" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+	id = "NCT"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
 "vSz" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -92675,7 +92814,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/shoes/sandal/white,
 /obj/item/clothing/under/pants/white,
-/obj/item/clothing/accessory/scarf/white,
+/obj/item/clothing/neck/scarf/white,
 /obj/effect/spawner/random/maintenance,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -94680,8 +94819,7 @@
 "wMl" = (
 /obj/machinery/door/window/classic/reversed{
 	dir = 4;
-	name = "Do Not Revive";
-	req_access = list(6)
+	name = "Do Not Revive"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/morgue{
@@ -94797,7 +94935,7 @@
 /obj/structure/bed,
 /obj/item/bedsheet/black,
 /obj/effect/spawner/random/cobweb/right/rare,
-/obj/random/hampter,
+/obj/effect/spawner/random/toy/hampter,
 /turf/simulated/floor/carpet/royalblack,
 /area/station/maintenance/apmaint)
 "wOf" = (
@@ -95126,9 +95264,7 @@
 	},
 /area/station/maintenance/asmaint)
 "wVH" = (
-/obj/machinery/door/airlock/security/glass{
-	req_access = list(1)
-	},
+/obj/machinery/door/airlock/security/glass,
 /obj/effect/mapping_helpers/airlock/autoname,
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -96846,6 +96982,13 @@
 "xBl" = (
 /turf/simulated/floor/grass,
 /area/station/security/permabrig)
+"xBp" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/light/directional/south,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/port)
 "xBw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -98030,6 +98173,14 @@
 /obj/item/trash/chips,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint2)
+"xWI" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp{
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/turf/simulated/floor/carpet/black,
+/area/station/procedure/trainer_office)
 "xWJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/south,
@@ -111660,7 +111811,7 @@ hCn
 uGE
 bDu
 bEm
-plc
+fKq
 bIb
 bJs
 jiy
@@ -112424,11 +112575,11 @@ bjO
 vcQ
 brk
 bgB
-bqr
-buX
+vSt
+cdO
 ibL
 eqL
-sAq
+rkX
 rrL
 bqr
 bFY
@@ -112680,13 +112831,13 @@ bhm
 bhm
 aSX
 brk
-bpF
-bqr
+bgB
+fQP
 rjY
 btG
 btB
-sAq
-rrL
+owW
+jMX
 bqr
 bFZ
 nfo
@@ -113195,9 +113346,9 @@ bhv
 aSY
 brk
 boT
-bqr
+ffQ
 nmJ
-btB
+xWI
 bvn
 joq
 byh
@@ -113451,9 +113602,9 @@ aMs
 aMs
 aMs
 brn
-rjP
-bqr
-bvb
+boT
+jGi
+nmJ
 btA
 bvn
 joq
@@ -113708,13 +113859,13 @@ biv
 bkd
 blJ
 brk
-bgB
+uDF
 bqr
 bvc
 btH
 hjH
 bwM
-btF
+lnP
 bqr
 bGb
 bJu
@@ -113965,7 +114116,7 @@ blh
 blh
 blh
 brp
-bgB
+boT
 bqr
 bqr
 bqr
@@ -114733,7 +114884,7 @@ bgM
 beP
 bgz
 vJv
-bgz
+bki
 blM
 dig
 dfh
@@ -118331,7 +118482,7 @@ bdk
 beR
 bgz
 vJv
-oll
+xBp
 blM
 bnI
 bnD
@@ -118845,7 +118996,7 @@ aaa
 beL
 bgA
 vJv
-oll
+ofH
 blM
 blM
 blM
@@ -120644,7 +120795,7 @@ aab
 beL
 bgA
 vJv
-oll
+gQu
 blR
 iFm
 rEs
diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm
index 1b0eb5fc9a85..d0e78d395687 100644
--- a/_maps/map_files220/stations/deltastation.dmm
+++ b/_maps/map_files220/stations/deltastation.dmm
@@ -120,7 +120,7 @@
 /turf/space,
 /area/station/maintenance/solar_maintenance/port)
 "acn" = (
-/obj/structure/machine_frame,
+/obj/machinery/autolathe,
 /obj/effect/turf_decal/delivery/hollow,
 /obj/machinery/economy/vending/wallmed/directional/east,
 /turf/simulated/floor/plasteel{
@@ -969,10 +969,16 @@
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
 "ahy" = (
-/obj/machinery/door/airlock/glass,
-/obj/effect/mapping_helpers/airlock/autoname,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/command/glass{
+	id_tag = "nct"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/polarized{
+	id = "NCT"
+	},
 /turf/simulated/floor/plasteel,
 /area/station/public/vacant_office)
 "ahz" = (
@@ -1936,9 +1942,7 @@
 /area/station/supply/warehouse)
 "aoe" = (
 /obj/structure/table,
-/obj/random/toolbox{
-	pixel_y = 2
-	},
+/obj/effect/spawner/random/engineering/toolbox,
 /obj/machinery/newscaster/directional/east,
 /obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel,
@@ -2122,7 +2126,7 @@
 /area/station/maintenance/fore)
 "aoS" = (
 /obj/structure/table,
-/obj/random/toolbox,
+/obj/effect/spawner/random/engineering/toolbox,
 /obj/item/wrench,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
@@ -2135,6 +2139,9 @@
 "aoV" = (
 /obj/machinery/photocopier,
 /obj/machinery/light/small/directional/north,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plasteel/grimy,
 /area/station/public/vacant_office)
 "aoX" = (
@@ -2148,7 +2155,10 @@
 "aoY" = (
 /obj/item/kirbyplants,
 /obj/machinery/firealarm/directional/north,
-/turf/simulated/floor/wood/oak,
+/turf/simulated/floor/plasteel{
+	dir = 9;
+	icon_state = "darkgreen"
+	},
 /area/station/public/vacant_office)
 "aoZ" = (
 /obj/item/radio/intercom/directional/east,
@@ -2161,20 +2171,24 @@
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp,
 /obj/machinery/light_switch/north,
-/turf/simulated/floor/wood/oak,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "apb" = (
 /obj/structure/table/wood,
 /obj/item/taperecorder,
 /obj/machinery/light/small/directional/north,
 /obj/machinery/status_display/directional/north,
-/turf/simulated/floor/wood/oak,
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "apc" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin,
 /obj/item/pen,
-/turf/simulated/floor/wood/oak,
+/obj/machinery/newscaster/directional/north,
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "ape" = (
 /obj/structure/table/reinforced,
@@ -2426,18 +2440,34 @@
 	},
 /obj/item/folder/yellow,
 /obj/item/pen,
-/turf/simulated/floor/wood/oak,
+/obj/machinery/door/window/classic/normal{
+	name = "Glass Door";
+	dir = 8
+	},
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "apS" = (
 /obj/structure/chair/office/light{
 	dir = 8
 	},
-/turf/simulated/floor/wood/oak,
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "apT" = (
-/obj/machinery/status_display/directional/east,
-/obj/structure/computerframe,
-/turf/simulated/floor/wood/oak,
+/obj/structure/filingcabinet,
+/obj/machinery/door_control/normal/east{
+	pixel_y = 6;
+	id = "nct";
+	name = "Office Door Control";
+	req_access = list(80)
+	},
+/obj/machinery/button/windowtint/east{
+	pixel_y = -6;
+	id = "NCT"
+	},
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "apV" = (
 /obj/machinery/keycard_auth/west,
@@ -2699,30 +2729,30 @@
 /turf/simulated/floor/plasteel/grimy,
 /area/station/public/vacant_office)
 "aqJ" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
+	dir = 1
 	},
 /turf/simulated/floor/plasteel/grimy,
 /area/station/public/vacant_office)
 "aqN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkgreen"
 	},
-/turf/simulated/floor/wood/oak,
 /area/station/public/vacant_office)
 "aqO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/door/window/classic/normal{
+	name = "Glass Door";
 	dir = 8
 	},
-/turf/simulated/floor/wood/oak,
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "aqQ" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp,
-/turf/simulated/floor/wood/oak,
+/obj/structure/closet,
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "aqR" = (
 /obj/machinery/ai_status_display/west,
@@ -2948,7 +2978,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/random/hampter,
+/obj/effect/spawner/random/toy/hampter,
 /obj/effect/mapping_helpers/turfs/damage,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/electrical_shop)
@@ -3000,7 +3030,7 @@
 /turf/simulated/floor/plasteel/grimy,
 /area/station/public/vacant_office)
 "arC" = (
-/obj/structure/filingcabinet/chestdrawer,
+/obj/machinery/papershredder,
 /obj/machinery/light/small/directional/south,
 /turf/simulated/floor/plasteel/grimy,
 /area/station/public/vacant_office)
@@ -3008,19 +3038,25 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/wood/oak,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 6;
+	icon_state = "darkgreen"
+	},
 /area/station/public/vacant_office)
 "arF" = (
 /obj/item/kirbyplants,
-/turf/simulated/floor/wood/oak,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "arG" = (
-/obj/structure/table/wood,
-/obj/item/camera,
 /obj/machinery/light/small/directional/south,
-/obj/item/camera_film,
-/obj/item/camera_film,
-/turf/simulated/floor/wood/oak,
+/obj/machinery/economy/vending/traindrobe,
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "arH" = (
 /obj/machinery/light/small/directional/north,
@@ -3260,7 +3296,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
 "ast" = (
-/turf/simulated/floor/wood/oak,
+/turf/simulated/floor/carpet/black,
 /area/station/public/vacant_office)
 "asw" = (
 /obj/machinery/status_display/directional/west,
@@ -34939,7 +34975,7 @@
 "cOF" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/crayon,
-/obj/item/clothing/suit/mantle/old,
+/obj/item/clothing/neck/cloak/old,
 /turf/simulated/floor/carpet,
 /area/station/maintenance/port)
 "cOG" = (
@@ -41009,6 +41045,15 @@
 	icon_state = "whitegreen"
 	},
 /area/station/medical/medbay)
+"dqB" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+	id = "NCT"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating,
+/area/station/public/vacant_office)
 "dqC" = (
 /obj/machinery/door/window/classic/reversed{
 	name = "Chemistry Delivery"
@@ -54843,7 +54888,7 @@
 /obj/structure/table/wood,
 /obj/item/reagent_containers/drinks/drinkingglass/shotglass,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/gun/projectile/revolver/russian{
+/obj/item/toy/russian_revolver{
 	pixel_y = 12
 	},
 /turf/simulated/floor/wood/oak,
@@ -56825,6 +56870,18 @@
 /obj/item/shard,
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard)
+"gTa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel/grimy,
+/area/station/public/vacant_office)
 "gTc" = (
 /obj/structure/railing/corner{
 	dir = 8
@@ -57283,6 +57340,14 @@
 	icon_state = "caution"
 	},
 /area/station/maintenance/electrical)
+"hbo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+	dir = 5;
+	icon_state = "darkgreen"
+	},
+/area/station/public/vacant_office)
 "hbq" = (
 /obj/effect/spawner/window/reinforced/plasma/grilled,
 /obj/machinery/atmospherics/pipe/simple/visible,
@@ -57299,7 +57364,7 @@
 /obj/structure/safe/floor{
 	known_by = list("captain")
 	},
-/obj/item/gun/projectile/revolver/russian,
+/obj/item/toy/russian_revolver,
 /obj/item/toy/figure/crew/captain,
 /obj/item/storage/fancy/cigarettes/cigpack_robustgold,
 /obj/item/lighter/zippo/nt_rep,
@@ -59284,7 +59349,7 @@
 /area/station/security/checkpoint/south)
 "hIj" = (
 /obj/structure/bed/psych,
-/obj/random/therapy,
+/obj/effect/spawner/random/toy/therapy_doll,
 /obj/effect/turf_decal/siding/wood/oak,
 /turf/simulated/floor/wood/oak,
 /area/station/medical/psych)
@@ -61133,7 +61198,6 @@
 /obj/structure/table/wood,
 /obj/item/paper_bin,
 /obj/item/pen,
-/obj/machinery/newscaster/directional/north,
 /turf/simulated/floor/plasteel/grimy,
 /area/station/public/vacant_office)
 "imx" = (
@@ -65060,7 +65124,7 @@
 "jvm" = (
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
-/obj/random/hampter,
+/obj/effect/spawner/random/toy/hampter,
 /turf/simulated/floor/plasteel{
 	icon_state = "redyellowfull"
 	},
@@ -69874,6 +69938,12 @@
 /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/port)
+"kWy" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel/grimy,
+/area/station/public/vacant_office)
 "kWB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -69899,6 +69969,15 @@
 /obj/machinery/light/directional/south,
 /turf/simulated/floor/engine,
 /area/station/science/test_chamber)
+"kWK" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+	id = "NCT"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/plating,
+/area/station/public/vacant_office)
 "kWO" = (
 /obj/structure/chair/sofa/corp/left{
 	dir = 1
@@ -72687,7 +72766,7 @@
 	pixel_x = -6;
 	pixel_y = 2
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_x = 14;
 	pixel_y = 4
 	},
@@ -73180,7 +73259,7 @@
 "lYq" = (
 /obj/structure/table/wood/poker,
 /obj/effect/decal/cleanable/dirt,
-/obj/random/hampter,
+/obj/effect/spawner/random/toy/hampter,
 /turf/simulated/floor/plasteel/grimy,
 /area/station/maintenance/abandonedbar)
 "lYz" = (
@@ -73811,13 +73890,13 @@
 /obj/item/clipboard{
 	pixel_y = 3
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 3
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 6
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 9
 	},
 /obj/machinery/door/poddoor/preopen{
@@ -74209,9 +74288,19 @@
 	},
 /area/station/public/toilet)
 "mqF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/wood/oak,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "darkgreen"
+	},
 /area/station/public/vacant_office)
 "mqG" = (
 /obj/structure/cable{
@@ -75986,6 +76075,15 @@
 	},
 /turf/simulated/floor/wood/parquet/tile,
 /area/station/service/library)
+"mWg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/plasteel/grimy,
+/area/station/public/vacant_office)
 "mWM" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -78248,7 +78346,10 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/simulated/floor/wood/oak,
+/turf/simulated/floor/plasteel{
+	dir = 10;
+	icon_state = "darkgreen"
+	},
 /area/station/public/vacant_office)
 "nEn" = (
 /obj/structure/disposalpipe/segment,
@@ -82850,8 +82951,8 @@
 	},
 /area/station/hallway/primary/central/sw)
 "oYb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
 	},
 /turf/simulated/floor/plasteel/grimy,
 /area/station/public/vacant_office)
@@ -86377,11 +86478,8 @@
 /area/station/maintenance/starboard)
 "qbx" = (
 /obj/structure/table,
-/obj/random/tool,
-/obj/random/tool{
-	pixel_x = 3;
-	pixel_y = 5
-	},
+/obj/effect/spawner/random/engineering/tools,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plating,
 /area/station/maintenance/virology_maint)
 "qbB" = (
@@ -87062,6 +87160,21 @@
 	icon_state = "neutral"
 	},
 /area/station/public/locker)
+"qnj" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+	id = "NCT"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/plating,
+/area/station/public/vacant_office)
 "qno" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
@@ -88879,6 +88992,18 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/carpet,
 /area/station/service/library)
+"qQa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel/grimy,
+/area/station/public/vacant_office)
 "qQx" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 10
@@ -89082,6 +89207,21 @@
 /obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel/dark,
 /area/station/maintenance/apmaint)
+"qSe" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkgreen"
+	},
+/area/station/public/vacant_office)
 "qSh" = (
 /obj/machinery/door/airlock/external{
 	hackProof = 1;
@@ -92106,6 +92246,10 @@
 	icon_state = "dark_small"
 	},
 /area/station/security/execution)
+"rQn" = (
+/obj/machinery/status_display/directional/east,
+/turf/simulated/floor/carpet/black,
+/area/station/public/vacant_office)
 "rQp" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -96277,7 +96421,7 @@
 /area/station/service/library)
 "teK" = (
 /obj/structure/rack,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/effect/spawner/random/maintenance,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
@@ -98761,13 +98905,13 @@
 	},
 /area/station/maintenance/starboard2)
 "tUZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "darkgreen"
 	},
-/turf/simulated/floor/wood/oak,
 /area/station/public/vacant_office)
 "tVj" = (
 /obj/effect/spawner/window/reinforced/grilled,
@@ -98869,6 +99013,7 @@
 	},
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
 /turf/simulated/floor/plating,
 /area/station/public/vacant_office)
 "tWL" = (
@@ -103770,7 +103915,7 @@
 "vCV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
 "vCZ" = (
@@ -103912,14 +104057,6 @@
 /obj/structure/table/wood,
 /obj/item/stack/package_wrap,
 /obj/item/hand_labeler,
-/obj/machinery/newscaster/directional/north,
-/turf/simulated/floor/plasteel/grimy,
-/area/station/public/vacant_office)
-"vEV" = (
-/obj/structure/chair/office/light,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel/grimy,
 /area/station/public/vacant_office)
 "vFu" = (
@@ -143976,9 +144113,9 @@ aaa
 adb
 ant
 anP
-aoo
+dqB
 imf
-apM
+kWy
 aqJ
 arB
 aoo
@@ -144231,12 +144368,12 @@ aaa
 abj
 aaa
 adb
-ant
-nCK
-aoo
+ann
+anP
+qnj
 aoV
+mWg
 apM
-oYb
 arC
 aoo
 uCt
@@ -144490,9 +144627,9 @@ aaa
 acC
 ant
 anP
-aoo
+kWK
 vET
-apM
+gTa
 oYb
 aqY
 aoo
@@ -144749,8 +144886,8 @@ ant
 rBP
 aoo
 aoX
-apM
-vEV
+qQa
+aqI
 arx
 aoo
 aVK
@@ -145006,7 +145143,7 @@ ant
 anP
 aoo
 aoY
-ast
+qSe
 aqN
 nEe
 aoo
@@ -145262,7 +145399,7 @@ acC
 ant
 dWx
 ahy
-mqF
+hbo
 mqF
 tUZ
 arE
@@ -146035,7 +146172,7 @@ nCK
 aoo
 apc
 apT
-ast
+rQn
 aqQ
 aoo
 azb
diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm
index 39851a8b89fd..0e3af94fb22a 100644
--- a/_maps/map_files220/stations/metastation.dmm
+++ b/_maps/map_files220/stations/metastation.dmm
@@ -532,12 +532,20 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
 "agh" = (
-/obj/structure/table,
-/obj/item/multitool,
+/obj/machinery/light{
+	dir = 8
+	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
+/obj/machinery/requests_console/directional/west,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/mob/living/simple_animal/lizard{
+	name = "Wags-His-Tail";
+	real_name = "Wags-His-Tail"
+	},
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "agi" = (
 /turf/simulated/floor/catwalk,
 /area/station/maintenance/fore)
@@ -1679,12 +1687,12 @@
 /area/station/maintenance/port)
 "anI" = (
 /obj/structure/rack,
-/obj/item/clothing/accessory/red{
+/obj/item/clothing/neck/tie/red{
 	pixel_x = -5;
 	pixel_y = 3
 	},
-/obj/item/clothing/accessory/horrible,
-/obj/item/clothing/accessory/blue{
+/obj/item/clothing/neck/tie/horrible,
+/obj/item/clothing/neck/tie/blue{
 	pixel_x = 5;
 	pixel_y = -2
 	},
@@ -2465,7 +2473,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -3165,7 +3173,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -3456,12 +3464,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
-"awv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/station/maintenance/fsmaint)
 "aww" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -5524,15 +5526,6 @@
 	icon_state = "barber"
 	},
 /area/station/public/dorms)
-"aFM" = (
-/obj/effect/spawner/random/barrier/grille_often,
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/station/maintenance/fsmaint)
 "aFO" = (
 /obj/effect/spawner/random/fungus/frequent,
 /turf/simulated/wall,
@@ -10083,7 +10076,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/station/public/fitness)
@@ -10094,11 +10087,10 @@
 /area/station/command/office/hos)
 "aWf" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
+/obj/structure/closet/jcloset,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "aWi" = (
 /obj/structure/extinguisher_cabinet/directional/east,
 /obj/item/kirbyplants/plant11,
@@ -12213,18 +12205,17 @@
 /area/station/service/chapel)
 "bdr" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/structure/cable/yellow{
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 5;
+	level = 2
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
 "bds" = (
@@ -13746,20 +13737,36 @@
 /turf/simulated/wall,
 /area/station/service/janitor)
 "bhr" = (
+/obj/machinery/door/airlock/command/glass{
+	id_tag = "nct"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/any/service/janitor,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/effect/mapping_helpers/airlock/polarized{
+	id = "NCT"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/station/procedure/trainer_office)
 "bht" = (
 /turf/simulated/wall,
 /area/station/maintenance/maintcentral)
 "bhu" = (
-/obj/machinery/door/airlock,
+/obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -13867,17 +13874,19 @@
 	},
 /area/station/engineering/tech_storage)
 "bhK" = (
-/obj/structure/disposalpipe/segment/corner{
-	dir = 2
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
 	},
-/obj/structure/closet/jcloset,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light_switch/east{
-	pixel_y = -6
+/obj/machinery/camera{
+	c_tag = "Career Trainer's Office"
 	},
-/obj/machinery/firealarm/directional/north,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/machinery/light_switch/north,
+/turf/simulated/floor/plasteel{
+	dir = 5;
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "bhL" = (
 /obj/machinery/hologram/holopad,
 /obj/structure/cable/yellow{
@@ -14311,30 +14320,39 @@
 	},
 /area/station/hallway/primary/central)
 "biY" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/structure/reagent_dispensers/spacecleanertank/north,
-/obj/machinery/light/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/machinery/economy/vending/traindrobe,
+/obj/effect/turf_decal/woodsiding{
+	dir = 9
+	},
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
 "biZ" = (
+/obj/effect/turf_decal/woodsiding{
+	dir = 1
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment/corner{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
 "bja" = (
-/obj/structure/closet/l3closet/janitor,
-/obj/machinery/alarm/directional/north,
+/obj/item/kirbyplants,
+/obj/effect/turf_decal/woodsiding{
+	dir = 5
+	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
 "bjb" = (
 /obj/structure/table/wood,
 /obj/item/folder/blue,
@@ -14899,54 +14917,51 @@
 	},
 /area/station/hallway/primary/central)
 "bkL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/chair/comfy/black,
+/obj/effect/turf_decal/woodsiding,
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
-/obj/effect/landmark/start/janitor,
-/turf/simulated/floor/plating,
-/area/station/service/janitor)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
 "bkM" = (
+/obj/effect/turf_decal/woodsiding{
+	dir = 6
+	},
 /obj/structure/cable/yellow{
-	icon_state = "2-4"
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
 "bkN" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
 	},
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
-"bkO" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "darkgreen"
 	},
+/area/station/procedure/trainer_office)
+"bkO" = (
+/obj/effect/mapping_helpers/airlock/access/all/procedure/trainer,
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/any/service/janitor,
 /turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
-"bkP" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
+/area/station/procedure/trainer_office)
 "bkQ" = (
 /obj/item/flashlight{
 	pixel_x = 1;
 	pixel_y = 5
 	},
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
@@ -15063,27 +15078,18 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central)
 "bll" = (
-/obj/structure/closet/emcloset,
-/obj/structure/sign/double/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";
-	pixel_y = 32
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "darkneutralfull"
-	},
-/area/station/hallway/primary/starboard)
+/obj/structure/sign/custodian,
+/turf/simulated/wall,
+/area/station/service/janitor)
 "blm" = (
-/obj/structure/sign/double/map/right{
-	desc = "A framed picture of the station. Clockwise from security in red at the top, you see engineering in yellow, science in purple, escape in checkered red-and-white, medbay in green, arrivals in checkered red-and-blue, and then cargo in brown.";
-	icon_state = "map-right-MS";
-	pixel_y = 32
-	},
-/obj/structure/closet/firecloset,
-/turf/simulated/floor/plasteel{
-	icon_state = "darkneutralfull"
-	},
-/area/station/hallway/primary/starboard)
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/mapping_helpers/airlock/access/all/service/janitor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "bln" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
@@ -15553,26 +15559,35 @@
 /turf/simulated/floor/plating,
 /area/station/public/storage/emergency)
 "bmC" = (
+/obj/structure/table/wood,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/station/procedure/trainer_office)
+"bmD" = (
+/obj/item/flashlight/lamp/green{
+	pixel_y = 15
+	},
 /obj/structure/cable/yellow{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
+/obj/machinery/door_control{
+	id = "nct";
+	name = "Office Door";
+	normaldoorcontrol = 1;
+	req_access = list(80);
+	pixel_x = -6
 	},
-/mob/living/simple_animal/lizard{
-	name = "Wags-His-Tail";
-	real_name = "Wags-His-Tail"
+/obj/structure/table/wood,
+/obj/machinery/button/windowtint{
+	id = "NCT";
+	dir = 8;
+	pixel_x = 6
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
-"bmD" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/area/station/procedure/trainer_office)
 "bmE" = (
 /obj/machinery/newscaster/directional/east,
 /obj/structure/disposalpipe/segment/corner{
@@ -15598,7 +15613,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -15623,30 +15638,37 @@
 	},
 /area/station/security/checkpoint/secondary)
 "bmQ" = (
-/obj/structure/table,
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_y = 4;
+	pixel_x = -5
 	},
-/obj/item/key/janitor,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/machinery/power/apc/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/box/lights/mixed,
-/obj/item/storage/box/lights/mixed,
-/obj/item/grenade/chem_grenade/cleaner,
-/obj/item/grenade/chem_grenade/cleaner,
-/obj/item/grenade/chem_grenade/cleaner,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/item/pen{
+	pixel_x = 8;
+	pixel_y = 5
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "bmR" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
+/obj/item/radio/intercom{
+	name = "east bump";
+	pixel_x = 28
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 12
 	},
-/area/station/maintenance/fsmaint)
+/obj/structure/janitorialcart,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "bmT" = (
 /obj/machinery/porta_turret/ai_turret,
 /turf/simulated/floor/plasteel{
@@ -15765,15 +15787,6 @@
 	icon_state = "cautioncorner"
 	},
 /area/station/hallway/primary/starboard)
-"bnj" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "cautioncorner"
-	},
-/area/station/hallway/primary/starboard)
 "bnk" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel{
@@ -16151,15 +16164,21 @@
 /turf/simulated/floor/plasteel,
 /area/station/supply/lobby)
 "bou" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/economy/vending/janidrobe,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/item/flag/nt,
+/turf/simulated/floor/plasteel{
+	dir = 10;
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "bov" = (
-/obj/structure/janitorialcart,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/structure/chair/comfy/brown{
+	dir = 1
+	},
+/obj/effect/landmark/start/nanotrasen_career_trainer,
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "bow" = (
 /obj/effect/turf_decal/delivery/hollow,
 /obj/machinery/atmospherics/portable/canister/nitrogen,
@@ -16169,13 +16188,16 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos/control)
 "box" = (
-/obj/structure/disposalpipe/trunk{
-	dir = 1
+/obj/machinery/power/apc/directional/east,
+/obj/machinery/alarm/directional/south,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
-/obj/machinery/disposal,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/turf/simulated/floor/plasteel{
+	dir = 6;
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "boy" = (
 /obj/item/storage/box/lights/mixed,
 /turf/simulated/floor/plating,
@@ -16279,22 +16301,16 @@
 /turf/simulated/floor/carpet,
 /area/station/command/office/captain/bedroom)
 "boN" = (
-/obj/item/restraints/legcuffs/beartrap,
-/obj/item/restraints/legcuffs/beartrap,
-/obj/machinery/requests_console/directional/west,
-/obj/machinery/camera{
-	c_tag = "Custodial Closet";
-	dir = 4
+/obj/effect/turf_decal/woodsiding{
+	dir = 10
 	},
-/obj/item/mop,
-/obj/item/reagent_containers/glass/bucket,
-/obj/structure/rack,
-/obj/item/clothing/gloves/color/orange,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/box/mousetraps,
-/obj/item/storage/box/mousetraps,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/structure/closet,
+/turf/simulated/floor/carpet,
+/area/station/procedure/trainer_office)
 "boO" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -16331,42 +16347,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/starboard)
-"boS" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/starboard)
-"boV" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/starboard)
 "boX" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -16702,13 +16682,15 @@
 	},
 /area/station/supply/office)
 "bpQ" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start/janitor,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom/directional/east,
-/obj/structure/sink/directional/west,
-/turf/simulated/floor/plasteel,
-/area/station/service/janitor)
+/obj/effect/mapping_helpers/airlock/windoor/access/all/procedure/trainer,
+/obj/machinery/door/window/reinforced/normal{
+	name = "NCT"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "bpS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
@@ -17576,10 +17558,13 @@
 	},
 /area/station/engineering/ai_transit_tube)
 "bsE" = (
-/obj/machinery/light/small/directional/south,
-/obj/vehicle/janicart,
-/turf/simulated/floor/plating,
-/area/station/service/janitor)
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "darkgreen"
+	},
+/area/station/procedure/trainer_office)
 "bsG" = (
 /obj/machinery/hologram/holopad,
 /obj/machinery/light/small/directional/north,
@@ -19529,7 +19514,7 @@
 /obj/structure/safe/floor{
 	known_by = list("captain")
 	},
-/obj/item/gun/projectile/revolver/russian,
+/obj/item/toy/russian_revolver,
 /obj/item/reagent_containers/drinks/bottle/absinthe/premium,
 /obj/item/lighter/zippo/nt_rep,
 /obj/item/storage/fancy/cigarettes/cigpack_robustgold,
@@ -24053,7 +24038,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/light/small/directional/south,
+/obj/machinery/light/small,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -27737,11 +27722,11 @@
 	},
 /area/station/command/bridge)
 "cca" = (
-/obj/item/clothing/accessory/stethoscope,
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope,
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 6
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 3
 	},
 /obj/item/flashlight/pen{
@@ -28371,7 +28356,7 @@
 	sort_type_txt = "7"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -36733,7 +36718,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/port)
 "cKC" = (
-/obj/random/hampter,
+/obj/effect/spawner/random/toy/hampter,
 /turf/simulated/floor/mech_bay_recharge_floor,
 /area/station/maintenance/apmaint)
 "cKD" = (
@@ -39637,7 +39622,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -41822,7 +41807,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/obj/random/hampter,
+/obj/effect/spawner/random/toy/hampter,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint)
 "dAO" = (
@@ -42260,16 +42245,6 @@
 /obj/effect/spawner/wire_splicing/thirty,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint)
-"dPf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/effect/spawner/wire_splicing/thirty,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
 "dPW" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating,
@@ -42412,6 +42387,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft2)
+"dTr" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/janitor,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "dTt" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -42836,7 +42819,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -43189,6 +43172,20 @@
 	},
 /turf/space,
 /area/station/engineering/solar/fore)
+"eos" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/l3closet/janitor,
+/obj/structure/reagent_dispensers/spacecleanertank{
+	pixel_y = 30
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	name = "east bump";
+	pixel_x = 24
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "eow" = (
 /obj/machinery/atmospherics/pipe/manifold/visible,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -44417,8 +44414,8 @@
 "eTh" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/unres,
 /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
+/obj/effect/mapping_helpers/airlock/unres,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
 "eTo" = (
@@ -44962,6 +44959,11 @@
 	icon_state = "dark"
 	},
 /area/station/engineering/atmos)
+"fhz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/vehicle/janicart,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "fhC" = (
 /obj/item/kirbyplants/plant22,
 /turf/simulated/floor/plasteel{
@@ -45274,7 +45276,7 @@
 	},
 /area/station/engineering/tech_storage)
 "fpi" = (
-/obj/random/hampter,
+/obj/effect/spawner/random/toy/hampter,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "fpk" = (
@@ -45529,7 +45531,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/access/any/security/general,
 /turf/simulated/floor/plasteel{
@@ -47486,6 +47488,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/station/security/prison/cell_block/a)
+"grU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "gsM" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
@@ -47657,18 +47665,6 @@
 	icon_state = "purple"
 	},
 /area/station/science/xenobiology)
-"gAM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plasteel,
-/area/station/security/permabrig)
 "gBa" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8
@@ -48810,6 +48806,12 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
+"hcb" = (
+/obj/machinery/alarm/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/economy/vending/janidrobe,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "hci" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -49104,7 +49106,7 @@
 "hjn" = (
 /obj/structure/table/glass,
 /obj/item/folder/blue,
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/item/clothing/glasses/hud/health,
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -50267,6 +50269,18 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
+"hIW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
 "hIZ" = (
 /obj/docking_port/stationary{
 	dir = 8;
@@ -50655,16 +50669,13 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft2)
 "hSX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 6
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -57772,7 +57783,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -57853,16 +57864,6 @@
 /obj/structure/lattice/catwalk,
 /turf/space,
 /area/space/nearstation)
-"lwL" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/tile/bar,
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "neutralcorner"
-	},
-/area/station/hallway/primary/starboard)
 "lwN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/yellow{
@@ -57870,6 +57871,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint)
+"lxc" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/access/all/service/janitor,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plating,
+/area/station/service/janitor)
 "lxz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/yellow{
@@ -59645,6 +59655,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
 	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central)
 "mmB" = (
@@ -60019,6 +60032,10 @@
 	icon_state = "solarpanel"
 	},
 /area/station/engineering/solar/fore)
+"mzQ" = (
+/obj/effect/mapping_helpers/turfs/rust/probably,
+/turf/simulated/wall,
+/area/station/service/janitor)
 "mAa" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -60424,7 +60441,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -60923,6 +60940,15 @@
 /obj/effect/mapping_helpers/airlock/access/any/science/research,
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft2)
+"mVV" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+	id = "NCT"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
 "mVW" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
@@ -61478,18 +61504,6 @@
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating,
 /area/station/engineering/atmos)
-"ngm" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/unres{
-	dir = 1
-	},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
 "ngG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/yellow{
@@ -62811,7 +62825,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -63523,7 +63537,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/station/security/brig)
@@ -65446,6 +65460,15 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
+"pox" = (
+/obj/effect/spawner/window/reinforced/polarized/grilled{
+	id = "NCT"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating,
+/area/station/procedure/trainer_office)
 "pps" = (
 /obj/structure/rack,
 /obj/item/crowbar/red,
@@ -66253,7 +66276,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/access/any/security/general,
 /turf/simulated/floor/plasteel{
@@ -70433,7 +70456,7 @@
 /obj/machinery/light_switch/west{
 	pixel_y = -6
 	},
-/obj/item/clothing/accessory/stethoscope{
+/obj/item/clothing/neck/stethoscope{
 	pixel_y = 6
 	},
 /turf/simulated/floor/plasteel{
@@ -70901,7 +70924,7 @@
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -71117,11 +71140,19 @@
 /area/station/security/main)
 "sln" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/structure/rack{
 	dir = 1
 	},
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
+/obj/item/storage/box/mousetraps,
+/obj/item/storage/box/mousetraps,
+/obj/item/clothing/gloves/color/orange,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/restraints/legcuffs/beartrap,
+/obj/item/restraints/legcuffs/beartrap,
+/obj/item/mop,
+/obj/machinery/firealarm/directional/north,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "sls" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -71740,17 +71771,13 @@
 /turf/simulated/floor/plating,
 /area/station/security/warden)
 "sDT" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/starboard)
@@ -72474,6 +72501,16 @@
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating,
 /area/station/maintenance/engimaint)
+"sUN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plating,
+/area/station/service/janitor)
 "sVu" = (
 /obj/effect/spawner/random/maintenance,
 /turf/simulated/floor/plating,
@@ -73849,6 +73886,9 @@
 /obj/structure/disposalpipe/segment/corner{
 	dir = 2
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralcorner"
 	},
@@ -74426,18 +74466,6 @@
 	icon_state = "vault"
 	},
 /area/station/security/armory/secure)
-"tYH" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel,
-/area/station/security/permabrig)
 "tYV" = (
 /obj/structure/rack,
 /obj/item/reagent_containers/drinks/bottle/rum{
@@ -74697,13 +74725,20 @@
 /turf/simulated/floor/plasteel,
 /area/station/security/brig)
 "ufr" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/fyellow,
-/obj/effect/spawner/random/maintenance,
+/obj/machinery/camera{
+	c_tag = "Custodial Closet";
+	dir = 4
+	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/west,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
+/obj/effect/landmark/start/janitor,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "ufw" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -74731,7 +74766,7 @@
 	sort_type_txt = "8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -77299,6 +77334,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos/control)
 "vug" = (
+/obj/machinery/autolathe,
 /turf/simulated/floor/plasteel{
 	icon_state = "yellow"
 	},
@@ -77947,6 +77983,9 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard2)
+"vRi" = (
+/turf/simulated/wall,
+/area/station/procedure/trainer_office)
 "vRv" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -78739,6 +78778,20 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel,
 /area/station/supply/lobby)
+"wpE" = (
+/obj/structure/table,
+/obj/item/key/janitor,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/machinery/power/apc/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/box/lights/mixed,
+/obj/item/storage/box/lights/mixed,
+/obj/item/grenade/chem_grenade/cleaner,
+/obj/item/grenade/chem_grenade/cleaner,
+/obj/item/grenade/chem_grenade/cleaner,
+/obj/structure/cable/yellow,
+/turf/simulated/floor/plasteel,
+/area/station/service/janitor)
 "wpL" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -78840,7 +78893,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 4
 	},
 /obj/structure/disposalpipe/sortjunction/reversed{
 	dir = 2;
@@ -80969,6 +81022,11 @@
 /obj/structure/lattice,
 /turf/space,
 /area/space/nearstation)
+"xzM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
 "xAl" = (
 /obj/structure/rack,
 /obj/item/storage/briefcase/inflatable{
@@ -105537,11 +105595,11 @@ lSa
 aFE
 bek
 bfK
-bhq
-bhq
-bhq
-bhq
-bhq
+vRi
+vRi
+vRi
+vRi
+vRi
 bqc
 bqc
 ezM
@@ -105794,7 +105852,7 @@ lIM
 bMC
 bek
 bfK
-bhq
+pox
 biY
 boN
 bmQ
@@ -106308,7 +106366,7 @@ gYO
 bQF
 ben
 bqb
-bhq
+mVV
 bja
 bkM
 bmD
@@ -106565,7 +106623,7 @@ bbg
 bNp
 bek
 bjA
-bhq
+vRi
 bhK
 bkN
 bpQ
@@ -106822,11 +106880,11 @@ bbh
 bcM
 bel
 bfO
-bhq
-bhq
+vRi
+vRi
 bkO
-bhq
-bhq
+vRi
+vRi
 bht
 brS
 bqc
@@ -107081,7 +107139,7 @@ qWN
 acw
 bht
 bjc
-bkP
+bmF
 bmF
 boy
 btP
@@ -108064,9 +108122,9 @@ adi
 oLF
 xKQ
 adi
-gAM
+nju
 pXf
-tYH
+hgp
 oEm
 amx
 pPJ
@@ -115821,8 +115879,8 @@ bhB
 bjq
 bkk
 bnr
-boS
-lwL
+hfi
+bqA
 bsp
 bun
 hvW
@@ -116842,12 +116900,12 @@ fWg
 aYK
 eTh
 alb
-dPf
-aIo
-aLl
-aLl
-aLl
-bez
+eTo
+bhq
+bhq
+bhq
+bhq
+bhq
 bni
 eFD
 wwo
@@ -117099,11 +117157,11 @@ aTo
 uPu
 aLl
 dAH
-eTo
-sOy
+hIW
+lxc
 agh
 ufr
-aLl
+wpE
 bll
 bnr
 boY
@@ -117355,14 +117413,14 @@ aVV
 fWg
 aYK
 aLl
-avA
+sOy
 hSX
-awv
+bhq
 sln
-avA
-aLl
+sUN
+grU
 blm
-bnr
+vEp
 sDT
 rEV
 bHA
@@ -117613,12 +117671,12 @@ aTp
 aXm
 aLl
 mdS
-fvU
-dAH
-avA
-alb
-aLl
-aLl
+eTo
+bhq
+hcb
+dTr
+fhz
+bhq
 bnr
 bcP
 bqA
@@ -117869,15 +117927,15 @@ aTo
 aTp
 auO
 aLl
-dAH
+xzM
 bdr
-aFM
-aWf
+bhq
+eos
 aWf
 bmR
-ngm
-bnj
-boV
+bhq
+bnr
+boY
 bqA
 bsp
 bxH
@@ -118128,11 +118186,11 @@ bbv
 aLl
 wVi
 bPb
-aIo
-aLl
-edZ
-gbM
-aLl
+bhq
+bhq
+bhq
+mzQ
+bhq
 bnk
 gcq
 lhu
diff --git a/modular_ss220/aesthetics/better_ids/icons/card.dmi b/modular_ss220/aesthetics/better_ids/icons/card.dmi
index a6270c06d585..ae3f789f1758 100644
Binary files a/modular_ss220/aesthetics/better_ids/icons/card.dmi and b/modular_ss220/aesthetics/better_ids/icons/card.dmi differ
diff --git a/modular_ss220/aesthetics_sounds/code/items.dm b/modular_ss220/aesthetics_sounds/code/items.dm
index 91f8c2c4bf50..1f30d18d11b4 100644
--- a/modular_ss220/aesthetics_sounds/code/items.dm
+++ b/modular_ss220/aesthetics_sounds/code/items.dm
@@ -111,7 +111,7 @@
 	drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/accessory.ogg'
 	pickup_sound =  'modular_ss220/aesthetics_sounds/sound/handling/pickup/accessory.ogg'
 
-/obj/item/clothing/accessory/necklace
+/obj/item/clothing/neck/necklace
 	drop_sound = 'modular_ss220/aesthetics_sounds/sound/handling/drop/accessory.ogg'
 	pickup_sound =  'modular_ss220/aesthetics_sounds/sound/handling/pickup/accessory.ogg'
 
diff --git a/modular_ss220/clothing/code/cloaks.dm b/modular_ss220/clothing/code/cloaks.dm
index 00a8afca9355..d1fdd6b4fb36 100644
--- a/modular_ss220/clothing/code/cloaks.dm
+++ b/modular_ss220/clothing/code/cloaks.dm
@@ -1,4 +1,4 @@
-/obj/item/clothing/suit/mantle/armor/captain/black
+/obj/item/clothing/neck/cloak/captain_mantle/black
 	name = "чёрная капитанская мантия"
 	desc = "Носится верховным лидером станции NSS Cyberiad."
 	icon = 'modular_ss220/clothing/icons/object/cloaks.dmi'
@@ -6,7 +6,7 @@
 	icon_override = 'modular_ss220/clothing/icons/mob/cloaks.dmi'
 	item_state = "capcloak_black"
 
-/obj/item/clothing/suit/mantle/armor/captain/black/Initialize(mapload)
+/obj/item/clothing/neck/cloak/captain_mantle/black/Initialize(mapload)
 	. = ..()
 	desc = "Носится верховным лидером станции [station_name()]."
 
diff --git a/modular_ss220/clothing/code/garment_bag.dm b/modular_ss220/clothing/code/garment_bag.dm
index 461b6d20af61..1520419fe499 100644
--- a/modular_ss220/clothing/code/garment_bag.dm
+++ b/modular_ss220/clothing/code/garment_bag.dm
@@ -1,7 +1,7 @@
 /obj/item/storage/bag/garment/captain/populate_contents()
 	. = ..()
 	new /obj/item/clothing/head/caphat/beret_black(src)
-	new /obj/item/clothing/suit/mantle/armor/captain/black(src)
+	new /obj/item/clothing/neck/cloak/captain_mantle/black(src)
 
 /obj/item/storage/bag/garment/head_of_security/populate_contents()
 	. = ..()
diff --git a/modular_ss220/jobs/code/donor/job/2_tier_jobs.dm b/modular_ss220/jobs/code/donor/job/2_tier_jobs.dm
index 74bbbf0f8243..c5aa45ca2a9f 100644
--- a/modular_ss220/jobs/code/donor/job/2_tier_jobs.dm
+++ b/modular_ss220/jobs/code/donor/job/2_tier_jobs.dm
@@ -50,7 +50,7 @@
 	jobtype = /datum/job/donor/bath
 
 	uniform = /obj/item/clothing/under/costume/pirate_rags
-	suit = /obj/item/clothing/suit/mantle
+	suit = /obj/item/clothing/neck/cloak/mantle
 	shoes = /obj/item/clothing/shoes/sandal
 	glasses = /obj/item/clothing/glasses/goggles
 	l_ear = /obj/item/radio/headset/headset_service
diff --git a/modular_ss220/jobs/code/donor/job/3_tier_jobs.dm b/modular_ss220/jobs/code/donor/job/3_tier_jobs.dm
index d197421957d7..d595dda5a9a2 100644
--- a/modular_ss220/jobs/code/donor/job/3_tier_jobs.dm
+++ b/modular_ss220/jobs/code/donor/job/3_tier_jobs.dm
@@ -326,7 +326,7 @@
 	jobtype = /datum/job/donor/uncertain
 
 	uniform = /obj/item/clothing/under/costume/kilt
-	suit = /obj/item/clothing/suit/unathi/mantle
+	suit = /obj/item/clothing/neck/cloak/unathi
 	shoes = /obj/item/clothing/shoes/footwraps
 	head = /obj/item/clothing/head/beanie/yellow
 	glasses = /obj/item/clothing/glasses/eyepatch
@@ -339,10 +339,10 @@
 		/obj/item/storage/fancy/cigarettes/cigpack_random = 2,
 		/obj/item/food/fancy/doshik = 3,
 		/obj/item/food/fancy/doshik_spicy = 3,
-		/obj/item/clothing/suit/mantle/old = 1,
+		/obj/item/clothing/neck/cloak/old = 1,
 		/obj/item/clothing/head/flatcap = 1,
 		/obj/item/clothing/suit/browntrenchcoat = 1,
-		/obj/item/clothing/accessory/horrible = 1,
+		/obj/item/clothing/neck/tie/horrible = 1,
 		/obj/item/clothing/under/costume/pirate_rags = 1,
 		/obj/item/clothing/head/cowboyhat = 1,
 		/obj/item/clothing/shoes/sandal = 1,
diff --git a/modular_ss220/jobs/code/objects/job_objects.dm b/modular_ss220/jobs/code/objects/job_objects.dm
index 2f2fb49fd5f9..e11b08dfd2da 100644
--- a/modular_ss220/jobs/code/objects/job_objects.dm
+++ b/modular_ss220/jobs/code/objects/job_objects.dm
@@ -63,7 +63,6 @@
 		/obj/item/toy/balloon,
 		/obj/item/toy/blink,
 		/obj/item/toy/katana,
-		/obj/random/mech,
 		/obj/item/toy/spinningtoy,
 		/obj/item/toy/sword,
 		/obj/item/dualsaber/toy,
@@ -71,10 +70,7 @@
 		/obj/item/instrument/violin,
 		/obj/item/instrument/guitar,
 		/obj/item/storage/belt/utility/full,
-		/obj/item/clothing/accessory/horrible,
-		/obj/random/carp_plushie,
-		/obj/random/plushie,
-		/obj/random/figure,
+		/obj/item/clothing/neck/tie/horrible,
 		/obj/item/deck/cards,
 		/obj/item/deck/cards/tiny,
 		/obj/item/deck/unum,
@@ -100,7 +96,7 @@
 		/obj/item/stack/tile/fakespace/loaded,
 		/obj/item/stack/tile/brass/fifty,
 		/obj/item/sord,
-		/obj/item/toy/prizeball/figure,
+		/obj/item/toy/prizeball/action_figure,
 		/obj/item/toy/prizeball/therapy,
 
 		// pew pew
diff --git a/modular_ss220/jobs/code/objects/medical_job_objects.dm b/modular_ss220/jobs/code/objects/medical_job_objects.dm
index 0090302fe1bd..7dd346db2570 100644
--- a/modular_ss220/jobs/code/objects/medical_job_objects.dm
+++ b/modular_ss220/jobs/code/objects/medical_job_objects.dm
@@ -9,10 +9,6 @@
 
 
 // loadout
-/datum/gear/accessory/stethoscope/New()
-	. = ..()
-	allowed_roles |= GLOB.medical_positions_ss220
-
 /datum/gear/accessory/armband_job/medical/New()
 	. = ..()
 	allowed_roles |= GLOB.medical_positions_ss220
diff --git a/modular_ss220/maps220/icons/mapping_helpers.dmi b/modular_ss220/maps220/icons/mapping_helpers.dmi
index 98f6b9118df8..fc470b6072c9 100644
Binary files a/modular_ss220/maps220/icons/mapping_helpers.dmi and b/modular_ss220/maps220/icons/mapping_helpers.dmi differ
diff --git a/modular_ss220/objects/code/plushies/hampters.dm b/modular_ss220/objects/code/plushies/hampters.dm
index 38fbeb436d29..c2478575d6be 100644
--- a/modular_ss220/objects/code/plushies/hampters.dm
+++ b/modular_ss220/objects/code/plushies/hampters.dm
@@ -38,14 +38,11 @@
 		play_squeak()
 
 // Спавнер рандомного хамптера для карты
-/obj/random/hampter
-	name = "Random Hampter"
-	desc = "This is a random hampter spawner."
+/obj/effect/spawner/random/toy/hampter
+	name = "random hampter toy"
 	icon = 'modular_ss220/objects/icons/plushies.dmi'
 	icon_state = "hampter"
-
-/obj/random/hampter/item_to_spawn()
-	return pick(typesof(/obj/item/toy/hampter))
+	loot_type_path = /obj/item/toy/hampter
 
 // Хамптер
 /obj/item/toy/hampter
diff --git a/modular_ss220/objects/icons/posters.dmi b/modular_ss220/objects/icons/posters.dmi
index 3e9e1fdaaae5..8ec9a3975e2f 100644
Binary files a/modular_ss220/objects/icons/posters.dmi and b/modular_ss220/objects/icons/posters.dmi differ
diff --git a/modular_ss220/outfits/code/outfits.dm b/modular_ss220/outfits/code/outfits.dm
index e3b3fc8e5ce7..8cd4226e7e16 100644
--- a/modular_ss220/outfits/code/outfits.dm
+++ b/modular_ss220/outfits/code/outfits.dm
@@ -152,7 +152,7 @@
 	gloves =/obj/item/clothing/gloves/ring/silver
 	mask = /obj/item/clothing/mask/holo_cigar
 	backpack_contents = list(
-		/obj/item/clothing/accessory/scarf/purple,
+		/obj/item/clothing/neck/scarf/purple,
 		/obj/item/clothing/gloves/combat,
 		/obj/item/gun/projectile/revolver/mateba,
 		/obj/item/ammo_box/a357,
diff --git a/modular_ss220/species/code/mob/living/carbon/human/eat/eat_list_clothing.dm b/modular_ss220/species/code/mob/living/carbon/human/eat/eat_list_clothing.dm
index 759c55a79b75..b61830a682c4 100644
--- a/modular_ss220/species/code/mob/living/carbon/human/eat/eat_list_clothing.dm
+++ b/modular_ss220/species/code/mob/living/carbon/human/eat/eat_list_clothing.dm
@@ -49,7 +49,7 @@
 /obj/item/clothing/accessory/legal_badge/Initialize(mapload)
 	. = ..()
 	material_type = MATERIAL_CLASS_NONE
-/obj/item/clothing/accessory/necklace/Initialize(mapload)
+/obj/item/clothing/neck/necklace/Initialize(mapload)
 	. = ..()
 	material_type = MATERIAL_CLASS_NONE
 /obj/item/clothing/accessory/medal/Initialize(mapload)