diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
index fd02464a4969..52e4491b0d92 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -218,7 +218,7 @@
 /area/ruin/space/spacehotelv1/engi2)
 "bC" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station/south,
+/obj/machinery/power/apc/off_station/directional/south,
 /obj/structure/dresser,
 /turf/simulated/floor/wood/oak,
 /area/ruin/space/spacehotelv1/guestroom5)
@@ -281,7 +281,7 @@
 /turf/simulated/floor/wood/oak,
 /area/ruin/space/spacehotelv1/forehallway)
 "cb" = (
-/obj/machinery/power/apc/off_station/west,
+/obj/machinery/power/apc/off_station/directional/west,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -374,7 +374,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/off_station/north,
+/obj/machinery/power/apc/off_station/directional/north,
 /obj/structure/table/wood/fancy/blue,
 /obj/item/bee_briefcase,
 /turf/simulated/floor/carpet/royalblack,
@@ -656,7 +656,7 @@
 /obj/structure/railing/cap{
 	dir = 10
 	},
-/obj/machinery/power/apc/off_station/north,
+/obj/machinery/power/apc/off_station/directional/north,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -1380,7 +1380,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station/south,
+/obj/machinery/power/apc/off_station/directional/south,
 /obj/structure/chair/wood{
 	dir = 1
 	},
@@ -1560,7 +1560,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/off_station/south,
+/obj/machinery/power/apc/off_station/directional/south,
 /obj/structure/table/reinforced/brass,
 /obj/item/paper_bin,
 /obj/item/pen/multi,
@@ -1677,7 +1677,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station/south,
+/obj/machinery/power/apc/off_station/directional/south,
 /turf/simulated/floor/plasteel{
 	icon_state = "showroomfloor"
 	},
@@ -1992,7 +1992,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/off_station/north,
+/obj/machinery/power/apc/off_station/directional/north,
 /obj/structure/chair/comfy/black{
 	dir = 8
 	},
@@ -2483,7 +2483,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station/west,
+/obj/machinery/power/apc/off_station/directional/west,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
@@ -2869,7 +2869,7 @@
 /area/ruin/space/spacehotelv1/engi1)
 "uI" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station/south,
+/obj/machinery/power/apc/off_station/directional/south,
 /obj/machinery/light_switch{
 	dir = 8;
 	pixel_x = 24
@@ -3088,7 +3088,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/off_station/east,
+/obj/machinery/power/apc/off_station/directional/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "cmo"
 	},
@@ -3472,7 +3472,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station/west,
+/obj/machinery/power/apc/off_station/directional/west,
 /obj/structure/disposalpipe/segment/corner{
 	dir = 1
 	},
@@ -4228,7 +4228,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/off_station/north,
+/obj/machinery/power/apc/off_station/directional/north,
 /obj/structure/chair/comfy/brown{
 	dir = 8
 	},
@@ -4501,7 +4501,7 @@
 /area/ruin/space/spacehotelv1/entryhallway)
 "FP" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station/east,
+/obj/machinery/power/apc/off_station/directional/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -5094,7 +5094,7 @@
 /area/ruin/space/spacehotelv1/centralhallway)
 "Ki" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station/south,
+/obj/machinery/power/apc/off_station/directional/south,
 /obj/structure/chair/comfy/black{
 	dir = 1
 	},
@@ -5292,7 +5292,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station/south,
+/obj/machinery/power/apc/off_station/directional/south,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/spacehotelv1/reception)
 "Lw" = (
@@ -5721,7 +5721,7 @@
 /area/ruin/space/spacehotelv1/guestroom6)
 "Oy" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station/south,
+/obj/machinery/power/apc/off_station/directional/south,
 /obj/structure/chair/sofa/right{
 	dir = 1
 	},
@@ -5832,7 +5832,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/off_station/north,
+/obj/machinery/power/apc/off_station/directional/north,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
@@ -5888,7 +5888,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/off_station/north,
+/obj/machinery/power/apc/off_station/directional/north,
 /obj/effect/spawner/random_spawners/dirt_often,
 /obj/machinery/atmospherics/portable/canister/nitrogen,
 /turf/simulated/floor/plating,
@@ -5979,7 +5979,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/off_station/east,
+/obj/machinery/power/apc/off_station/directional/east,
 /obj/vehicle/janicart,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/spacehotelv1/janitor)
@@ -6029,7 +6029,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/obj/machinery/economy/atm/west,
+/obj/machinery/economy/atm/directional/west,
 /turf/simulated/floor/wood/oak,
 /area/ruin/space/spacehotelv1/centralhallway)
 "QO" = (
@@ -6348,7 +6348,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/off_station/north,
+/obj/machinery/power/apc/off_station/directional/north,
 /turf/simulated/floor/plating,
 /area/ruin/space/spacehotelv1/engi1)
 "TN" = (
@@ -6624,7 +6624,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/off_station/north,
+/obj/machinery/power/apc/off_station/directional/north,
 /turf/simulated/floor/wood/oak,
 /area/ruin/space/spacehotelv1/guestroom2)
 "VH" = (
@@ -7010,7 +7010,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/off_station/east,
+/obj/machinery/power/apc/off_station/directional/east,
 /obj/effect/spawner/random_spawners/dirt_often,
 /turf/simulated/floor/plating,
 /area/ruin/space/spacehotelv1/engi2)
diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm
index 3ad309f6aa86..b4d2a9e52503 100644
--- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm
+++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm
@@ -7107,7 +7107,7 @@
 	icon_state = "0-8"
 	},
 /obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/machinery/power/apc/off_station/empty_charge/east,
+/obj/machinery/power/apc/off_station/empty_charge/directional/east,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "yellowcorner"
@@ -9564,7 +9564,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station/empty_charge/south,
+/obj/machinery/power/apc/off_station/empty_charge/directional/south,
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
 	},
