diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
index 0839518362b4..3bf64a6b03b7 100644
--- a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
@@ -89,10 +89,8 @@
 	dir = 4;
 	color = "#808080"
 	},
-/obj/structure/closet/wall/red{
-	dir = 8;
+/obj/structure/closet/wall/red/directional/east{
 	name = "armory locker";
-	pixel_x = 28;
 	req_one_access_txt = "1"
 	},
 /obj/item/storage/box/slugshot,
@@ -1151,10 +1149,8 @@
 "sw" = (
 /obj/effect/turf_decal/siding/wood/end,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall{
-	dir = 8;
-	icon_door = "grey_wall";
-	pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+	icon_door = "grey_wall"
 	},
 /obj/item/flashlight/lantern{
 	pixel_x = 8
@@ -1471,10 +1467,7 @@
 "wx" = (
 /obj/structure/catwalk/over,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/machinery/atmospherics/pipe/simple/orange/hidden,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -2012,10 +2005,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/item/skub{
 	pixel_x = -5;
 	pixel_y = 6
@@ -2121,10 +2111,8 @@
 	dir = 8;
 	color = "#808080"
 	},
-/obj/structure/closet/wall/red{
-	dir = 4;
+/obj/structure/closet/wall/red/directional/west{
 	name = "armory locker";
-	pixel_x = -28;
 	req_one_access_txt = "1"
 	},
 /obj/item/storage/belt/military,
@@ -2425,10 +2413,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "KC" = (
 /obj/structure/catwalk/over,
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/yellow{
@@ -2841,10 +2826,8 @@
 	dir = 4;
 	color = "#A47449"
 	},
-/obj/structure/closet/wall{
-	name = "uniform closet";
-	dir = 4;
-	pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+	name = "uniform closet"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/yellow{
@@ -2947,10 +2930,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ruin/beach/starwalker)
 "SS" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 32
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/item/stack/sticky_tape,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/pod,
@@ -3360,10 +3340,8 @@
 	dir = 6;
 	color = "#808080"
 	},
-/obj/structure/closet/wall/red{
-	dir = 8;
+/obj/structure/closet/wall/red/directional/east{
 	name = "armory locker";
-	pixel_x = 28;
 	req_one_access_txt = "1"
 	},
 /obj/structure/railing,
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
index 3b21c3271764..5a3d8ea3a2c7 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
@@ -321,10 +321,7 @@
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectrooms)
 "io" = (
-/obj/structure/closet/wall/red{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/wall/red/directional/west,
 /obj/item/keycard/office{
 	desc = "Only Elite level employees are authorized to handle this keycard. All other employees may face termination if found in possession.";
 	name = "Vault Card";
@@ -1392,9 +1389,7 @@
 /turf/open/floor/plating/catwalk_floor,
 /area/ruin/unpowered/corprejectrooms)
 "Fa" = (
-/obj/structure/closet/firecloset/wall{
-	pixel_x = -27
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/structure/cable/blue{
 	icon_state = "5-6"
 	},
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
index ff730ff082bd..bed82db78338 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -465,10 +465,8 @@
 /area/ship/storage)
 "fv" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall/red{
-	dir = 1;
-	name = "Bartender's locker";
-	pixel_y = -28
+/obj/structure/closet/wall/red/directional/south{
+	name = "Bartender's locker"
 	},
 /obj/item/clothing/under/suit/waiter/syndicate,
 /obj/item/clothing/suit/apron/purple_bartender,
@@ -1029,10 +1027,7 @@
 /obj/structure/sign/poster/contraband/lusty_xenomorph{
 	pixel_y = 32
 	},
-/obj/structure/closet/secure_closet/freezer/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/secure_closet/freezer/wall/directional/west,
 /obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/reagent_containers/food/snacks/rationpack,
 /obj/item/reagent_containers/food/snacks/rationpack,
@@ -2857,10 +2852,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/wall/directional/west,
 /obj/item/reagent_containers/syringe/contraband/bath_salts{
 	pixel_y = 6;
 	pixel_x = -4
diff --git a/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm b/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
index 224bd54c8361..628c44f42f6e 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
@@ -443,10 +443,7 @@
 /turf/open/floor/plating/dirt/jungle/dark/lit,
 /area/overmap_encounter/planetoid/jungle/explored)
 "dv" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	pixel_x = -29
-	},
+/obj/structure/closet/wall/blue/directional/west,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -485,10 +482,7 @@
 /turf/closed/wall/mineral/titanium,
 /area/ruin/jungle/interceptor/porthall)
 "dE" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/effect/turf_decal/corner/opaque/orange/border{
 	dir = 6
 	},
@@ -581,10 +575,8 @@
 	},
 /obj/item/clothing/suit/armor/vest,
 /obj/item/gun/energy/disabler,
-/obj/structure/closet/wall/red{
-	name = "secure locker";
-	dir = 4;
-	pixel_x = -28
+/obj/structure/closet/wall/red/directional/west{
+	name = "secure locker"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/jungle/interceptor/security)
@@ -999,10 +991,7 @@
 /obj/effect/turf_decal/corner/opaque/bottlegreen/border{
 	dir = 5
 	},
-/obj/structure/closet/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/wall/directional/east,
 /obj/item/reagent_containers/food/snacks/meat/slab/monkey,
 /obj/item/reagent_containers/food/snacks/meat/slab/monkey,
 /obj/item/reagent_containers/food/condiment/sugar,
@@ -1096,10 +1085,7 @@
 /turf/open/floor/wood,
 /area/ruin/jungle/interceptor/starhall)
 "im" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	pixel_x = -29
-	},
+/obj/structure/closet/wall/blue/directional/west,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -1166,10 +1152,7 @@
 /obj/effect/turf_decal/corner/opaque/bottlegreen/border{
 	dir = 8
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/wall/directional/west,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ruin/jungle/interceptor/starhall)
@@ -1529,10 +1512,7 @@
 /turf/open/floor/plating/dirt/jungle/lit,
 /area/overmap_encounter/planetoid/jungle/explored)
 "mU" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	pixel_x = -29
-	},
+/obj/structure/closet/wall/blue/directional/west,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -1796,10 +1776,7 @@
 /obj/effect/turf_decal/corner_steel_grid{
 	dir = 10
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/structure/cable/green{
 	icon_state = "4-9"
 	},
@@ -2124,10 +2101,7 @@
 /turf/open/floor/plating/dirt/jungle/lit,
 /area/overmap_encounter/planetoid/jungle/explored)
 "rU" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/item/clothing/mask/breath,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/plastic,
@@ -3087,10 +3061,8 @@
 /obj/effect/turf_decal/corner/transparent/bar/three_quarters{
 	dir = 4
 	},
-/obj/structure/closet/wall/red{
-	name = "secure locker";
-	dir = 4;
-	pixel_x = -28
+/obj/structure/closet/wall/red/directional/west{
+	name = "secure locker"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/jungle/interceptor/security)
@@ -3209,10 +3181,7 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/wall/directional/west,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -3934,10 +3903,8 @@
 	},
 /obj/item/light/bulb/broken,
 /obj/item/clothing/suit/space/hardsuit/security,
-/obj/structure/closet/wall/red{
-	name = "secure locker";
-	dir = 1;
-	pixel_y = -28
+/obj/structure/closet/wall/red/directional/south{
+	name = "secure locker"
 	},
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/interceptor/security)
@@ -4503,9 +4470,7 @@
 /obj/structure/cable/orange{
 	icon_state = "2-8"
 	},
-/obj/structure/closet/wall{
-	pixel_y = 29
-	},
+/obj/structure/closet/wall/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/effect/decal/cleanable/glass,
 /obj/machinery/light/small/broken/directional/east,
@@ -5517,10 +5482,7 @@
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/interceptor/starlaunchertwo)
 "UD" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/effect/turf_decal/corner/opaque/orange/border{
 	dir = 5
 	},
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashed_pinnance.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashed_pinnance.dmm
index ae8079063627..32c0fbf31006 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashed_pinnance.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashed_pinnance.dmm
@@ -369,10 +369,8 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ruin/unpowered/crashsite/pinnance)
 "Gt" = (
-/obj/structure/closet/wall/white{
-	dir = 8;
-	name = "survey gear";
-	pixel_x = 30
+/obj/structure/closet/wall/white/directional/east{
+	name = "survey gear"
 	},
 /obj/item/survey_handheld/elite,
 /obj/item/survey_handheld/advanced,
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
index 9b5adb277fa8..ed6c98765b2b 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
@@ -1964,10 +1964,7 @@
 /area/ruin/powered)
 "Tl" = (
 /obj/machinery/light/directional/south,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
-	pixel_x = -27
-	},
+/obj/structure/closet/secure_closet/wall/directional/west,
 /obj/item/storage/firstaid/ancient,
 /obj/item/clothing/neck/stethoscope,
 /obj/item/grenade/chem_grenade/teargas{
diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
index e4d83a8eb842..209709f2599b 100644
--- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
+++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
@@ -195,10 +195,8 @@
 /turf/open/floor/engine,
 /area/ruin/whitesands/pubbycrash)
 "fk" = (
-/obj/structure/closet/wall/blue{
-	dir = 1;
-	name = "Captain's locker";
-	pixel_y = -28
+/obj/structure/closet/wall/blue/directional/south{
+	name = "Captain's locker"
 	},
 /obj/item/clothing/suit/space/hardsuit/mining/heavy,
 /obj/effect/decal/cleanable/dirt,
@@ -503,10 +501,7 @@
 /area/ruin/whitesands/pubbycrash)
 "ln" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/effect/spawner/lootdrop/maintenance/two,
 /turf/open/floor/plasteel/tech/grid,
 /area/ruin/whitesands/pubbycrash/engine_room)
@@ -660,10 +655,8 @@
 	},
 /area/ruin/whitesands/pubbycrash/split)
 "oo" = (
-/obj/structure/closet/wall/white{
-	dir = 1;
-	name = "Medicine storage";
-	pixel_y = -30
+/obj/structure/closet/wall/white/directional/south{
+	name = "Medicine storage"
 	},
 /obj/item/storage/firstaid/ancient{
 	pixel_x = 6;
@@ -857,10 +850,9 @@
 /obj/effect/turf_decal/siding/brown{
 	dir = 1
 	},
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
 	icon_door = "orange_wall";
-	name = "Mining equipment";
-	pixel_y = 28
+	name = "Mining equipment"
 	},
 /obj/item/clothing/glasses/meson,
 /obj/item/clothing/glasses/meson,
@@ -1818,10 +1810,8 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall/red{
-	dir = 8;
+/obj/structure/closet/wall/red/directional/east{
 	name = "Firearm Locker";
-	pixel_x = 29;
 	welded = 1
 	},
 /obj/effect/turf_decal/spline/fancy/opaque/black{
@@ -1988,10 +1978,8 @@
 /turf/open/floor/plasteel,
 /area/ruin/whitesands/pubbycrash/split)
 "Pr" = (
-/obj/structure/closet/wall/red{
-	dir = 4;
+/obj/structure/closet/wall/red/directional/west{
 	name = "Pilots locker";
-	pixel_x = -29;
 	welded = 1
 	},
 /obj/item/clothing/under/suit/black,
diff --git a/_maps/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
index adf957299b7a..db2b305b063b 100644
--- a/_maps/RandomRuins/SpaceRuins/astraeus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
@@ -1499,7 +1499,7 @@
 /turf/open/floor/plasteel/dark/airless,
 /area/ruin/space/has_grav/astraeus/bridge)
 "Ni" = (
-/obj/structure/closet/wall,
+/obj/structure/closet/wall/directional/north,
 /obj/item/circuitboard/computer/rdconsole,
 /obj/item/clothing/suit/toggle/labcoat,
 /obj/item/research_notes/loot/big,
diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
index 28695ad57a80..a1bfbbcabd83 100644
--- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
+++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -1282,9 +1282,7 @@
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav)
 "IR" = (
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 29
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav)
 "Ja" = (
@@ -1820,9 +1818,7 @@
 /area/ruin/space/has_grav)
 "UQ" = (
 /obj/effect/turf_decal/siding/purple,
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 29
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav)
 "UR" = (
diff --git a/_maps/RandomRuins/SpaceRuins/fueldepot.dmm b/_maps/RandomRuins/SpaceRuins/fueldepot.dmm
index abe9e9f4562c..aa5edab6420a 100644
--- a/_maps/RandomRuins/SpaceRuins/fueldepot.dmm
+++ b/_maps/RandomRuins/SpaceRuins/fueldepot.dmm
@@ -148,10 +148,8 @@
 	},
 /obj/structure/table_frame,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall{
-	name = "armory locker";
-	pixel_x = 28;
-	dir = 8
+/obj/structure/closet/wall/directional/east{
+	name = "armory locker"
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/unpowered)
@@ -218,10 +216,8 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 5
 	},
-/obj/structure/closet/wall{
-	name = "armory locker";
-	pixel_x = 28;
-	dir = 8
+/obj/structure/closet/wall/directional/east{
+	name = "armory locker"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/gun/ballistic/shotgun/brimstone,
@@ -615,10 +611,8 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall{
-	name = "suit locker";
-	pixel_x = -28;
-	dir = 4
+/obj/structure/closet/wall/directional/west{
+	name = "suit locker"
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/unpowered)
@@ -1314,10 +1308,8 @@
 /obj/effect/decal/cleanable/oil,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/reagent_containers/food/drinks/bottle/rum,
-/obj/structure/closet/wall{
-	name = "armory locker";
-	pixel_x = 28;
-	dir = 8
+/obj/structure/closet/wall/directional/east{
+	name = "armory locker"
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/unpowered)
@@ -1458,10 +1450,8 @@
 /obj/structure/cable{
 	icon_state = "4-6"
 	},
-/obj/structure/closet/wall{
-	name = "suit locker";
-	pixel_x = -28;
-	dir = 4
+/obj/structure/closet/wall/directional/west{
+	name = "suit locker"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/mineral/plastitanium,
diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
index 3175796cd159..c9984937d2a7 100644
--- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
+++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
@@ -4615,10 +4615,7 @@
 	},
 /area/ruin/space/has_grav/singularitylab)
 "sr" = (
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/wall/directional/west,
 /obj/item/reagent_containers/food/drinks/flask,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/singularitylab/civvie)
@@ -8959,10 +8956,7 @@
 /turf/open/floor/engine,
 /area/ruin/space/has_grav/singularitylab/reactor)
 "Jk" = (
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/wall/directional/west,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/singularitylab/civvie)
 "Jl" = (
diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
index aba1424544be..e5ed66920caf 100644
--- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -1439,9 +1439,7 @@
 	pixel_y = 5
 	},
 /obj/item/reagent_containers/food/condiment/sugar,
-/obj/structure/closet/wall{
-	pixel_y = 30
-	},
+/obj/structure/closet/wall/directional/north,
 /obj/item/spacecash/bundle/c100,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/spacemall)
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
index 570af22f6ced..cc330e69baa9 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
@@ -4127,9 +4127,7 @@
 /turf/closed/wall/concrete/reinforced,
 /area/ruin/wasteplanet/abandoned_mechbay/mechlab)
 "Yu" = (
-/obj/structure/closet/wall/white{
-	pixel_y = 29
-	},
+/obj/structure/closet/wall/white/directional/north,
 /obj/item/storage/firstaid/toxin,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm
index 2cd76a6338be..7a4b5e4caa3c 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_crash_kitchen.dmm
@@ -431,10 +431,7 @@
 /obj/machinery/advanced_airlock_controller{
 	pixel_y = -24
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_x = 28;
-	dir = 8
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ruin/unpowered)
 "TZ" = (
diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm
index e7d2e554a70e..7d7ad5ecb653 100644
--- a/_maps/outpost/indie_space.dmm
+++ b/_maps/outpost/indie_space.dmm
@@ -2856,10 +2856,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/plasteel,
 /area/outpost/hallway/central)
 "sB" = (
@@ -3933,10 +3930,7 @@
 "yV" = (
 /obj/effect/turf_decal/corner/opaque/grey/full,
 /obj/effect/turf_decal/corner/opaque/neutral,
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /turf/open/floor/plasteel,
 /area/outpost/hallway/port)
 "za" = (
@@ -7221,9 +7215,7 @@
 /obj/effect/turf_decal/corner/opaque/neutral{
 	dir = 1
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel,
 /area/outpost/hallway/central)
 "SC" = (
diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
index 2ea6c907e80e..02d44702bc23 100644
--- a/_maps/outpost/nanotrasen_asteroid.dmm
+++ b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -3893,10 +3893,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/structure/closet/secure_closet/freezer/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/secure_closet/freezer/wall/directional/east,
 /turf/open/floor/wood,
 /area/outpost/hallway/central)
 "op" = (
@@ -5299,10 +5296,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/structure/closet/secure_closet/freezer/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/secure_closet/freezer/wall/directional/east,
 /obj/item/clothing/suit/apron/chef,
 /turf/open/floor/concrete/tiles,
 /area/outpost/crew/library)
@@ -5958,10 +5952,8 @@
 	},
 /obj/effect/turf_decal/siding/wood,
 /obj/machinery/light/directional/north,
-/obj/structure/closet/wall{
-	name = "Storage Locker";
-	dir = 8;
-	pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+	name = "Storage Locker"
 	},
 /turf/open/floor/carpet,
 /area/outpost/hallway/central)
@@ -6029,9 +6021,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
@@ -6147,10 +6137,8 @@
 /obj/item/reagent_containers/glass/rag,
 /obj/item/mop,
 /obj/item/soap/deluxe,
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	name = "Janitorial Closet";
-	pixel_x = -29
+/obj/structure/closet/wall/blue/directional/west{
+	name = "Janitorial Closet"
 	},
 /obj/machinery/door/window,
 /obj/effect/turf_decal/industrial/warning,
@@ -7235,9 +7223,7 @@
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 5
 	},
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /turf/open/floor/plasteel/tech/grid,
 /area/outpost/engineering)
 "zm" = (
@@ -7383,10 +7369,8 @@
 /turf/open/floor/grass,
 /area/outpost/crew/garden)
 "zP" = (
-/obj/structure/closet/wall/red{
-	dir = 8;
-	name = "Bartender's locker";
-	pixel_x = 29
+/obj/structure/closet/wall/red/directional/east{
+	name = "Bartender's locker"
 	},
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -9154,10 +9138,8 @@
 /turf/open/floor/plating,
 /area/outpost/crew/lounge)
 "Gi" = (
-/obj/structure/closet/wall{
-	name = "Storage Locker";
-	pixel_y = -28;
-	dir = 1
+/obj/structure/closet/wall/directional/south{
+	name = "Storage Locker"
 	},
 /turf/open/floor/carpet/green,
 /area/outpost/hallway/central)
@@ -10427,10 +10409,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/wood,
 /area/outpost/hallway/central)
 "Kn" = (
@@ -14302,10 +14281,7 @@
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 8
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/plasteel/tech/grid,
 /area/outpost/engineering)
 "Yi" = (
@@ -14580,10 +14556,7 @@
 /turf/closed/indestructible/reinforced,
 /area/outpost/crew/dorm)
 "Zb" = (
-/obj/structure/closet/secure_closet/freezer/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/secure_closet/freezer/wall/directional/east,
 /obj/item/clothing/under/shorts/cookjorts,
 /obj/item/clothing/shoes/cookflops,
 /obj/item/clothing/suit/toggle/chef,
@@ -14866,10 +14839,8 @@
 	dir = 6
 	},
 /obj/machinery/light/directional/south,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/east{
 	name = "Game Locker";
-	dir = 8;
-	pixel_x = 28;
 	desc = "It's a basic storage unit. Theres a little label on it, asking you to put the toys back in when finished"
 	},
 /obj/item/toy/figure/curator{
diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
index 41224e73386c..65df51cb9735 100644
--- a/_maps/shuttles/independent/independent_beluga.dmm
+++ b/_maps/shuttles/independent/independent_beluga.dmm
@@ -335,10 +335,8 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	name = "Janitorial Closet";
-	pixel_x = -28
+/obj/structure/closet/wall/blue/directional/west{
+	name = "Janitorial Closet"
 	},
 /obj/item/mop,
 /obj/item/reagent_containers/glass/bucket,
@@ -659,10 +657,8 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/structure/closet/wall/blue{
-	dir = 1;
-	name = "Bridge Officers Locker";
-	pixel_y = -28
+/obj/structure/closet/wall/blue/directional/south{
+	name = "Bridge Officers Locker"
 	},
 /obj/item/clothing/shoes/cowboy/fancy,
 /obj/item/clothing/gloves/color/white,
@@ -1045,10 +1041,8 @@
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "jI" = (
-/obj/structure/closet/wall/orange{
-	name = "fuel locker";
-	dir = 4;
-	pixel_x = -28
+/obj/structure/closet/wall/orange/directional/west{
+	name = "fuel locker"
 	},
 /obj/item/stack/sheet/mineral/plasma/five{
 	pixel_y = 3
@@ -1593,10 +1587,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "pe" = (
@@ -2201,10 +2192,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "vd" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/carpet/nanoweave/purple,
 /area/ship/crew)
 "vj" = (
@@ -2631,10 +2619,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "yZ" = (
-/obj/structure/closet/wall{
-	dir = 1;
-	name = "Utility Closet";
-	pixel_y = -28
+/obj/structure/closet/wall/directional/south{
+	name = "Utility Closet"
 	},
 /obj/item/radio,
 /obj/item/radio,
@@ -2743,10 +2729,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-9"
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "AF" = (
@@ -3224,9 +3207,7 @@
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/crew/dorm)
 "EP" = (
-/obj/structure/closet/secure_closet/freezer/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/secure_closet/freezer/wall/directional/north,
 /obj/item/reagent_containers/food/condiment/rice{
 	pixel_y = 17
 	},
@@ -3471,10 +3452,8 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/bridge)
 "Hu" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	name = "Captains Locker";
-	pixel_x = -28
+/obj/structure/closet/wall/blue/directional/west{
+	name = "Captains Locker"
 	},
 /obj/item/clothing/under/rank/command/captain,
 /obj/item/clothing/under/rank/command,
@@ -3655,10 +3634,7 @@
 /turf/open/floor/engine/hull/interior,
 /area/ship/cargo)
 "IH" = (
-/obj/structure/closet/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/wall/directional/south,
 /obj/item/storage/briefcase,
 /obj/item/folder/yellow,
 /obj/item/folder/red,
@@ -3757,10 +3733,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
 "Jk" = (
@@ -3916,10 +3889,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/machinery/door/firedoor/border_only,
 /obj/item/reagent_containers/syringe/contraband{
 	pixel_x = 6;
@@ -4976,10 +4946,8 @@
 /area/ship/engineering)
 "WG" = (
 /obj/effect/turf_decal/siding/wideplating/dark,
-/obj/structure/closet/wall/red{
-	dir = 1;
-	name = "Officer's Locker";
-	pixel_y = -28
+/obj/structure/closet/wall/red/directional/south{
+	name = "Officer's Locker"
 	},
 /obj/item/clothing/shoes/combat,
 /obj/item/storage/belt/security/webbing/inteq,
diff --git a/_maps/shuttles/independent/independent_box.dmm b/_maps/shuttles/independent/independent_box.dmm
index 5eec37e52c2b..0e1e4e9439b5 100644
--- a/_maps/shuttles/independent/independent_box.dmm
+++ b/_maps/shuttles/independent/independent_box.dmm
@@ -1180,10 +1180,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/item/storage/firstaid/fire,
 /obj/item/extinguisher/mini,
 /turf/open/floor/plasteel/tech,
@@ -1570,10 +1567,7 @@
 	pixel_x = -25;
 	pixel_y = 24
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "ss" = (
diff --git a/_maps/shuttles/independent/independent_boyardee.dmm b/_maps/shuttles/independent/independent_boyardee.dmm
index 65f03d149b90..7d6fb95b99da 100644
--- a/_maps/shuttles/independent/independent_boyardee.dmm
+++ b/_maps/shuttles/independent/independent_boyardee.dmm
@@ -97,10 +97,8 @@
 	pixel_x = -5;
 	pixel_y = -4
 	},
-/obj/structure/closet/wall/white{
-	dir = 8;
-	name = "First Aid";
-	pixel_x = 28
+/obj/structure/closet/wall/white/directional/east{
+	name = "First Aid"
 	},
 /obj/machinery/light/small/directional/south,
 /obj/machinery/newscaster/directional/west,
diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
index 40cd267a4b04..6150fe8877ec 100644
--- a/_maps/shuttles/independent/independent_dwayne.dmm
+++ b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -296,9 +296,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
-/obj/structure/closet/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/wall/directional/north,
 /obj/item/clothing/shoes/cowboy,
 /obj/item/clothing/shoes/cowboy,
 /obj/item/clothing/shoes/cowboy,
@@ -426,9 +424,7 @@
 /obj/effect/turf_decal/corner/opaque/blue{
 	dir = 4
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel/white{
 	dir = 1
 	},
@@ -1503,9 +1499,8 @@
 /obj/item/pickaxe/silver,
 /obj/item/storage/bag/ore,
 /obj/item/storage/bag/ore,
-/obj/structure/closet/wall{
-	name = "equipment closet";
-	pixel_y = 28
+/obj/structure/closet/wall/directional/north{
+	name = "equipment closet"
 	},
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 1
diff --git a/_maps/shuttles/independent/independent_junker.dmm b/_maps/shuttles/independent/independent_junker.dmm
index 006a74a2e3fb..a5b4354e7456 100644
--- a/_maps/shuttles/independent/independent_junker.dmm
+++ b/_maps/shuttles/independent/independent_junker.dmm
@@ -2266,9 +2266,7 @@
 /obj/item/gun/ballistic/automatic/pistol/disposable,
 /obj/item/reagent_containers/food/drinks/bottle/hooch,
 /obj/machinery/light/dim/directional/south,
-/obj/structure/closet/wall/blue{
-	dir = 8;
-	pixel_x = 32;
+/obj/structure/closet/wall/blue/directional/east{
 	welded = 1
 	},
 /turf/open/floor/plating,
diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm
index 4f9b272a00f7..f1f68c199fa4 100644
--- a/_maps/shuttles/independent/independent_lagoon.dmm
+++ b/_maps/shuttles/independent/independent_lagoon.dmm
@@ -386,10 +386,7 @@
 /obj/item/clothing/suit/hawaiian,
 /obj/item/spacecash/bundle/c1000,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/wall/directional/west,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
@@ -1166,10 +1163,7 @@
 /turf/open/floor/engine,
 /area/ship/engineering)
 "hN" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -32
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -1264,10 +1258,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
@@ -2694,9 +2685,7 @@
 /obj/item/cultivator,
 /obj/item/storage/box/beakers,
 /obj/item/plant_analyzer,
-/obj/structure/closet/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/wall/directional/north,
 /obj/item/storage/bag/plants/portaseeder,
 /obj/item/clothing/gloves/botanic_leather,
 /obj/effect/turf_decal/siding/wood{
@@ -2896,10 +2885,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "sQ" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
@@ -3720,10 +3706,7 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/port)
 "ys" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/item/storage/firstaid/o2,
 /obj/effect/turf_decal/corner/opaque/white/border{
 	dir = 8
@@ -3794,9 +3777,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -4199,9 +4180,7 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/starboard)
 "BT" = (
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -4602,10 +4581,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -32
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -5067,10 +5043,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/item/storage/firstaid/o2,
 /obj/effect/turf_decal/corner/opaque/white/border{
 	dir = 8
@@ -6278,10 +6251,7 @@
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "QU" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
@@ -6767,10 +6737,9 @@
 /obj/item/radio,
 /obj/item/gun/energy/e_gun/advtaser,
 /obj/item/pen/survival,
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "sec_wall";
 	name = "equipment locker";
-	pixel_y = 28;
 	req_access = list(30)
 	},
 /obj/item/card/id/captains_spare,
diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
index 34af2d7b3622..f82cdc7ba748 100644
--- a/_maps/shuttles/independent/independent_mudskipper.dmm
+++ b/_maps/shuttles/independent/independent_mudskipper.dmm
@@ -619,10 +619,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "nV" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
+/obj/structure/closet/wall/blue/directional/west{
 	secure = 1;
-	pixel_x = -28;
 	locked = 1
 	},
 /obj/item/gun/energy/laser/scatter,
diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
index 1115785bfab7..13b336dc36ae 100644
--- a/_maps/shuttles/independent/independent_rigger.dmm
+++ b/_maps/shuttles/independent/independent_rigger.dmm
@@ -351,12 +351,10 @@
 /obj/item/reagent_containers/syringe{
 	pixel_x = 7
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 8;
+/obj/structure/closet/secure_closet/wall/directional/east{
 	icon_door = "med_wall";
 	locked = 0;
 	name = "mortuary locker";
-	pixel_x = 28;
 	req_access_txt = "5"
 	},
 /obj/effect/turf_decal/corner/opaque/green{
@@ -657,11 +655,9 @@
 /obj/effect/turf_decal/borderfloor{
 	dir = 4
 	},
-/obj/structure/closet/wall{
-	dir = 8;
+/obj/structure/closet/wall/directional/east{
 	icon_door = "white_wall";
-	name = "medical closet";
-	pixel_x = 28
+	name = "medical closet"
 	},
 /obj/item/storage/backpack/satchel/med,
 /obj/item/clothing/shoes/sneakers/white,
@@ -1014,16 +1010,13 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plating,
 /area/ship/maintenance/central)
 "mH" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "sec_wall";
 	name = "firearms locker";
-	pixel_y = 28;
 	req_access_txt = "1"
 	},
 /obj/item/gun/ballistic/shotgun/flamingarrow,
@@ -1430,10 +1423,9 @@
 /turf/open/floor/engine/hull,
 /area/ship/external)
 "sq" = (
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
 	icon_door = "red_wall";
-	name = "security closet";
-	pixel_y = 28
+	name = "security closet"
 	},
 /obj/item/storage/backpack/security,
 /obj/item/clothing/gloves/fingerless,
@@ -1605,10 +1597,9 @@
 	dir = 4
 	},
 /obj/structure/catwalk/over,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
 	icon_door = "yellow_wall";
-	name = "engineering closet";
-	pixel_y = 28
+	name = "engineering closet"
 	},
 /obj/item/storage/backpack/industrial,
 /obj/item/clothing/shoes/workboots,
@@ -1988,12 +1979,10 @@
 	pixel_x = -4;
 	pixel_y = 5
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_door = "med_wall";
 	locked = 0;
 	name = "medical locker";
-	pixel_y = -28;
 	req_access_txt = "5"
 	},
 /obj/effect/turf_decal/corner/opaque/green/border{
@@ -2445,11 +2434,9 @@
 /obj/effect/turf_decal/corner/opaque/red{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "firearms locker";
-	pixel_y = -28;
 	req_access_txt = "1"
 	},
 /obj/item/flashlight/seclite,
@@ -2895,11 +2882,9 @@
 /obj/effect/turf_decal/corner/opaque/red{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "armor locker";
-	pixel_y = -28;
 	req_access_txt = "1"
 	},
 /obj/item/clothing/suit/armor/vest/alt,
@@ -3087,11 +3072,9 @@
 /obj/effect/turf_decal/corner/opaque/red{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "firearms locker";
-	pixel_y = -28;
 	req_access_txt = "1"
 	},
 /obj/item/storage/belt/security,
@@ -3284,10 +3267,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/central)
 "NU" = (
@@ -3444,12 +3424,10 @@
 	},
 /obj/effect/turf_decal/corner/opaque/white/mono,
 /obj/item/roller,
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_door = "med_wall";
 	locked = 0;
 	name = "medical locker";
-	pixel_y = -28;
 	req_access_txt = "5"
 	},
 /obj/item/roller,
@@ -3609,11 +3587,9 @@
 /obj/item/clothing/head/HoS/cowboy,
 /obj/item/ammo_box/c38,
 /obj/item/ammo_box/c38,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "solgov_wall";
 	name = "first mate's closet";
-	pixel_x = -28;
 	req_access_txt = "57"
 	},
 /turf/open/floor/carpet/blue,
@@ -3776,11 +3752,9 @@
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/clothing/head/caphat/cowboy,
 /obj/item/gun/ballistic/automatic/pistol/candor,
-/obj/structure/closet/secure_closet/wall{
-	dir = 8;
+/obj/structure/closet/secure_closet/wall/directional/east{
 	icon_state = "solgov_wall";
 	name = "captain's closet";
-	pixel_x = 28;
 	req_access_txt = "20"
 	},
 /obj/item/ammo_box/magazine/m45,
@@ -4159,10 +4133,9 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/cargo)
 "WG" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "sec_wall";
 	name = "ammunition locker";
-	pixel_y = 28;
 	req_access_txt = "1"
 	},
 /obj/item/ammo_box/c38_box,
@@ -4495,9 +4468,8 @@
 	dir = 4
 	},
 /obj/structure/catwalk/over,
-/obj/structure/closet/wall/orange{
-	name = "tool closet";
-	pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+	name = "tool closet"
 	},
 /obj/item/storage/toolbox/mechanical,
 /obj/item/storage/belt/utility,
diff --git a/_maps/shuttles/independent/independent_schmiedeberg.dmm b/_maps/shuttles/independent/independent_schmiedeberg.dmm
index 7e4ea3906a9d..a77e943f1558 100644
--- a/_maps/shuttles/independent/independent_schmiedeberg.dmm
+++ b/_maps/shuttles/independent/independent_schmiedeberg.dmm
@@ -467,10 +467,7 @@
 	dir = 4
 	},
 /obj/structure/curtain/bounty,
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -32
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
@@ -1766,10 +1763,7 @@
 	icon_state = "1-8"
 	},
 /obj/effect/turf_decal/corner/opaque/blue/three_quarters,
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -32
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "yv" = (
@@ -1980,12 +1974,10 @@
 /obj/item/reagent_containers/syringe/piercing,
 /obj/item/reagent_containers/syringe/piercing,
 /obj/item/reagent_containers/syringe/piercing,
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/south{
 	desc = "For when you REALLY need to reserve the right to deny service. Immediate results guaranteed*";
-	dir = 1;
 	icon_state = "sec_wall";
-	name = "Unruly Customer Pacification";
-	pixel_y = -28
+	name = "Unruly Customer Pacification"
 	},
 /obj/item/reagent_containers/glass/bottle/chloralhydrate{
 	pixel_x = 10
@@ -2046,10 +2038,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 32
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew/canteen)
 "CX" = (
@@ -2223,9 +2212,8 @@
 /obj/item/clothing/head/helmet/space/orange,
 /obj/item/pickaxe/mini,
 /obj/item/pickaxe/mini,
-/obj/structure/closet/wall/white{
-	name = "E.V.A";
-	pixel_y = 28
+/obj/structure/closet/wall/white/directional/north{
+	name = "E.V.A"
 	},
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
@@ -2450,10 +2438,7 @@
 /obj/machinery/portable_atmospherics/scrubber,
 /obj/machinery/light/small/directional/west,
 /obj/effect/turf_decal/box/white,
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -32
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "Ln" = (
@@ -2534,9 +2519,7 @@
 /turf/open/floor/concrete/slab_3,
 /area/ship/crew/hydroponics)
 "MP" = (
-/obj/structure/closet/secure_closet/freezer/wall{
-	pixel_y = 32
-	},
+/obj/structure/closet/secure_closet/freezer/wall/directional/north,
 /obj/item/storage/fancy/egg_box,
 /obj/item/storage/fancy/egg_box,
 /obj/item/reagent_containers/food/condiment/flour,
@@ -2702,10 +2685,7 @@
 /turf/open/floor/concrete/tiles,
 /area/ship/crew/hydroponics)
 "On" = (
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/wall/directional/west,
 /obj/machinery/washing_machine,
 /obj/item/clothing/suit/longcoat/chemist,
 /obj/item/clothing/suit/longcoat/chemist,
@@ -3523,11 +3503,9 @@
 /obj/machinery/door/window/eastright{
 	dir = 1
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 8;
+/obj/structure/closet/secure_closet/wall/directional/east{
 	icon_state = "solgov_wall";
 	name = "Chief Pharmacist's Locker";
-	pixel_x = 32;
 	req_access_txt = "40"
 	},
 /obj/item/storage/bag/medical,
diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
index 4061815b4276..3d5fa7c58420 100644
--- a/_maps/shuttles/independent/independent_shetland.dmm
+++ b/_maps/shuttles/independent/independent_shetland.dmm
@@ -1288,11 +1288,9 @@
 /obj/effect/turf_decal/corner/opaque/green{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 8;
+/obj/structure/closet/secure_closet/wall/directional/east{
 	icon_door = "med_wall";
 	name = "mortuary locker";
-	pixel_x = 28;
 	req_access_txt = "5"
 	},
 /obj/item/reagent_containers/glass/bottle/formaldehyde{
@@ -2120,11 +2118,9 @@
 /area/ship/hallway/fore)
 "rQ" = (
 /obj/effect/turf_decal/corner/opaque/bottlegreen/full,
-/obj/structure/closet/wall{
-	dir = 4;
+/obj/structure/closet/wall/directional/west{
 	icon_door = "white_wall";
-	name = "medical closet";
-	pixel_x = -28
+	name = "medical closet"
 	},
 /obj/item/storage/backpack/satchel/med,
 /obj/item/clothing/shoes/sneakers/white,
@@ -3206,10 +3202,7 @@
 /turf/open/floor/carpet/blue,
 /area/ship/bridge)
 "AG" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -5048,11 +5041,9 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Rm" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 8;
+/obj/structure/closet/secure_closet/wall/directional/east{
 	icon_door = "med_wall";
 	name = "medical locker";
-	pixel_x = 28;
 	req_access_txt = "5"
 	},
 /obj/item/storage/box/syringes,
diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm
index 195117431ebc..d39a1ef392e3 100644
--- a/_maps/shuttles/independent/independent_tranquility.dmm
+++ b/_maps/shuttles/independent/independent_tranquility.dmm
@@ -563,10 +563,8 @@
 /obj/item/reagent_containers/food/condiment/rice,
 /obj/item/reagent_containers/food/condiment/rice,
 /obj/item/storage/box/condimentbottles,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
-	name = "Kitchen Cabinet";
-	pixel_x = -28
+/obj/structure/closet/secure_closet/wall/directional/west{
+	name = "Kitchen Cabinet"
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
@@ -672,10 +670,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/structure/closet/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/wall/directional/south,
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/radio,
@@ -1333,10 +1328,8 @@
 /turf/open/floor/grass,
 /area/ship/crew/hydroponics)
 "js" = (
-/obj/structure/closet/wall{
-	dir = 4;
-	name = "Wardrobe";
-	pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+	name = "Wardrobe"
 	},
 /obj/item/clothing/head/beret,
 /obj/item/clothing/under/color/jumpskirt/random,
@@ -1476,10 +1469,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	name = "Wardrobe";
-	pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+	name = "Wardrobe"
 	},
 /obj/item/clothing/head/wig/random,
 /obj/item/clothing/under/color/jumpskirt/random,
@@ -1768,10 +1759,7 @@
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/hallway/port)
 "ny" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/hallway/starboard)
 "nz" = (
@@ -2011,10 +1999,7 @@
 /area/ship/hallway/port)
 "pT" = (
 /obj/effect/turf_decal/techfloor/orange,
-/obj/structure/closet/wall/orange{
-	dir = 1;
-	pixel_y = -32
-	},
+/obj/structure/closet/wall/orange/directional/south,
 /obj/item/stack/tape/industrial/electrical,
 /obj/item/stack/tape/industrial,
 /obj/item/holosign_creator/engineering,
@@ -2092,10 +2077,8 @@
 /area/ship/hallway/port)
 "qV" = (
 /obj/effect/turf_decal/siding/wood,
-/obj/structure/closet/wall{
-	dir = 1;
-	name = "Wardrobe";
-	pixel_y = -28
+/obj/structure/closet/wall/directional/south{
+	name = "Wardrobe"
 	},
 /obj/item/clothing/head/wig/random,
 /obj/item/storage/box/syndie_kit/chameleon,
@@ -2479,10 +2462,8 @@
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/hallway/port)
 "ub" = (
-/obj/structure/closet/wall{
-	dir = 8;
-	name = "Personal Effects";
-	pixel_x = 32
+/obj/structure/closet/wall/directional/east{
+	name = "Personal Effects"
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -2958,9 +2939,7 @@
 /turf/open/floor/carpet/nanoweave/red,
 /area/ship/crew/dorm/dormfour)
 "xW" = (
-/obj/structure/closet/wall/orange{
-	pixel_y = 32
-	},
+/obj/structure/closet/wall/orange/directional/north,
 /obj/item/clothing/suit/fire/atmos,
 /obj/item/clothing/mask/gas/atmos,
 /obj/item/clothing/head/hardhat/atmos,
@@ -3490,9 +3469,8 @@
 /obj/item/clothing/under/pants/khaki,
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/under/suit/charcoal,
-/obj/structure/closet/wall{
-	name = "Wardrobe";
-	pixel_y = 28
+/obj/structure/closet/wall/directional/north{
+	name = "Wardrobe"
 	},
 /obj/item/clothing/accessory/waistcoat,
 /turf/open/floor/carpet/black,
@@ -4507,10 +4485,8 @@
 	icon_state = "1-8"
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/closet/wall/blue{
-	dir = 1;
-	name = "Janitorial Closet";
-	pixel_y = -28
+/obj/structure/closet/wall/blue/directional/south{
+	name = "Janitorial Closet"
 	},
 /obj/item/soap/deluxe,
 /obj/item/mop,
@@ -4769,10 +4745,8 @@
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/hallway/starboard)
 "LS" = (
-/obj/structure/closet/wall{
-	dir = 8;
-	name = "Wardrobe";
-	pixel_x = 32
+/obj/structure/closet/wall/directional/east{
+	name = "Wardrobe"
 	},
 /obj/item/clothing/suit/toggle/labcoat/chemist/side,
 /obj/item/clothing/head/beret/puce,
@@ -4812,10 +4786,8 @@
 "Md" = (
 /obj/item/circuitboard/machine/telecomms/relay,
 /obj/item/circuitboard/machine/telecomms/message_server,
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	name = "Component Storage";
-	pixel_x = -28
+/obj/structure/closet/wall/blue/directional/west{
+	name = "Component Storage"
 	},
 /obj/item/stack/cable_coil/blue,
 /obj/item/stock_parts/subspace/filter,
@@ -5485,10 +5457,8 @@
 /obj/item/reagent_containers/food/condiment/soymilk,
 /obj/item/storage/fancy/egg_box,
 /obj/item/storage/fancy/egg_box,
-/obj/structure/closet/secure_closet/wall{
-	dir = 8;
-	name = "Freezer";
-	pixel_x = 32
+/obj/structure/closet/secure_closet/wall/directional/east{
+	name = "Freezer"
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
@@ -5857,10 +5827,8 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/storage)
 "TI" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	name = "Personal Effects";
-	pixel_x = -32
+/obj/structure/closet/wall/blue/directional/west{
+	name = "Personal Effects"
 	},
 /obj/item/storage/belt/utility/full,
 /obj/item/clothing/suit/hooded/wintercoat/engineering,
@@ -5877,10 +5845,8 @@
 /turf/open/floor/carpet/nanoweave/red,
 /area/ship/crew/dorm/dormfour)
 "TJ" = (
-/obj/structure/closet/wall{
-	dir = 8;
-	name = "Personal Effects";
-	pixel_x = 32
+/obj/structure/closet/wall/directional/east{
+	name = "Personal Effects"
 	},
 /obj/item/storage/bag/chemistry,
 /obj/item/storage/box/pillbottles,
@@ -6655,10 +6621,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical/surgery)
 "ZU" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/hallway/port)
 
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
index 4692d9eabb34..e8baced58968 100644
--- a/_maps/shuttles/inteq/inteq_colossus.dmm
+++ b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -190,10 +190,9 @@
 /obj/item/clothing/head/soft/inteq,
 /obj/item/clothing/head/soft/inteq,
 /obj/item/clothing/head/soft/inteq,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
 	icon_door = "orange_wall";
-	name = "uniform closet";
-	pixel_y = 28
+	name = "uniform closet"
 	},
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel/grimy,
@@ -1775,10 +1774,8 @@
 /obj/item/tank/internals/oxygen,
 /obj/item/tank/internals/oxygen,
 /obj/item/tank/internals/oxygen,
-/obj/structure/closet/wall{
-	dir = 8;
-	icon_state = "emergency_wall";
-	pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+	icon_state = "emergency_wall"
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/port)
@@ -2294,10 +2291,9 @@
 /obj/item/clothing/shoes/sneakers/black,
 /obj/item/clothing/shoes/sneakers/black,
 /obj/item/clothing/shoes/sneakers/black,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
 	icon_door = "orange_wall";
-	name = "uniform closet";
-	pixel_y = 28
+	name = "uniform closet"
 	},
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
@@ -2621,12 +2617,10 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "Da" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_door = "solgov_wall";
 	icon_state = "solgov_wall";
 	name = "vanguard's locker";
-	pixel_x = -28;
 	req_access_txt = "58"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -2901,11 +2895,9 @@
 /area/ship/crew/toilet)
 "GL" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible,
-/obj/structure/closet/wall{
-	dir = 8;
+/obj/structure/closet/wall/directional/east{
 	icon_door = "yellow_wall";
-	name = "engineering closet";
-	pixel_x = 32
+	name = "engineering closet"
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/item/storage/backpack/industrial,
@@ -3267,10 +3259,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "KM" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -32
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Ld" = (
@@ -4552,10 +4541,7 @@
 	piping_layer = 2
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Zz" = (
diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm
index 59c4616d5b5a..5616d1d2d4b0 100644
--- a/_maps/shuttles/inteq/inteq_hound.dmm
+++ b/_maps/shuttles/inteq/inteq_hound.dmm
@@ -650,10 +650,9 @@
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 1
 	},
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
 	icon_door = "orange_wall";
-	name = "uniform closet";
-	pixel_y = 28
+	name = "uniform closet"
 	},
 /obj/item/clothing/head/soft/inteq,
 /obj/item/clothing/head/soft/inteq,
@@ -965,12 +964,10 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "va" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_door = "solgov_wall";
 	icon_state = "solgov_wall";
 	name = "vanguard's locker";
-	pixel_x = -28;
 	req_access_txt = "58"
 	},
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
@@ -1102,10 +1099,9 @@
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/storage/belt/security/webbing/inteq,
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "sec_wall";
 	name = "equipment locker";
-	pixel_y = 28;
 	req_one_access_txt = "1"
 	},
 /turf/open/floor/plasteel/patterned/grid,
@@ -1245,9 +1241,7 @@
 /obj/structure/sign/poster/official/safety_internals{
 	pixel_x = -32
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "AW" = (
@@ -1391,11 +1385,9 @@
 /obj/item/gun/ballistic/automatic/assault/skm/inteq{
 	pixel_x = -5
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "weapons lockup";
-	pixel_y = -28;
 	req_one_access_txt = "58"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -1956,10 +1948,7 @@
 	pixel_x = 25;
 	pixel_y = 7
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "OP" = (
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index fb686d09569a..4234e39cbafc 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -162,9 +162,7 @@
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 1
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 32
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "aV" = (
@@ -2729,10 +2727,8 @@
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing,
 /obj/machinery/airalarm/directional/north,
-/obj/structure/closet/wall{
-	dir = 4;
-	icon_door = "grey_wall";
-	pixel_x = -32
+/obj/structure/closet/wall/directional/west{
+	icon_door = "grey_wall"
 	},
 /obj/item/radio/headset,
 /obj/item/radio/headset,
@@ -3801,9 +3797,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 32
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/port)
 "wQ" = (
@@ -3829,9 +3823,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 32
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "xb" = (
diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
index c4d13df99860..89c80e0e363a 100644
--- a/_maps/shuttles/inteq/inteq_valor.dmm
+++ b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -141,9 +141,7 @@
 /obj/effect/turf_decal/borderfloor{
 	dir = 4
 	},
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "bB" = (
@@ -526,10 +524,9 @@
 	dir = 4
 	},
 /obj/structure/table,
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "sec_wall";
 	name = "equipment locker";
-	pixel_y = 28;
 	req_access = list(1)
 	},
 /obj/item/storage/box/zipties,
@@ -572,10 +569,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "eV" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
@@ -904,10 +898,7 @@
 /obj/structure/chair/sofa/left{
 	dir = 8
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "ix" = (
@@ -1745,9 +1736,7 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "pA" = (
-/obj/structure/closet/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/wall/directional/north,
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/radio,
@@ -1803,9 +1792,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "pU" = (
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/machinery/atmospherics/components/binary/pump/on/layer2{
 	dir = 4
 	},
@@ -2064,10 +2051,9 @@
 /obj/item/gun/ballistic/automatic/pistol/commander/inteq/no_mag{
 	pixel_x = 4
 	},
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "sec_wall";
 	name = "weapons lockup";
-	pixel_y = 28;
 	req_access = list(1)
 	},
 /obj/structure/table,
@@ -2373,10 +2359,7 @@
 "vx" = (
 /obj/effect/turf_decal/siding/thinplating/dark/end,
 /obj/machinery/airalarm/directional/south,
-/obj/structure/closet/wall/white{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/wall/white/directional/east,
 /obj/item/clothing/under/rank/medical/gown,
 /obj/item/clothing/under/rank/medical/gown,
 /obj/item/clothing/under/rank/medical/gown,
@@ -4359,12 +4342,10 @@
 /obj/item/clothing/under/syndicate/inteq,
 /obj/item/clothing/suit/armor/hos/inteq,
 /obj/item/clothing/head/beret/sec/hos/inteq,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_door = "solgov_wall";
 	icon_state = "solgov_wall";
 	name = "vanguard's locker";
-	pixel_x = -28;
 	req_access = list(58)
 	},
 /obj/item/storage/lockbox/medal/sec,
@@ -4382,10 +4363,7 @@
 /obj/structure/chair/sofa/right{
 	dir = 8
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "Oh" = (
@@ -4402,9 +4380,7 @@
 /obj/effect/turf_decal/borderfloor{
 	dir = 8
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Ok" = (
@@ -4707,9 +4683,7 @@
 /obj/item/clothing/head/soft/inteq,
 /obj/item/clothing/head/soft/inteq,
 /obj/item/clothing/head/soft/inteq,
-/obj/structure/closet/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/wall/directional/north,
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
@@ -4724,10 +4698,8 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "RR" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	name = "honorable corpsman's locker";
-	pixel_x = -28;
 	req_access = list(19)
 	},
 /obj/item/clothing/shoes/combat,
@@ -5396,9 +5368,7 @@
 /obj/item/clothing/shoes/combat,
 /obj/item/clothing/shoes/combat,
 /obj/item/clothing/shoes/combat,
-/obj/structure/closet/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/wall/directional/north,
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
 "YZ" = (
diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
index 3c94681b60f7..23e763a6b9c6 100644
--- a/_maps/shuttles/inteq/inteq_vaquero.dmm
+++ b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -890,11 +890,9 @@
 /obj/item/clothing/head/hardhat,
 /obj/item/clothing/shoes/combat,
 /obj/effect/turf_decal/hardline_small/right,
-/obj/structure/closet/wall{
-	dir = 8;
+/obj/structure/closet/wall/directional/east{
 	icon_door = "yellow_wall";
-	name = "engineering closet";
-	pixel_x = 28
+	name = "engineering closet"
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
@@ -908,12 +906,10 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "mu" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_door = "solgov_wall";
 	icon_state = "solgov_wall";
 	name = "vanguard's locker";
-	pixel_x = -28;
 	req_access_txt = "20"
 	},
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
@@ -1209,10 +1205,9 @@
 /obj/item/clothing/head/soft/inteq,
 /obj/item/clothing/head/soft/inteq,
 /obj/item/clothing/head/soft/inteq,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
 	icon_door = "orange_wall";
-	name = "uniform closet";
-	pixel_y = 28
+	name = "uniform closet"
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
@@ -1737,9 +1732,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Bu" = (
-/obj/structure/closet/wall{
-	icon_door = "grey_wall";
-	pixel_y = 28
+/obj/structure/closet/wall/directional/north{
+	icon_door = "grey_wall"
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -1868,10 +1862,8 @@
 	dir = 9
 	},
 /obj/effect/turf_decal/number/six,
-/obj/structure/closet/wall/orange{
-	dir = 8;
+/obj/structure/closet/wall/orange/directional/east{
 	name = "tool closet";
-	pixel_x = 28;
 	req_access_txt = "11"
 	},
 /obj/item/pipe_dispenser,
@@ -2149,10 +2141,9 @@
 /obj/item/clothing/shoes/sneakers/black,
 /obj/item/clothing/shoes/sneakers/black,
 /obj/item/clothing/shoes/sneakers/black,
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/north{
 	icon_door = "orange_wall";
-	name = "uniform closet";
-	pixel_y = 28
+	name = "uniform closet"
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
@@ -2223,10 +2214,9 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security)
 "HN" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_door = "med_wall";
 	name = "medical locker";
-	pixel_y = 28;
 	req_access_txt = "5"
 	},
 /obj/item/storage/firstaid/regular{
diff --git a/_maps/shuttles/minutemen/minutemen_vela.dmm b/_maps/shuttles/minutemen/minutemen_vela.dmm
index 938ba4284993..8525a9d297bb 100644
--- a/_maps/shuttles/minutemen/minutemen_vela.dmm
+++ b/_maps/shuttles/minutemen/minutemen_vela.dmm
@@ -1032,10 +1032,7 @@
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew/dorm)
 "gB" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
@@ -1563,10 +1560,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/science)
 "jI" = (
-/obj/structure/closet/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/wall/directional/south,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
@@ -2490,10 +2484,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/machinery/button/door{
 	dir = 8;
 	id = "vela_labeva";
@@ -3979,10 +3970,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "wk" = (
-/obj/structure/closet/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/wall/directional/south,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -4736,10 +4724,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "zR" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/storage/firstaid/fire,
 /obj/effect/turf_decal/techfloor,
@@ -6189,10 +6174,7 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "HO" = (
-/obj/structure/closet/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/wall/directional/south,
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/effect/turf_decal/steeldecal/steel_decals_central7{
 	pixel_y = 1
@@ -6400,10 +6382,8 @@
 /area/ship/hallway/central)
 "Jj" = (
 /obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/structure/closet/wall{
-	dir = 4;
-	name = "spare uniforms";
-	pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+	name = "spare uniforms"
 	},
 /obj/item/clothing/under/clip/minutemen,
 /obj/item/clothing/under/clip/minutemen,
@@ -7412,10 +7392,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/science/xenobiology)
 "Ox" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/effect/turf_decal/techfloor{
 	dir = 6
 	},
@@ -8487,10 +8464,7 @@
 /obj/machinery/camera/autoname{
 	dir = 10
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/dark,
 /area/ship/hangar/port)
@@ -8518,10 +8492,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Uw" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/item/storage/box/gum/happiness,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engine)
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
index 1a43aca0ab18..6fef103cab50 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -46,11 +46,7 @@
 "ap" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -32;
-	pixel_y = -6
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/plating,
 /area/ship/hallway/port)
 "ar" = (
@@ -848,9 +844,7 @@
 /obj/effect/turf_decal/corner/opaque/bar{
 	dir = 1
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "dr" = (
@@ -934,10 +928,8 @@
 /obj/machinery/camera{
 	dir = 5
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	name = "Emergency Defense Storage";
-	pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+	name = "Emergency Defense Storage"
 	},
 /obj/item/ammo_box/magazine/co9mm{
 	pixel_x = 5
@@ -1451,10 +1443,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /turf/open/floor/plasteel,
 /area/ship/hallway/port)
 "oz" = (
@@ -2715,10 +2704,8 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/corner/opaque/lime,
-/obj/structure/closet/wall{
-	dir = 4;
-	name = "Radio Storage";
-	pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+	name = "Radio Storage"
 	},
 /obj/item/radio,
 /obj/item/radio,
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
index b20ca306b163..4fa6a4424482 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -352,11 +352,9 @@
 /obj/item/clothing/under/rank/cargo/qm,
 /obj/effect/turf_decal/corner/opaque/yellow/full,
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/obj/structure/closet/wall{
-	dir = 4;
+/obj/structure/closet/wall/directional/west{
 	icon_door = "orange_wall";
-	name = "quartermaster's closet";
-	pixel_x = -28
+	name = "quartermaster's closet"
 	},
 /obj/item/clothing/neck/cloak/qm,
 /obj/item/clothing/under/rank/cargo/qm/skirt,
@@ -1192,9 +1190,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "eV" = (
-/obj/structure/closet/wall/orange{
-	name = "fuel locker";
-	pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+	name = "fuel locker"
 	},
 /obj/item/stack/sheet/mineral/plasma/fifty,
 /obj/effect/decal/cleanable/wrapping{
@@ -1458,9 +1455,8 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "gb" = (
-/obj/structure/closet/wall/orange{
-	name = "Chief Engineer's Locker";
-	pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Chief Engineer's Locker"
 	},
 /obj/item/clothing/under/rank/engineering/chief_engineer,
 /obj/item/clothing/suit/toggle/hazard,
@@ -2578,9 +2574,7 @@
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "ki" = (
-/obj/structure/closet/wall/orange{
-	dir = 4;
-	pixel_x = -28;
+/obj/structure/closet/wall/orange/directional/west{
 	name = "Pilot's Locker"
 	},
 /obj/item/clothing/under/rank/security/officer/military/eng,
@@ -3761,9 +3755,7 @@
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 4
 	},
-/obj/structure/closet/wall/blue{
-	pixel_y = 28
-	},
+/obj/structure/closet/wall/blue/directional/north,
 /obj/item/aicard{
 	pixel_x = -5
 	},
@@ -3861,10 +3853,8 @@
 /obj/item/clothing/suit/fire/atmos,
 /obj/item/clothing/mask/gas/atmos,
 /obj/item/clothing/head/hardhat/atmos,
-/obj/structure/closet/wall{
-	name = "Atmospheric locker";
-	dir = 8;
-	pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+	name = "Atmospheric locker"
 	},
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 4
@@ -3959,10 +3949,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/directional/west,
-/obj/structure/closet/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/wall/directional/south,
 /obj/item/clothing/under/rank/rnd/roboticist,
 /obj/item/clothing/under/rank/rnd/research_director/turtleneck,
 /obj/item/clothing/under/rank/rnd/roboticist/skirt,
@@ -4151,10 +4138,7 @@
 /turf/open/floor/plasteel/elevatorshaft,
 /area/ship/science/robotics)
 "pk" = (
-/obj/structure/closet/secure_closet/freezer/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/secure_closet/freezer/wall/directional/east,
 /obj/item/clothing/under/shorts/cookjorts,
 /obj/item/clothing/shoes/cookflops,
 /obj/item/clothing/suit/toggle/chef,
@@ -4173,10 +4157,7 @@
 	},
 /obj/effect/decal/cleanable/vomit/old,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/wall/directional/west,
 /obj/item/reagent_containers/syringe/contraband/fentanyl{
 	pixel_x = -3;
 	pixel_y = 4
@@ -5019,10 +5000,7 @@
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 4
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
@@ -5442,9 +5420,8 @@
 	pixel_y = 7;
 	pixel_x = 9
 	},
-/obj/structure/closet/wall{
-	name = "Toy Storage";
-	pixel_y = 28
+/obj/structure/closet/wall/directional/north{
+	name = "Toy Storage"
 	},
 /obj/item/toy/figure/engineer{
 	pixel_x = 7
@@ -5823,9 +5800,8 @@
 /turf/open/floor/plasteel/elevatorshaft,
 /area/ship/science/robotics)
 "vb" = (
-/obj/structure/closet/wall/orange{
-	name = "Pilot's Locker";
-	pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Pilot's Locker"
 	},
 /obj/item/clothing/under/rank/security/officer/military/eng,
 /obj/item/clothing/suit/jacket/leather/duster,
@@ -6364,10 +6340,7 @@
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 4
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/effect/turf_decal/techfloor/hole/right{
 	dir = 4
 	},
@@ -7526,10 +7499,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "BJ" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
@@ -8646,10 +8616,8 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
-/obj/structure/closet/wall{
-	name = "Utility Closet";
-	dir = 4;
-	pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+	name = "Utility Closet"
 	},
 /obj/item/flashlight,
 /obj/item/flashlight,
@@ -9112,10 +9080,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/atmospherics)
 "HG" = (
-/obj/structure/closet/secure_closet/freezer/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/secure_closet/freezer/wall/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/holopad,
 /obj/effect/turf_decal/siding/white{
@@ -9168,9 +9133,8 @@
 /turf/open/floor/wood,
 /area/ship/crew/dorm/dormtwo)
 "HI" = (
-/obj/structure/closet/wall/orange{
-	name = "Pilot's Locker";
-	pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Pilot's Locker"
 	},
 /obj/item/clothing/under/rank/security/officer/military/eng,
 /obj/item/clothing/suit/jacket/leather/duster,
@@ -10237,11 +10201,9 @@
 	dir = 10
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall{
-	dir = 1;
+/obj/structure/closet/wall/directional/south{
 	icon_door = null;
-	name = "Office Supplies";
-	pixel_y = -28
+	name = "Office Supplies"
 	},
 /obj/item/storage/briefcase,
 /obj/item/storage/secure/briefcase{
@@ -10564,11 +10526,9 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "MT" = (
-/obj/structure/closet/wall{
-	dir = 8;
+/obj/structure/closet/wall/directional/east{
 	icon_door = "red_wall";
-	name = "Roboticists Locker";
-	pixel_x = 28
+	name = "Roboticists Locker"
 	},
 /obj/item/clothing/suit/longcoat/roboblack,
 /obj/item/clothing/suit/longcoat/robowhite,
@@ -10691,9 +10651,8 @@
 /obj/item/storage/backpack/industrial,
 /obj/item/clothing/head/beret/eng/hazard,
 /obj/item/clothing/glasses/meson/engine,
-/obj/structure/closet/wall/orange{
-	name = "Engineering locker";
-	pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Engineering locker"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/item/storage/belt/utility/full/engi{
@@ -10878,11 +10837,9 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "Of" = (
-/obj/structure/closet/wall{
+/obj/structure/closet/wall/directional/east{
 	icon_door = "orange_wall";
-	name = "Mining equipment";
-	pixel_x = 29;
-	dir = 8
+	name = "Mining equipment"
 	},
 /obj/item/storage/bag/ore,
 /obj/item/storage/bag/ore,
@@ -13091,9 +13048,8 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/obj/structure/closet/wall/red{
-	name = "Ammo locker";
-	pixel_y = 28
+/obj/structure/closet/wall/red/directional/north{
+	name = "Ammo locker"
 	},
 /obj/item/ammo_box/magazine/co9mm{
 	pixel_x = -7
@@ -13576,10 +13532,8 @@
 /obj/item/storage/backpack/ert/janitor{
 	pixel_x = 6
 	},
-/obj/structure/closet/wall/blue{
-	dir = 8;
-	name = "Janitorial Closet";
-	pixel_x = 28
+/obj/structure/closet/wall/blue/directional/east{
+	name = "Janitorial Closet"
 	},
 /obj/item/clothing/suit/longcoat/science{
 	name = "janitor longcoat"
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
index da6ae6b8b0ba..beee568b9a48 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
@@ -108,10 +108,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/crew/toilet)
 "aV" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -1823,9 +1820,7 @@
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/ship/hallway/central)
 "km" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	pixel_x = -30;
+/obj/structure/closet/wall/blue/directional/west{
 	name = "Space Suits";
 	desc = "Contains supplies for space walking."
 	},
@@ -2105,10 +2100,7 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "lA" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 32
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/crew/dorm/dormthree)
@@ -3575,10 +3567,7 @@
 /turf/open/floor/plating,
 /area/ship/storage/eva)
 "uO" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -3758,9 +3747,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/electrical)
 "wk" = (
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -4523,9 +4510,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security/armory)
 "AP" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	pixel_x = -30;
+/obj/structure/closet/wall/blue/directional/west{
 	name = "Space Suits";
 	desc = "Contains supplies for space walking."
 	},
@@ -6403,10 +6388,7 @@
 /obj/structure/railing/corner{
 	dir = 4
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/effect/turf_decal/corner/opaque/orange/border{
 	dir = 8
 	},
@@ -7469,9 +7451,7 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "Rm" = (
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
index ffb36020da1f..398fcebfbfb7 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -3,12 +3,10 @@
 /obj/structure/chair/comfy/brown{
 	dir = 1
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_door = "sec_wall";
 	icon_state = "sec_wall";
 	name = "gun locker";
-	pixel_x = -32;
 	req_access_txt = "19"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2191,10 +2189,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/science)
 "oE" = (
-/obj/structure/closet/wall{
-	dir = 1;
-	icon_door = "grey_wall";
-	pixel_y = -28
+/obj/structure/closet/wall/directional/south{
+	icon_door = "grey_wall"
 	},
 /obj/item/clothing/under/color/grey,
 /obj/item/clothing/under/color/grey,
@@ -2245,9 +2241,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering/atmospherics)
 "oQ" = (
@@ -2551,10 +2545,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/corner/transparent/neutral,
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "qw" = (
@@ -2928,10 +2919,7 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /turf/open/floor/plasteel,
 /area/ship/crew/cryo)
 "sJ" = (
@@ -3063,9 +3051,7 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "tO" = (
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
index 90f6aed9030a..7605fa6433cd 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -381,9 +381,7 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "dK" = (
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -938,9 +936,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "iI" = (
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
@@ -1486,10 +1482,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "pf" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -2688,10 +2681,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "BY" = (
@@ -3066,10 +3056,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -30
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "Gn" = (
@@ -4038,10 +4025,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "RA" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
index deac666bf516..803c5f0ea0c2 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -2164,10 +2164,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/office)
 "qS" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	name = "The Captain's Personal Medicine Cabinet And Soap Holder";
-	pixel_x = -28;
 	req_access_txt = "20"
 	},
 /obj/item/soap/nanotrasen,
@@ -3704,10 +3702,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "Dy" = (
@@ -5676,9 +5671,7 @@
 /turf/open/floor/engine,
 /area/ship/engineering/atmospherics)
 "Wy" = (
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/hallway/central)
 "Wz" = (
diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm
index 2cd73b12dfda..e39ca5bb9654 100644
--- a/_maps/shuttles/pgf/pgf_crying_sun.dmm
+++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm
@@ -239,10 +239,8 @@
 	pixel_x = 7;
 	pixel_y = -5
 	},
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "sec_wall";
-	dir = 4;
-	pixel_x = -28;
 	name = "equipment locker"
 	},
 /obj/effect/turf_decal/corner/opaque/purple/border{
@@ -793,11 +791,9 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/structure/closet/wall{
-	dir = 1;
+/obj/structure/closet/wall/directional/south{
 	icon_door = null;
-	name = "Uniforms";
-	pixel_y = -28
+	name = "Uniforms"
 	},
 /obj/item/clothing/under/gezena{
 	pixel_y = -5;
@@ -990,10 +986,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/lime{
 	dir = 8
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -1182,9 +1175,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "jt" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "cargo_wall";
-	pixel_y = 28;
 	name = "Engineer's Locker"
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -1519,10 +1511,7 @@
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm/dormthree)
 "na" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
@@ -1543,9 +1532,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "nm" = (
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	pixel_x = -28;
+/obj/structure/closet/wall/blue/directional/west{
 	name = "Spare EVA Closet"
 	},
 /obj/effect/turf_decal/corner/opaque/lime/mono,
@@ -1736,9 +1723,7 @@
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 4
 	},
-/obj/structure/closet/wall{
-	dir = 8;
-	pixel_x = 28;
+/obj/structure/closet/wall/directional/east{
 	name = "Cleaning Station"
 	},
 /obj/machinery/computer/helm/viewscreen/directional/south,
@@ -1997,9 +1982,8 @@
 /turf/closed/wall/mineral/titanium/exterior,
 /area/ship/construction)
 "qZ" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "cargo_wall";
-	pixel_y = 28;
 	name = "Engineer's Locker"
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -2075,10 +2059,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/office)
 "rN" = (
-/obj/structure/closet/secure_closet/wall{
-	icon_state = "secure_wall";
-	dir = 8;
-	pixel_x = 26
+/obj/structure/closet/secure_closet/wall/directional/east{
+	icon_state = "secure_wall"
 	},
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable{
@@ -2132,10 +2114,7 @@
 /obj/effect/turf_decal/corner_steel_grid{
 	dir = 10
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -27
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
@@ -2225,10 +2204,7 @@
 /obj/structure/railing{
 	dir = 6
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "ty" = (
@@ -2321,10 +2297,8 @@
 	pixel_x = 11;
 	pixel_y = -5
 	},
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "sec_wall";
-	dir = 4;
-	pixel_x = -28;
 	name = "equipment locker"
 	},
 /obj/structure/window/reinforced{
@@ -3040,11 +3014,9 @@
 /obj/effect/turf_decal/corner_steel_grid{
 	dir = 9
 	},
-/obj/structure/closet/wall{
-	dir = 2;
+/obj/structure/closet/wall/directional/north{
 	icon_door = null;
-	name = "headset storage";
-	pixel_y = 28
+	name = "headset storage"
 	},
 /obj/item/encryptionkey/pgf{
 	pixel_y = -5;
@@ -3419,9 +3391,7 @@
 /obj/item/towel,
 /obj/item/towel,
 /obj/item/towel,
-/obj/structure/closet/wall{
-	dir = 4;
-	pixel_x = -28;
+/obj/structure/closet/wall/directional/west{
 	name = "towel closet"
 	},
 /turf/open/floor/plastic,
@@ -3714,10 +3684,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/lime{
 	dir = 8
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -3737,11 +3704,9 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/structure/closet/wall{
-	dir = 1;
+/obj/structure/closet/wall/directional/south{
 	icon_door = null;
-	name = "Uniforms";
-	pixel_y = -28
+	name = "Uniforms"
 	},
 /obj/item/clothing/gloves/gezena{
 	pixel_x = -5;
@@ -4469,10 +4434,7 @@
 /obj/effect/turf_decal/corner_steel_grid{
 	dir = 10
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
@@ -4488,10 +4450,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "KB" = (
@@ -4718,13 +4677,10 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/dormtwo)
 "MC" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/east{
 	icon_door = "med_wall";
 	name = "Doctor's Locker";
-	pixel_y = 0;
-	req_access_txt = "5";
-	dir = 8;
-	pixel_x = 28
+	req_access_txt = "5"
 	},
 /obj/item/clothing/gloves/gezena{
 	pixel_x = 3;
@@ -5277,10 +5233,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "PP" = (
-/obj/structure/closet/wall{
-	dir = 4;
+/obj/structure/closet/wall/directional/west{
 	icon_state = "emergency_wall";
-	pixel_x = -28;
 	name = "Spare Internals Closet"
 	},
 /obj/effect/turf_decal/corner/opaque/lime/mono,
@@ -5425,10 +5379,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -27
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -5582,10 +5533,7 @@
 	dir = 10
 	},
 /obj/machinery/light/directional/north,
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/construction)
 "RX" = (
@@ -6367,10 +6315,8 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "Xz" = (
-/obj/structure/closet/secure_closet/wall{
-	icon_state = "secure_wall";
-	dir = 8;
-	pixel_x = 26
+/obj/structure/closet/secure_closet/wall/directional/east{
+	icon_state = "secure_wall"
 	},
 /turf/open/floor/plastic,
 /area/ship/crew/toilet)
@@ -6650,10 +6596,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/dormthree)
 "ZH" = (
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "cargo_wall";
-	pixel_y = -28;
-	dir = 1;
 	name = "Engineering Equipment"
 	},
 /obj/item/storage/box/metalfoam{
diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm
index 34536c2b4bcb..5bec6898af92 100644
--- a/_maps/shuttles/pirate/pirate_ember.dmm
+++ b/_maps/shuttles/pirate/pirate_ember.dmm
@@ -205,10 +205,7 @@
 /area/ship/hallway/central)
 "aZ" = (
 /obj/effect/decal/cleanable/oil,
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
@@ -1414,10 +1411,8 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "hq" = (
-/obj/structure/closet/wall{
-	name = "Atmospheric locker";
-	dir = 4;
-	pixel_x = -28
+/obj/structure/closet/wall/directional/west{
+	name = "Atmospheric locker"
 	},
 /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos,
 /obj/item/clothing/suit/fire/atmos,
@@ -1464,10 +1459,7 @@
 /turf/open/floor/plating/rust,
 /area/ship/medical)
 "hy" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/wrapping,
 /obj/item/kirbyplants/random,
@@ -2437,10 +2429,8 @@
 	},
 /area/ship/engineering/electrical)
 "mi" = (
-/obj/structure/closet/wall/red{
-	dir = 4;
+/obj/structure/closet/wall/red/directional/west{
 	name = "armory locker";
-	pixel_x = -28;
 	req_one_access_txt = "1"
 	},
 /obj/effect/turf_decal/techfloor{
@@ -2736,11 +2726,9 @@
 /area/ship/maintenance/fore)
 "nx" = (
 /obj/effect/turf_decal/techfloor,
-/obj/structure/closet/wall{
-	dir = 1;
+/obj/structure/closet/wall/directional/south{
 	icon_door = "yellow_wall";
-	name = "engineering closet";
-	pixel_y = -28
+	name = "engineering closet"
 	},
 /obj/item/clothing/suit/toggle/industrial,
 /obj/item/clothing/under/utility,
@@ -2863,10 +2851,8 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/obj/structure/closet/wall/red{
-	dir = 1;
-	name = "Firearm Locker";
-	pixel_y = -28
+/obj/structure/closet/wall/red/directional/south{
+	name = "Firearm Locker"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/steeldecal/steel_decals_central2{
@@ -3315,9 +3301,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/fore)
 "qr" = (
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/item/seeds/berry{
 	pixel_x = -8;
 	pixel_y = 6
@@ -3353,10 +3337,8 @@
 	pixel_x = 1;
 	pixel_y = -4
 	},
-/obj/structure/closet/wall/blue{
-	dir = 4;
-	name = "Component Storage";
-	pixel_x = -28
+/obj/structure/closet/wall/blue/directional/west{
+	name = "Component Storage"
 	},
 /obj/item/stack/cable_coil/blue,
 /obj/item/stack/cable_coil/orange{
@@ -3579,10 +3561,7 @@
 "rJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/east,
-/obj/structure/closet/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/wall/directional/south,
 /obj/item/reagent_containers/syringe/contraband/fentanyl{
 	pixel_x = -3;
 	pixel_y = 4
@@ -3623,10 +3602,7 @@
 /turf/closed/wall/rust,
 /area/ship/crew/canteen)
 "rQ" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
@@ -4693,9 +4669,7 @@
 /area/ship/maintenance/central)
 "wC" = (
 /obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/plating,
 /area/ship/hallway/central)
@@ -4741,10 +4715,7 @@
 /obj/effect/turf_decal/trimline/transparent/lightgrey/line{
 	dir = 4
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -5458,10 +5429,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/fore)
 "AL" = (
-/obj/structure/closet/wall/orange{
-	dir = 8;
-	name = "Engineering locker";
-	pixel_x = 28
+/obj/structure/closet/wall/orange/directional/east{
+	name = "Engineering locker"
 	},
 /obj/effect/decal/cleanable/robot_debris/gib,
 /obj/item/clothing/under/utility,
@@ -5872,9 +5841,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall{
-	dir = 8;
-	pixel_x = 28;
+/obj/structure/closet/wall/directional/east{
 	name = "Uniform Closet"
 	},
 /obj/item/clothing/neck/shemagh,
@@ -6107,9 +6074,7 @@
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 4
 	},
-/obj/structure/closet/wall/blue{
-	dir = 8;
-	pixel_x = 28;
+/obj/structure/closet/wall/blue/directional/east{
 	name = "Bridge Officer's locker"
 	},
 /obj/item/clothing/shoes/workboots,
@@ -6848,11 +6813,9 @@
 /area/ship/maintenance/fore)
 "GF" = (
 /obj/effect/turf_decal/techfloor,
-/obj/structure/closet/wall{
-	dir = 1;
+/obj/structure/closet/wall/directional/south{
 	icon_door = "yellow_wall";
-	name = "engineering closet";
-	pixel_y = -28
+	name = "engineering closet"
 	},
 /obj/item/clothing/suit/toggle/industrial,
 /obj/item/clothing/under/utility,
@@ -7756,10 +7719,8 @@
 	dir = 6
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall{
-	name = "Utility Closet";
-	pixel_y = -28;
-	dir = 1
+/obj/structure/closet/wall/directional/south{
+	name = "Utility Closet"
 	},
 /obj/item/radio/old{
 	pixel_x = 2;
@@ -8181,9 +8142,7 @@
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 4
 	},
-/obj/structure/closet/wall/blue{
-	dir = 8;
-	pixel_x = 28;
+/obj/structure/closet/wall/blue/directional/east{
 	name = "Bridge Officer's locker"
 	},
 /obj/item/clothing/shoes/workboots,
@@ -8958,10 +8917,8 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Pn" = (
-/obj/structure/closet/wall/red{
-	name = "Ammo locker";
-	dir = 4;
-	pixel_x = -28
+/obj/structure/closet/wall/red/directional/west{
+	name = "Ammo locker"
 	},
 /obj/effect/turf_decal/techfloor{
 	dir = 8
@@ -9251,10 +9208,7 @@
 "QH" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/communications)
@@ -9888,10 +9842,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/machinery/advanced_airlock_controller{
 	pixel_y = 26
 	},
diff --git a/_maps/shuttles/pirate/pirate_libertatia.dmm b/_maps/shuttles/pirate/pirate_libertatia.dmm
index 933836561c47..2fe2cd9ddb20 100644
--- a/_maps/shuttles/pirate/pirate_libertatia.dmm
+++ b/_maps/shuttles/pirate/pirate_libertatia.dmm
@@ -424,10 +424,8 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 5
 	},
-/obj/structure/closet/wall/red{
-	dir = 8;
+/obj/structure/closet/wall/red/directional/east{
 	name = "armory locker";
-	pixel_x = 28;
 	req_one_access_txt = "1"
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -443,10 +441,8 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/obj/structure/closet/wall/red{
-	dir = 4;
+/obj/structure/closet/wall/red/directional/west{
 	name = "suit locker";
-	pixel_x = -28;
 	req_one_access_txt = "1"
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -501,10 +497,8 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/structure/closet/wall/red{
-	dir = 8;
+/obj/structure/closet/wall/red/directional/east{
 	name = "armory locker";
-	pixel_x = 28;
 	req_one_access_txt = "1"
 	},
 /obj/item/gun/ballistic/shotgun/doublebarrel{
@@ -535,10 +529,8 @@
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 1
 	},
-/obj/structure/closet/wall/red{
-	dir = 4;
+/obj/structure/closet/wall/red/directional/west{
 	name = "suit locker";
-	pixel_x = -28;
 	req_one_access_txt = "1"
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -585,10 +577,8 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 6
 	},
-/obj/structure/closet/wall/red{
-	dir = 8;
+/obj/structure/closet/wall/red/directional/east{
 	name = "armory locker";
-	pixel_x = 28;
 	req_one_access_txt = "1"
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -659,9 +649,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/machinery/advanced_airlock_controller{
 	pixel_y = -25
 	},
@@ -900,10 +888,8 @@
 /obj/item/clothing/under/costume/sailor,
 /obj/item/clothing/under/costume/sailor,
 /obj/item/clothing/under/costume/sailor,
-/obj/structure/closet/wall{
-	dir = 8;
-	icon_door = "grey_wall";
-	pixel_x = 28
+/obj/structure/closet/wall/directional/east{
+	icon_door = "grey_wall"
 	},
 /turf/open/floor/pod/light,
 /area/ship/crew)
@@ -1139,10 +1125,7 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/pod/light,
 /area/ship/cargo)
 "Hh" = (
@@ -1312,10 +1295,7 @@
 /obj/structure/cable/yellow,
 /obj/machinery/power/terminal,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /turf/open/floor/plating{
 	icon_state = "platingdmg3"
 	},
@@ -1402,10 +1382,7 @@
 /obj/item/wrench,
 /obj/effect/decal/cleanable/oil,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /turf/open/floor/plating,
 /area/ship/hallway/starboard)
 "OA" = (
diff --git a/_maps/shuttles/pirate/pirate_noderider.dmm b/_maps/shuttles/pirate/pirate_noderider.dmm
index 9e13db35c42e..df346f703dd3 100644
--- a/_maps/shuttles/pirate/pirate_noderider.dmm
+++ b/_maps/shuttles/pirate/pirate_noderider.dmm
@@ -294,10 +294,7 @@
 /obj/item/storage/box/handcuffs,
 /obj/item/storage/box/handcuffs,
 /obj/item/storage/box/handcuffs,
-/obj/structure/closet/wall/red{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/wall/red/directional/east,
 /obj/item/storage/backpack/duffelbag/syndie/c4,
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
@@ -1027,8 +1024,7 @@
 /turf/open/floor/plating/airless,
 /area/ship/external)
 "qh" = (
-/obj/structure/closet/wall/red{
-	pixel_y = 28;
+/obj/structure/closet/wall/red/directional/north{
 	name = "weapons locker"
 	},
 /obj/item/gun/energy/e_gun/smg,
@@ -1194,10 +1190,8 @@
 /obj/structure/sign/poster/contraband/cybersun_borg{
 	pixel_y = 32
 	},
-/obj/structure/closet/wall/white{
-	dir = 4;
-	name = "First Aid";
-	pixel_x = -28
+/obj/structure/closet/wall/white/directional/west{
+	name = "First Aid"
 	},
 /obj/item/storage/backpack/duffelbag/med/surgery,
 /obj/item/storage/toolbox/mechanical,
@@ -1297,8 +1291,7 @@
 /turf/closed/wall/r_wall/syndicate,
 /area/ship/maintenance/central)
 "tF" = (
-/obj/structure/closet/wall/red{
-	pixel_y = 28;
+/obj/structure/closet/wall/red/directional/north{
 	name = "armor locker"
 	},
 /obj/item/clothing/suit/armor/riot,
@@ -1483,9 +1476,7 @@
 /area/ship/external)
 "xl" = (
 /obj/structure/table,
-/obj/structure/closet/wall/red{
-	pixel_x = -28;
-	dir = 4;
+/obj/structure/closet/wall/red/directional/west{
 	name = "captain's locker"
 	},
 /obj/effect/turf_decal/spline/fancy/opaque/black{
@@ -2545,9 +2536,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/maintenance/central)
 "MJ" = (
-/obj/structure/closet/wall{
-	dir = 1;
-	pixel_y = -28;
+/obj/structure/closet/wall/directional/south{
 	name = "node uniforms"
 	},
 /obj/item/clothing/under/utility,
diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm
index 06b2b8c53e00..6d1a743dc6a0 100644
--- a/_maps/shuttles/roumain/srm_elder.dmm
+++ b/_maps/shuttles/roumain/srm_elder.dmm
@@ -210,9 +210,7 @@
 /turf/open/floor/wood/maple,
 /area/ship/hallway/central)
 "cg" = (
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -818,10 +816,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
 	dir = 8
 	},
@@ -853,9 +848,7 @@
 /turf/open/floor/wood/ebony,
 /area/ship/hallway/port)
 "iT" = (
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/effect/turf_decal/siding/brown{
 	dir = 1
 	},
@@ -921,9 +914,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "jv" = (
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -1892,10 +1883,7 @@
 /turf/open/floor/grass/ship/jungle,
 /area/ship/bridge)
 "wE" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "xe" = (
@@ -2327,10 +2315,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/atmospherics)
 "Cr" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/grass/ship/jungle,
 /area/ship/roumain)
 "Cx" = (
@@ -2401,9 +2386,7 @@
 /turf/open/floor/plating,
 /area/ship/hallway/port)
 "CF" = (
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/effect/turf_decal/siding/brown{
 	dir = 1
 	},
@@ -2667,9 +2650,7 @@
 /turf/open/floor/wood/ebony,
 /area/ship/storage)
 "HB" = (
-/obj/structure/closet/wall/blue{
-	dir = 8;
-	pixel_x = 28;
+/obj/structure/closet/wall/blue/directional/east{
 	name = "Spare EVA Closet"
 	},
 /obj/item/clothing/suit/space/eva{
@@ -2700,10 +2681,7 @@
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)
 "Ii" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/effect/turf_decal/spline/fancy/wood{
 	dir = 4
 	},
@@ -4164,10 +4142,7 @@
 /turf/open/floor/wood/mahogany,
 /area/ship/hallway/starboard)
 "ZI" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/effect/turf_decal/spline/fancy/wood{
 	dir = 4
 	},
diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/solgov/solgov_chronicle.dmm
index 8b386706f50d..c790d8a67b7c 100644
--- a/_maps/shuttles/solgov/solgov_chronicle.dmm
+++ b/_maps/shuttles/solgov/solgov_chronicle.dmm
@@ -3130,8 +3130,7 @@
 /turf/open/floor/engine/n2,
 /area/ship/engineering/engine)
 "Ez" = (
-/obj/structure/closet/secure_closet/wall{
-	pixel_y = 28;
+/obj/structure/closet/secure_closet/wall/directional/north{
 	name = "bridge supplies"
 	},
 /obj/item/binoculars,
@@ -3336,10 +3335,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /obj/machinery/camera/autoname{
 	dir = 4
 	},
@@ -3903,10 +3899,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /turf/open/floor/wood,
 /area/ship/bridge)
 "Me" = (
@@ -3982,10 +3975,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /turf/open/floor/plasteel/white,
 /area/ship/engineering/engine)
 "Nm" = (
diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm
index 46b06a15c309..c64c73a5f191 100644
--- a/_maps/shuttles/solgov/solgov_inkwell.dmm
+++ b/_maps/shuttles/solgov/solgov_inkwell.dmm
@@ -1054,10 +1054,7 @@
 /obj/effect/turf_decal/spline/fancy/transparent/solgovblue{
 	dir = 8
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -1311,10 +1308,7 @@
 /obj/item/clothing/under/solgov/formal/skirt,
 /obj/item/clothing/suit/solgov/suit,
 /obj/structure/table/wood,
-/obj/structure/closet/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/wall/directional/east,
 /obj/machinery/button/door{
 	pixel_y = -21;
 	pixel_x = -8;
@@ -1698,10 +1692,7 @@
 /obj/item/clothing/under/solgov/formal/skirt,
 /obj/item/clothing/suit/solgov/suit,
 /obj/structure/table/wood,
-/obj/structure/closet/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/wall/directional/east,
 /obj/item/clothing/suit/hooded/wintercoat/solgov,
 /obj/item/clothing/suit/hooded/wintercoat/solgov,
 /turf/open/floor/wood/walnut,
@@ -2569,9 +2560,7 @@
 	dir = 8
 	},
 /obj/structure/table/wood,
-/obj/structure/closet/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/wall/directional/north,
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/radio,
@@ -5837,9 +5826,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
@@ -6269,10 +6256,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/starboard)
 "PB" = (
@@ -6410,9 +6394,7 @@
 /obj/effect/turf_decal/spline/fancy/transparent/solgovblue{
 	dir = 8
 	},
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "QT" = (
diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
index 212ba49ba231..ba1181c14daa 100644
--- a/_maps/shuttles/solgov/solgov_paracelsus.dmm
+++ b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -1160,9 +1160,7 @@
 /turf/template_noop,
 /area/template_noop)
 "lD" = (
-/obj/structure/closet/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/wall/directional/north,
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/radio,
@@ -1891,8 +1889,7 @@
 /obj/structure/railing/wood{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/wall{
-	pixel_y = 28;
+/obj/structure/closet/secure_closet/wall/directional/north{
 	name = "navigational supplies";
 	req_access_txt = "19"
 	},
@@ -2868,11 +2865,9 @@
 /obj/item/ammo_box/magazine/pistol556mm,
 /obj/item/ammo_box/magazine/pistol556mm,
 /obj/item/ammo_box/magazine/pistol556mm,
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "firearms locker";
-	pixel_y = -28;
 	req_access_txt = "19"
 	},
 /turf/open/floor/carpet/royalblue,
@@ -4321,10 +4316,7 @@
 /area/ship/cargo/office)
 "Pp" = (
 /obj/structure/table/wood,
-/obj/structure/closet/secure_closet/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/secure_closet/wall/directional/east,
 /obj/item/clipboard,
 /obj/item/paper_bin/carbon,
 /obj/item/clothing/accessory/waistcoat/solgov,
diff --git a/_maps/shuttles/subshuttles/inteq_anvil.dmm b/_maps/shuttles/subshuttles/inteq_anvil.dmm
index f14f1e64d7fd..5e591774e259 100644
--- a/_maps/shuttles/subshuttles/inteq_anvil.dmm
+++ b/_maps/shuttles/subshuttles/inteq_anvil.dmm
@@ -46,10 +46,7 @@
 	},
 /obj/effect/landmark/ert_shuttle_spawn,
 /obj/machinery/light/directional/east,
-/obj/structure/closet/emcloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/south,
 /obj/item/tank/internals/oxygen,
 /obj/item/tank/internals/oxygen,
 /turf/open/floor/plasteel/dark,
diff --git a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm
index 7176477bab9c..1238678040f8 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm
@@ -149,9 +149,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/bridge)
 "vV" = (
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/item/clothing/suit/space/eva,
 /obj/item/clothing/suit/space/eva,
 /obj/item/clothing/suit/space/eva,
diff --git a/_maps/shuttles/subshuttles/pgf_nail.dmm b/_maps/shuttles/subshuttles/pgf_nail.dmm
index 80534adfc514..9a5224dc4573 100644
--- a/_maps/shuttles/subshuttles/pgf_nail.dmm
+++ b/_maps/shuttles/subshuttles/pgf_nail.dmm
@@ -194,9 +194,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "y" = (
diff --git a/_maps/shuttles/subshuttles/syndicate_runner.dmm b/_maps/shuttles/subshuttles/syndicate_runner.dmm
index 21e4f84a10e5..100a0d234000 100644
--- a/_maps/shuttles/subshuttles/syndicate_runner.dmm
+++ b/_maps/shuttles/subshuttles/syndicate_runner.dmm
@@ -188,10 +188,7 @@
 /obj/effect/turf_decal/trimline/opaque/bar/filled/corner{
 	dir = 1
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/item/tank/internals/oxygen,
 /obj/item/tank/internals/oxygen,
 /obj/item/tank/internals/oxygen,
diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm
index 1558ea2edad1..e879c978eef0 100644
--- a/_maps/shuttles/syndicate/syndicate_aegis.dmm
+++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm
@@ -32,10 +32,8 @@
 	},
 /obj/item/clothing/neck/stripedredscarf,
 /obj/item/clothing/neck/tie/red,
-/obj/structure/closet/wall/red{
-	dir = 8;
+/obj/structure/closet/wall/red/directional/east{
 	name = "Captain's Locker";
-	pixel_x = 30;
 	req_access_txt = "20"
 	},
 /obj/item/storage/belt/sabre,
@@ -84,10 +82,9 @@
 /obj/item/shovel/spade,
 /obj/item/cultivator,
 /obj/item/reagent_containers/glass/bucket,
-/obj/structure/closet/wall/white{
+/obj/structure/closet/wall/white/directional/north{
 	color = "#50C878";
-	name = "Produce Production Locker";
-	pixel_y = 30
+	name = "Produce Production Locker"
 	},
 /obj/item/storage/box/disks_plantgene,
 /obj/item/clothing/gloves/botanic_leather,
@@ -128,11 +125,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/structure/closet/wall{
-	dir = 8;
+/obj/structure/closet/wall/directional/east{
 	icon_door = "orange_wall";
-	name = "Mining equipment";
-	pixel_x = 29
+	name = "Mining equipment"
 	},
 /obj/item/gps/mining,
 /obj/item/pickaxe,
@@ -236,9 +231,8 @@
 /obj/item/folder/red,
 /obj/item/laser_pointer/red,
 /obj/item/clipboard,
-/obj/structure/closet/wall/red{
-	name = "Psychologists Locker";
-	pixel_y = 28
+/obj/structure/closet/wall/red/directional/north{
+	name = "Psychologists Locker"
 	},
 /obj/item/clothing/head/suns,
 /obj/item/clothing/gloves/suns/xo,
@@ -506,9 +500,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 29
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/structure/catwalk/over,
 /obj/machinery/atmospherics/pipe/manifold/orange/hidden{
 	dir = 1
@@ -571,9 +563,8 @@
 /obj/item/clothing/glasses/hud/health/sunglasses,
 /obj/item/clothing/neck/stripedredscarf,
 /obj/item/clothing/neck/stripedbluescarf,
-/obj/structure/closet/wall/red{
-	name = "Lead Doctor's Locker";
-	pixel_y = 28
+/obj/structure/closet/wall/red/directional/north{
+	name = "Lead Doctor's Locker"
 	},
 /obj/item/reagent_containers/food/drinks/bottle/holywater,
 /obj/item/clothing/suit/armor/vest/security/brig_phys{
@@ -671,10 +662,8 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall/white{
-	dir = 8;
-	name = "Bartenders Clothing";
-	pixel_x = 30
+/obj/structure/closet/wall/white/directional/east{
+	name = "Bartenders Clothing"
 	},
 /obj/item/clothing/under/rank/civilian/bartender/skirt,
 /obj/item/clothing/under/rank/civilian/bartender,
@@ -742,9 +731,8 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "fJ" = (
-/obj/structure/closet/wall/orange{
-	name = "fuel locker";
-	pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+	name = "fuel locker"
 	},
 /obj/item/stack/sheet/mineral/uranium/five{
 	pixel_x = 2
@@ -1002,8 +990,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall/white{
-	pixel_y = 26;
+/obj/structure/closet/wall/white/directional/north{
 	name = "bureaucratic supplies"
 	},
 /obj/item/paper_bin,
@@ -2330,10 +2317,8 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall/white{
-	dir = 4;
-	name = "Cooks Clothing";
-	pixel_x = -30
+/obj/structure/closet/wall/white/directional/west{
+	name = "Cooks Clothing"
 	},
 /obj/item/book/manual/wiki/cooking,
 /obj/item/clothing/under/rank/civilian/chef,
@@ -2365,9 +2350,8 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "vs" = (
-/obj/structure/closet/wall/orange{
-	name = "Engineering locker";
-	pixel_y = 30
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Engineering locker"
 	},
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 8
@@ -2504,9 +2488,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 31
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/structure/catwalk/over,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -2550,10 +2532,8 @@
 /area/ship/hallway/central)
 "xh" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wall{
-	dir = 1;
-	name = "Patient Clothing Closet";
-	pixel_y = -30
+/obj/structure/closet/wall/directional/south{
+	name = "Patient Clothing Closet"
 	},
 /obj/effect/decal/cleanable/blood/drip,
 /obj/item/clothing/under/rank/medical/gown,
@@ -3148,9 +3128,8 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/structure/closet/wall/orange{
-	name = "Emergency Engineering";
-	pixel_y = 30
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Emergency Engineering"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -3405,11 +3384,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/structure/closet/wall{
-	dir = 8;
+/obj/structure/closet/wall/directional/east{
 	icon_door = "orange_wall";
-	name = "Mining equipment";
-	pixel_x = 29
+	name = "Mining equipment"
 	},
 /obj/item/gps/mining,
 /obj/item/pickaxe,
@@ -4491,10 +4468,8 @@
 	name = "butlers's uniform"
 	},
 /obj/item/clothing/under/suit/waiter/syndicate,
-/obj/structure/closet/wall/red{
-	dir = 8;
-	name = "Uniform Closet";
-	pixel_x = 30
+/obj/structure/closet/wall/red/directional/east{
+	name = "Uniform Closet"
 	},
 /obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood{
@@ -4616,9 +4591,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/medical)
 "Tt" = (
-/obj/structure/closet/wall/orange{
-	name = "Chemical Closet";
-	pixel_y = 30
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Chemical Closet"
 	},
 /obj/item/storage/bag/chemistry,
 /obj/item/clothing/glasses/sunglasses/chemical,
@@ -4741,10 +4715,7 @@
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/kitchen/knife/combat/survival,
 /obj/item/kitchen/knife/combat/survival,
-/obj/structure/closet/secure_closet/wall{
-	dir = 8;
-	pixel_x = 32
-	},
+/obj/structure/closet/secure_closet/wall/directional/east,
 /turf/open/floor/wood/walnut,
 /area/ship/bridge)
 "Uu" = (
@@ -5089,10 +5060,8 @@
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/radio,
-/obj/structure/closet/wall{
-	dir = 8;
-	name = "Uniform closet";
-	pixel_x = 32
+/obj/structure/closet/wall/directional/east{
+	name = "Uniform closet"
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -5216,10 +5185,8 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/structure/closet/secure_closet/freezer/wall{
-	dir = 1;
-	name = "Kitchen Freezer";
-	pixel_y = -30
+/obj/structure/closet/secure_closet/freezer/wall/directional/south{
+	name = "Kitchen Freezer"
 	},
 /obj/effect/turf_decal/trimline/opaque/brown/filled/line,
 /obj/structure/table/wood/reinforced,
diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
index e9bf22ec61f6..d02d2a60319c 100644
--- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
+++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
@@ -86,10 +86,8 @@
 /obj/item/storage/firstaid/medical,
 /obj/item/storage/firstaid/regular,
 /obj/item/storage/firstaid/regular,
-/obj/structure/closet/wall/white{
-	dir = 1;
-	name = "Medical Supplies";
-	pixel_y = -32
+/obj/structure/closet/wall/white/directional/south{
+	name = "Medical Supplies"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
@@ -1382,9 +1380,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
-/obj/structure/closet/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/wall/directional/north,
 /obj/machinery/computer/cryopod/directional/west,
 /obj/machinery/camera/autoname{
 	dir = 4
@@ -1428,9 +1424,8 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "KP" = (
-/obj/structure/closet/wall{
-	name = "emergency rum cabinet";
-	pixel_y = 28
+/obj/structure/closet/wall/directional/north{
+	name = "emergency rum cabinet"
 	},
 /obj/item/reagent_containers/food/drinks/bottle/rum,
 /obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
@@ -1882,9 +1877,7 @@
 "VJ" = (
 /obj/structure/chair/comfy/black,
 /obj/effect/turf_decal/corner/opaque/syndiered/bordercorner,
-/obj/structure/closet/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/wall/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "Xa" = (
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
index 029fd0f85fcf..cce460292a0c 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -1486,10 +1486,8 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
 "zq" = (
-/obj/structure/closet/wall/red{
-	dir = 8;
-	name = "uniform closet";
-	pixel_x = 28
+/obj/structure/closet/wall/red/directional/east{
+	name = "uniform closet"
 	},
 /obj/item/clothing/under/syndicate/gorlex,
 /obj/item/clothing/under/syndicate/gorlex,
@@ -1558,9 +1556,7 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "Af" = (
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
@@ -3163,9 +3159,7 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "Yc" = (
diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
index 6676d9b8e89e..a4f74d6a6737 100644
--- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
+++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -376,12 +376,10 @@
 /obj/item/clothing/shoes/combat,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/item/clothing/suit/armor/vest/duster,
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "Bridge Officer's Locker";
-	req_access_txt = "57";
-	pixel_y = -29
+	req_access_txt = "57"
 	},
 /obj/item/melee/classic_baton/telescopic,
 /obj/item/clothing/neck/chameleon,
@@ -834,10 +832,8 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	name = "Utility Closet";
-	pixel_x = -30
+/obj/structure/closet/wall/directional/west{
+	name = "Utility Closet"
 	},
 /obj/item/radio,
 /obj/item/radio,
@@ -887,10 +883,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/machinery/advanced_airlock_controller{
 	dir = 8;
 	pixel_x = 24
@@ -1160,10 +1153,8 @@
 /turf/open/floor/circuit/green/off,
 /area/ship/maintenance/starboard)
 "lr" = (
-/obj/structure/closet/wall/orange{
-	dir = 1;
-	name = "Engineering locker";
-	pixel_y = -30
+/obj/structure/closet/wall/orange/directional/south{
+	name = "Engineering locker"
 	},
 /obj/item/clothing/under/syndicate/coldres,
 /obj/item/clothing/suit/toggle/industrial,
@@ -1411,11 +1402,9 @@
 /obj/item/pickaxe,
 /obj/item/mining_scanner,
 /obj/item/mining_scanner,
-/obj/structure/closet/wall{
-	dir = 1;
+/obj/structure/closet/wall/directional/south{
 	icon_door = "orange_wall";
-	name = "Mining equipment";
-	pixel_y = -29
+	name = "Mining equipment"
 	},
 /obj/item/gps/mining,
 /turf/open/floor/plasteel/tech,
@@ -1580,10 +1569,7 @@
 	dir = 8;
 	name = "tactical chair"
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 29
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
@@ -2020,12 +2006,10 @@
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/storage/toolbox/ammo/c10mm,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "sec_wall";
 	name = "Ammo Locker";
-	req_access_txt = "1";
-	pixel_x = -29
+	req_access_txt = "1"
 	},
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/magazine/smgm45,
@@ -2304,12 +2288,10 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "secure_wall";
 	name = "Peacekeeping Locker";
-	req_access_txt = "1";
-	pixel_x = -29
+	req_access_txt = "1"
 	},
 /obj/item/gun/energy/disabler,
 /obj/item/gun/energy/disabler,
@@ -2730,10 +2712,8 @@
 	icon_state = "1-2"
 	},
 /obj/structure/catwalk/over,
-/obj/structure/closet/wall/orange{
-	dir = 8;
-	name = "fuel locker";
-	pixel_x = 28
+/obj/structure/closet/wall/orange/directional/east{
+	name = "fuel locker"
 	},
 /obj/item/stack/sheet/mineral/plasma/five,
 /obj/item/stack/sheet/mineral/plasma/five,
@@ -2910,12 +2890,10 @@
 	},
 /obj/item/clothing/mask/gas/sechailer/swat,
 /obj/item/clothing/head/HoS/beret/syndicate,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "sec_wall";
 	name = "Sergeant's Locker";
-	req_access_txt = "58";
-	pixel_x = -29
+	req_access_txt = "58"
 	},
 /obj/item/melee/classic_baton/telescopic,
 /obj/item/clothing/suit/armor/vest/blueshirt,
@@ -3131,10 +3109,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 8;
-	pixel_x = 29
-	},
+/obj/structure/closet/firecloset/wall/directional/east,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "Eb" = (
@@ -3999,10 +3974,8 @@
 /obj/effect/turf_decal/trimline/transparent/bar/filled/line{
 	dir = 6
 	},
-/obj/structure/closet/wall/red{
-	dir = 1;
-	name = "Bartender's locker";
-	pixel_y = -29
+/obj/structure/closet/wall/red/directional/south{
+	name = "Bartender's locker"
 	},
 /obj/item/clothing/shoes/cowboy/black,
 /obj/item/storage/belt/military/snack,
@@ -4117,12 +4090,10 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "sec_wall";
 	name = "Armor Locker";
-	req_access_txt = "1";
-	pixel_x = -29
+	req_access_txt = "1"
 	},
 /obj/item/storage/belt/military,
 /obj/item/storage/belt/military,
@@ -5540,10 +5511,8 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
 	},
-/obj/structure/closet/wall{
-	dir = 4;
-	name = "uniform closet";
-	pixel_x = -30
+/obj/structure/closet/wall/directional/west{
+	name = "uniform closet"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/storage/backpack/duffelbag/syndie,
diff --git a/_maps/shuttles/syndicate/syndicate_litieguai.dmm b/_maps/shuttles/syndicate/syndicate_litieguai.dmm
index 70c1330bd7a0..fb7070893017 100644
--- a/_maps/shuttles/syndicate/syndicate_litieguai.dmm
+++ b/_maps/shuttles/syndicate/syndicate_litieguai.dmm
@@ -1027,11 +1027,10 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "sec_wall";
 	name = "firearms locker";
-	req_access_txt = "5";
-	pixel_y = 28
+	req_access_txt = "5"
 	},
 /obj/item/ammo_box/magazine/m10mm/rubber,
 /obj/item/ammo_box/magazine/m10mm/rubber,
@@ -1099,9 +1098,7 @@
 /turf/open/floor/plasteel/freezer,
 /area/ship/crew/toilet)
 "wt" = (
-/obj/structure/closet/emcloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/north,
 /obj/effect/turf_decal/number/two,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
@@ -1408,12 +1405,10 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "armor locker";
-	req_access_txt = "5";
-	pixel_y = -28
+	req_access_txt = "5"
 	},
 /obj/item/clothing/suit/armor/vest/marine/trauma,
 /obj/item/clothing/suit/armor/vest/marine/trauma,
@@ -1495,12 +1490,10 @@
 /obj/item/storage/belt/medical,
 /obj/item/healthanalyzer/advanced,
 /obj/item/hypospray/mkii/CMO,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "solgov_wall";
 	name = "chief medical officer's closet";
-	req_access_txt = "40";
-	pixel_x = -28
+	req_access_txt = "40"
 	},
 /obj/item/storage/backpack/satchel/med,
 /obj/item/defibrillator/compact/loaded,
@@ -1566,12 +1559,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 1;
+/obj/structure/closet/secure_closet/wall/directional/south{
 	icon_state = "sec_wall";
 	name = "clothing locker";
-	req_access_txt = "5";
-	pixel_y = -28
+	req_access_txt = "5"
 	},
 /obj/item/clothing/under/syndicate/medic,
 /obj/item/clothing/under/syndicate/medic,
@@ -2400,11 +2391,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
 	},
-/obj/structure/closet/secure_closet/wall{
+/obj/structure/closet/secure_closet/wall/directional/north{
 	icon_state = "sec_wall";
 	name = "equipment locker";
-	req_access_txt = "5";
-	pixel_y = 28
+	req_access_txt = "5"
 	},
 /obj/item/healthanalyzer/advanced,
 /obj/item/healthanalyzer/advanced,
@@ -2854,12 +2844,10 @@
 /obj/item/areaeditor/shuttle,
 /obj/item/megaphone/command,
 /obj/item/clothing/glasses/sunglasses,
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "solgov_wall";
 	name = "captain's closet";
-	req_access_txt = "20";
-	pixel_x = -28
+	req_access_txt = "20"
 	},
 /obj/item/gun/ballistic/revolver,
 /obj/item/clothing/suit/armor/vest/capcarapace/cybersun,
@@ -2885,10 +2873,7 @@
 /obj/machinery/atmospherics/components/binary/pump/on/layer2{
 	dir = 8
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Xx" = (
diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index 5d43bd59e8ea..19071dbc1baf 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -4,10 +4,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/item/clothing/suit/space/syndicate/black/engie,
 /obj/item/clothing/head/helmet/space/syndicate/black/engie,
 /turf/open/floor/plasteel/dark,
@@ -135,10 +132,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "aG" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/secure_closet/wall/directional/east,
 /obj/item/kitchen/knife,
 /obj/item/cutting_board,
 /obj/item/clothing/under/suit/waiter/syndicate,
@@ -2326,9 +2320,7 @@
 /obj/item/card/id/syndicate_command/lieutenant{
 	name = "lieutenant ID card"
 	},
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
-	pixel_x = -28;
+/obj/structure/closet/secure_closet/wall/directional/west{
 	name = "spare cards locker";
 	req_access = list(3,150)
 	},
@@ -2431,10 +2423,7 @@
 /obj/effect/turf_decal/corner/opaque/syndiered{
 	dir = 10
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 1;
-	pixel_y = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/south,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 1
 	},
@@ -4784,10 +4773,7 @@
 /obj/effect/turf_decal/corner/opaque/syndiered{
 	dir = 9
 	},
-/obj/structure/closet/firecloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/firecloset/wall/directional/west,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 4
 	},
@@ -5215,10 +5201,7 @@
 /obj/effect/turf_decal/corner/opaque/syndiered{
 	dir = 9
 	},
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 4
 	},
@@ -5801,10 +5784,7 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/port)
 "GN" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/item/clothing/suit/space/syndicate,
 /obj/item/clothing/suit/space/syndicate,
 /obj/item/clothing/head/helmet/space/syndicate,
@@ -6176,10 +6156,7 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "IV" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 4;
-	pixel_x = -28
-	},
+/obj/structure/closet/emcloset/wall/directional/west,
 /obj/item/clothing/suit/space/syndicate,
 /obj/item/clothing/head/helmet/space/syndicate,
 /obj/item/clothing/head/helmet/space/syndicate,
@@ -7781,10 +7758,7 @@
 "SA" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
+/obj/structure/closet/emcloset/wall/directional/east,
 /obj/item/clothing/suit/space/syndicate/black/engie,
 /obj/item/clothing/head/helmet/space/syndicate/black/engie,
 /turf/open/floor/plasteel/dark,
@@ -8345,9 +8319,8 @@
 /obj/effect/turf_decal/trimline/opaque/orange/line{
 	dir = 5
 	},
-/obj/structure/closet/wall/orange{
-	name = "Chemical Closet";
-	pixel_y = 28
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Chemical Closet"
 	},
 /obj/item/storage/bag/chemistry,
 /obj/item/reagent_containers/glass/beaker/large,
@@ -8578,9 +8551,7 @@
 	dir = 5
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/firecloset/wall{
-	pixel_y = 28
-	},
+/obj/structure/closet/firecloset/wall/directional/north,
 /obj/effect/turf_decal/borderfloorblack,
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/starboard)
diff --git a/tools/UpdatePaths/Scripts/2883_wall_lockers.txt b/tools/UpdatePaths/Scripts/2883_wall_lockers.txt
new file mode 100644
index 000000000000..403deb69f119
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/2883_wall_lockers.txt
@@ -0,0 +1,71 @@
+/obj/structure/closet/wall {dir=@UNSET} : /obj/structure/closet/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall {dir=1} : /obj/structure/closet/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall {dir=2} : /obj/structure/closet/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall {dir=4} : /obj/structure/closet/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall {dir=8} : /obj/structure/closet/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/blue {dir=@UNSET} : /obj/structure/closet/wall/blue/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/blue {dir=1} : /obj/structure/closet/wall/blue/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/blue {dir=2} : /obj/structure/closet/wall/blue/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/blue {dir=4} : /obj/structure/closet/wall/blue/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/blue {dir=8} : /obj/structure/closet/wall/blue/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/chem {dir=@UNSET} : /obj/structure/closet/wall/chem/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/chem {dir=1} : /obj/structure/closet/wall/chem/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/chem {dir=2} : /obj/structure/closet/wall/chem/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/chem {dir=4} : /obj/structure/closet/wall/chem/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/chem {dir=8} : /obj/structure/closet/wall/chem/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/med {dir=@UNSET} : /obj/structure/closet/wall/med/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/med {dir=1} : /obj/structure/closet/wall/med/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/med {dir=2} : /obj/structure/closet/wall/med/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/med {dir=4} : /obj/structure/closet/wall/med/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/med {dir=8} : /obj/structure/closet/wall/med/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/orange {dir=@UNSET} : /obj/structure/closet/wall/orange/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/orange {dir=1} : /obj/structure/closet/wall/orange/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/orange {dir=2} : /obj/structure/closet/wall/orange/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/orange {dir=4} : /obj/structure/closet/wall/orange/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/orange {dir=8} : /obj/structure/closet/wall/orange/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/red {dir=@UNSET} : /obj/structure/closet/wall/red/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/red {dir=1} : /obj/structure/closet/wall/red/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/red {dir=2} : /obj/structure/closet/wall/red/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/red {dir=4} : /obj/structure/closet/wall/red/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/red {dir=8} : /obj/structure/closet/wall/red/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/wall/white {dir=@UNSET} : /obj/structure/closet/wall/white/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/white {dir=1} : /obj/structure/closet/wall/white/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/white {dir=2} : /obj/structure/closet/wall/white/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/white {dir=4} : /obj/structure/closet/wall/white/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/wall/white {dir=8} : /obj/structure/closet/wall/white/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/emcloset/wall {dir=@UNSET} : /obj/structure/closet/emcloset/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/emcloset/wall {dir=1} : /obj/structure/closet/emcloset/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/emcloset/wall {dir=2} : /obj/structure/closet/emcloset/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/emcloset/wall {dir=4} : /obj/structure/closet/emcloset/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/emcloset/wall {dir=8} : /obj/structure/closet/emcloset/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/firecloset/wall {dir=@UNSET} : /obj/structure/closet/firecloset/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/firecloset/wall {dir=1} : /obj/structure/closet/firecloset/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/firecloset/wall {dir=2} : /obj/structure/closet/firecloset/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/firecloset/wall {dir=4} : /obj/structure/closet/firecloset/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/firecloset/wall {dir=8} : /obj/structure/closet/firecloset/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/secure_closet/wall {dir=@UNSET} : /obj/structure/closet/secure_closet/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/wall {dir=1} : /obj/structure/closet/secure_closet/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/wall {dir=2} : /obj/structure/closet/secure_closet/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/wall {dir=4} : /obj/structure/closet/secure_closet/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/wall {dir=8} : /obj/structure/closet/secure_closet/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/secure_closet/brig/wall {dir=@UNSET} : /obj/structure/closet/secure_closet/brig/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/brig/wall {dir=1} : /obj/structure/closet/secure_closet/brig/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/brig/wall {dir=2} : /obj/structure/closet/secure_closet/brig/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/brig/wall {dir=4} : /obj/structure/closet/secure_closet/brig/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/brig/wall {dir=8} : /obj/structure/closet/secure_closet/brig/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+
+/obj/structure/closet/secure_closet/freezer/wall {dir=@UNSET} : /obj/structure/closet/secure_closet/freezer/wall/directional/north {@OLD;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/freezer/wall {dir=1} : /obj/structure/closet/secure_closet/freezer/wall/directional/south {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/freezer/wall {dir=2} : /obj/structure/closet/secure_closet/freezer/wall/directional/north {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/freezer/wall {dir=4} : /obj/structure/closet/secure_closet/freezer/wall/directional/west {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
+/obj/structure/closet/secure_closet/freezer/wall {dir=8} : /obj/structure/closet/secure_closet/freezer/wall/directional/east {@OLD;dir=@SKIP;pixel_x=@SKIP;pixel_y=@SKIP}
\ No newline at end of file