diff --git a/_maps/_mod_celadon/shuttles/elysim/elysim_homa.dmm b/_maps/_mod_celadon/shuttles/elysim/elysim_homa.dmm
index 422696fd1ab0..7b7744d4d813 100644
--- a/_maps/_mod_celadon/shuttles/elysim/elysim_homa.dmm
+++ b/_maps/_mod_celadon/shuttles/elysim/elysim_homa.dmm
@@ -292,7 +292,6 @@
 "hn" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/wall/orange{
-	dir = 1;
 	pixel_y = -30
 	},
 /obj/item/clothing/mask/gas/welding,
@@ -493,7 +492,6 @@
 /area/ship/hallway/central)
 "lM" = (
 /obj/structure/closet/wall{
-	dir = 1;
 	pixel_y = -30
 	},
 /obj/item/disk/design_disk/ammo_c10mm,
@@ -667,7 +665,8 @@
 "qG" = (
 /obj/item/storage/firstaid/regular,
 /obj/structure/closet/wall/white/med{
-	pixel_y = 30
+	pixel_y = 30;
+	dir = 1
 	},
 /turf/open/floor/plating,
 /area/ship/bridge)
@@ -931,7 +930,6 @@
 	pixel_y = 7
 	},
 /obj/structure/closet/wall{
-	dir = 1;
 	pixel_y = -30
 	},
 /obj/item/clothing/mask/bandana/durathread,
diff --git a/_maps/_mod_celadon/shuttles/elysim/elysim_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/elysim/elysim_iron_maiden.dmm
index 9a410ef38dcb..f3d3a1c47446 100644
--- a/_maps/_mod_celadon/shuttles/elysim/elysim_iron_maiden.dmm
+++ b/_maps/_mod_celadon/shuttles/elysim/elysim_iron_maiden.dmm
@@ -304,7 +304,7 @@
 	},
 /obj/structure/closet/wall/orange{
 	name = "fuel locker";
-	dir = 4;
+	dir = 8;
 	pixel_x = -28
 	},
 /obj/effect/decal/cleanable/insectguts,
@@ -634,7 +634,8 @@
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/effect/decal/cleanable/oil,
 /obj/item/clothing/head/bandana/elysium/green,
@@ -704,7 +705,8 @@
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/item/trash/chips,
 /obj/item/clothing/head/bandana/elysium/green,
@@ -754,8 +756,7 @@
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
-	pixel_y = -28;
-	dir = 1
+	pixel_y = -28
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/trash/chips,
@@ -1072,7 +1073,8 @@
 /obj/structure/closet/wall{
 	icon_door = "orange_wall";
 	name = "uniform closet";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/item/radio,
 /obj/item/radio,
@@ -1126,7 +1128,8 @@
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/clothing/head/bandana/elysium/green,
@@ -1302,7 +1305,8 @@
 	},
 /obj/structure/closet/wall{
 	icon_state = "emergency_wall";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/item/tank/internals/oxygen,
 /obj/item/tank/internals/oxygen,
@@ -1342,7 +1346,7 @@
 /obj/structure/closet/secure_closet/wall{
 	icon_door = "med_wall";
 	name = "medical locker";
-	dir = 4;
+	dir = 8;
 	pixel_x = -28
 	},
 /obj/structure/cable{
@@ -1363,8 +1367,7 @@
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
-	pixel_y = -28;
-	dir = 1
+	pixel_y = -28
 	},
 /obj/structure/cable{
 	icon_state = "5-9"
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_alone.dmm b/_maps/_mod_celadon/shuttles/independent/independent_alone.dmm
index fcc0b5b52137..b62f37284bcc 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_alone.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_alone.dmm
@@ -54,7 +54,6 @@
 	},
 /obj/structure/cable,
 /obj/structure/closet/wall{
-	dir = 1;
 	name = "Tools";
 	pixel_y = -30
 	},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_caravan.dmm b/_maps/_mod_celadon/shuttles/independent/independent_caravan.dmm
index d1cd3b26c061..267a49ab26b7 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_caravan.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_caravan.dmm
@@ -312,7 +312,7 @@
 "fv" = (
 /obj/machinery/door/window/northleft,
 /obj/structure/closet/wall{
-	dir = 4;
+	dir = 8;
 	pixel_x = -29
 	},
 /obj/item/clothing/shoes/galoshes,
@@ -1252,7 +1252,8 @@
 /obj/item/pipe_dispenser,
 /obj/item/multitool,
 /obj/structure/closet/wall/orange{
-	pixel_y = 32
+	pixel_y = 32;
+	dir = 1
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
@@ -1756,7 +1757,7 @@
 	dir = 8
 	},
 /obj/structure/closet/wall{
-	dir = 4;
+	dir = 8;
 	pixel_x = -32
 	},
 /obj/item/kinetic_crusher,
@@ -1962,7 +1963,7 @@
 /area/ship/external)
 "JR" = (
 /obj/structure/closet/secure_closet/wall{
-	dir = 4;
+	dir = 8;
 	name = "kitchen freezer";
 	pixel_x = -28
 	},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_elder.dmm b/_maps/_mod_celadon/shuttles/independent/independent_elder.dmm
index 73ea3b693d83..5f5e737edaae 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_elder.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_elder.dmm
@@ -211,7 +211,8 @@
 /area/ship/hallway/central)
 "cg" = (
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -819,7 +820,7 @@
 	dir = 10
 	},
 /obj/structure/closet/emcloset/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 28
 	},
 /obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