diff --git a/_maps/map_files220/RandomZLevels/spacebattle.dmm b/_maps/map_files220/RandomZLevels/spacebattle.dmm
index 8e60ae70079d..870d2e58b8f2 100644
--- a/_maps/map_files220/RandomZLevels/spacebattle.dmm
+++ b/_maps/map_files220/RandomZLevels/spacebattle.dmm
@@ -89,10 +89,7 @@
 /area/awaymission/space_battle/syndicate)
 "ap" = (
 /obj/machinery/computer/nonfunctional{
-	name = "broken computer";
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	icon_state = "computer";
-	dir = 2
+	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "blue";
@@ -379,7 +376,6 @@
 /area/awaymission/space_battle/syndicate/syndicate5)
 "bg" = (
 /obj/structure/sign/directions/cargo{
-	dir = 2;
 	pixel_y = 11
 	},
 /obj/structure/sign/directions/engineering{
@@ -387,7 +383,6 @@
 	pixel_y = 4
 	},
 /obj/structure/sign/directions/medical{
-	dir = 2;
 	pixel_y = -3
 	},
 /obj/structure/sign/directions/security{
@@ -532,7 +527,6 @@
 /obj/machinery/cryopod/offstation{
 	icon_state = "sleeper_s";
 	occupied_icon_state = "sleeper_s";
-	dir = 8;
 	base_icon_state = "sleeper_s-open"
 	},
 /obj/effect/turf_decal/siding/black{
@@ -1329,7 +1323,6 @@
 /area/awaymission/space_battle/syndicate/syndicate3)
 "eq" = (
 /obj/machinery/computer/nonfunctional{
-	name = "broken computer";
 	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
 	icon_state = "control_boxp";
 	dir = 8;
@@ -1370,13 +1363,6 @@
 	dir = 4
 	},
 /area/awaymission/space_battle/hallway2)
-"ew" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/awaymission/space_battle/sec_storage)
 "ex" = (
 /obj/machinery/light/small/directional/west,
 /turf/simulated/floor/plating,
@@ -2855,8 +2841,7 @@
 	dir = 1
 	},
 /obj/structure/shuttle/engine/heater{
-	icon_state = "heater3x3";
-	dir = 2
+	icon_state = "heater3x3"
 	},
 /obj/structure/cable,
 /turf/simulated/floor/plating,
@@ -3631,9 +3616,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	dir = 2
-	},
+/obj/effect/decal/cleanable/blood/tracks,
 /turf/simulated/floor/plasteel/dark,
 /area/awaymission/space_battle/hallway4)
 "kX" = (
@@ -4363,7 +4346,6 @@
 "nu" = (
 /obj/effect/spawner/window/plastitanium,
 /obj/machinery/door/poddoor/shutters{
-	dir = 4;
 	layer = 2.9
 	},
 /turf/simulated/floor/plating/airless,
@@ -4431,7 +4413,6 @@
 /area/awaymission/space_battle/server)
 "nI" = (
 /obj/effect/decal/cleanable/blood/tracks{
-	dir = 2;
 	icon_state = "blood1"
 	},
 /turf/simulated/floor/plasteel,
@@ -4741,9 +4722,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plasteel,
 /area/awaymission/space_battle/sec_storage)
 "oA" = (
@@ -4773,13 +4752,6 @@
 /obj/item/stack/ore/glass,
 /turf/simulated/floor/plating/asteroid/airless,
 /area/space)
-"oF" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/obj/effect/decal/cleanable/blood,
-/turf/simulated/floor/plasteel,
-/area/awaymission/space_battle/sec_storage)
 "oH" = (
 /obj/machinery/economy/vending/cola/free,
 /turf/simulated/floor/plasteel{
@@ -5348,7 +5320,7 @@
 /area/awaymission/space_battle/sec_storage)
 "qH" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/off_station/empty_charge/north,
+/obj/machinery/power/apc/off_station/empty_charge/directional/north,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -6088,9 +6060,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/space_battle/hallway6)
 "tc" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/corner,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
@@ -6428,9 +6398,7 @@
 /area/awaymission/space_battle/syndicate)
 "ud" = (
 /obj/machinery/computer/nonfunctional{
-	name = "broken computer";
 	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	icon_state = "computer";
 	dir = 1
 	},
 /obj/machinery/light/directional/south,
@@ -6549,7 +6517,6 @@
 	dir = 1
 	},
 /obj/machinery/computer/nonfunctional{
-	dir = 2;
 	name = "computer"
 	},
 /turf/simulated/floor/plasteel,
@@ -7278,9 +7245,7 @@
 	color = "red";
 	dir = 4
 	},
-/obj/machinery/alarm/syndicate{
-	pixel_y = 32
-	},
+/obj/machinery/alarm/syndicate/directional/north,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/awaymission/space_battle/syndicate/syndicate6)
 "wQ" = (
@@ -7578,9 +7543,7 @@
 /area/awaymission/space_battle/cruiser)
 "xN" = (
 /obj/machinery/computer/nonfunctional{
-	name = "broken computer";
 	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	icon_state = "computer";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -8294,9 +8257,7 @@
 /area/awaymission/space_battle/hallway1)
 "Ab" = (
 /obj/machinery/computer/nonfunctional{
-	name = "broken computer";
 	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	icon_state = "computer";
 	dir = 1
 	},
 /turf/simulated/floor/plasteel/dark{
@@ -8323,9 +8284,7 @@
 /turf/simulated/floor/mineral/titanium,
 /area/awaymission/space_battle/storage)
 "Ag" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/corner,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/awaymission/space_battle/syndicate/syndicate2)
 "Ah" = (
@@ -8404,15 +8363,6 @@
 	icon_state = "dark_large"
 	},
 /area/awaymission/space_battle/hallway4)
-"As" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 2
-	},
-/turf/simulated/floor/plasteel,
-/area/awaymission/space_battle/sec_storage)
 "At" = (
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
@@ -8805,7 +8755,6 @@
 "BF" = (
 /obj/structure/table/reinforced,
 /obj/machinery/computer/nonfunctional{
-	name = "broken computer";
 	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
 	icon_state = "laptop";
 	dir = 8;
@@ -8972,9 +8921,7 @@
 /area/awaymission/space_battle/hallway4)
 "Cf" = (
 /obj/machinery/computer/nonfunctional{
-	name = "broken computer";
 	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	icon_state = "computer";
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
@@ -9029,7 +8976,6 @@
 /obj/machinery/cryopod/offstation{
 	icon_state = "sleeper_s";
 	occupied_icon_state = "sleeper_s";
-	dir = 8;
 	base_icon_state = "sleeper_s-open"
 	},
 /turf/simulated/floor/mineral/plastitanium/red,
@@ -10243,7 +10189,6 @@
 /area/awaymission/space_battle/syndicate/syndicate5)
 "FO" = (
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "whiteblue"
 	},
 /area/awaymission/space_battle/medbay)
@@ -10370,10 +10315,7 @@
 /area/awaymission/space_battle/hallway9)
 "Gj" = (
 /obj/machinery/computer/nonfunctional{
-	name = "broken computer";
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	icon_state = "computer";
-	dir = 2
+	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."
 	},
 /turf/simulated/floor/plasteel,
 /area/awaymission/space_battle/sec_storage)
@@ -10410,7 +10352,6 @@
 /obj/structure/table/reinforced,
 /obj/item/storage/firstaid,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "whiteblue"
 	},
 /area/awaymission/space_battle/medbay)
