diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm index 83bac76a715c..30a8eb20d17c 100644 --- a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm @@ -1184,13 +1184,11 @@ icon_state = "0-2"; pixel_y = 1 }, -/obj/machinery/power/apc/off_station{ - dir = 8; +/obj/machinery/power/apc/off_station/directional/west{ lighting_channel = 2; locked = 0; environment_channel = 0; equipment_channel = 0; - pixel_x = -24; start_charge = 0 }, /turf/simulated/floor/plasteel{ @@ -1878,11 +1876,9 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/apc/off_station{ - dir = 1; +/obj/machinery/power/apc/off_station/directional/north{ lighting_channel = 0; locked = 0; - pixel_y = 24; environment_channel = 0; equipment_channel = 0; operating = 0; @@ -2881,11 +2877,9 @@ pixel_y = 1 }, /obj/structure/spider/stickyweb, -/obj/machinery/power/apc/off_station{ - dir = 1; +/obj/machinery/power/apc/off_station/directional/north{ lighting_channel = 2; locked = 0; - pixel_y = 24; environment_channel = 0; equipment_channel = 0; start_charge = 0 @@ -3795,13 +3789,11 @@ icon_state = "1-2" }, /obj/structure/spider/stickyweb, -/obj/machinery/power/apc/off_station{ - dir = 4; +/obj/machinery/power/apc/off_station/directional/east{ lighting_channel = 2; locked = 0; environment_channel = 2; equipment_channel = 2; - pixel_x = 24; start_charge = 100 }, /obj/structure/spider/stickyweb, @@ -4659,11 +4651,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/power/apc/off_station{ - dir = 1; +/obj/machinery/power/apc/off_station/directional/north{ lighting_channel = 2; locked = 0; - pixel_y = 24; environment_channel = 1; equipment_channel = 0; start_charge = 100 @@ -4718,11 +4708,9 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/apc/off_station{ - dir = 1; +/obj/machinery/power/apc/off_station/directional/north{ lighting_channel = 2; locked = 0; - pixel_y = 24; environment_channel = 0; equipment_channel = 0; start_charge = 0 @@ -6262,10 +6250,9 @@ /area/awaymission/BMPship/TurretsSouth) "Nq" = ( /obj/structure/cable, -/obj/machinery/power/apc/off_station{ +/obj/machinery/power/apc/off_station/directional/south{ lighting_channel = 2; locked = 0; - pixel_y = -24; environment_channel = 0; equipment_channel = 0; start_charge = 0 @@ -6339,13 +6326,11 @@ icon_state = "0-2"; pixel_y = 1 }, -/obj/machinery/power/apc/off_station{ - dir = 8; +/obj/machinery/power/apc/off_station/directional/west{ lighting_channel = 2; locked = 0; environment_channel = 0; equipment_channel = 0; - pixel_x = -24; start_charge = 0 }, /turf/simulated/floor/engine, @@ -6984,10 +6969,8 @@ icon_state = "2-8" }, /obj/structure/alien/resin, -/obj/machinery/power/apc/off_station{ - dir = 1; +/obj/machinery/power/apc/off_station/directional/north{ lighting_channel = 0; - pixel_y = 24; environment_channel = 0; equipment_channel = 0; operating = 0; @@ -7139,13 +7122,11 @@ "XH" = ( /obj/item/trash/tastybread, /obj/structure/cable, -/obj/machinery/power/apc/off_station{ - dir = 8; +/obj/machinery/power/apc/off_station/directional/west{ lighting_channel = 2; locked = 0; environment_channel = 0; equipment_channel = 0; - pixel_x = -24; start_charge = 0 }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm index 3b95b5e5952c..39ea701dcd53 100644 --- a/_maps/map_files220/RandomZLevels/caves.dmm +++ b/_maps/map_files220/RandomZLevels/caves.dmm @@ -4925,9 +4925,7 @@ }, /area/awaymission/caves) "zk" = ( -/obj/machinery/power/apc/off_station/empty_charge{ - pixel_y = -24 - }, +/obj/machinery/power/apc/off_station/empty_charge/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4" diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index 480c16968288..496ec0a007b9 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -55213,11 +55213,7 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "gkj" = ( -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 4; - name = "Courtroom"; - pixel_x = 24; +/obj/machinery/power/apc/critical/directional/east{ shock_proof = 1 }, /obj/structure/cable{ @@ -102778,11 +102774,7 @@ /obj/structure/table/wood, /obj/item/food/snacks/grown/poppy/geranium, /obj/item/soap/deluxe, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 4; - name = "Courtroom"; - pixel_x = 24; +/obj/machinery/power/apc/critical/directional/east{ shock_proof = 1 }, /obj/structure/cable{ @@ -103574,11 +103566,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 4; - name = "Courtroom"; - pixel_x = 24; +/obj/machinery/power/apc/critical/directional/east{ shock_proof = 1 }, /turf/simulated/floor/wood/oak, @@ -111390,11 +111378,7 @@ pixel_x = -5; pixel_y = 2 }, -/obj/machinery/power/apc{ - cell_type = 25000; - dir = 4; - name = "Courtroom"; - pixel_x = 24; +/obj/machinery/power/apc/critical/directional/east{ shock_proof = 1 }, /obj/structure/cable{ diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm index cc3eeb2e9c3e..43ba2847ee24 100644 --- a/_maps/map_files220/generic/Lavaland.dmm +++ b/_maps/map_files220/generic/Lavaland.dmm @@ -616,11 +616,7 @@ /turf/simulated/floor/plasteel, /area/mine/laborcamp) "bB" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "Labor Camp APC"; - pixel_y = 24 - }, +/obj/machinery/power/apc/directional/north, /obj/machinery/computer/cryopod{ pixel_y = 38 }, @@ -6237,10 +6233,7 @@ /turf/simulated/floor/indestructible/boss, /area/lavaland/surface/outdoors/legion) "vf" = ( -/obj/machinery/power/apc{ - name = "Labor Camp Security APC"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 7b2128d54ef4..b682e635eb48 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -29046,10 +29046,7 @@ }, /area/centcom/ss220/admin3) "udY" = ( -/obj/machinery/power/apc{ - name = "Gamma Armory APC"; - pixel_y = -24 - }, +/obj/machinery/power/apc/directional/south, /obj/structure/cable{ d2 = 4; icon_state = "0-4"