@@ -854,7 +855,8 @@
 /area/ship/hallway/port)
 "iT" = (
 /obj/structure/closet/firecloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/effect/turf_decal/siding/brown{
 	dir = 1
@@ -924,7 +926,8 @@
 /area/ship/engineering/engine)
 "jv" = (
 /obj/structure/closet/firecloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2398,7 +2401,8 @@
 /area/ship/hallway/port)
 "CF" = (
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/effect/turf_decal/siding/brown{
 	dir = 1
@@ -2664,7 +2668,7 @@
 /area/ship/storage)
 "HB" = (
 /obj/structure/closet/wall/blue{
-	dir = 8;
+	dir = 4;
 	pixel_x = 28;
 	name = "Spare EVA Closet"
 	},
@@ -2697,7 +2701,7 @@
 /area/ship/bridge)
 "Ii" = (
 /obj/structure/closet/firecloset/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 28
 	},
 /obj/effect/turf_decal/spline/fancy/wood{
@@ -4159,7 +4163,7 @@
 /area/ship/hallway/starboard)
 "ZI" = (
 /obj/structure/closet/emcloset/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 28
 	},
 /obj/effect/turf_decal/spline/fancy/wood{
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_escapepod.dmm b/_maps/_mod_celadon/shuttles/independent/independent_escapepod.dmm
index 4071339d5a13..27993c91e944 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_escapepod.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_escapepod.dmm
@@ -17,7 +17,8 @@
 /obj/item/kitchen/knife/combat/survival,
 /obj/structure/closet/wall{
 	pixel_y = 31;
-	pixel_x = -3
+	pixel_x = -3;
+	dir = 1
 	},
 /obj/item/storage/firstaid/medical,
 /turf/open/floor/plasteel/dark,
@@ -28,7 +29,8 @@
 	},
 /obj/structure/closet/wall{
 	pixel_y = 31;
-	pixel_x = 3
+	pixel_x = 3;
+	dir = 1
 	},
 /obj/item/stack/sheet/mineral/plasma/five,
 /obj/item/stack/sheet/metal/twenty,
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm b/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm
index 3f946c8dfc43..0c43b975403c 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm
@@ -159,7 +159,7 @@
 	dir = 9
 	},
 /obj/structure/closet/secure_closet/wall{
-	dir = 8;
+	dir = 4;
 	icon_state = "sec_wall";
 	name = "clothing locker";
 	pixel_x = 28;
@@ -394,7 +394,7 @@
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/structure/closet/secure_closet/wall{
-	dir = 4;
+	dir = 8;
 	icon_state = "sec_wall";
 	name = "firearms locker";
 	pixel_x = -28;
@@ -546,7 +546,7 @@
 	icon_state = "1-2"
 	},
 /obj/structure/closet/emcloset/wall{
-	dir = 4;
+	dir = 8;
 	pixel_x = -28
 	},
 /obj/effect/turf_decal/number/five{
@@ -728,7 +728,7 @@
 /obj/item/clothing/head/helmet/sec,
 /obj/item/clothing/head/helmet/sec,
 /obj/structure/closet/secure_closet/wall{
-	dir = 8;
+	dir = 4;
 	icon_state = "sec_wall";
 	name = "armor locker";
 	pixel_x = 28;
@@ -1042,7 +1042,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/structure/closet/secure_closet/wall{
-	dir = 4;
+	dir = 8;
 	icon_state = "sec_wall";
 	name = "firearms locker";
 	pixel_x = -28;
@@ -1348,7 +1348,7 @@
 	icon_state = "1-2"
 	},
 /obj/structure/closet/firecloset/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 28
 	},
 /turf/open/floor/plating,
@@ -1583,7 +1583,6 @@
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
 /obj/structure/closet/secure_closet/wall{
-	dir = 1;
 	icon_state = "solgov_wall";
 	name = "head of security's closet";
 	pixel_y = -28;
@@ -1611,7 +1610,7 @@
 /obj/item/ammo_box/magazine/toy/pistol,
 /obj/item/ammo_box/magazine/toy/pistol,
 /obj/structure/closet/wall/red{
-	dir = 8;
+	dir = 4;
 	pixel_x = 28;
 	name = "foam gun cabinet"
 	},
@@ -1948,7 +1947,6 @@
 /area/template_noop)
 "UJ" = (
 /obj/structure/closet/secure_closet/wall{
-	dir = 1;
 	icon_state = "solgov_wall";
 	name = "captain's closet";
 	pixel_y = -28;
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm b/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm
index abd34032a5ed..97aae30d04fc 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm
@@ -2268,7 +2268,7 @@
 /obj/item/reagent_containers/food/drinks/bottle/hooch,
 /obj/machinery/light/dim/directional/south,
 /obj/structure/closet/wall/blue{
-	dir = 8;
+	dir = 4;
 	pixel_x = 32;
 	welded = 1
 	},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_masinyane.dmm b/_maps/_mod_celadon/shuttles/independent/independent_masinyane.dmm
index 45b7e7904d6a..5ed94a50ea70 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_masinyane.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_masinyane.dmm
@@ -519,7 +519,7 @@
 	},
 /obj/item/storage/firstaid/regular,
 /obj/structure/closet/wall/blue{
-	dir = 4;
+	dir = 8;
 	name = "Equipment closet";
 	pixel_x = -30
 	},
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm b/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm
index 0a25b246562f..0c8e338ed2b0 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm
@@ -1908,7 +1908,7 @@
 /obj/item/kinetic_crusher,
 /obj/item/kinetic_crusher,
 /obj/structure/closet/wall/orange{
-	dir = 4;
+	dir = 8;
 	pixel_x = -32
 	},
 /obj/item/t_scanner/adv_mining_scanner/lesser,
@@ -2187,10 +2187,10 @@
 	dir = 8
 	},
 /obj/structure/closet/secure_closet/wall{
-	dir = 4;
+	dir = 8;
 	icon_state = "sec_wall";
 	name = "hunting locker";
-	pixel_x = -32;
+	pixel_x = -30;
 	req_access = list(30)
 	},
 /obj/item/kitchen/knife/hunting,
@@ -2217,13 +2217,13 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "Gx" = (
-/obj/structure/closet/wall{
-	dir = 8;
-	pixel_x = 32
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
+/obj/structure/closet/wall{
+	dir = 4;
+	pixel_x = 30
+	},
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "GJ" = (
@@ -2579,7 +2579,7 @@
 	dir = 1
 	},
 /obj/structure/closet/wall/orange{
-	dir = 4;
+	dir = 8;
 	pixel_x = -30
 	},
 /obj/item/clothing/head/hardhat/weldhat,
@@ -2940,7 +2940,7 @@
 	dir = 8
 	},
 /obj/structure/closet/wall/white/med{
-	dir = 4;
+	dir = 8;
 	pixel_x = -30
 	},
 /obj/item/defibrillator/loaded,
@@ -3027,7 +3027,7 @@
 /obj/item/holosign_creator/atmos,
 /obj/item/analyzer,
 /obj/structure/closet/wall/orange{
-	dir = 4;
+	dir = 8;
 	pixel_x = -32
 	},
 /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos,
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_qurk.dmm b/_maps/_mod_celadon/shuttles/independent/independent_qurk.dmm
index e1f2c9437f0f..171a640fd4af 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_qurk.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_qurk.dmm
@@ -1182,7 +1182,7 @@
 /obj/item/storage/backpack/satchel/chem,
 /obj/item/storage/backpack/satchel/chem,
 /obj/structure/closet/wall/white/chem{
-	dir = 4;
+	dir = 8;
 	pixel_x = -30
 	},
 /obj/structure/chair,
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm b/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
index 23f329ef5b16..df439f97f18d 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
@@ -1457,7 +1457,8 @@
 	},
 /obj/structure/closet/wall/blue{
 	pixel_y = 31;
-	req_access_txt = "20"
+	req_access_txt = "20";
+	dir = 1
 	},
 /obj/item/binoculars,
 /obj/item/kitchen/knife/combat,
@@ -1933,7 +1934,6 @@
 /obj/structure/table/reinforced,
 /obj/structure/closet/secure_closet/freezer/kitchen/wall{
 	icon_state = "freezer_wall";
-	dir = 1;
 	pixel_y = -28
 	},
 /obj/item/kitchen/rollingpin,
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm b/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm
index a1753d3257ee..e5f5d9b02d55 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_rigger.dmm
@@ -334,7 +334,7 @@
 	pixel_x = 7
 	},
 /obj/structure/closet/secure_closet/wall{
-	dir = 8;
+	dir = 4;
 	icon_door = "med_wall";
 	locked = 0;
 	name = "mortuary locker";
@@ -633,7 +633,7 @@
 	dir = 4
 	},
 /obj/structure/closet/wall{
-	dir = 8;
+	dir = 4;
 	icon_door = "white_wall";
 	name = "medical closet";
 	pixel_x = 28
@@ -989,7 +989,8 @@
 	dir = 4
 	},
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
@@ -1002,7 +1003,8 @@
 	icon_state = "sec_wall";
 	name = "firearms locker";
 	pixel_y = 28;
-	req_access_txt = "1"
+	req_access_txt = "1";
+	dir = 1
 	},
 /obj/item/gun/ballistic/shotgun/flamingarrow,
 /obj/item/gun/ballistic/automatic/pistol/candor,
@@ -1613,7 +1615,8 @@
 /obj/structure/closet/wall{
 	icon_door = "yellow_wall";
 	name = "engineering closet";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/item/storage/backpack/industrial,
 /obj/item/storage/backpack/industrial,
@@ -2011,7 +2014,6 @@
 	pixel_y = 5
 	},
 /obj/structure/closet/secure_closet/wall{
-	dir = 1;
 	icon_door = "med_wall";
 	locked = 0;
 	name = "medical locker";
@@ -2438,7 +2440,6 @@
 	dir = 8
 	},
 /obj/structure/closet/secure_closet/wall{
-	dir = 1;
 	icon_state = "sec_wall";
 	name = "firearms locker";
 	pixel_y = -28;
@@ -2910,7 +2911,6 @@
 	dir = 8
 	},
 /obj/structure/closet/secure_closet/wall{
-	dir = 1;
 	icon_state = "sec_wall";
 	name = "armor locker";
 	pixel_y = -28;
@@ -2971,7 +2971,8 @@
 /obj/structure/closet/wall{
 	icon_door = "white_wall";
 	name = "science closet";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/item/storage/backpack/satchel/eng,
 /obj/item/clothing/shoes/workboots,
@@ -3119,7 +3120,6 @@
 	dir = 8
 	},
 /obj/structure/closet/secure_closet/wall{
-	dir = 1;
 	icon_state = "sec_wall";
 	name = "firearms locker";
 	pixel_y = -28;
@@ -3459,7 +3459,6 @@
 /obj/effect/turf_decal/corner/opaque/white/mono,
 /obj/item/roller,
 /obj/structure/closet/secure_closet/wall{
-	dir = 1;
 	icon_door = "med_wall";
 	locked = 0;
 	name = "medical locker";
@@ -3606,7 +3605,7 @@
 /obj/item/gun/ballistic/revolver/detective,
 /obj/item/clothing/head/HoS/cowboy,
 /obj/structure/closet/secure_closet/wall{
-	dir = 4;
+	dir = 8;
 	icon_state = "solgov_wall";
 	name = "first mate's closet";
 	pixel_x = -28;
@@ -3775,7 +3774,7 @@
 /obj/item/clothing/head/caphat/cowboy,
 /obj/item/gun/ballistic/automatic/pistol/candor,
 /obj/structure/closet/secure_closet/wall{
-	dir = 8;
+	dir = 4;
 	icon_state = "solgov_wall";
 	name = "captain's closet";
 	pixel_x = 28;
@@ -4143,7 +4142,8 @@
 	icon_state = "sec_wall";
 	name = "ammunition locker";
 	pixel_y = 28;
-	req_access_txt = "1"
+	req_access_txt = "1";
+	dir = 1
 	},
 /obj/item/ammo_box/c38_box,
 /obj/item/ammo_box/magazine/m45/rubber,
@@ -4165,7 +4165,8 @@
 /obj/structure/closet/wall{
 	icon_door = "orange_wall";
 	name = "mining closet";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/item/storage/backpack/explorer,
 /obj/item/storage/backpack/explorer,
@@ -4481,7 +4482,8 @@
 /obj/structure/catwalk/over,
 /obj/structure/closet/wall/orange{
 	name = "tool closet";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/item/storage/toolbox/mechanical,
 /obj/item/storage/toolbox/mechanical,
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_rube_goldberg.dmm b/_maps/_mod_celadon/shuttles/independent/independent_rube_goldberg.dmm
index 4e9570ab09be..e66664f77c2b 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_rube_goldberg.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_rube_goldberg.dmm
@@ -1424,7 +1424,7 @@
 	icon_state = "1-2"
 	},
 /obj/structure/closet/firecloset/wall{
-	dir = 4;
+	dir = 8;
 	pixel_x = -28
 	},
 /turf/open/floor/plating/airless,
@@ -3599,7 +3599,6 @@
 	dir = 4
 	},
 /obj/structure/closet/firecloset/wall{
-	dir = 1;
 	pixel_y = -29
 	},
 /turf/open/floor/plating,
@@ -4102,7 +4101,8 @@
 /area/ship/crew/canteen)
 "NC" = (
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm b/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm
index da5a1a9127f9..82eeb5168e4a 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_shepherd.dmm
@@ -12,14 +12,14 @@
 /obj/item/clothing/suit/hooded/chaplain_hoodie,
 /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit,
 /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit,
-/obj/structure/closet/wall{
-	dir = 8;
-	pixel_x = 30
-	},
 /obj/structure/dresser,
 /obj/item/clothing/suit/hooded/chaplain_hoodie,
 /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit,
 /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit,
+/obj/structure/closet/wall{
+	dir = 4;
+	pixel_x = 30
+	},
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "am" = (
@@ -1566,7 +1566,7 @@
 /obj/item/reagent_containers/glass/bucket/wooden,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/wall{
-	dir = 4;
+	dir = 8;
 	name = "supply closet";
 	pixel_x = -28
 	},
@@ -1808,7 +1808,7 @@
 /area/ship/hallway/port)
 "pW" = (
 /obj/structure/closet/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 30
 	},
 /obj/effect/turf_decal/corner_techfloor_grid/diagonal,
@@ -2118,7 +2118,6 @@
 /area/ship/hallway/starboard)
 "sH" = (
 /obj/structure/closet/wall{
-	dir = 1;
 	name = "glass storage";
 	pixel_y = -28
 	},
@@ -2590,7 +2589,7 @@
 "xg" = (
 /obj/machinery/door/window/northleft,
 /obj/structure/closet/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 30
 	},
 /obj/effect/turf_decal/corner_techfloor_grid/diagonal,
@@ -2912,7 +2911,6 @@
 /area/ship/bridge)
 "AA" = (
 /obj/structure/closet/wall{
-	dir = 1;
 	name = "glass storage";
 	pixel_y = -28
 	},
@@ -3552,7 +3550,7 @@
 /obj/item/multitool,
 /obj/item/clothing/glasses/welding,
 /obj/structure/closet/wall/orange{
-	dir = 8;
+	dir = 4;
 	name = "Engineering Supplies";
 	pixel_x = 30
 	},
@@ -3763,7 +3761,7 @@
 "Ix" = (
 /obj/machinery/computer/cryopod/directional/south,
 /obj/structure/closet/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 30
 	},
 /obj/effect/turf_decal/corner_techfloor_grid/diagonal,
@@ -5282,7 +5280,8 @@
 /area/ship/crew/hydroponics)
 "Uu" = (
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 32
+	pixel_y = 32;
+	dir = 1
 	},
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 1
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
index 28bd1447424c..99ca97f3798b 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
@@ -291,7 +291,7 @@
 	},
 /obj/structure/closet/wall/orange{
 	name = "fuel locker";
-	dir = 4;
+	dir = 8;
 	pixel_x = -28
 	},
 /obj/item/stack/sheet/mineral/uranium/twenty,
@@ -600,7 +600,8 @@
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
@@ -671,7 +672,8 @@
 	icon_state = "generic_wall";
 	name = "equipment locker";
 	pixel_y = 28;
-	req_access_txt = "3"
+	req_access_txt = "3";
+	dir = 1
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
@@ -734,8 +736,7 @@
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
-	pixel_y = -28;
-	dir = 1
+	pixel_y = -28
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
@@ -1051,7 +1052,8 @@
 /obj/structure/closet/wall{
 	icon_door = "orange_wall";
 	name = "uniform closet";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/item/radio,
 /obj/item/radio,
@@ -1124,7 +1126,8 @@
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
@@ -1293,7 +1296,8 @@
 	},
 /obj/structure/closet/wall{
 	icon_state = "emergency_wall";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/item/tank/internals/oxygen,
 /obj/item/tank/internals/oxygen,
@@ -1334,7 +1338,7 @@
 	icon_door = "med_wall";
 	name = "medical locker";
 	req_access_txt = "5";
-	dir = 4;
+	dir = 8;
 	pixel_x = -28
 	},
 /obj/item/storage/firstaid/advanced{
@@ -1388,8 +1392,7 @@
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
-	pixel_y = -28;
-	dir = 1
+	pixel_y = -28
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
@@ -1413,8 +1416,7 @@
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
-	pixel_y = -28;
-	dir = 1
+	pixel_y = -28
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
diff --git a/_maps/_mod_celadon/shuttles/misc/independent_bulk.dmm b/_maps/_mod_celadon/shuttles/misc/independent_bulk.dmm
index 4f3f05876ea0..7c8e858f0610 100644
--- a/_maps/_mod_celadon/shuttles/misc/independent_bulk.dmm
+++ b/_maps/_mod_celadon/shuttles/misc/independent_bulk.dmm
@@ -904,7 +904,8 @@
 /area/ship/engineering/atmospherics)
 "sJ" = (
 /obj/structure/closet/wall{
-	pixel_y = 30
+	pixel_y = 30;
+	dir = 1
 	},
 /obj/item/clothing/head/helmet/sec,
 /obj/item/clothing/head/helmet/sec,
@@ -1967,7 +1968,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/atmospherics)
diff --git a/_maps/_mod_celadon/shuttles/misc/independent_sfwb.dmm b/_maps/_mod_celadon/shuttles/misc/independent_sfwb.dmm
index 387408b34bbf..22d50f3290fd 100644
--- a/_maps/_mod_celadon/shuttles/misc/independent_sfwb.dmm
+++ b/_maps/_mod_celadon/shuttles/misc/independent_sfwb.dmm
@@ -560,10 +560,6 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
-/obj/structure/closet/wall{
-	dir = 8;
-	pixel_x = 32
-	},
 /obj/machinery/power/ship_gravity,
 /obj/structure/cable{
 	icon_state = "0-8"
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
index 3dc2fd8eeef0..b3b4f07fda5f 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_darect.dmm
@@ -1,7 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aO" = (
 /obj/structure/closet/wall{
-	dir = 1;
 	name = "uniform closet";
 	pixel_y = -30
 	},
@@ -31,12 +30,6 @@
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 4
 	},
-/obj/structure/closet/wall{
-	dir = 8;
-	icon_door = "yellow_wall";
-	name = "engineering closet";
-	pixel_x = 28
-	},
 /obj/item/clothing/accessory/armband/engine,
 /obj/item/clothing/head/hardhat/dblue,
 /obj/item/clothing/gloves/color/yellow,
@@ -60,6 +53,10 @@
 /obj/item/tank/internals/emergency_oxygen/engi,
 /obj/item/clothing/head/helmet/space/light/engineer,
 /obj/item/clothing/suit/space/engineer,
+/obj/structure/closet/wall{
+	dir = 4;
+	pixel_x = 30
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "bA" = (
@@ -219,7 +216,8 @@
 	},
 /obj/structure/closet/wall/orange{
 	name = "fuel locker";
-	pixel_y = 28
+	pixel_y = 30;
+	dir = 1
 	},
 /obj/item/stack/sheet/mineral/plasma/twenty,
 /obj/item/stack/sheet/mineral/plasma/twenty{
@@ -998,7 +996,8 @@
 /obj/item/storage/bag/trash,
 /obj/structure/closet/wall{
 	name = "Janitorial supplies";
-	pixel_y = 30
+	pixel_y = 30;
+	dir = 1
 	},
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
@@ -1321,7 +1320,6 @@
 "ze" = (
 /obj/effect/turf_decal/techfloor,
 /obj/structure/closet/secure_closet/wall{
-	dir = 1;
 	icon_door = "red_wall";
 	icon_state = "generic_wall";
 	name = "equipment locker";
@@ -1518,7 +1516,8 @@
 /obj/structure/closet/wall/red{
 	name = "Ammo locker";
 	pixel_y = 28;
-	pixel_x = -7
+	pixel_x = -7;
+	dir = 1
 	},
 /obj/item/ammo_box/magazine/smgm9mm{
 	pixel_y = 7;
@@ -1657,7 +1656,6 @@
 	dir = 10
 	},
 /obj/structure/closet/wall{
-	dir = 1;
 	name = "uniform closet";
 	pixel_y = -30
 	},
@@ -2304,7 +2302,6 @@
 /area/ship/security)
 "QS" = (
 /obj/structure/closet/wall{
-	dir = 1;
 	icon_door = null;
 	name = "radio locker";
 	pixel_y = -28
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
index 04c24c1e07eb..7c69d7d92b63 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -2613,9 +2613,6 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/dormfive)
 "Gm" = (
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
 /obj/item/clothing/suit/armor/curator,
 /obj/item/clothing/suit/armor/curator,
 /obj/item/clothing/suit/armor/curator,
@@ -2632,12 +2629,11 @@
 /obj/item/clothing/head/fedora/white,
 /obj/item/clothing/head/fedora/white,
 /obj/item/clothing/head/fedora/white,
-/obj/structure/closet/wall/directional/north,
-/obj/item/radio,
 /obj/item/clothing/suit/jacket/letterman_nanotrasen,
 /obj/item/clothing/suit/jacket/letterman_nanotrasen,
 /obj/item/clothing/suit/jacket/letterman_nanotrasen,
 /obj/item/clothing/suit/jacket/letterman_nanotrasen,
+/obj/structure/closet,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "Gt" = (
@@ -2712,6 +2708,11 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
+/obj/structure/closet/wall/directional/north,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew)
 "GT" = (
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
index d6d2a55b085c..b628eb99a62a 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm
@@ -352,7 +352,8 @@
 /obj/item/clothing/glasses/meson/engine/tray,
 /obj/item/areaeditor/shuttle,
 /obj/structure/closet/wall/orange{
-	pixel_y = 32
+	pixel_y = 32;
+	dir = 1
 	},
 /obj/item/storage/box/metalfoam,
 /obj/item/holosign_creator/engineering,
@@ -1046,7 +1047,8 @@
 /obj/machinery/chem_heater,
 /obj/machinery/light/dim/directional/east,
 /obj/structure/closet/firecloset/wall{
-	pixel_y = 32
+	pixel_y = 32;
+	dir = 1
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -1445,7 +1447,7 @@
 	dir = 9
 	},
 /obj/structure/closet/firecloset/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 28
 	},
 /turf/open/floor/engine,
@@ -1530,7 +1532,8 @@
 	},
 /obj/structure/closet/firecloset/wall{
 	pixel_y = 32;
-	pixel_x = 32
+	pixel_x = 32;
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -1620,7 +1623,7 @@
 /obj/item/radio,
 /obj/item/radio,
 /obj/structure/closet/wall{
-	dir = 8;
+	dir = 4;
 	name = "Radio Storage";
 	pixel_x = 28
 	},
@@ -2182,10 +2185,6 @@
 	pixel_y = 31
 	},
 /obj/machinery/disposal/bin,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -30
-	},
 /obj/structure/disposalpipe/trunk,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -2508,7 +2507,7 @@
 	pixel_y = 32
 	},
 /obj/structure/closet/emcloset/wall{
-	dir = 4;
+	dir = 8;
 	pixel_x = -30
 	},
 /turf/open/floor/plasteel,
@@ -2565,7 +2564,7 @@
 	dir = 4
 	},
 /obj/structure/closet/secure_closet/wall{
-	dir = 4;
+	dir = 8;
 	name = "medicine cabinet";
 	pixel_x = -28
 	},
@@ -2958,7 +2957,7 @@
 	pixel_y = 11
 	},
 /obj/structure/closet/firecloset/wall{
-	dir = 4;
+	dir = 8;
 	pixel_x = -28
 	},
 /turf/open/floor/plasteel,
@@ -3220,7 +3219,7 @@
 /area/ship/hallway/starboard)
 "PN" = (
 /obj/structure/closet/secure_closet/wall{
-	dir = 4;
+	dir = 8;
 	icon_door = "sec_wall";
 	icon_state = "sec_wall";
 	name = "gun locker";
diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
index 3f2fb427e295..54a0ca69ac5a 100644
--- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
+++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm
@@ -106,7 +106,8 @@
 /area/ship/bridge)
 "iG" = (
 /obj/structure/closet/wall/red{
-	pixel_y = 32
+	pixel_y = 32;
+	dir = 1
 	},
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/c9mm,
@@ -252,7 +253,7 @@
 /area/ship/bridge)
 "ts" = (
 /obj/structure/closet/wall/blue{
-	dir = 4;
+	dir = 8;
 	pixel_x = -32
 	},
 /obj/item/areaeditor/shuttle,
@@ -290,7 +291,6 @@
 /area/template_noop)
 "xy" = (
 /obj/structure/closet/wall/white/med{
-	dir = 1;
 	pixel_y = -32
 	},
 /obj/item/storage/firstaid/medical,
@@ -301,7 +301,7 @@
 "zJ" = (
 /obj/machinery/light/floor,
 /obj/structure/closet/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 32
 	},
 /obj/item/radio,
@@ -401,7 +401,8 @@
 	dir = 1
 	},
 /obj/structure/closet/firecloset/wall{
-	pixel_y = 32
+	pixel_y = 32;
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -459,7 +460,8 @@
 /obj/item/reagent_containers/food/drinks/waterbottle,
 /obj/item/reagent_containers/food/drinks/waterbottle,
 /obj/structure/closet/wall/white{
-	pixel_y = 32
+	pixel_y = 32;
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -675,7 +677,8 @@
 /obj/machinery/light/floor,
 /obj/effect/turf_decal/atmos/oxygen,
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 32
+	pixel_y = 32;
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
diff --git a/_maps/_mod_celadon/shuttles/solgov/solgov_cepheus.dmm b/_maps/_mod_celadon/shuttles/solgov/solgov_cepheus.dmm
index df43b201cb55..e2a10bbb72c8 100644
--- a/_maps/_mod_celadon/shuttles/solgov/solgov_cepheus.dmm
+++ b/_maps/_mod_celadon/shuttles/solgov/solgov_cepheus.dmm
@@ -105,7 +105,6 @@
 	dir = 8
 	},
 /obj/structure/closet/emcloset/wall{
-	dir = 1;
 	pixel_y = -28
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -1074,7 +1073,8 @@
 /area/ship/hallway/central)
 "nG" = (
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/effect/turf_decal/techfloor,
 /obj/effect/turf_decal/techfloor{
@@ -1256,7 +1256,7 @@
 	dir = 4
 	},
 /obj/structure/closet/wall{
-	dir = 8;
+	dir = 4;
 	icon_door = "red_wall";
 	name = "Roboticists Locker";
 	pixel_x = 28
@@ -1868,7 +1868,6 @@
 "we" = (
 /obj/effect/turf_decal/techfloor,
 /obj/structure/closet/secure_closet/wall{
-	dir = 1;
 	pixel_y = -28;
 	name = "Prisoner locker"
 	},
@@ -2423,7 +2422,7 @@
 	icon_state = "2-8"
 	},
 /obj/structure/closet/firecloset/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 28
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -3594,7 +3593,8 @@
 /obj/item/pen/fountain/solgov,
 /obj/structure/closet/secure_closet/wall{
 	pixel_y = 28;
-	name = "bridge supplies"
+	name = "bridge supplies";
+	dir = 1
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
@@ -3668,7 +3668,7 @@
 	dir = 4
 	},
 /obj/structure/closet/wall/red{
-	dir = 8;
+	dir = 4;
 	name = "Ammo locker";
 	pixel_x = 28
 	},
@@ -3698,7 +3698,8 @@
 /obj/structure/closet/wall{
 	icon_door = "orange_wall";
 	name = "Mining equipment";
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/item/circuitboard/machine/ore_redemption,
 /obj/item/pickaxe,
@@ -3752,7 +3753,6 @@
 "TH" = (
 /obj/effect/turf_decal/techfloor,
 /obj/structure/closet/firecloset/wall{
-	dir = 1;
 	pixel_y = -28
 	},
 /obj/effect/spawner/lootdrop/maintenance,
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
index 1bf663500260..48b0d13aa83a 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_remora.dmm
@@ -112,7 +112,8 @@
 /obj/structure/chair/plastic,
 /obj/machinery/light/directional/west,
 /obj/structure/closet/firecloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm)
@@ -127,7 +128,8 @@
 	dir = 4
 	},
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm)
@@ -250,7 +252,8 @@
 	pixel_y = 50
 	},
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/effect/decal/cleanable/oil,
 /turf/open/floor/plating,
@@ -423,7 +426,6 @@
 /obj/structure/closet/wall{
 	name = "uniform closet";
 	icon_state = "generic_wall";
-	dir = 1;
 	pixel_y = -29;
 	icon_door = "orange_wall"
 	},
@@ -1580,7 +1582,7 @@
 "dl" = (
 /obj/structure/closet/wall/white/chem{
 	icon_state = "freezer_wall";
-	dir = 4;
+	dir = 8;
 	pixel_x = -30
 	},
 /obj/item/cartridge/chemistry,
@@ -1649,7 +1651,8 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/machinery/door/firedoor/heavy,
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
@@ -3425,7 +3428,8 @@
 	pixel_y = 50
 	},
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/electrical)
@@ -4094,7 +4098,8 @@
 	dir = 1
 	},
 /obj/structure/closet/firecloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
@@ -4196,7 +4201,7 @@
 	pixel_x = 4
 	},
 /obj/structure/closet/emcloset/wall{
-	dir = 8;
+	dir = 4;
 	pixel_x = 28
 	},
 /turf/open/floor/plasteel/tech/grid,
@@ -4333,7 +4338,8 @@
 	pixel_y = 50
 	},
 /obj/structure/closet/firecloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /obj/machinery/syndicatebomb{
 	anchored = 1
@@ -4405,7 +4411,8 @@
 	pixel_y = 50
 	},
 /obj/structure/closet/emcloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/science)