@@ -10535,7 +10476,6 @@
 /area/awaymission/space_battle/hallway2)
 "GI" = (
 /obj/machinery/computer/nonfunctional{
-	dir = 2;
 	icon_keyboard = "syndie_key";
 	icon_screen = "syndinavigation";
 	name = "computer"
@@ -10600,7 +10540,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station/empty_charge/south,
+/obj/machinery/power/apc/off_station/empty_charge/directional/south,
 /turf/simulated/floor/plating,
 /area/awaymission/space_battle/turret7)
 "GR" = (
@@ -10966,7 +10906,6 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/poddoor/shutters{
-	dir = 4;
 	id_tag = "spacebattlestorage";
 	name = "Secure Storage"
 	},
@@ -11042,7 +10981,6 @@
 /area/awaymission/space_battle/cruiser)
 "If" = (
 /obj/machinery/computer/nonfunctional{
-	dir = 2;
 	icon_keyboard = "syndie_key";
 	icon_screen = "syndinavigation";
 	name = "computer"
@@ -11578,9 +11516,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/space_battle/sec_storage)
 "JQ" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	dir = 2
-	},
+/obj/effect/decal/cleanable/blood/tracks,
 /turf/simulated/floor/plasteel,
 /area/awaymission/space_battle/hallway4)
 "JR" = (
@@ -12549,7 +12485,6 @@
 	layer = 3.3
 	},
 /obj/machinery/door/poddoor/shutters{
-	dir = 4;
 	id_tag = "spacebattlestorage";
 	name = "Secure Storage"
 	},
@@ -12927,7 +12862,6 @@
 "NT" = (
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "whiteblue"
 	},
 /area/awaymission/space_battle/medbay)
