diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
index fd02464a4969..aa8b6c527c14 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -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" = (
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 7f95ec3e896d..f1b62062eff9 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" = (
@@ -25518,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;
@@ -29932,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"
@@ -31895,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"
@@ -36440,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"
@@ -37067,7 +37067,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"
@@ -37391,7 +37391,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"
@@ -38054,7 +38054,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"
@@ -38412,7 +38412,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"
@@ -40248,7 +40248,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{
@@ -40852,7 +40852,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"
@@ -41064,7 +41064,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" = (
@@ -42246,7 +42246,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"
@@ -43287,7 +43287,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" = (
@@ -43802,7 +43802,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"
@@ -44278,7 +44278,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" = (
@@ -44676,7 +44676,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" = (
@@ -51027,7 +51027,7 @@
 	dir = 4;
 	pixel_x = -24
 	},
-/obj/machinery/power/apc/super/north,
+/obj/machinery/power/apc/critical/directional/north,
 /obj/machinery/atmospherics/binary/pump{
 	dir = 1;
 	name = "Gas to Filter"
@@ -53015,7 +53015,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" = (
@@ -58947,7 +58947,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" = (
@@ -58997,7 +58997,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;
@@ -59095,9 +59095,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"
@@ -60187,7 +60185,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"
@@ -61426,7 +61424,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"
 	},
@@ -64253,7 +64251,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,
@@ -68993,7 +68991,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"
@@ -76076,7 +76074,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"
@@ -83242,7 +83240,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"
 	},
@@ -86832,7 +86830,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)
@@ -91222,7 +91220,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"
@@ -95665,7 +95663,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"
@@ -95976,7 +95974,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"
@@ -100256,7 +100254,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"
diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm
index 50e2bcfa7a11..ce8618e05cbd 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/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/directional/east,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -56518,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"
@@ -60056,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"
@@ -62063,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"
@@ -66613,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"
@@ -67641,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{
@@ -73755,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"
@@ -74324,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)
@@ -75645,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
 	},
@@ -75874,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" = (
@@ -82416,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"
@@ -82895,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"
@@ -85380,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"
 	},
@@ -93489,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"
@@ -102726,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
@@ -102753,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/directional/east,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
@@ -103545,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/directional/east,
 /turf/simulated/floor/wood/oak,
 /area/station/maintenance/starboard)
 "vsc" = (
@@ -111353,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/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 7afa63791928..3bbb5480111c 100644
--- a/_maps/map_files220/stations/metastation.dmm
+++ b/_maps/map_files220/stations/metastation.dmm
@@ -9907,7 +9907,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 +10723,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 +11015,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 +11158,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 +12906,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
 	},
@@ -18273,7 +18273,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"
@@ -20359,7 +20359,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{
@@ -23260,7 +23260,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)
@@ -32403,7 +32403,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"
@@ -41232,7 +41232,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
 	},
@@ -46113,7 +46113,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;
@@ -68297,7 +68297,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"
@@ -69432,7 +69432,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" = (
@@ -69920,7 +69920,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" = (
@@ -74656,7 +74656,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"
@@ -81275,7 +81275,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"
@@ -83307,7 +83307,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"
@@ -87681,7 +87681,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"
 	},