@@ -4480,7 +4487,8 @@
 /obj/structure/closet/mob_capture,
 /obj/effect/turf_decal/corner/opaque/green/diagonal,
 /obj/structure/closet/firecloset/wall{
-	pixel_y = 28
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/science/xenobiology)
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm
index d590cd822b2f..08214892e47a 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm
@@ -212,7 +212,8 @@
 	},
 /obj/structure/closet/wall/white/med{
 	name = "medical locker";
-	pixel_y = 29
+	pixel_y = 29;
+	dir = 1
 	},
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/carpet/blue,
@@ -1103,7 +1104,7 @@
 	dir = 4
 	},
 /obj/structure/closet/secure_closet/wall{
-	dir = 4;
+	dir = 8;
 	icon_state = "sec_wall";
 	name = "Armour locker";
 	req_access_txt = "1";
@@ -1896,7 +1897,8 @@
 	icon_state = "sec_wall";
 	name = "Ammo locker";
 	pixel_y = 28;
-	req_access_txt = "1"
+	req_access_txt = "1";
+	dir = 1
 	},
 /obj/structure/table/reinforced,
 /obj/item/storage/box/lethalshot,
@@ -1982,7 +1984,7 @@
 	},
 /obj/machinery/firealarm/directional/north,
 /obj/structure/closet/wall/blue{
-	dir = 4;
+	dir = 8;
 	pixel_x = -28;
 	name = "Mecha parts locker"
 	},