@@ -13828,9 +13762,7 @@
 /area/awaymission/space_battle/syndicate/syndicate6)
 "QN" = (
 /obj/machinery/computer/nonfunctional{
-	name = "broken computer";
 	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	icon_state = "computer";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/dark{
@@ -13888,7 +13820,6 @@
 "QX" = (
 /obj/structure/shuttle/engine/heater{
 	icon_state = "heater3x3";
-	dir = 2;
 	layer = 3.1
 	},
 /obj/structure/window/plasmareinforced{
@@ -14090,7 +14021,6 @@
 	layer = 3.3
 	},
 /obj/machinery/door/poddoor/shutters{
-	dir = 4;
 	id_tag = "spacebattlestorage";
 	name = "Secure Storage"
 	},
@@ -14197,7 +14127,6 @@
 /obj/machinery/economy/vending/wallmed/directional/south,
 /obj/machinery/iv_drip,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "whiteblue"
 	},
 /area/awaymission/space_battle/medbay)
@@ -14330,9 +14259,7 @@
 /area/space)
 "Ss" = (
 /obj/machinery/computer/nonfunctional{
-	name = "broken computer";
 	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	icon_state = "computer";
 	dir = 8
 	},
 /obj/item/paper/docs_part/spacebattle/bridge2,
@@ -14667,7 +14594,6 @@
 /area/awaymission/space_battle/cruiser)
 "Tz" = (
 /obj/machinery/computer/nonfunctional{
-	dir = 2;
 	icon_state = "broken";
 	icon_screen = "broken";
 	icon_keyboard = "generic_key_broken"
@@ -15011,7 +14937,6 @@
 /area/awaymission/space_battle/storage)
 "UI" = (
 /obj/effect/decal/cleanable/blood/tracks{
-	dir = 2;
 	icon_state = "blood1"
 	},
 /turf/simulated/floor/plasteel{
@@ -15237,9 +15162,7 @@
 /obj/item/stack/rods{
 	amount = 15
 	},
-/obj/effect/decal/cleanable/blood/tracks{
-	dir = 2
-	},
+/obj/effect/decal/cleanable/blood/tracks,
 /turf/simulated/floor/plasteel,
 /area/awaymission/space_battle/hallway4)
 "Vo" = (
@@ -15279,7 +15202,6 @@
 "Vw" = (
 /obj/structure/table/reinforced,
 /turf/simulated/floor/plasteel{
-	dir = 2;
 	icon_state = "whiteblue"
 	},
 /area/awaymission/space_battle/medbay)
@@ -15563,12 +15485,6 @@
 	icon_state = "whiteblue"
 	},
 /area/awaymission/space_battle/medbay)
-"Wp" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/turf/simulated/floor/plasteel,
-/area/awaymission/space_battle/sec_storage)
 "Wq" = (
 /obj/machinery/mass_driver_frame{
 	dir = 8;
@@ -15695,9 +15611,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/awaymission/space_battle/sec_storage)
@@ -15802,7 +15716,6 @@
 /area/awaymission/space_battle/hallway9)
 "Xf" = (
 /obj/effect/decal/cleanable/blood/tracks{
-	dir = 2;
 	icon_state = "xeno2"
 	},
 /obj/effect/decal/cleanable/blood/drip{
@@ -16787,7 +16700,6 @@
 /obj/machinery/cryopod/offstation{
 	icon_state = "sleeper_s";
 	occupied_icon_state = "sleeper_s";
-	dir = 8;
 	base_icon_state = "sleeper_s-open"
 	},
 /turf/simulated/floor/mineral/plastitanium/red/nitrogen,
@@ -41098,7 +41010,7 @@ gr
 Aw
 dh
 Ej
-ew
+rP
 wy
 gr
 wy
@@ -41355,7 +41267,7 @@ wy
 Zy
 wE
 Ej
-Wp
+qD
 Jw
 zr
 mU
@@ -41612,7 +41524,7 @@ Zy
 zX
 Zy
 Ej
-oF
+bG
 VV
 mU
 wy
@@ -41862,7 +41774,7 @@ VC
 pS
 uy
 Ow
-As
+XI
 OB
 yp
 DM
diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm
index 8b95516e5870..2f1c97b030e7 100644
--- a/_maps/map_files220/generic/centcomm.dmm
+++ b/_maps/map_files220/generic/centcomm.dmm
@@ -5378,7 +5378,7 @@
 /area/centcom/ss220/park)
 "dHo" = (
 /obj/machinery/light/spot,
-/obj/machinery/economy/atm/south,
+/obj/machinery/economy/atm/directional/south,
 /turf/simulated/floor/wood/fancy/cherry,
 /area/shuttle/trade/sol)
 "dHB" = (
@@ -12028,7 +12028,7 @@
 /obj/machinery/light/spot{
 	dir = 1
 	},
-/obj/machinery/economy/atm/north,
+/obj/machinery/economy/atm/directional/north,
 /turf/simulated/floor/wood/fancy/cherry,
 /area/shuttle/trade/sol)
 "hWx" = (
diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm
index cf0ab261967e..31adba32f197 100644
--- a/_maps/map_files220/stations/boxstation.dmm
+++ b/_maps/map_files220/stations/boxstation.dmm
@@ -1357,7 +1357,7 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
-/obj/machinery/power/apc/important/east,
+/obj/machinery/power/apc/important/directional/east,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -8488,7 +8488,7 @@
 	c_tag = "Fore Port Solar Control";
 	dir = 1
 	},
-/obj/machinery/power/apc/engineering/west,
+/obj/machinery/power/apc/directional/west,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -9281,7 +9281,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/engineering/west,
+/obj/machinery/power/apc/directional/west,
 /turf/simulated/floor/plating,
 /area/station/maintenance/auxsolarstarboard)
 "aIC" = (
@@ -10595,7 +10595,7 @@
 	},
 /area/station/service/barber)
 "aNZ" = (
-/obj/machinery/economy/atm/south,
+/obj/machinery/economy/atm/directional/south,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -11084,7 +11084,7 @@
 	},
 /area/station/hallway/secondary/entry)
 "aPS" = (
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -12009,7 +12009,7 @@
 "aTt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/power/apc/cryo/east,
+/obj/machinery/power/apc/critical/directional/east,
 /obj/structure/cable,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
@@ -15550,7 +15550,7 @@
 	},
 /area/station/public/dorms)
 "bfy" = (
-/obj/machinery/economy/atm/south,
+/obj/machinery/economy/atm/directional/south,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -17402,7 +17402,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/ne)
 "bnu" = (
-/obj/machinery/economy/atm/east,
+/obj/machinery/economy/atm/directional/east,
 /obj/machinery/camera{
 	c_tag = "Arrivals Hallway";
 	dir = 8
@@ -18018,7 +18018,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
 "bql" = (
-/obj/machinery/economy/atm/east,
+/obj/machinery/economy/atm/directional/east,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/port)
 "bqm" = (
@@ -20161,7 +20161,7 @@
 	},
 /area/station/hallway/primary/central/east)
 "bAn" = (
-/obj/machinery/economy/atm/north,
+/obj/machinery/economy/atm/directional/north,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/starboard/west)
 "bAo" = (
@@ -20533,7 +20533,7 @@
 	},
 /area/station/supply/office)
 "bCF" = (
-/obj/machinery/economy/atm/west,
+/obj/machinery/economy/atm/directional/west,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "browncorner"
@@ -21149,7 +21149,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/supply/storage)
 "bFo" = (
-/obj/machinery/economy/atm/north,
+/obj/machinery/economy/atm/directional/north,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/starboard/east)
 "bFp" = (
@@ -23217,10 +23217,7 @@
 /area/station/supply/office)
 "bOu" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/alarm/all_access{
-	dir = 8;
-	pixel_x = 24
-	},
+/obj/machinery/alarm/all_access/directional/east,
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 10
@@ -25521,7 +25518,7 @@
 /turf/simulated/wall,
 /area/station/supply/qm)
 "bYO" = (
-/obj/machinery/economy/atm/west,
+/obj/machinery/economy/atm/directional/west,
 /obj/machinery/light/directional/west,
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -29935,7 +29932,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "darkbluecorners"
@@ -31898,7 +31895,7 @@
 	},
 /area/station/engineering/break_room)
 "cyw" = (
-/obj/machinery/power/apc/engineering/south,
+/obj/machinery/power/apc/directional/south,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -36443,7 +36440,7 @@
 /turf/simulated/floor/mineral/titanium/blue,
 /area/shuttle/pod_4)
 "cPy" = (
-/obj/machinery/power/apc/super/north,
+/obj/machinery/power/apc/critical/directional/north,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -36645,7 +36642,6 @@
 /turf/simulated/wall/r_wall,
 /area/station/engineering/supermatter_room)
 "cQg" = (
-/obj/machinery/light/directional/north,
 /obj/machinery/camera{
 	c_tag = "Engineering Atmos East";
 	network = list("SS13","Engineering")
@@ -37070,7 +37066,7 @@
 	pixel_x = -1
 	},
 /obj/effect/turf_decal/delivery/blue/hollow,
-/obj/machinery/power/apc/engineering/west,
+/obj/machinery/power/apc/directional/west,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -37394,7 +37390,7 @@
 	},
 /area/station/engineering/atmos)
 "cSq" = (
-/obj/machinery/power/apc/engineering/east,
+/obj/machinery/power/apc/directional/east,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -38057,7 +38053,7 @@
 /turf/simulated/floor/carpet,
 /area/station/public/mrchangs)
 "cUj" = (
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -38415,7 +38411,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/engineering/south,
+/obj/machinery/power/apc/directional/south,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "yellow"
@@ -40251,7 +40247,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "dcl" = (
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/turf_decal/delivery/hollow,
 /obj/structure/cable{
@@ -40855,7 +40851,7 @@
 	},
 /area/station/medical/patients_rooms)
 "deu" = (
-/obj/machinery/power/apc/super/north,
+/obj/machinery/power/apc/critical/directional/north,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -41067,7 +41063,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/engineering/west,
+/obj/machinery/power/apc/directional/west,
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboardsolar)
 "deU" = (
@@ -41413,10 +41409,10 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "dgi" = (
-/obj/machinery/light/directional/south,
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 4
 	},
+/obj/machinery/alarm/directional/south,
 /turf/simulated/floor/plasteel{
 	icon_state = "yellow"
 	},
@@ -42249,7 +42245,7 @@
 /area/station/engineering/control)
 "djv" = (
 /obj/machinery/light/directional/north,
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -43290,7 +43286,7 @@
 	},
 /area/station/turret_protected/ai)
 "dnk" = (
-/obj/machinery/economy/atm/east,
+/obj/machinery/economy/atm/directional/east,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/ne)
 "dnl" = (
@@ -43805,7 +43801,7 @@
 	pixel_y = -7
 	},
 /obj/item/storage/toolbox/mechanical,
-/obj/machinery/power/apc/engineering/west,
+/obj/machinery/power/apc/directional/west,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -44281,7 +44277,7 @@
 	network = list("SS13","MiniSat");
 	start_active = 1
 	},
-/obj/machinery/power/apc/important/south,
+/obj/machinery/power/apc/important/directional/south,
 /turf/simulated/floor/bluegrid,
 /area/station/turret_protected/ai)
 "drS" = (
@@ -44679,7 +44675,7 @@
 	c_tag = "Tech Storage";
 	network = list("SS13","Engineering")
 	},
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /turf/simulated/floor/plating,
 /area/station/engineering/tech_storage)
 "dtF" = (
@@ -51026,11 +51022,8 @@
 /area/station/hallway/secondary/exit)
 "fJg" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/alarm/engine{
-	dir = 4;
-	pixel_x = -24
-	},
-/obj/machinery/power/apc/super/north,
+/obj/machinery/alarm/engine/directional/west,
+/obj/machinery/power/apc/critical/directional/north,
 /obj/machinery/atmospherics/binary/pump{
 	dir = 1;
 	name = "Gas to Filter"
@@ -53018,7 +53011,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
-/obj/machinery/economy/atm/north,
+/obj/machinery/economy/atm/directional/north,
 /turf/simulated/floor/wood/fancy/cherry,
 /area/station/service/bar)
 "gvg" = (
@@ -58950,7 +58943,7 @@
 	dir = 1
 	},
 /obj/structure/cable,
-/obj/machinery/power/apc/engineering/south,
+/obj/machinery/power/apc/directional/south,
 /turf/simulated/floor/plating,
 /area/station/maintenance/portsolar)
 "iCD" = (
@@ -59000,7 +58993,7 @@
 /area/station/maintenance/fore)
 "iDz" = (
 /obj/structure/filingcabinet/filingcabinet,
-/obj/machinery/power/apc/important/south,
+/obj/machinery/power/apc/important/directional/south,
 /obj/structure/cable,
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -59098,9 +59091,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/power/apc/engineering/north{
-	cell_type = 5000
-	},
+/obj/machinery/power/apc/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "yellow"
@@ -60190,7 +60181,7 @@
 "jam" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/machinery/atmospherics/pipe/simple/visible/cyan,
-/obj/machinery/power/apc/engineering/east,
+/obj/machinery/power/apc/directional/east,
 /obj/structure/cable,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral"
@@ -61429,7 +61420,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/engineering/south,
+/obj/machinery/power/apc/directional/south,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkyellow"
 	},
@@ -64256,7 +64247,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
 "kDW" = (
-/obj/machinery/power/apc/important/south,
+/obj/machinery/power/apc/important/directional/south,
 /obj/structure/cable,
 /obj/machinery/light/directional/south,
 /turf/simulated/floor/bluegrid,
@@ -68996,7 +68987,7 @@
 /area/station/maintenance/asmaint)
 "mlz" = (
 /obj/item/radio/intercom/directional/south,
-/obj/machinery/power/apc/engineering/west,
+/obj/machinery/power/apc/directional/west,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -73406,7 +73397,6 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "nVh" = (
-/obj/machinery/firealarm,
 /turf/simulated/wall,
 /area/station/engineering/atmos)
 "nVn" = (
@@ -74002,7 +73992,6 @@
 /area/station/maintenance/aft)
 "ogy" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/alarm,
 /turf/simulated/wall,
 /area/station/engineering/atmos)
 "ogH" = (
@@ -76079,7 +76068,7 @@
 	},
 /area/station/maintenance/fsmaint)
 "oRn" = (
-/obj/machinery/economy/atm/east,
+/obj/machinery/economy/atm/directional/east,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "whiteblue"
@@ -83245,7 +83234,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/cryo/north,
+/obj/machinery/power/apc/critical/directional/north,
 /turf/simulated/floor/plasteel{
 	icon_state = "whitegreenfull"
 	},
@@ -85333,6 +85322,13 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/aft)
+"sms" = (
+/obj/machinery/light/directional/west,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "yellow"
+	},
+/area/station/engineering/atmos)
 "smu" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -86835,7 +86831,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "sLy" = (
-/obj/machinery/power/apc/engineering/south,
+/obj/machinery/power/apc/directional/south,
 /obj/structure/cable,
 /turf/simulated/floor/plating,
 /area/station/maintenance/storage)
@@ -90710,6 +90706,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/simulated/floor/plasteel{
 	icon_state = "yellow"
 	},
@@ -91225,7 +91222,7 @@
 /turf/simulated/floor/carpet/royalblack,
 /area/station/command/office/ntrep)
 "uph" = (
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -95668,7 +95665,7 @@
 /turf/simulated/floor/bluegrid,
 /area/station/aisat/hall)
 "vTU" = (
-/obj/machinery/power/apc/important/north,
+/obj/machinery/power/apc/important/directional/north,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -95979,7 +95976,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/port)
 "vZh" = (
-/obj/machinery/economy/atm/north,
+/obj/machinery/economy/atm/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "bluecorner"
@@ -100259,7 +100256,7 @@
 	},
 /area/station/maintenance/apmaint)
 "xHz" = (
-/obj/machinery/power/apc/engineering/west,
+/obj/machinery/power/apc/directional/west,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -101911,10 +101908,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint)
 "yjv" = (
-/obj/machinery/alarm/server{
-	dir = 4;
-	pixel_x = -24
-	},
+/obj/machinery/alarm/server/directional/west,
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging,
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -133677,7 +133671,7 @@ dop
 gru
 oWM
 dfF
-cUM
+dfD
 cSd
 ctJ
 dgQ
@@ -134191,7 +134185,7 @@ dop
 gru
 oWM
 dfF
-qpq
+sms
 dkA
 ctJ
 cDS
diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm
index da0cc3c7c369..f5e69e94ec4a 100644
--- a/_maps/map_files220/stations/deltastation.dmm
+++ b/_maps/map_files220/stations/deltastation.dmm
@@ -1122,7 +1122,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
 "ait" = (
-/obj/machinery/economy/atm/south,
+/obj/machinery/economy/atm/directional/south,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -1783,7 +1783,7 @@
 	},
 /area/station/hallway/secondary/entry)
 "anp" = (
-/obj/machinery/power/apc/cryo/north,
+/obj/machinery/power/apc/critical/directional/north,
 /obj/machinery/camera{
 	c_tag = "Arrivals Hall Center"
 	},
@@ -10071,7 +10071,7 @@
 	},
 /area/station/maintenance/disposal/west)
 "aRS" = (
-/obj/machinery/power/apc/engineering/east,
+/obj/machinery/power/apc/directional/east,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -13570,7 +13570,7 @@
 	},
 /area/station/engineering/atmos)
 "bhl" = (
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -13871,7 +13871,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "purple"
@@ -17833,7 +17833,7 @@
 "bzn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dust,
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -23827,7 +23827,7 @@
 /turf/simulated/floor/bluegrid,
 /area/station/turret_protected/ai_upload)
 "bSK" = (
-/obj/machinery/power/apc/important/south,
+/obj/machinery/power/apc/important/directional/south,
 /obj/structure/cable,
 /turf/simulated/floor/bluegrid,
 /area/station/turret_protected/ai_upload)