@@ -2657,7 +2659,8 @@
 	icon_state = "sec_wall";
 	name = "Trophy's locker";
 	pixel_y = 28;
-	req_access_txt = "1"
+	req_access_txt = "1";
+	dir = 1
 	},
 /obj/item/toy/nuke,
 /turf/open/floor/mineral/plastitanium/red,
@@ -2941,7 +2944,7 @@
 /area/ship/maintenance/starboard)
 "Yd" = (
 /obj/structure/closet/wall/red{
-	dir = 8;
+	dir = 4;
 	name = "uniform closet";
 	pixel_x = 28
 	},
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gec_lugol.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gec_lugol.dmm
index 6994f283b8c2..a438911b5a22 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gec_lugol.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gec_lugol.dmm
@@ -893,7 +893,6 @@
 	color = "#4c535b"
 	},
 /obj/structure/closet/wall{
-	dir = 1;
 	name = "Radio Closet";
 	pixel_y = -30
 	},
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm
index 15a789dcb0b6..c0d958c0ed0e 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kaas.dmm
@@ -480,7 +480,7 @@
 /area/ship/bridge)
 "mf" = (
 /obj/structure/closet/wall{
-	dir = 4;
+	dir = 8;
 	pixel_x = -28;
 	name = "uniform closet"
 	},
@@ -865,7 +865,6 @@
 /area/ship/bridge)
 "uB" = (
 /obj/structure/closet/emcloset/wall{
-	dir = 1;
 	pixel_y = -28
 	},
 /obj/item/tank/internals/emergency_oxygen/double,
@@ -1485,7 +1484,7 @@
 /area/ship/security/armory)
 "Fr" = (
 /obj/structure/closet/wall{
-	dir = 4;
+	dir = 8;
 	pixel_x = -28;
 	name = "gear closet"
 	},
diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm
index e4d103a8083e..81bb75789b63 100644
--- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm
+++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_luxembourg.dmm
@@ -149,7 +149,7 @@
 /obj/item/stack/wrapping_paper,
 /obj/item/stack/packageWrap,
 /obj/structure/closet/wall{
-	dir = 8;
+	dir = 4;
 	icon_door = "orange_wall";
 	name = "employee closet";
 	pixel_x = 28
@@ -255,7 +255,6 @@
 	pixel_y = -4
 	},
 /obj/structure/closet/wall/white/med{
-	dir = 1;
 	name = "medicine locker";
 	pixel_y = -28
 	},
@@ -309,7 +308,7 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/structure/closet/secure_closet/wall{
-	dir = 4;
+	dir = 8;
 	icon_state = "solgov_wall";
 	name = "manager's locker";
 	pixel_x = -28;
@@ -654,7 +653,7 @@
 /obj/item/stack/packageWrap,
 /obj/structure/railing,
 /obj/structure/closet/wall{
-	dir = 4;
+	dir = 8;
 	icon_door = "orange_wall";
 	name = "employee closet";
 	pixel_x = -28
@@ -750,7 +749,6 @@
 /obj/structure/table,
 /obj/machinery/door/firedoor,
 /obj/item/radio/intercom/directional/north,
-/obj/item/gun/ballistic/automatic/smg/c20r/toy,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "qh" = (
@@ -1182,6 +1180,9 @@
 	req_access = null;
 	req_one_access_txt = list(25,41)
 	},
+/obj/item/gun/ballistic/automatic/smg/c20r/toy,
+/obj/item/gun/ballistic/automatic/smg/c20r/toy,
+/obj/item/gun/ballistic/automatic/smg/c20r/toy,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
 "xw" = (
@@ -1533,7 +1534,7 @@
 /obj/item/stack/wrapping_paper,
 /obj/item/stack/packageWrap,
 /obj/structure/closet/wall{
-	dir = 4;
+	dir = 8;
 	icon_door = "orange_wall";
 	name = "employee closet";
 	pixel_x = -28
@@ -1682,7 +1683,7 @@
 /obj/item/stack/packageWrap,
 /obj/structure/railing,
 /obj/structure/closet/wall{
-	dir = 8;
+	dir = 4;
 	icon_door = "orange_wall";
 	name = "employee closet";
 	pixel_x = 28
@@ -1875,7 +1876,6 @@
 "KZ" = (
 /obj/effect/turf_decal/siding/red,
 /obj/structure/closet/secure_closet/freezer/wall{
-	dir = 1;
 	name = "refrigerator";
 	pixel_y = -32
 	},
@@ -2301,7 +2301,7 @@
 /obj/item/stack/wrapping_paper,
 /obj/item/stack/packageWrap,
 /obj/structure/closet/wall{
-	dir = 4;
+	dir = 8;
 	icon_door = "orange_wall";
 	name = "employee closet";
 	pixel_x = -28