@@ -24717,7 +24717,7 @@
 /area/station/hallway/secondary/bridge)
 "bVB" = (
 /obj/item/kirbyplants,
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -27460,7 +27460,7 @@
 /obj/machinery/computer/atmos_alert{
 	dir = 1
 	},
-/obj/machinery/power/apc/engineering/south,
+/obj/machinery/power/apc/directional/south,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -28652,7 +28652,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/control)
 "cjO" = (
-/obj/machinery/power/apc/engineering/east,
+/obj/machinery/power/apc/directional/east,
 /obj/structure/cable/yellow{
 	d2 = 8;
 	icon_state = "0-8"
@@ -46288,7 +46288,7 @@
 /turf/simulated/floor/wood/oak,
 /area/station/service/theatre)
 "dRT" = (
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/structure/cable{
 	d2 = 2;
 	icon_state = "0-2"
@@ -46589,7 +46589,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
-/obj/machinery/economy/atm/north,
+/obj/machinery/economy/atm/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "green"
@@ -51493,7 +51493,7 @@
 /obj/item/stack/rods,
 /obj/structure/table_frame,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/worn_out/south,
+/obj/machinery/power/apc/worn_out/directional/south,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -52566,7 +52566,7 @@
 "ftv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
-/obj/machinery/power/apc/engineering/south,
+/obj/machinery/power/apc/directional/south,
 /turf/simulated/floor/plasteel{
 	dir = 7;
 	icon_state = "yellow"
@@ -55013,7 +55013,7 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/public/fitness)
 "ghJ" = (
-/obj/machinery/economy/atm/east,
+/obj/machinery/economy/atm/directional/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralcorner"
 	},
@@ -55191,9 +55191,7 @@
 /turf/simulated/floor/wood/fancy/cherry,
 /area/station/legal/lawoffice)
 "gkj" = (
-/obj/machinery/power/apc/critical/directional/east{
-	shock_proof = 1
-	},
+/obj/machinery/power/apc/critical/directional/east,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -55963,9 +55961,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/alarm/engine{
-	pixel_y = 24
-	},
+/obj/machinery/alarm/engine/directional/north,
 /obj/structure/cable/yellow{
 	d1 = 2;
 	d2 = 8;
@@ -56520,7 +56516,7 @@
 /obj/effect/turf_decal{
 	dir = 6
 	},
-/obj/machinery/power/apc/engineering/east,
+/obj/machinery/power/apc/directional/east,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -60058,7 +60054,7 @@
 	c_tag = "Research Toxin Mixing";
 	network = list("Research","SS13")
 	},
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -62065,7 +62061,7 @@
 /turf/simulated/floor/transparent/glass/reinforced,
 /area/station/maintenance/starboard2)
 "iri" = (
-/obj/machinery/economy/atm/north,
+/obj/machinery/economy/atm/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "neutralcorner"
@@ -66615,7 +66611,7 @@
 /area/space/nearstation)
 "jMV" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/engineering/south,
+/obj/machinery/power/apc/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
@@ -67643,7 +67639,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/exit)
 "kdm" = (
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /obj/machinery/firealarm/directional/east,
 /obj/machinery/light/directional/east,
 /obj/structure/cable{
@@ -73757,7 +73753,7 @@
 /area/station/maintenance/port)
 "maI" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/cryo/south,
+/obj/machinery/power/apc/critical/directional/south,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whitegreen"
@@ -74326,7 +74322,7 @@
 /obj/structure/railing{
 	dir = 1
 	},
-/obj/machinery/power/apc/engineering/east,
+/obj/machinery/power/apc/directional/east,
 /obj/structure/cable,
 /turf/simulated/floor/wood/oak,
 /area/station/service/bar/atrium)
@@ -75647,7 +75643,7 @@
 	},
 /area/station/engineering/mechanic)
 "mKB" = (
-/obj/machinery/economy/atm/west,
+/obj/machinery/economy/atm/directional/west,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
@@ -75876,7 +75872,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/engineering/north,
+/obj/machinery/power/apc/directional/north,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/equipmentstorage)
 "mPY" = (
@@ -82418,7 +82414,7 @@
 /obj/machinery/camera{
 	c_tag = "Locker Room North"
 	},
-/obj/machinery/economy/atm/north,
+/obj/machinery/economy/atm/directional/north,
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=hall9f";
 	location = "hall9e"
@@ -82897,7 +82893,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/power/apc/super/north,
+/obj/machinery/power/apc/critical/directional/north,
 /obj/structure/cable/yellow{
 	d2 = 4;
 	icon_state = "0-4"
@@ -85382,7 +85378,7 @@
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/old_kitchen)
 "pGV" = (
-/obj/machinery/economy/atm/north,
+/obj/machinery/economy/atm/directional/north,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -93491,7 +93487,7 @@
 /area/station/command/office/hos)
 "sjT" = (
 /obj/item/flag/clown,
-/obj/machinery/power/apc/engineering/east,
+/obj/machinery/power/apc/directional/east,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -102728,7 +102724,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
 "vei" = (
-/obj/machinery/economy/atm/east,
+/obj/machinery/economy/atm/directional/east,
 /obj/machinery/camera{
 	c_tag = "Central Ring Hallway East";
 	dir = 8
@@ -102755,9 +102751,7 @@
 /obj/structure/table/wood,
 /obj/item/food/snacks/grown/geranium,
 /obj/item/soap/deluxe,
-/obj/machinery/power/apc/critical/directional/east{
-	shock_proof = 1
-	},
+/obj/machinery/power/apc/critical/directional/east,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -103547,9 +103541,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/critical/directional/east{
-	shock_proof = 1
-	},
+/obj/machinery/power/apc/critical/directional/east,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/starboard)
 "vsc" = (
@@ -111355,9 +111347,7 @@
 	pixel_x = -5;
 	pixel_y = 2
 	},
-/obj/machinery/power/apc/critical/directional/east{
-	shock_proof = 1
-	},
+/obj/machinery/power/apc/critical/directional/east,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm
index b1ae30ac0c5a..449ea4aaefdf 100644
--- a/_maps/map_files220/stations/metastation.dmm
+++ b/_maps/map_files220/stations/metastation.dmm
@@ -121,9 +121,6 @@
 	pixel_y = -6
 	},
 /obj/machinery/firealarm/directional/east,
-/obj/machinery/alarm/directional/east{
-	pixel_x = 36
-	},
 /obj/item/stamp/warden{
 	pixel_x = -6;
 	pixel_y = 6
@@ -9907,7 +9904,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
 "aTi" = (
-/obj/machinery/economy/atm/south,
+/obj/machinery/economy/atm/directional/south,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "redcorner"
@@ -10723,7 +10720,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/important/south,
+/obj/machinery/power/apc/important/directional/south,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -11015,7 +11012,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/machinery/power/apc/super/west,
+/obj/machinery/power/apc/critical/directional/west,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/control)
 "aWq" = (
@@ -11158,7 +11155,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/super/west,
+/obj/machinery/power/apc/critical/directional/west,
 /obj/machinery/computer/security/engineering,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkneutralfull"
@@ -12906,7 +12903,7 @@
 	pixel_x = -29
 	},
 /obj/effect/landmark/start/cyborg,
-/obj/machinery/power/apc/important/south,
+/obj/machinery/power/apc/important/directional/south,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
@@ -16264,10 +16261,7 @@
 /area/station/maintenance/turbine)
 "bkZ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/alarm/all_access{
-	dir = 8;
-	pixel_x = 24
-	},
+/obj/machinery/alarm/all_access/directional/east,
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/manifold/visible{
 	dir = 4
@@ -18276,7 +18270,7 @@
 /turf/simulated/floor/wood,
 /area/station/command/office/captain/bedroom)
 "bqr" = (
-/obj/machinery/power/apc/important/south,
+/obj/machinery/power/apc/important/directional/south,
 /obj/structure/cable/yellow{
 	d2 = 8;
 	icon_state = "0-8"
@@ -20362,7 +20356,7 @@
 	c_tag = "Bridge - Port";
 	dir = 4
 	},
-/obj/machinery/power/apc/important/west,
+/obj/machinery/power/apc/important/directional/west,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
@@ -23263,7 +23257,7 @@
 	c_tag = "Arrivals - Middle Arm";
 	dir = 1
 	},
-/obj/machinery/economy/atm/south,
+/obj/machinery/economy/atm/directional/south,
 /obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry)
@@ -29675,9 +29669,7 @@
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 4
 	},
-/obj/machinery/alarm/server{
-	pixel_y = 24
-	},
+/obj/machinery/alarm/server/directional/north,
 /turf/simulated/floor/plasteel/dark/telecomms,
 /area/station/science/server/coldroom)
 "cbi" = (
@@ -32408,7 +32400,7 @@
 	dir = 4;
 	name = "Gas to Chamber"
 	},
-/obj/machinery/power/apc/super/north,
+/obj/machinery/power/apc/critical/directional/north,
 /obj/structure/cable/yellow{
 	d2 = 2;
 	icon_state = "0-2"
@@ -41237,7 +41229,7 @@
 	},
 /area/station/medical/surgery/secondary)
 "cRq" = (
-/obj/machinery/economy/atm/north,
+/obj/machinery/economy/atm/directional/north,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
@@ -44497,7 +44489,7 @@
 	},
 /obj/machinery/power/apc/directional/east,
 /obj/machinery/light_switch/east{
-	pixel_y = 10
+	pixel_y = 12
 	},
 /turf/simulated/floor/plasteel,
 /area/station/security/prison/cell_block/A)
@@ -46118,7 +46110,7 @@
 	icon_state = "0-4"
 	},
 /obj/item/megaphone,
-/obj/machinery/power/apc/important/north,
+/obj/machinery/power/apc/important/directional/north,
 /obj/item/eftpos,
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -46716,18 +46708,6 @@
 	icon_state = "darkredcorners"
 	},
 /area/station/security/armory/secure)
-"epM" = (
-/obj/machinery/door/poddoor/preopen{
-	id_tag = "Secure Gate";
-	name = "brig shutters"
-	},
-/obj/structure/cable/yellow{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
-/area/station/security/warden)
 "epY" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
@@ -58156,6 +58136,7 @@
 	dir = 8;
 	network = list("SS13","Research Outpost","Mining Outpost")
 	},
+/obj/machinery/alarm/directional/south,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "red"
@@ -60093,6 +60074,9 @@
 /obj/effect/mapping_helpers/airlock/windoor/access/any/security/brig{
 	dir = 8
 	},
+/obj/machinery/firealarm/directional/south{
+	pixel_x = -4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -62761,10 +62745,7 @@
 	dir = 8;
 	name = "Gas to Filter"
 	},
-/obj/machinery/alarm/engine{
-	dir = 1;
-	pixel_y = -24
-	},
+/obj/machinery/alarm/engine/directional/south,
 /turf/simulated/floor/engine,
 /area/station/engineering/engine/supermatter)
 "lGx" = (
@@ -64698,11 +64679,6 @@
 	name = "brig shutters"
 	},
 /obj/machinery/door/firedoor,
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
 /obj/structure/cable/yellow{
 	d1 = 1;
 	d2 = 8;
@@ -68305,7 +68281,7 @@
 	network = list("SS13","MiniSat");
 	start_active = 1
 	},
-/obj/machinery/power/apc/important/south,
+/obj/machinery/power/apc/important/directional/south,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -69440,7 +69416,7 @@
 	},
 /area/station/hallway/primary/central)
 "oPi" = (
-/obj/machinery/economy/atm/west,
+/obj/machinery/economy/atm/directional/west,
 /turf/simulated/floor/wood,
 /area/station/public/mrchangs)
 "oPO" = (
@@ -69928,7 +69904,7 @@
 /obj/item/melee/chainofcommand,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/power/apc/important/west,
+/obj/machinery/power/apc/important/directional/west,
 /turf/simulated/floor/wood,
 /area/station/command/office/captain)
 "pcz" = (
@@ -71674,10 +71650,6 @@
 	},
 /area/station/service/kitchen)
 "pSE" = (
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/alarm/directional/west{
-	pixel_x = -36
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/yellow{
@@ -71690,6 +71662,7 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
+/obj/machinery/alarm/directional/west,
 /turf/simulated/floor/plasteel,
 /area/station/security/prison/cell_block/A)
 "pSL" = (
@@ -74664,7 +74637,7 @@
 /turf/simulated/floor/engine,
 /area/station/engineering/control)
 "rmg" = (
-/obj/machinery/economy/atm/south,
+/obj/machinery/economy/atm/directional/south,
 /obj/machinery/light/directional/south,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralcorner"
@@ -81283,7 +81256,7 @@
 /turf/simulated/floor/wood,
 /area/station/maintenance/apmaint)
 "uBY" = (
-/obj/machinery/power/apc/important/south,
+/obj/machinery/power/apc/important/directional/south,
 /obj/structure/cable/yellow,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -83315,7 +83288,7 @@
 	},
 /area/station/medical/surgery/secondary)
 "vuZ" = (
-/obj/machinery/power/apc/important/east,
+/obj/machinery/power/apc/important/directional/east,
 /obj/structure/cable/yellow{
 	d2 = 8;
 	icon_state = "0-8"
@@ -87689,7 +87662,7 @@
 /area/station/service/chapel)
 "xKg" = (
 /obj/structure/disposalpipe/segment,
-/obj/machinery/economy/atm/east,
+/obj/machinery/economy/atm/directional/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralcorner"
 	},
@@ -116557,7 +116530,7 @@ rEl
 acf
 fRT
 jIs
-epM
+aqu
 aHM
 aJk
 aNt
diff --git a/modular_ss220/aesthetics/airalarm/icons/airalarm.dmi b/modular_ss220/aesthetics/airalarm/icons/airalarm.dmi
index 7f31570b4dae..b18952326998 100644
Binary files a/modular_ss220/aesthetics/airalarm/icons/airalarm.dmi and b/modular_ss220/aesthetics/airalarm/icons/airalarm.dmi differ
diff --git a/modular_ss220/aesthetics/atm/icons/atm.dmi b/modular_ss220/aesthetics/atm/icons/atm.dmi
index 23e9a29ce8a6..de0cb700cd9c 100644
Binary files a/modular_ss220/aesthetics/atm/icons/atm.dmi and b/modular_ss220/aesthetics/atm/icons/atm.dmi differ
diff --git a/modular_ss220/maps220/code/directions.dm b/modular_ss220/maps220/code/directions.dm
index 455fa21498f9..d9127c14fb28 100644
--- a/modular_ss220/maps220/code/directions.dm
+++ b/modular_ss220/maps220/code/directions.dm
@@ -33,25 +33,6 @@
 /obj/machinery/economy/vending/wallmed/directional/east
 	pixel_x = 24
 
-/* Air Alarm */
-/obj/machinery/alarm/directional
-	name = "\improper air alarm"
-
-/obj/machinery/alarm/directional/south
-	pixel_y = -24
-	dir = 1
-
-/obj/machinery/alarm/directional/north
-	pixel_y = 24
-
-/obj/machinery/alarm/directional/west
-	pixel_x = -24
-	dir = 4
-
-/obj/machinery/alarm/directional/east
-	pixel_x = 24
-	dir = 8
-
 /* Fire Alarm */
 /obj/machinery/firealarm/directional
 	name = "\improper fire alarm"
@@ -387,147 +368,6 @@
 	pixel_x = 24
 	dir = 8
 
-/* APC */
-/obj/machinery/power/apc/directional
-	name = "\improper Area Power Controller"
-
-/obj/machinery/power/apc/directional/south
-	pixel_y = -24
-
-/obj/machinery/power/apc/directional/north
-	pixel_y = 24
-	dir = 1
-
-/obj/machinery/power/apc/directional/west
-	pixel_x = -24
-	dir = 8
-
-/obj/machinery/power/apc/directional/east
-	pixel_x = 24
-	dir = 4
-
-/obj/machinery/power/apc/engineering
-	name = "\improper Engineering APC"
-	shock_proof = TRUE
-
-/obj/machinery/power/apc/engineering/south
-	pixel_y = -24
-
-/obj/machinery/power/apc/engineering/north
-	pixel_y = 24
-	dir = 1
-
-/obj/machinery/power/apc/engineering/west
-	pixel_x = -24
-	dir = 8
-
-/obj/machinery/power/apc/engineering/east
-	pixel_x = 24
-	dir = 4
-
-/obj/machinery/power/apc/super
-	name = "\improper Super APC"
-	cell_type = 25000
-	shock_proof = TRUE
-
-/obj/machinery/power/apc/super/south
-	pixel_y = -24
-
-/obj/machinery/power/apc/super/north
-	pixel_y = 24
-	dir = 1
-
-/obj/machinery/power/apc/super/west
-	pixel_x = -24
-	dir = 8
-
-/obj/machinery/power/apc/super/east
-	pixel_x = 24
-	dir = 4
-
-/obj/machinery/power/apc/cryo
-	name = "\improper Cryo and Arrivals Super APC"
-	cell_type = 20000
-
-/obj/machinery/power/apc/cryo/south
-	pixel_y = -24
-
-/obj/machinery/power/apc/cryo/north
-	pixel_y = 24
-	dir = 1
-
-/obj/machinery/power/apc/cryo/west
-	pixel_x = -24
-	dir = 8
-
-/obj/machinery/power/apc/cryo/east
-	pixel_x = 24
-	dir = 4
-
-/obj/machinery/power/apc/important
-	name = "\improper Important APC"
-	cell_type = 5000
-
-/obj/machinery/power/apc/important/south
-	pixel_y = -24
-
-/obj/machinery/power/apc/important/north
-	pixel_y = 24
-	dir = 1
-
-/obj/machinery/power/apc/important/west
-	pixel_x = -24
-	dir = 8
-
-/obj/machinery/power/apc/important/east
-	pixel_x = 24
-	dir = 4
-
-/obj/machinery/power/apc/worn_out/south
-	pixel_y = -24
-
-/obj/machinery/power/apc/worn_out/north
-	pixel_y = 24
-	dir = 1
-
-/obj/machinery/power/apc/worn_out/west
-	pixel_x = -24
-	dir = 8
-
-/obj/machinery/power/apc/worn_out/east
-	pixel_x = 24
-	dir = 4
-
-/obj/machinery/power/apc/off_station/south
-	pixel_y = -24
-
-/obj/machinery/power/apc/off_station/north
-	pixel_y = 24
-	dir = 1
-
-/obj/machinery/power/apc/off_station/west
-	pixel_x = -24
-	dir = 8
-
-/obj/machinery/power/apc/off_station/east
-	pixel_x = 24
-	dir = 4
-
-/obj/machinery/power/apc/off_station/empty_charge/south
-	pixel_y = -24
-
-/obj/machinery/power/apc/off_station/empty_charge/north
-	pixel_y = 24
-	dir = 1
-
-/obj/machinery/power/apc/off_station/empty_charge/west
-	pixel_x = -24
-	dir = 8
-
-/obj/machinery/power/apc/off_station/empty_charge/east
-	pixel_x = 24
-	dir = 4
-
 /* Wall Tanks */
 /obj/structure/reagent_dispensers/fueltank/chem
 	name = "\improper fuel tank"
@@ -769,19 +609,6 @@
 /obj/machinery/computer/security/telescreen/entertainment/directional/east
 	pixel_x = 32
 
-/* ATM */
-/obj/machinery/economy/atm/south
-	pixel_y = -32
-
-/obj/machinery/economy/atm/north
-	pixel_y = 32
-
-/obj/machinery/economy/atm/west
-	pixel_x = -32
-
-/obj/machinery/economy/atm/east
-	pixel_x = 32
-
 /* Airlock Cycle Button */
 /obj/machinery/access_button/south
 	pixel_y = -24