diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 7183ce8bf660..21ff73ab859e 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -56,22 +56,10 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( //NOTE: STUFF STOLEN FROM AIRLOCK.DM thx -/obj/structure/machinery/power/apc/weak - cell_type = /obj/item/cell - -/obj/structure/machinery/power/apc/high - cell_type = /obj/item/cell/high - -/obj/structure/machinery/power/apc/super - cell_type = /obj/item/cell/super - -/obj/structure/machinery/power/apc/hyper - cell_type = /obj/item/cell/hyper - /obj/structure/machinery/power/apc name = "area power controller" desc = "A control terminal for the area electrical systems." - icon = 'icons/obj/structures/machinery/power.dmi' + icon = 'icons/obj/structures/machinery/apc.dmi' icon_state = "apc_mapicon" anchored = TRUE use_power = USE_POWER_NONE @@ -98,7 +86,6 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( var/locked = 1 var/coverlocked = 1 var/aidisabled = 0 - var/tdir = null var/obj/structure/machinery/power/terminal/terminal = null var/lastused_light = 0 var/lastused_equip = 0 @@ -137,13 +124,23 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( /obj/structure/machinery/power/apc/Initialize(mapload, ndir, building=0) . = ..() - //Offset 24 pixels in direction of dir + //Offset apc depending on the dir //This allows the APC to be embedded in a wall, yet still inside an area if(building) setDir(ndir) - set_pixel_location() + switch(dir) + if(NORTH) + pixel_y = 32 + if(SOUTH) + pixel_y = -26 + if(EAST) + pixel_x = 30 + pixel_y = 6 + if(WEST) + pixel_x = -30 + pixel_y = 6 if(building == 0) init() @@ -161,13 +158,6 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( if(!start_charge && is_ground_level(z) && prob(10)) set_broken() -/obj/structure/machinery/power/apc/set_pixel_location() - tdir = dir //To fix Vars bug - setDir(SOUTH) - - pixel_x = (tdir & 3) ? 0 : (tdir == 4 ? 24 : -24) - pixel_y = (tdir & 3) ? (tdir == 1 ? 24 : -24) : 0 - /obj/structure/machinery/power/apc/Destroy() if(terminal) terminal.master = null @@ -344,7 +334,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( //Create a terminal object at the same position as original turf loc //Wires will attach to this terminal = new/obj/structure/machinery/power/terminal(src.loc) - terminal.setDir(tdir) + terminal.setDir(dir) terminal.master = src /obj/structure/machinery/power/apc/proc/init() @@ -1367,13 +1357,122 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( /obj/structure/machinery/power/apc/almayer cell_type = /obj/item/cell/high +/obj/structure/machinery/power/apc/almayer/north + pixel_y = 32 + dir = 1 + +/obj/structure/machinery/power/apc/almayer/south + pixel_y = -26 + dir = 2 + +/obj/structure/machinery/power/apc/almayer/east + pixel_x = 30 + dir = 4 + +/obj/structure/machinery/power/apc/almayer/west + pixel_x = -30 + dir = 8 + /obj/structure/machinery/power/apc/almayer/hardened name = "hardened area power controller" desc = "A control terminal for the area electrical systems. This one is hardened against sudden power fluctuations caused by electrical grid damage." crash_break_probability = 0 -#undef APC_UPDATE_ICON_COOLDOWN +/obj/structure/machinery/power/apc/almayer/hardened/north + pixel_y = 32 + dir = 1 + +/obj/structure/machinery/power/apc/almayer/hardened/south + pixel_y = -26 + dir = 2 + +/obj/structure/machinery/power/apc/almayer/hardened/east + pixel_x = 30 + dir = 4 + +/obj/structure/machinery/power/apc/almayer/hardened/west + pixel_x = -30 + dir = 8 + +//------ Directional APCs ------// + +/obj/structure/machinery/power/apc/no_power + start_charge = 0 + +/obj/structure/machinery/power/apc/no_power/north + pixel_y = 32 + dir = 1 + +/obj/structure/machinery/power/apc/no_power/south + pixel_y = -26 + dir = 2 + +/obj/structure/machinery/power/apc/no_power/east + pixel_x = 30 + dir = 4 + +/obj/structure/machinery/power/apc/no_power/west + pixel_x = -30 + dir = 8 + +// Powered APCs with directions +/obj/structure/machinery/power/apc/power/north + pixel_y = 32 + dir = 1 + +/obj/structure/machinery/power/apc/power/south + pixel_y = -26 + dir = 2 + +/obj/structure/machinery/power/apc/power/east + pixel_x = 30 + dir = 4 + +/obj/structure/machinery/power/apc/power/west + pixel_x = -30 + dir = 8 + +// Upgraded APC's with directions +/obj/structure/machinery/power/apc/upgraded/power + desc = "A control terminal for the area electrical systems. This one is upgraded with better power cell to sustain higher power usage." + cell_type = /obj/item/cell/high + + +/obj/structure/machinery/power/apc/upgraded/power/north + pixel_y = 32 + dir = 1 + +/obj/structure/machinery/power/apc/upgraded/power/south + pixel_y = -26 + dir = 2 + +/obj/structure/machinery/power/apc/upgraded/power/east + pixel_x = 30 + dir = 4 + +/obj/structure/machinery/power/apc/upgraded/power/west + pixel_x = -30 + dir = 8 // apc that start at zero charge. -/obj/structure/machinery/power/apc/nocharge + +/obj/structure/machinery/power/apc/upgraded/no_power start_charge = 0 + +/obj/structure/machinery/power/apc/upgraded/no_power/north + pixel_y = 32 + dir = 1 + +/obj/structure/machinery/power/apc/upgraded/no_power/south + pixel_y = -26 + dir = 2 + +/obj/structure/machinery/power/apc/upgraded/no_power/east + pixel_x = 30 + dir = 4 + +/obj/structure/machinery/power/apc/upgraded/no_power/west + pixel_x = -30 + dir = 8 + +#undef APC_UPDATE_ICON_COOLDOWN diff --git a/icons/obj/structures/machinery/apc.dmi b/icons/obj/structures/machinery/apc.dmi new file mode 100644 index 000000000000..74698aeaf969 Binary files /dev/null and b/icons/obj/structures/machinery/apc.dmi differ diff --git a/icons/obj/structures/machinery/power.dmi b/icons/obj/structures/machinery/power.dmi index aae3f3d69c13..d976a23d4a7e 100644 Binary files a/icons/obj/structures/machinery/power.dmi and b/icons/obj/structures/machinery/power.dmi differ diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index b71c76ab1cb9..55749f9f580d 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -254,11 +254,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/space_port) "abe" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -32; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/dark, /area/bigredv2/outside/space_port) "abf" = ( @@ -1417,9 +1413,7 @@ /turf/open/floor/dark, /area/bigredv2/outside/telecomm) "afK" = ( -/obj/structure/machinery/power/apc{ - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /obj/structure/machinery/light{ dir = 8 }, @@ -2159,10 +2153,7 @@ "aiF" = ( /obj/structure/surface/table, /obj/item/ammo_magazine/shotgun/slugs, -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/dark, /area/bigredv2/outside/marshal_office) "aiG" = ( @@ -3902,11 +3893,8 @@ /turf/open/floor/plating, /area/bigredv2/outside/general_store) "apv" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - name = "Xenbiology Lab APC"; - pixel_x = -30; - start_charge = 0 +/obj/structure/machinery/power/apc/no_power/west{ + name = "Xenbiology Lab APC" }, /obj/structure/machinery/door_control{ id = "lambda"; @@ -4390,7 +4378,7 @@ /turf/open/floor, /area/bigredv2/outside/general_offices) "arw" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/plating, /area/bigredv2/outside/general_offices) "arx" = ( @@ -5485,10 +5473,8 @@ /turf/open/floor, /area/bigredv2/outside/dorms) "avF" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - name = "Dormitories APC"; - pixel_y = 25 +/obj/structure/machinery/power/apc/power/north{ + name = "Dormitories APC" }, /turf/open/floor, /area/bigredv2/outside/dorms) @@ -5950,11 +5936,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/darkish, /area/bigredv2/caves/lambda/breakroom) "axr" = ( @@ -7666,8 +7648,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/bar) "aEb" = ( -/obj/structure/machinery/power/apc{ - dir = 1; +/obj/structure/machinery/power/apc/power/north{ name = "Bar APC" }, /turf/open/floor/wood, @@ -7697,11 +7678,7 @@ /turf/open/floor/plating, /area/bigredv2/caves/eta/living) "aEm" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/whitepurple/west, /area/bigredv2/caves/lambda/research) "aEn" = ( @@ -8381,11 +8358,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whitegreen/northwest, /area/bigredv2/caves/lambda/virology) "aHa" = ( @@ -9317,7 +9290,7 @@ /turf/open/floor/freezerfloor, /area/bigredv2/outside/hydroponics) "aKH" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/freezerfloor, /area/bigredv2/outside/hydroponics) "aKI" = ( @@ -10933,8 +10906,7 @@ /turf/open/floor/white, /area/bigredv2/outside/virology) "aQC" = ( -/obj/structure/machinery/power/apc{ - dir = 1; +/obj/structure/machinery/power/apc/power/north{ name = "Virology APC" }, /turf/open/floor/white, @@ -11639,8 +11611,7 @@ /turf/open/floor/white, /area/bigredv2/outside/admin_building) "aSZ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; +/obj/structure/machinery/power/apc/power/north{ name = "Control Center APC" }, /turf/open/floor/plating, @@ -12522,10 +12493,7 @@ /turf/open/floor, /area/bigredv2/outside/general_store) "aXb" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/bigredv2/outside/cargo) "aXc" = ( @@ -13941,8 +13909,7 @@ /area/bigredv2/outside/office_complex) "bcZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc{ - dir = 1; +/obj/structure/machinery/power/apc/power/north{ name = "Interview Room APC" }, /turf/open/floor, @@ -14091,7 +14058,7 @@ /turf/open/floor/dark, /area/bigredv2/outside/chapel) "bdG" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/dark, /area/bigredv2/outside/chapel) "bdI" = ( @@ -14876,9 +14843,7 @@ /turf/open/floor/bot/north, /area/bigredv2/outside/cargo) "bhf" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor, /area/bigredv2/outside/cargo) "bhi" = ( @@ -19695,10 +19660,7 @@ /turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "ccI" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/warning_stripes{ icon_state = "W"; layer = 2.5; @@ -19969,11 +19931,7 @@ /area/bigredv2/outside/marshal_office) "cGT" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -32; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/darkyellow2/west, /area/bigredv2/outside/filtration_plant) "cGZ" = ( @@ -21484,7 +21442,7 @@ /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves_lambda) "fyp" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/darkgreencorners2, /area/bigredv2/caves/eta/storage) "fyz" = ( @@ -21584,9 +21542,7 @@ /turf/open/mars_cave/mars_cave_5, /area/bigredv2/caves_north) "fKW" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/darkyellowcorners2/north, /area/bigredv2/caves/eta/living) "fLj" = ( @@ -23241,10 +23197,7 @@ /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) "jiS" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/bigredv2/outside/general_store) "jkn" = ( @@ -24249,9 +24202,7 @@ /turf/open/mars_cave, /area/bigredv2/caves_east) "kRy" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/plating, /area/bigredv2/outside/medical) "kRK" = ( @@ -24784,9 +24735,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/wood, /area/bigredv2/outside/library) "lTM" = ( @@ -25276,10 +25225,7 @@ /turf/open/mars_cave/mars_dirt_6, /area/bigredv2/caves/mining) "mYV" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/red/north, /area/bigredv2/outside/lambda_cave_cas) "mYW" = ( @@ -26473,9 +26419,7 @@ /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/e) "plx" = ( -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/darkred2/east, /area/bigredv2/caves/eta/research) "pmk" = ( @@ -26806,10 +26750,7 @@ /turf/open/floor/carpet, /area/bigredv2/outside/library) "pTo" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/warning_stripes{ icon_state = "W"; pixel_x = -1 @@ -28551,10 +28492,7 @@ /area/bigredv2/caves/mining) "sWh" = ( /obj/structure/platform_decoration, -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/telecomm/n_cave) "sWS" = ( @@ -28981,7 +28919,7 @@ /turf/open/floor/plating, /area/bigredv2/caves/mining) "tDl" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/darkredcorners2/west, /area/bigredv2/caves/eta/xenobiology) "tDv" = ( @@ -29530,10 +29468,7 @@ /turf/open/mars_cave/mars_dirt_5, /area/bigredv2/caves/mining) "uJF" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor, /area/bigred/ground/garage_workshop) "uJI" = ( @@ -31002,9 +30937,7 @@ /turf/open/mars_cave/mars_cave_15, /area/bigredv2/caves/mining) "xAX" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/darkyellow2/north, /area/bigredv2/outside/engineering) "xBn" = ( @@ -31233,9 +31166,7 @@ /turf/open/floor/plating/warnplate/west, /area/bigredv2/outside/telecomm/warehouse) "xWV" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /obj/structure/cable{ icon_state = "1-2" }, diff --git a/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm b/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm index 29f3f5b1e4dd..f4ec5053616a 100644 --- a/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm +++ b/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm @@ -297,7 +297,7 @@ /turf/open/floor, /area/bigredv2/outside/marshal_office) "be" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /obj/structure/machinery/camera/autoname{ dir = 1 }, diff --git a/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm b/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm index af347ca1f772..0b6af75969c2 100644 --- a/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm +++ b/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm @@ -303,7 +303,7 @@ /turf/open/floor/darkish, /area/bigredv2/outside/chapel) "bm" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /obj/effect/decal/cleanable/blood{ icon_state = "gib6" }, diff --git a/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm b/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm index 215c6f874cb2..42c8551d2395 100644 --- a/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm +++ b/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm @@ -131,10 +131,7 @@ /turf/open/floor/plating/warnplate/west, /area/bigredv2/outside/telecomm/warehouse) "S" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/warning_stripes{ icon_state = "W"; layer = 2.5; diff --git a/maps/map_files/BigRed/sprinkles/25.lz1containers_scramble.dmm b/maps/map_files/BigRed/sprinkles/25.lz1containers_scramble.dmm index ba7296705642..18820b304c27 100644 --- a/maps/map_files/BigRed/sprinkles/25.lz1containers_scramble.dmm +++ b/maps/map_files/BigRed/sprinkles/25.lz1containers_scramble.dmm @@ -46,11 +46,7 @@ /turf/closed/wall/solaris, /area/bigredv2/outside/space_port) "ao" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -32; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/dark, /area/bigredv2/outside/space_port) "ap" = ( diff --git a/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm b/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm index 0b51c63b39be..7cb6e167725d 100644 --- a/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm +++ b/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm @@ -310,9 +310,7 @@ /turf/open/floor/bot/north, /area/bigredv2/outside/cargo) "bk" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor, /area/bigredv2/outside/cargo) "bm" = ( diff --git a/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm b/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm index c2336bae0b40..38b92227e1f1 100644 --- a/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm +++ b/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm @@ -20,8 +20,7 @@ /turf/open/floor, /area/bigredv2/outside/dorms) "af" = ( -/obj/structure/machinery/power/apc{ - dir = 1; +/obj/structure/machinery/power/apc/power/north{ name = "Fitness APC" }, /turf/open/floor, diff --git a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm index 16bdac130168..5758eb83d7f0 100644 --- a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm +++ b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm @@ -1,10 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ax" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor, /area/bigred/ground/security) "aN" = ( diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 5730f8e64032..42c903cab227 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -1015,11 +1015,7 @@ /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/corsat/gamma/residential/researcher) "adW" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/red/west, /area/corsat/gamma/hangar) "adX" = ( @@ -2782,11 +2778,7 @@ /turf/open/floor/wood, /area/corsat/gamma/residential/east) "akY" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/red/north, /area/corsat/sigma/airlock/south/id) "akZ" = ( @@ -3071,11 +3063,7 @@ /turf/open/floor/corsat/yellowcorner/west, /area/corsat/gamma/residential) "amc" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /obj/structure/closet/crate/trashcart, /turf/open/floor/corsat/yellow/east, /area/corsat/gamma/residential/maint) @@ -3101,11 +3089,7 @@ /turf/open/floor/corsat/white/east, /area/corsat/sigma/dorms) "amg" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/squareswood/north, /area/corsat/gamma/rnr/arcade) "amh" = ( @@ -3919,11 +3903,7 @@ }, /area/prison/hangar_storage/research/shuttle) "apn" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/red/northwest, /area/corsat/omega/hangar/security) "apo" = ( @@ -4090,11 +4070,7 @@ /turf/closed/wall/biodome, /area/corsat/gamma/airlock/north) "apU" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /obj/structure/flora/pottedplant, /turf/open/floor/corsat/bluegrey/northeast, /area/corsat/gamma/airlock/north) @@ -4608,11 +4584,7 @@ /turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asj" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/bluegrey/west, /area/corsat/gamma/hangar/flightcontrol) "ask" = ( @@ -5227,11 +5199,7 @@ /turf/open/floor/corsat, /area/corsat/sigma/southeast/generator) "auV" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/red/north, /area/corsat/sigma/south) "auW" = ( @@ -5291,11 +5259,7 @@ /turf/open/floor/corsat/bluegreycorner, /area/corsat/gamma/airlock/north) "ave" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /obj/structure/surface/table/almayer, /obj/item/evidencebag, /obj/item/evidencebag, @@ -5315,11 +5279,7 @@ /turf/open/floor/corsat/red/east, /area/corsat/gamma/hangar/checkpoint) "avh" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/yellow/northwest, /area/corsat/gamma/engineering/core) "avj" = ( @@ -5382,19 +5342,11 @@ /turf/open/floor/corsat/red/east, /area/corsat/gamma/hangar/security) "avx" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/whitebluefull/southwest, /area/corsat/gamma/residential/lavatory) "avy" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/brown/north, /area/corsat/omega/cargo) "avz" = ( @@ -5448,11 +5400,7 @@ /turf/open/floor/corsat/plate, /area/corsat/omega/cargo) "avM" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/blue/north, /area/corsat/sigma/southeast) "avN" = ( @@ -5583,11 +5531,7 @@ /turf/open/floor/corsat/greenwhite/north, /area/corsat/gamma/medbay/chemistry) "awn" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/greenwhitecorner/north, /area/corsat/gamma/medbay/chemistry) "awo" = ( @@ -6161,11 +6105,7 @@ /turf/open/floor/corsat/retrosquares, /area/corsat/gamma/hallwaysouth) "ayi" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/redcorner/north, /area/corsat/sigma/hangar/id) "ayj" = ( @@ -6287,11 +6227,7 @@ /turf/open/floor/corsat/red, /area/corsat/sigma/hangar/id) "ayG" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /obj/structure/closet/wardrobe/atmospherics_yellow, /turf/open/floor/corsat/yellow/west, /area/corsat/sigma/airlock/control) @@ -6416,11 +6352,7 @@ /turf/open/floor/corsat/bluegrey/north, /area/corsat/sigma/airlock/east) "ayX" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /obj/structure/flora/pottedplant, /turf/open/floor/corsat/bluegrey/northeast, /area/corsat/sigma/airlock/east) @@ -6653,11 +6585,7 @@ /turf/open/floor/corsat/blue/west, /area/corsat/sigma/south) "azQ" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /obj/structure/machinery/light, /obj/structure/closet/secure_closet{ name = "secure evidence locker"; @@ -6813,11 +6741,7 @@ /turf/open/floor/corsat/bluegrey/east, /area/corsat/sigma/airlock/south) "aAr" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/whitetan/north, /area/corsat/gamma/canteen) "aAs" = ( @@ -6922,11 +6846,7 @@ /turf/open/floor/corsat/retrosquareslight, /area/corsat/gamma/medbay/lobby) "aAM" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/greenwhitecorner/west, /area/corsat/gamma/medbay/surgery) "aAN" = ( @@ -6939,11 +6859,7 @@ /turf/open/floor/corsat/red, /area/corsat/gamma/hangar/checkpoint) "aAO" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/greenwhite/northwest, /area/corsat/gamma/medbay/lobby) "aAP" = ( @@ -6956,11 +6872,7 @@ /turf/open/floor/corsat/red/southeast, /area/corsat/sigma/hangar/checkpoint) "aAR" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/spiralplate, /area/corsat/sigma/airlock/south) "aAS" = ( @@ -7220,11 +7132,7 @@ /turf/open/floor/corsat/officesquares, /area/corsat/sigma/airlock/south) "aBZ" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/yellow/northwest, /area/corsat/omega/maint) "aCa" = ( @@ -7439,11 +7347,7 @@ /turf/open/floor/corsat, /area/corsat/sigma/airlock/south) "aCL" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/light{ dir = 8 }, @@ -7510,11 +7414,7 @@ /turf/open/floor/corsat/squares, /area/corsat/sigma/hangar/checkpoint) "aCW" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/red/north, /area/corsat/sigma/checkpoint) "aCX" = ( @@ -7610,11 +7510,7 @@ /turf/open/floor/corsat/retrosquares, /area/corsat/sigma/north) "aDo" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/whitebluefull/southwest, /area/corsat/sigma/laundry) "aDp" = ( @@ -7643,11 +7539,7 @@ /turf/open/floor/corsat/whitebluefull/southwest, /area/corsat/sigma/laundry) "aDu" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/browncorner/north, /area/corsat/sigma/cargo) "aDv" = ( @@ -7674,11 +7566,7 @@ /turf/open/floor/wood, /area/corsat/sigma/cafe) "aDz" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/corsat/sigma/cafe) "aDA" = ( @@ -7732,11 +7620,7 @@ /turf/open/floor/corsat/plate, /area/corsat/theta/airlock/east) "aDG" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/whitebluefull/southwest, /area/corsat/sigma/lavatory) "aDH" = ( @@ -7797,11 +7681,7 @@ /turf/open/floor/corsat/plate, /area/corsat/gamma/hangar/arrivals) "aDQ" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/bluecorner/north, /area/corsat/sigma/hangar) "aDR" = ( @@ -7815,11 +7695,7 @@ /turf/open/floor/corsat/darkgreen/northwest, /area/corsat/gamma/hangar/arrivals) "aDT" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/light{ dir = 8 }, @@ -8313,11 +8189,7 @@ /turf/open/floor/corsat/darkgreencorner/west, /area/corsat/gamma/foyer) "aFL" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/bluegreycorner/north, /area/corsat/theta/airlock/east) "aFM" = ( @@ -8493,11 +8365,7 @@ /turf/open/floor/corsat/browncorner/north, /area/corsat/gamma/cargo) "aGo" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/corsat/squareswood/north, /area/corsat/gamma/residential/lounge) @@ -8697,11 +8565,7 @@ /turf/open/floor/corsat/blue/north, /area/corsat/sigma/southeast/datalab) "aGX" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/blue/north, /area/corsat/sigma/southeast/datalab) "aGY" = ( @@ -9023,11 +8887,7 @@ /turf/open/floor/corsat/squares, /area/corsat/gamma/hydroponics) "aHR" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/plate, /area/corsat/gamma/freezer) "aHS" = ( @@ -9455,11 +9315,7 @@ /turf/open/floor/corsat/red/west, /area/corsat/sigma/south) "aJA" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/light{ dir = 8 }, @@ -9526,11 +9382,7 @@ /turf/open/floor/corsat/arrow_east, /area/corsat/gamma/cargo) "aJQ" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/red/north, /area/corsat/sigma/south/security) "aJR" = ( @@ -9898,11 +9750,7 @@ /turf/open/floor/corsat/yellow, /area/corsat/omega/control) "aLw" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/red/northeast, /area/corsat/gamma/airlock/south/id) "aLx" = ( @@ -9924,11 +9772,7 @@ /turf/open/floor/corsat/bluegrey, /area/corsat/sigma/southeast/dataoffice) "aLD" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/brown/west, /area/corsat/omega/cargo) "aLE" = ( @@ -10123,11 +9967,7 @@ /turf/open/floor/corsat/plate, /area/corsat/sigma/south/security) "aMs" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /obj/structure/closet/wardrobe/medic_white, /turf/open/floor/corsat/greenwhite/north, /area/corsat/gamma/medbay) @@ -10160,11 +10000,7 @@ /area/corsat/omega/airlocknorth/id) "aMx" = ( /obj/structure/surface/table/reinforced, -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/computer/station_alert, /turf/open/floor/corsat/plate, /area/corsat/omega/airlocknorth/id) @@ -10333,11 +10169,7 @@ /turf/open/floor/corsat/bluegrey/north, /area/corsat/sigma/southeast/dataoffice) "aNe" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/bluegrey/north, /area/corsat/sigma/southeast/dataoffice) "aNg" = ( @@ -10358,11 +10190,7 @@ "aNj" = ( /obj/structure/surface/rack, /obj/item/evidencebag, -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/red/southwest, /area/corsat/theta/airlock/east/id) "aNk" = ( @@ -10450,11 +10278,7 @@ /turf/open/floor/corsat/officesquares, /area/corsat/sigma/south/offices) "aNB" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/officesquares, /area/corsat/sigma/south/offices) @@ -10605,11 +10429,7 @@ /turf/open/floor/corsat/purplecorner/east, /area/corsat/sigma/south) "aOh" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/red/east, /area/corsat/gamma/foyer) "aOi" = ( @@ -10818,11 +10638,7 @@ /turf/open/floor/corsat/officesquares, /area/corsat/gamma/hangar/office) "aOY" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/bluegrey/west, /area/corsat/gamma/hangar/office) "aOZ" = ( @@ -10852,10 +10668,7 @@ /turf/open/floor/corsat/plate, /area/corsat/emergency_access) "aPd" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/upgraded/power/north, /turf/open/floor/corsat/red/north, /area/corsat/gamma/security/armory) "aPe" = ( @@ -10870,11 +10683,7 @@ /turf/open/floor/corsat/red, /area/corsat/gamma/security) "aPh" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/red/west, /area/corsat/gamma/hangar/security) "aPj" = ( @@ -10972,11 +10781,7 @@ /turf/open/floor/plating, /area/corsat/gamma/hangar) "aPz" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/red/west, /area/corsat/gamma/hangar/checkpoint) "aPA" = ( @@ -11153,11 +10958,7 @@ }, /area/prison/hangar_storage/research/shuttle) "aQh" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/red/northeast, /area/corsat/omega/hangar/office) "aQi" = ( @@ -13018,11 +12819,7 @@ /turf/open/floor/corsat/purplewhite, /area/corsat/sigma/south/complex) "aWC" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/almayer/tcomms, /area/corsat/sigma/southeast/telecomm) "aWD" = ( @@ -13793,11 +13590,7 @@ /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) "aZo" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/red/north, /area/corsat/omega/checkpoint) "aZp" = ( @@ -14312,11 +14105,7 @@ /turf/open/floor/corsat/squares, /area/corsat/omega/checkpoint) "baL" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/omega, /area/corsat/omega/control) "baM" = ( @@ -16531,11 +16320,7 @@ /area/corsat/omega/hallways) "biZ" = ( /obj/structure/reagent_dispensers/watertank, -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/plate, /area/corsat/gamma/hydroponics) "bja" = ( @@ -16788,11 +16573,7 @@ /turf/open/floor/asteroidplating, /area/corsat/sigma/biodome/gunrange) "bjQ" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/surface/table/almayer, /obj/item/device/camera, /turf/open/floor/corsat/purplewhite/north, @@ -17317,19 +17098,11 @@ /turf/open/floor/corsat, /area/corsat/gamma/hangar/cargo) "blO" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/red/west, /area/corsat/gamma/hangar/cargo) "blP" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/blue/east, /area/corsat/gamma/hangar/arrivals) "blQ" = ( @@ -17373,11 +17146,7 @@ /turf/open/floor/corsat/yellow/west, /area/corsat/gamma/hangar/monorail/control) "bma" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/yellow/northwest, /area/corsat/sigma/hangar/monorail/control) "bmb" = ( @@ -17647,11 +17416,7 @@ /turf/closed/wall/r_wall/biodome, /area/corsat/gamma/engineering/core) "bnm" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/browncorner/north, /area/corsat/gamma/cargo) "bnn" = ( @@ -17943,11 +17708,7 @@ /turf/closed/wall/r_wall/biodome, /area/corsat/omega/hangar) "boK" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/plate, /area/corsat/omega/hangar) "boL" = ( @@ -19250,11 +19011,7 @@ /turf/open/floor/corsat/plate, /area/corsat/gamma/hangar) "buL" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/closet/wardrobe/virology_white, /turf/open/floor/corsat/purplewhite/north, /area/corsat/gamma/biodome/virology) @@ -19662,11 +19419,7 @@ /turf/open/floor/corsat/yellowcorner/west, /area/corsat/sigma/south/engineering) "bww" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/plate, /area/corsat/sigma/southeast/generator) "bwx" = ( @@ -19951,11 +19704,7 @@ /turf/open/floor/corsat/squares, /area/corsat/sigma/south/engineering) "bxN" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/surface/rack, /obj/item/powerloader_clamp, /turf/open/floor/corsat/yellow/north, @@ -20394,11 +20143,7 @@ /turf/open/floor/corsat/purplewhite, /area/corsat/omega/complex) "bzl" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/purplewhite/west, /area/corsat/omega/complex) "bzm" = ( @@ -21784,11 +21529,7 @@ /turf/open/floor/corsat/spiralplate, /area/corsat/gamma/administration) "bED" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/surface/table/almayer, /obj/item/paper_bin, /obj/item/tool/pen, @@ -22213,10 +21954,7 @@ /turf/open/floor/corsat/yellow, /area/corsat/gamma/residential/maint) "bGp" = ( -/obj/structure/machinery/power/apc/hyper{ - pixel_y = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/south, /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/corsat/plate, /area/corsat/gamma/hangar/monorail) @@ -22225,11 +21963,7 @@ /turf/open/floor/corsat/yellow/west, /area/corsat/gamma/hangar/monorail/control) "bGr" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /obj/structure/closet/jcloset, /turf/open/floor/corsat/yellow/west, /area/corsat/gamma/hangar/monorail/control) @@ -22245,11 +21979,7 @@ /turf/open/floor/corsat/yellow/west, /area/corsat/gamma/hangar/monorail/control) "bGu" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/darkgreen/north, /area/corsat/sigma/hangar/monorail) "bGy" = ( @@ -23782,11 +23512,7 @@ /turf/open/floor/corsat/yellow, /area/corsat/gamma/residential/maint) "bOH" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/surface/table/almayer, /obj/item/paper_bin, /turf/open/floor/corsat/brown/northwest, @@ -24041,11 +23767,7 @@ /turf/open/floor/corsat/brown/southeast, /area/corsat/sigma/cargo) "bPM" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/yellow/north, /area/corsat/sigma/north) "bPO" = ( @@ -24059,11 +23781,7 @@ /turf/open/floor/corsat/yellow/west, /area/corsat/gamma/engineering/atmos) "bPR" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/yellowcorner/east, /area/corsat/gamma/engineering/atmos) "bPS" = ( @@ -24128,11 +23846,7 @@ /turf/open/floor/corsat/yellowcorner, /area/corsat/sigma/north) "bQe" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/phoron{ amount = 15 @@ -24243,11 +23957,7 @@ /turf/open/floor/plating, /area/corsat/inaccessible) "bQw" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/surface/rack, /obj/item/device/lightreplacer, /obj/item/storage/box/lights, @@ -24683,11 +24393,7 @@ /turf/open/floor/corsat/redcorner/west, /area/corsat/omega/checkpoint) "bSr" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/red/east, /area/corsat/sigma/hangar/security) "bSx" = ( @@ -24919,11 +24625,7 @@ /turf/open/floor/corsat/retrosquareslight, /area/corsat/sigma/south/complex) "bTO" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /obj/structure/closet/l3closet/scientist, /turf/open/floor/corsat/purplewhite/east, /area/corsat/gamma/biodome/complex) @@ -25208,11 +24910,7 @@ /turf/open/floor/corsat/blue/north, /area/corsat/gamma/airlock/control) "bVs" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /obj/structure/closet/wardrobe/atmospherics_yellow, /turf/open/floor/corsat/yellow/east, /area/corsat/gamma/airlock/control) @@ -25222,11 +24920,7 @@ /turf/open/floor/corsat/yellow/west, /area/corsat/sigma/airlock/control) "bVw" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/closet/wardrobe/atmospherics_yellow, /turf/open/floor/corsat/yellow/north, /area/corsat/theta/airlock/control) @@ -26239,11 +25933,7 @@ /turf/open/floor/corsat/retrosquareslight, /area/corsat/gamma/biodome/toxins) "bZK" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /obj/structure/closet/wardrobe/toxins_white, /turf/open/floor/corsat/purplewhite/west, /area/corsat/gamma/biodome/toxins) @@ -26279,19 +25969,11 @@ /turf/open/floor/corsat/squares, /area/corsat/theta/biodome/complex) "cah" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/purplewhitecorner/north, /area/corsat/theta/biodome/hydrowest) "cai" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/purplewhitecorner/east, /area/corsat/theta/biodome/hydroeast) "cak" = ( @@ -26344,19 +26026,11 @@ /turf/open/floor/corsat/retrosquareslight, /area/corsat/theta/biodome/hydroeast) "cau" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/purplewhite/southwest, /area/corsat/theta/biodome/complex) "caw" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/asteroidfloor/north, /area/corsat/sigma/biodome/testgrounds) "caA" = ( @@ -27208,11 +26882,7 @@ /turf/open/floor/corsat/squares, /area/corsat/gamma/airlock/control) "cXt" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, @@ -27862,11 +27532,7 @@ /turf/open/floor/corsat/darkgreen/east, /area/corsat/gamma/foyer) "dEe" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat, /area/corsat/gamma/sigmaremote) "dET" = ( @@ -28434,11 +28100,7 @@ /turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "eiQ" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /turf/open/floor/corsat/darkgreen/west, /area/corsat/gamma/rnr) "eiR" = ( @@ -29358,11 +29020,7 @@ /turf/open/floor/corsat/whitebluefull/southwest, /area/corsat/gamma/residential/showers) "fgN" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/yellow/north, /area/corsat/sigma/south/engineering) "fha" = ( @@ -30110,11 +29768,7 @@ /turf/open/floor/corsat/yellowcorner/north, /area/corsat/sigma/airlock/control) "fXE" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /obj/effect/landmark/yautja_teleport, /turf/open/floor/corsat/squares, /area/corsat/gamma/residential) @@ -31060,10 +30714,6 @@ /obj/structure/closet/wardrobe/science_white, /turf/open/floor/corsat/purplewhite/east, /area/corsat/gamma/biodome/complex) -"gRH" = ( -/obj/structure/surface/table/reinforced, -/turf/open/floor/corsat/retrosquareslight, -/area/corsat/sigma/south/complex) "gRP" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ name = "Morgue"; @@ -31476,11 +31126,7 @@ /turf/open/floor/corsat, /area/corsat/omega/complex) "hlC" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/redcorner/east, /area/corsat/omega/security) "hlM" = ( @@ -32540,11 +32186,7 @@ /area/corsat/theta/biodome) "iiS" = ( /obj/structure/surface/table/reinforced, -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /obj/item/device/flashlight/lamp, /turf/open/floor/corsat/red/northwest, /area/corsat/gamma/airlock/south) @@ -33369,11 +33011,7 @@ /turf/open/floor/corsat/retrosquareslight, /area/corsat/theta/biodome/complex) "jee" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/plate, /area/corsat/theta/airlock/west/id) "jeE" = ( @@ -33747,11 +33385,7 @@ /area/corsat/sigma/hangar/security) "jAz" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/bluegrey/north, /area/corsat/omega/offices) "jAE" = ( @@ -33807,11 +33441,7 @@ /turf/open/floor/corsat/whitetancorner/west, /area/corsat/gamma/residential/west) "jFF" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/plate, /area/corsat/gamma/residential/researcher) "jFJ" = ( @@ -34742,11 +34372,7 @@ /turf/open/floor/corsat/purplewhite/northwest, /area/corsat/gamma/biodome/virology) "kKs" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/plate, /area/corsat/sigma/dorms) "kKw" = ( @@ -35029,10 +34655,7 @@ /turf/open/floor/corsat/red/north, /area/corsat/gamma/foyer) "kZy" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/upgraded/power/north, /turf/open/floor/corsat/red/northwest, /area/corsat/theta/airlock/west) "lac" = ( @@ -35673,10 +35296,6 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/corsat/retrosquareslight, /area/corsat/omega/complex) -"lHI" = ( -/obj/structure/surface/table/reinforced, -/turf/open/floor/corsat/retrosquareslight, -/area/corsat/sigma/south/complex) "lHK" = ( /turf/open/floor/corsat/bluegrey/west, /area/corsat/sigma/south/offices) @@ -37097,11 +36716,7 @@ /turf/open/mars_cave/mars_dirt_4, /area/corsat/sigma/biodome) "ndF" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/whitebluefull/southwest, /area/corsat/gamma/residential/laundry) "nen" = ( @@ -38230,11 +37845,7 @@ /turf/open/floor/almayer/research/containment/floor2, /area/corsat/inaccessible) "ome" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/whitetan/east, /area/corsat/gamma/residential/west) "omw" = ( @@ -40540,11 +40151,7 @@ /turf/open/floor/corsat/yellow, /area/corsat/gamma/airlock/control) "qLo" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/yellow/north, /area/corsat/gamma/hallwaysouth) "qLz" = ( @@ -41161,11 +40768,7 @@ /turf/open/floor/almayer/research/containment/corner_var1/containment_corner_variant_2, /area/corsat/gamma/sigmaremote) "rvC" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/redcorner/east, /area/corsat/sigma/airlock/east/id) "rvD" = ( @@ -42901,11 +42504,7 @@ /turf/open/floor/corsat/plate, /area/corsat/gamma/freezer) "thv" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/whitebluefull/southwest, /area/corsat/gamma/residential/showers) "tja" = ( @@ -43009,11 +42608,7 @@ /turf/open/floor/corsat/greenwhite/west, /area/corsat/gamma/medbay) "tpA" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/surface/table/almayer, /obj/item/storage/fancy/cigarettes/lucky_strikes, /turf/open/floor/corsat/spiralplate, @@ -43074,11 +42669,7 @@ /turf/open/floor/corsat/whitetan/north, /area/corsat/gamma/residential/west) "ttJ" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/plate, /area/corsat/gamma/hallwaysouth) "ttK" = ( @@ -43121,11 +42712,7 @@ /turf/open/floor/corsat/redcorner/north, /area/corsat/theta/airlock/control) "tvO" = ( -/obj/structure/machinery/power/apc/high{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/east, /turf/open/floor/corsat/greencorner/east, /area/corsat/gamma/medbay/morgue) "tvW" = ( @@ -43958,11 +43545,7 @@ /turf/open/floor/corsat/squares, /area/corsat/gamma/engineering/core) "upN" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/plate, /area/corsat/sigma/south/complex) "uqb" = ( @@ -44818,11 +44401,7 @@ /turf/open/floor/corsat/whitetan/southeast, /area/corsat/gamma/residential/west) "vhS" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/red/north, /area/corsat/sigma/hangar/checkpoint) "vhU" = ( @@ -46884,11 +46463,7 @@ /turf/open/gm/dirt, /area/corsat/theta/biodome) "xtO" = ( -/obj/structure/machinery/power/apc/high{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/corsat/squareswood/north, /area/corsat/gamma/rnr/library) "xtR" = ( @@ -47146,11 +46721,7 @@ /turf/open/floor/corsat/plate, /area/corsat/sigma/south) "xJB" = ( -/obj/structure/machinery/power/apc/hyper{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/north, /turf/open/floor/corsat/red/northwest, /area/corsat/omega/airlocknorth/id) "xJH" = ( @@ -92180,7 +91751,7 @@ aje akd bwc aHZ -lHI +bTM bTW aks akd @@ -93161,7 +92732,7 @@ akd bDa aHZ uSc -gRH +bTM aks akd eWX diff --git a/maps/map_files/CORSAT/standalone/sigma_ice.dmm b/maps/map_files/CORSAT/standalone/sigma_ice.dmm index 47d72b283e14..33d62da2e60c 100644 --- a/maps/map_files/CORSAT/standalone/sigma_ice.dmm +++ b/maps/map_files/CORSAT/standalone/sigma_ice.dmm @@ -1454,11 +1454,7 @@ /turf/open/floor/asteroidplating, /area/corsat/sigma/biodome/gunrange) "GJ" = ( -/obj/structure/machinery/power/apc/high{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/upgraded/no_power/west, /obj/structure/closet/wardrobe/atmospherics_yellow, /turf/open/floor/corsat/yellow/west, /area/corsat/sigma/airlock/control) diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 2e078646853d..7fc58191e032 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -771,11 +771,7 @@ /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) "adi" = ( /obj/structure/surface/table, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/exterior/valley/south_valley_dam) "adj" = ( @@ -1020,11 +1016,7 @@ /turf/open/desert/desert_shore/shore_edge1/west, /area/desert_dam/exterior/river/riverside_east) "aei" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/blue/east, /area/desert_dam/building/administration/control_room) "aej" = ( @@ -1133,11 +1125,7 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_labs) "aeD" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/interior/wood, /area/desert_dam/building/bar/backroom) "aeE" = ( @@ -2685,11 +2673,7 @@ /turf/open/floor/prison/darkpurple2/northwest, /area/desert_dam/interior/lab_northeast/east_lab_excavation) "akm" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkpurple2/north, /area/desert_dam/interior/lab_northeast/east_lab_excavation) "akn" = ( @@ -3089,11 +3073,7 @@ /turf/open/floor/prison, /area/desert_dam/interior/lab_northeast/east_lab_excavation) "alS" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/whitepurple/north, /area/desert_dam/interior/lab_northeast/east_lab_east_hallway) "alT" = ( @@ -3358,11 +3338,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/telecomm/lz1_valley) "amR" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/interior/lab_northeast/east_lab_containment) "amS" = ( @@ -3393,11 +3369,7 @@ /turf/open/floor/prison/darkpurplecorners2/north, /area/desert_dam/interior/lab_northeast/east_lab_biology) "amX" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkpurple2/north, /area/desert_dam/interior/lab_northeast/east_lab_biology) "amY" = ( @@ -3494,11 +3466,7 @@ /turf/open/floor/prison/whitepurple/east, /area/desert_dam/interior/lab_northeast/east_lab_east_hallway) "anr" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/floor_plate/southwest, /area/desert_dam/interior/dam_interior/west_tunnel) "ans" = ( @@ -3657,11 +3625,7 @@ /turf/open/floor/prison/whitepurple/north, /area/desert_dam/interior/lab_northeast/east_lab_central_hallway) "anY" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/whitepurple/north, /area/desert_dam/interior/lab_northeast/east_lab_central_hallway) "anZ" = ( @@ -4118,11 +4082,7 @@ /turf/open/floor/prison/darkred2/east, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) "aqe" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkred2/west, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) "aqf" = ( @@ -4432,11 +4392,7 @@ /turf/open/floor/prison/darkred2/west, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) "arl" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkredcorners2/north, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) "arm" = ( @@ -4469,11 +4425,7 @@ /turf/open/floor/warning, /area/desert_dam/interior/lab_northeast/east_lab_east_entrance) "arr" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/darkred2/east, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) "ars" = ( @@ -4551,10 +4503,7 @@ /area/desert_dam/interior/dam_interior/garage) "arG" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/interior/lab_northeast/east_lab_workshop) "arH" = ( @@ -5056,11 +5005,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) "atG" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/darkyellow2/west, /area/desert_dam/building/substation/northeast) "atH" = ( @@ -5077,11 +5022,7 @@ /turf/open/floor/prison/red/north, /area/desert_dam/interior/lab_northeast/east_lab_east_entrance) "atK" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/red/north, /area/desert_dam/interior/lab_northeast/east_lab_east_entrance) "atL" = ( @@ -5159,11 +5100,7 @@ /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/floodgate_control) "atZ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/floodgate_control) "aua" = ( @@ -5182,11 +5119,7 @@ /turf/open/floor/dark2, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) "aue" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/red/north, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) "auf" = ( @@ -5268,11 +5201,7 @@ /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_medical) "auw" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkpurple2/northeast, /area/desert_dam/interior/lab_northeast/east_lab_RND) "aux" = ( @@ -5360,11 +5289,7 @@ /turf/open/floor/whiteblue/north, /area/desert_dam/interior/lab_northeast/east_lab_lobby) "auR" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whiteblue/north, /area/desert_dam/interior/lab_northeast/east_lab_lobby) "auS" = ( @@ -5662,11 +5587,7 @@ /turf/open/asphalt/cement/cement13, /area/desert_dam/interior/dam_interior/west_tunnel) "awb" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/whitepurple/north, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) "awc" = ( @@ -6371,11 +6292,7 @@ /turf/open/floor/prison/whitepurple/east, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) "azd" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/blue/west, /area/desert_dam/interior/lab_northeast/east_lab_RND) "azf" = ( @@ -7596,11 +7513,7 @@ /turf/open/asphalt/cement/cement15, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) "aDR" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/asphalt/cement/cement15, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) "aDS" = ( @@ -7793,11 +7706,7 @@ /turf/open/desert/dirt/desert_transition_edge1/northeast, /area/desert_dam/exterior/valley/valley_crashsite) "aEC" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -9454,11 +9363,7 @@ /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/landing_pad_one) "aLb" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whitegreen/north, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) "aLc" = ( @@ -9913,11 +9818,7 @@ /turf/open/floor/prison/darkyellow2/northwest, /area/desert_dam/building/substation/northeast) "aMB" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/building/substation/northeast) "aMC" = ( @@ -10818,11 +10719,7 @@ /turf/open/asphalt/tile, /area/desert_dam/exterior/landing_pad_one) "aQk" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkbrown2/west, /area/desert_dam/building/warehouse/loading) "aQl" = ( @@ -11174,11 +11071,7 @@ /turf/open/desert/dirt/desert_transition_corner1/west, /area/desert_dam/exterior/valley/valley_wilderness) "aRO" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/valley_hydro) "aRP" = ( @@ -11646,11 +11539,7 @@ /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/building/mining/workshop) "aTO" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/building/mining/workshop) "aTP" = ( @@ -12070,11 +11959,7 @@ /turf/open/floor/wood, /area/desert_dam/building/administration/office) "aVQ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/desert_dam/building/administration/office) "aVR" = ( @@ -12315,11 +12200,7 @@ /turf/open/floor/vault2/northeast, /area/desert_dam/building/administration/control_room) "aWQ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/interior/wood, /area/desert_dam/building/security/office) "aWR" = ( @@ -12990,11 +12871,7 @@ /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/administration/hallway) "aZB" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/blue/west, /area/desert_dam/building/administration/hallway) "aZC" = ( @@ -13085,11 +12962,7 @@ /turf/open/floor/dark2, /area/desert_dam/building/administration/archives) "aZX" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/dark2, /area/desert_dam/building/administration/archives) "aZY" = ( @@ -13178,11 +13051,7 @@ /turf/open/floor/darkred2/north, /area/desert_dam/building/administration/lobby) "bar" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkred2/northeast, /area/desert_dam/building/administration/lobby) "bas" = ( @@ -13310,11 +13179,7 @@ /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/hallway) "baN" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/surface/table, /obj/item/storage/donut_box, /turf/open/floor/prison, @@ -13879,11 +13744,7 @@ /turf/open/floor/wood, /area/desert_dam/building/administration/meetingrooom) "bdm" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/desert_dam/building/administration/meetingrooom) "bdn" = ( @@ -14255,11 +14116,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/water_treatment_two/hallway) "beS" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/purification) "beT" = ( @@ -14761,11 +14618,7 @@ /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river/riverside_central_north) "bgV" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/control_room) "bgW" = ( @@ -14830,11 +14683,7 @@ /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/north_valley_dam) "bhn" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -14933,11 +14782,7 @@ /turf/open/desert/dirt/desert_transition_corner1/north, /area/desert_dam/exterior/valley/north_valley_dam) "bhI" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/lobby) "bhL" = ( @@ -15661,11 +15506,7 @@ /turf/open/floor/prison/red/west, /area/desert_dam/building/security/lobby) "blb" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkbrowncorners2/east, /area/desert_dam/building/mining/workshop_foyer) "blc" = ( @@ -15972,11 +15813,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/dark, /area/desert_dam/building/security/observation) "bml" = ( @@ -16140,11 +15977,7 @@ /turf/open/floor/dark, /area/desert_dam/building/security/interrogation) "bmW" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/interior/wood, /area/desert_dam/building/security/detective) "bmX" = ( @@ -16158,11 +15991,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "bnb" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/interior/wood, /area/desert_dam/building/security/marshals_office) "bnc" = ( @@ -16333,11 +16162,7 @@ /turf/open/floor/prison/darkbrown2/northeast, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) "bnP" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/blue/west, /area/desert_dam/interior/dam_interior/tech_storage) "bnQ" = ( @@ -16466,11 +16291,7 @@ /turf/open/asphalt/cement/cement1, /area/desert_dam/interior/dam_interior/western_dam_cave) "box" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/dark, /area/desert_dam/building/security/interrogation) "boy" = ( @@ -16630,11 +16451,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/security/northern_hallway) "bph" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/redcorner/north, /area/desert_dam/building/security/northern_hallway) "bpi" = ( @@ -17170,11 +16987,7 @@ /turf/open/floor/prison/cell_stripe/east, /area/desert_dam/interior/dam_interior/hanger) "brE" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/hanger) "brF" = ( @@ -17514,11 +17327,7 @@ /turf/open/floor/prison/darkbrowncorners2/north, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) "btr" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkbrown2/north, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) "bts" = ( @@ -17688,11 +17497,7 @@ /turf/open/floor/plating, /area/desert_dam/exterior/valley/valley_telecoms) "bue" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/holding) "buf" = ( @@ -18163,11 +17968,7 @@ /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/interior/dam_interior/engine_west_wing) "bwl" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/interior/dam_interior/engine_west_wing) "bwn" = ( @@ -18254,11 +18055,7 @@ /turf/open/floor/dark, /area/desert_dam/building/security/interrogation) "bwM" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/floor_plate, /area/desert_dam/building/security/evidence) "bwO" = ( @@ -18433,11 +18230,7 @@ /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/administration/hallway) "bxz" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkyellow2/west, /area/desert_dam/interior/dam_interior/smes_main) "bxB" = ( @@ -18771,11 +18564,7 @@ /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/hangar_storage) "bzj" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/hangar_storage) "bzk" = ( @@ -18901,11 +18690,7 @@ /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/administration/overseer_office) "bzK" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/floor_plate/southwest, /area/desert_dam/interior/dam_interior/north_tunnel_entrance) "bzL" = ( @@ -18981,11 +18766,7 @@ /turf/open/floor/prison/floor_plate, /area/desert_dam/building/security/evidence) "bAa" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/staffroom) "bAb" = ( @@ -19011,11 +18792,7 @@ /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/administration/hallway) "bAp" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/northwestern_tunnel) "bAq" = ( @@ -19190,11 +18967,7 @@ /turf/open/floor/prison/floor_marked/southwest, /area/desert_dam/interior/dam_interior/hangar_storage) "bBk" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/desert_dam/building/administration/overseer_office) @@ -19239,11 +19012,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/engine_west_wing) "bBv" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkyellow2/west, /area/desert_dam/interior/dam_interior/control_room) "bBw" = ( @@ -19368,11 +19137,7 @@ /turf/open/asphalt/cement, /area/desert_dam/interior/dam_interior/north_tunnel) "bCm" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/sand_overlay/sand2{ dir = 4 }, @@ -19397,11 +19162,7 @@ /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/northeastern_tunnel) "bCq" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/sand_overlay/sand2/corner2{ dir = 1 }, @@ -19634,19 +19395,11 @@ /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/control_room) "bDu" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/neutral, /area/desert_dam/interior/dam_interior/engine_room) "bDw" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/darkyellowcorners2/north, /area/desert_dam/interior/dam_interior/engine_east_wing) "bDx" = ( @@ -19666,11 +19419,7 @@ /turf/open/floor/prison/green/north, /area/desert_dam/interior/dam_interior/atmos_storage) "bDB" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/green/north, /area/desert_dam/interior/dam_interior/atmos_storage) "bDC" = ( @@ -20094,11 +19843,7 @@ /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/southern_hallway) "bFl" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/southern_hallway) "bFm" = ( @@ -20416,11 +20161,7 @@ /turf/open/floor/prison, /area/desert_dam/building/security/southern_hallway) "bGG" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/interior/wood, /area/desert_dam/building/security/courtroom) "bGH" = ( @@ -20585,11 +20326,7 @@ /turf/open/floor/white, /area/desert_dam/interior/dam_interior/lobby) "bHi" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkyellow2/west, /area/desert_dam/interior/dam_interior/lobby) "bHl" = ( @@ -20817,11 +20554,7 @@ /turf/open/floor/prison/darkyellow2/east, /area/desert_dam/interior/dam_interior/lobby) "bIm" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/northwest, /area/desert_dam/interior/dam_interior/smes_backup) "bIn" = ( @@ -22223,11 +21956,7 @@ /turf/open/floor/prison/darkred2/east, /area/desert_dam/building/security/prison) "bOK" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkred2/east, /area/desert_dam/building/security/armory) "bOM" = ( @@ -22318,11 +22047,7 @@ /turf/open/floor/prison/darkbrowncorners2/west, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) "bPg" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/darkyellow2/east, /area/desert_dam/interior/dam_interior/primary_tool_storage) "bPh" = ( @@ -22482,11 +22207,7 @@ /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/workshop) "bPR" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/workshop) "bPT" = ( @@ -22565,11 +22286,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/northeast, /area/desert_dam/interior/dam_interior/CE_office) "bQg" = ( @@ -22656,11 +22373,7 @@ /turf/open/floor/prison/floor_marked, /area/desert_dam/building/security/armory) "bQy" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellowcorners2/east, /area/desert_dam/building/warehouse/breakroom) "bQz" = ( @@ -22734,11 +22447,7 @@ /turf/open/desert/dirt/desert_transition_edge1/southwest, /area/desert_dam/exterior/valley/valley_medical) "bQR" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/sand_overlay/sand2{ dir = 4 }, @@ -22777,11 +22486,7 @@ /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/workshop) "bQZ" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/dark, /area/desert_dam/interior/dam_interior/office) "bRb" = ( @@ -23122,11 +22827,7 @@ /turf/open/floor/darkyellow2/north, /area/desert_dam/building/security/prison) "bSs" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkyellowcorners2/north, /area/desert_dam/building/security/prison) "bSu" = ( @@ -23771,11 +23472,7 @@ /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/central_tunnel) "bVn" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/central_tunnel) "bVo" = ( @@ -23858,11 +23555,7 @@ /turf/open/asphalt/cement_sunbleached/cement_sunbleached19, /area/desert_dam/exterior/valley/south_valley_dam) "bVI" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/warden) "bVJ" = ( @@ -24465,11 +24158,7 @@ }, /area/desert_dam/interior/dam_interior/disposals) "bXT" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/west_tunnel) "bXU" = ( @@ -24851,11 +24540,7 @@ /turf/open/floor/freezerfloor, /area/desert_dam/interior/dam_interior/break_room) "bZg" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whiteyellow/northwest, /area/desert_dam/interior/dam_interior/break_room) "bZh" = ( @@ -25032,11 +24717,7 @@ /turf/open/floor/plating/warnplate/north, /area/desert_dam/exterior/valley/valley_telecoms) "bZL" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/building/security/execution_chamber) "bZM" = ( @@ -25893,11 +25574,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) "cdd" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/deathrow) "cdf" = ( @@ -25959,11 +25636,7 @@ /turf/open/floor/grimy, /area/desert_dam/building/bar/bar) "cdr" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/grimy, @@ -27424,11 +27097,7 @@ /turf/open/floor/prison/darkyellow2/northeast, /area/desert_dam/building/medical/break_room) "cjE" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/desert_dam/building/medical/break_room) "cjF" = ( @@ -27460,11 +27129,7 @@ /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_telecoms) "cjP" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/floor_plate/southwest, /area/desert_dam/interior/dam_interior/south_tunnel) "cjQ" = ( @@ -27529,11 +27194,7 @@ /turf/open/floor/prison/bright_clean2/southwest, /area/desert_dam/building/medical/morgue) "ckf" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/bright_clean2/southwest, /area/desert_dam/building/medical/morgue) "ckg" = ( @@ -27646,11 +27307,7 @@ /turf/closed/wall, /area/desert_dam/building/medical/chemistry) "ckE" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/white, /area/desert_dam/building/medical/chemistry) "ckF" = ( @@ -28703,11 +28360,7 @@ /turf/open/floor/prison/darkbrown2/north, /area/desert_dam/building/warehouse/warehouse) "cpg" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkbrowncorners2/east, /area/desert_dam/building/warehouse/warehouse) "cph" = ( @@ -28834,11 +28487,7 @@ /turf/open/floor/prison/whitegreen/north, /area/desert_dam/building/medical/north_wing_hallway) "cpN" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/whitegreen/north, /area/desert_dam/building/medical/north_wing_hallway) "cpP" = ( @@ -29230,11 +28879,7 @@ /turf/open/floor/prison/whitegreen/north, /area/desert_dam/building/medical/lobby) "crG" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/whitegreen/north, /area/desert_dam/building/medical/lobby) "crH" = ( @@ -29390,11 +29035,7 @@ /turf/open/floor/asteroidplating, /area/desert_dam/exterior/telecomm/lz2_tcomms) "csp" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkyellow2/west, /area/desert_dam/building/substation/west) "css" = ( @@ -29751,11 +29392,7 @@ /obj/structure/surface/table/reinforced, /obj/item/device/healthanalyzer, /obj/item/device/healthanalyzer, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/whitegreen/east, /area/desert_dam/building/medical/west_wing_hallway) "ctW" = ( @@ -30061,11 +29698,7 @@ /turf/open/floor/prison/bright_clean2/southwest, /area/desert_dam/building/medical/surgury_observation) "cvd" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/bright_clean2/southwest, /area/desert_dam/building/medical/surgury_observation) "cve" = ( @@ -30546,11 +30179,7 @@ /turf/open/floor/wood, /area/desert_dam/building/medical/CMO) "cxb" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/wood, /area/desert_dam/building/medical/CMO) "cxc" = ( @@ -31400,11 +31029,7 @@ /turf/open/floor/prison/whitered/east, /area/desert_dam/building/medical/surgery_room_two) "cAv" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkyellow2/west, /area/desert_dam/building/substation/central) "cAx" = ( @@ -31444,11 +31069,7 @@ /turf/closed/wall, /area/desert_dam/building/medical/office2) "cAH" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/structure/disposalpipe/junction{ dir = 1; icon_state = "pipe-j2" @@ -31644,11 +31265,7 @@ /turf/open/floor/prison/whitered/west, /area/desert_dam/building/medical/primary_storage) "cBm" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/whitered/west, /area/desert_dam/building/medical/surgery_room_one) "cBo" = ( @@ -31663,11 +31280,7 @@ /turf/open/floor/prison/whitered/east, /area/desert_dam/building/medical/surgery_room_one) "cBq" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/whitered/west, /area/desert_dam/building/medical/surgery_room_two) "cBr" = ( @@ -31940,20 +31553,12 @@ /area/desert_dam/building/medical/office1) "cCC" = ( /obj/structure/bed, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/whitered/east, /area/desert_dam/building/medical/office1) "cCE" = ( /obj/structure/bed, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/whitered/east, /area/desert_dam/building/medical/office2) "cCF" = ( @@ -32392,11 +31997,7 @@ /area/desert_dam/building/medical/treatment_room) "cEA" = ( /obj/structure/machinery/iv_drip, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/whitegreen/northwest, /area/desert_dam/building/medical/treatment_room) "cEB" = ( @@ -32430,11 +32031,7 @@ /turf/open/floor/prison/whitegreencorner/east, /area/desert_dam/building/medical/east_wing_hallway) "cEI" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/whitegreen/north, /area/desert_dam/building/medical/east_wing_hallway) "cEJ" = ( @@ -32544,11 +32141,7 @@ /obj/effect/decal/medical_decals{ icon_state = "docstriping" }, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/white, /area/desert_dam/building/medical/garage) "cFi" = ( @@ -33723,11 +33316,7 @@ /turf/closed/wall, /area/desert_dam/building/medical/virology_isolation) "cJH" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/desert_dam/building/medical/east_wing_hallway) "cJI" = ( @@ -33967,11 +33556,7 @@ /turf/open/floor/prison/whitegreen/east, /area/desert_dam/building/medical/virology_wing) "cKI" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/whitegreen/east, /area/desert_dam/building/medical/virology_wing) "cKJ" = ( @@ -34713,11 +34298,7 @@ /turf/open/floor/dark, /area/desert_dam/building/church) "cOe" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/dark, /area/desert_dam/building/church) "cOf" = ( @@ -34847,10 +34428,7 @@ /turf/open/floor/prison/whitegreen/southwest, /area/desert_dam/building/medical/virology_isolation) "cOJ" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/whitegreen, /area/desert_dam/building/medical/virology_isolation) "cOK" = ( @@ -35063,11 +34641,7 @@ /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_cargo) "cPH" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/northwest, /area/desert_dam/building/substation/southwest) "cPI" = ( @@ -35347,11 +34921,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_one) "cQN" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/bar/bar_restroom) "cQO" = ( @@ -35679,11 +35249,7 @@ /turf/open/floor/prison, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) "cSh" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/floor_plate/southwest, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) "cSl" = ( @@ -36013,11 +35579,7 @@ /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/hydroponics/hydroponics_breakroom) "cTM" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/hydroponics/hydroponics_breakroom) "cTN" = ( @@ -36750,11 +36312,7 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/prison/greencorner/east, @@ -37279,11 +36837,7 @@ /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/cafeteria) "dbF" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/microwave, /obj/structure/surface/table/reinforced, /turf/open/floor/prison/sterile_white, @@ -37448,10 +37002,7 @@ /turf/open/floor/plating, /area/desert_dam/building/cafeteria/backroom) "dcq" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/plating, /area/desert_dam/building/cafeteria/backroom) "dcs" = ( @@ -37486,11 +37037,7 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_civilian) "dcL" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/whitered/east, /area/desert_dam/building/medical/primary_storage) @@ -37654,11 +37201,7 @@ /turf/open/floor/freezerfloor, /area/desert_dam/building/cafeteria/cold_room) "ddu" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/freezerfloor, /area/desert_dam/building/cafeteria/cold_room) "ddv" = ( @@ -37796,11 +37339,7 @@ /turf/open/floor/prison/floor_marked/southwest, /area/desert_dam/building/hydroponics/hydroponics_loading) "ddZ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/building/hydroponics/hydroponics_loading) "dea" = ( @@ -38067,11 +37606,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/river/riverside_south) "dfe" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison, /area/desert_dam/building/hydroponics/hydroponics_storage) "dfh" = ( @@ -38134,11 +37669,7 @@ /turf/open/floor/prison, /area/desert_dam/building/cafeteria/loading) "dfv" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/building/cafeteria/loading) "dfw" = ( @@ -38928,11 +38459,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "dld" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrown3/north, /area/desert_dam/interior/dam_interior/disposals) @@ -39363,11 +38890,7 @@ /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/cafeteria) "dqu" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/cafeteria) @@ -39393,11 +38916,7 @@ /area/desert_dam/building/water_treatment_one/lobby) "dqS" = ( /obj/structure/bed/chair, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/lobby) "dqT" = ( @@ -39604,11 +39123,7 @@ /turf/open/asphalt, /area/desert_dam/building/water_treatment_one/garage) "dtt" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/garage) "dtu" = ( @@ -39709,11 +39224,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/water_treatment_one/hallway) "duu" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/hallway) "duw" = ( @@ -40018,10 +39529,7 @@ /turf/open/asphalt, /area/desert_dam/interior/dam_interior/south_tunnel) "dxd" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/purification) "dxe" = ( @@ -40145,11 +39653,7 @@ }, /area/desert_dam/building/water_treatment_one/breakroom) "dyi" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/floodgate_control) "dyj" = ( @@ -40267,11 +39771,7 @@ /turf/open/gm/river/desert/deep/covered, /area/desert_dam/exterior/river/filtration_a) "dzi" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/freezerfloor, /area/desert_dam/building/water_treatment_one/equipment) "dzj" = ( @@ -40545,11 +40045,7 @@ /turf/open/floor/freezerfloor, /area/desert_dam/building/water_treatment_one/breakroom) "dBj" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/whiteyellowcorner/north, /area/desert_dam/building/water_treatment_one/breakroom) "dBo" = ( @@ -41011,11 +40507,7 @@ /turf/open/floor/wood, /area/desert_dam/building/dorms/hallway_westwing) "dEu" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/green/west, /area/desert_dam/building/dorms/hallway_westwing) "dEv" = ( @@ -41099,11 +40591,7 @@ /turf/open/floor/plating, /area/desert_dam/building/dorms/restroom) "dFj" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/dorms/restroom) "dFk" = ( @@ -41520,11 +41008,7 @@ /area/desert_dam/building/warehouse/loading) "dHQ" = ( /obj/structure/surface/table, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/effect/spawner/random/toolbox, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison/bright_clean/southwest, @@ -41736,11 +41220,7 @@ /turf/open/floor/prison/blue/north, /area/desert_dam/building/dorms/pool) "dIR" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -42430,9 +41910,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "dMY" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; +/obj/structure/machinery/power/apc/power/north{ start_charge = 150 }, /obj/effect/decal/cleanable/dirt, @@ -44405,11 +43883,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/hydroponics/hydroponics) "dVN" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/control_room) @@ -46927,11 +46401,7 @@ /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/south_valley_dam) "gRC" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 31; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating, /area/desert_dam/exterior/telecomm/lz2_containers) "gTD" = ( @@ -47619,11 +47089,7 @@ /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/south_valley_dam) "jxq" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/delivery, /area/desert_dam/exterior/telecomm/lz1_south) "jxN" = ( @@ -48411,11 +47877,7 @@ /area/desert_dam/interior/dam_interior/hanger) "mKZ" = ( /obj/structure/flora/pottedplant, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/light{ dir = 4 }, @@ -48937,11 +48399,7 @@ /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/lab_northeast/east_lab_east_entrance) "oYp" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/exterior/telecomm/lz1_valley) "pac" = ( @@ -49370,11 +48828,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_one) "qJI" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/desert_dam/exterior/telecomm/lz1_xenoflora) "qJU" = ( @@ -49667,11 +49121,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "E" }, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/asteroidplating, /area/desert_dam/exterior/telecomm/lz2_tcomms) "rTV" = ( @@ -51170,11 +50620,7 @@ /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_civilian) "xkK" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 31; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating, /area/desert_dam/exterior/telecomm/lz2_storage) "xls" = ( diff --git a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm index 61bc40a64e52..972e9ddf3b59 100644 --- a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm +++ b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm @@ -842,11 +842,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) "rm" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/interior/wood, /area/desert_dam/building/bar/bar) "rR" = ( @@ -1153,11 +1149,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "xG" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/prison/floor_plate/southwest, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) @@ -1910,11 +1902,7 @@ /turf/open/floor/prison/floor_plate/southwest, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) "LJ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/item/stack/sheet/metal, /turf/open/floor/plating/platingdmg3, /area/desert_dam/building/bar/backroom) diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 60bb9c8aa42f..518ea89a0257 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -789,10 +789,7 @@ /turf/open/floor/prison/whitepurple, /area/prison/research/secret/testing) "acy" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/whitepurple, /area/prison/research/secret/testing) "acz" = ( @@ -1454,11 +1451,7 @@ /turf/open/floor/prison, /area/prison/security/monitoring/maxsec/panopticon) "aeB" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, @@ -1841,10 +1834,7 @@ /turf/open/floor/prison/whitepurple, /area/prison/research/secret/bioengineering) "afS" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/whitepurple, /area/prison/research/secret/bioengineering) "afT" = ( @@ -2174,11 +2164,7 @@ /turf/open/floor/prison/darkpurple2/north, /area/prison/research/secret/containment) "ahd" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkpurple2/north, /area/prison/research/secret/containment) "ahe" = ( @@ -2234,11 +2220,7 @@ /turf/open/floor/prison/darkpurple2/north, /area/prison/research/secret) "ahk" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/landmark/good_item, /turf/open/floor/prison/darkpurple2/north, /area/prison/research/secret) @@ -2286,11 +2268,7 @@ /turf/open/floor/prison/darkredfull2/southwest, /area/prison/cellblock/maxsec/north) "ahv" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkredfull2/southwest, /area/prison/cellblock/maxsec/north) "ahw" = ( @@ -2625,11 +2603,7 @@ /turf/open/floor/prison, /area/prison/research/secret/dissection) "aiP" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/prison/research/secret/dissection) "aiQ" = ( @@ -3144,11 +3118,7 @@ /turf/open/floor/plating, /area/prison/maintenance/research_medbay) "akC" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/prison/maintenance/research_medbay) "akD" = ( @@ -3512,10 +3482,7 @@ /area/prison/research/secret/chemistry) "alT" = ( /obj/structure/surface/table/reinforced, -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/darkpurplefull2/northwest, /area/prison/research/secret/chemistry) "alU" = ( @@ -3919,11 +3886,7 @@ /turf/open/floor/prison/sterile_white/southwest, /area/prison/medbay/surgery) "ann" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/whitegreen/east, /area/prison/medbay/surgery) "ano" = ( @@ -4017,11 +3980,7 @@ /turf/open/floor/prison/darkred2/north, /area/prison/security/checkpoint/maxsec_highsec) "anE" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkred2/north, /area/prison/security/checkpoint/maxsec_highsec) "anF" = ( @@ -5084,11 +5043,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/west, /area/prison/research/RD) "aro" = ( @@ -5244,11 +5199,7 @@ /turf/open/floor/prison/whitepurple/east, /area/prison/research) "arT" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/item/stack/rods, /turf/open/floor/prison/red/west, /area/prison/cellblock/highsec/north/north) @@ -5567,10 +5518,7 @@ /turf/open/floor/prison/sterile_white/southwest, /area/prison/medbay) "ate" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /obj/structure/platform, /turf/open/floor/prison/sterile_white/southwest, /area/prison/hanger/research) @@ -5721,11 +5669,7 @@ /turf/open/floor/prison/darkredfull2/southwest, /area/prison/cellblock/maxsec/south) "atI" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/prison/medbay/morgue) "atJ" = ( @@ -5960,10 +5904,7 @@ /turf/open/floor/prison/darkredfull2/southwest, /area/prison/cellblock/maxsec/south) "auH" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/darkredfull2/southwest, /area/prison/cellblock/maxsec/south) "auI" = ( @@ -6296,11 +6237,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/prison/chapel) "awc" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/bright_clean/southwest, /area/prison/chapel) "awe" = ( @@ -6435,11 +6372,7 @@ /area/prison/hanger/research) "awH" = ( /obj/structure/surface/rack, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/southwest, /area/prison/hangar_storage/research) "awI" = ( @@ -6567,11 +6500,7 @@ /obj/item/roller{ icon_state = "down" }, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/whitegreen/east, /area/prison/medbay) "axk" = ( @@ -6759,11 +6688,7 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/prison/security/checkpoint/maxsec) "axU" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/prison/maintenance/residential/access/north) "axV" = ( @@ -7337,10 +7262,7 @@ /turf/open/floor/prison/darkred2, /area/prison/security/checkpoint/maxsec) "aAq" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, @@ -7530,11 +7452,7 @@ /turf/open/floor/prison/darkredfull2/southwest, /area/prison/medbay/foyer) "aAY" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/whitepurple/southwest, /area/prison/research) "aAZ" = ( @@ -8053,11 +7971,7 @@ /turf/open/floor/prison/bright_clean2/southwest, /area/prison/medbay/foyer) "aDh" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/medbay/foyer) "aDi" = ( @@ -8441,10 +8355,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/freezerfloor, /area/prison/toilet/research) "aEB" = ( @@ -8575,11 +8486,7 @@ /turf/open/floor/prison/darkyellow2/north, /area/prison/hangar_storage/main) "aFc" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/northeast, /area/prison/hangar_storage/main) "aFd" = ( @@ -8966,10 +8873,7 @@ /turf/open/floor/prison/southwest, /area/prison/recreation/highsec/n) "aGC" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/southwest, /area/prison/recreation/highsec/n) @@ -9352,10 +9256,7 @@ /turf/open/floor/prison/whitepurple/southwest, /area/prison/quarters/research) "aIa" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/whitepurple, /area/prison/quarters/research) "aIb" = ( @@ -9419,11 +9320,7 @@ /turf/open/floor/prison, /area/prison/storage/highsec/n) "aIp" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/prison/storage/highsec/n) "aIq" = ( @@ -9492,11 +9389,7 @@ /turf/open/floor/prison/sterile_white/southwest, /area/prison/residential/central) "aIC" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/prison/maintenance/staff_research) "aID" = ( @@ -10387,11 +10280,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/prison/cleaning) "aMm" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/janitorialcart, /turf/open/floor/prison/bright_clean/southwest, /area/prison/cleaning) @@ -10462,11 +10351,7 @@ /turf/open/floor/prison/green/north, /area/prison/quarters/staff) "aMz" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, @@ -10974,11 +10859,7 @@ /area/prison/command/secretary_office) "aOy" = ( /obj/structure/bed/chair/comfy, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/wood, /area/prison/command/office) "aOA" = ( @@ -11036,10 +10917,7 @@ /turf/open/floor/prison/red, /area/prison/cellblock/highsec/north/south) "aOK" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/red, /area/prison/cellblock/highsec/north/south) "aOL" = ( @@ -11517,11 +11395,7 @@ /turf/closed/wall/prison, /area/prison/recreation/staff) "aQD" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/green/west, /area/prison/hallway/staff) "aQF" = ( @@ -11622,11 +11496,7 @@ /turf/open/floor/plating, /area/prison/maintenance/residential/nw) "aQW" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/prison/maintenance/residential/nw) "aQZ" = ( @@ -11738,11 +11608,7 @@ /turf/open/floor/prison/greenfull, /area/prison/cellblock/lowsec/nw) "aRv" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/green/north, /area/prison/cellblock/lowsec/nw) "aRw" = ( @@ -12193,11 +12059,7 @@ /turf/open/floor/wood, /area/prison/recreation/staff) "aTp" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/blue/west, /area/prison/command/secretary_office) "aTq" = ( @@ -12457,6 +12319,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkredfull2/southwest, /area/prison/security/checkpoint/highsec/n) "aUq" = ( @@ -12567,11 +12430,7 @@ /turf/open/floor/prison/sterile_white, /area/prison/toilet/staff) "aUJ" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/sterile_white, /area/prison/toilet/staff) "aUK" = ( @@ -12639,11 +12498,7 @@ /turf/open/floor/plating, /area/prison/command/quarters) "aUW" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/prison/maintenance/residential/ne) "aUY" = ( @@ -12730,11 +12585,6 @@ /obj/structure/machinery/light/small{ dir = 8 }, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, /obj/structure/filingcabinet, /turf/open/floor/prison/darkredfull2/southwest, /area/prison/security/checkpoint/highsec/n) @@ -12926,11 +12776,7 @@ /turf/open/floor/carpet, /area/prison/command/quarters) "aWc" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/carpet, /area/prison/command/quarters) "aWd" = ( @@ -13419,11 +13265,7 @@ /turf/open/floor/wood, /area/prison/recreation/staff) "aXW" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/prison/recreation/staff) @@ -13941,11 +13783,7 @@ /turf/open/floor/prison/green/west, /area/prison/cellblock/lowsec/ne) "aZY" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/green/east, /area/prison/cellblock/lowsec/ne) "aZZ" = ( @@ -14641,11 +14479,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/prison/hallway/entrance) "bcB" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/effect/decal/warning_stripes{ icon_state = "SE-out" }, @@ -14837,11 +14671,7 @@ /turf/open/floor/asteroid, /area/prison/residential/central) "bdw" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/blue/west, /area/prison/security/checkpoint/vip) "bdx" = ( @@ -16569,11 +16399,7 @@ /turf/open/floor/prison/blue/northeast, /area/prison/storage/vip) "bjY" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/storage/vip) "bjZ" = ( @@ -17395,10 +17221,7 @@ /turf/open/floor/prison/blue, /area/prison/cellblock/vip) "bnn" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/blue, /area/prison/cellblock/vip) "bno" = ( @@ -17508,11 +17331,7 @@ /turf/open/floor/prison/bright_clean2/southwest, /area/prison/toilet/canteen) "bnP" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 }, @@ -17535,11 +17354,7 @@ /turf/open/floor/prison/bright_clean2/southwest, /area/prison/toilet/canteen) "bnT" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/floor_plate/southwest, /area/prison/hallway/entrance) "bnU" = ( @@ -18425,11 +18240,7 @@ /turf/open/floor/prison/bright_clean2/southwest, /area/prison/visitation) "brB" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/visitation) "brD" = ( @@ -18679,11 +18490,7 @@ /turf/open/floor/prison/cell_stripe/east, /area/prison/cellblock/lowsec/se) "bsM" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/green/west, /area/prison/cellblock/lowsec/sw) "bsN" = ( @@ -19459,10 +19266,7 @@ /turf/open/floor/prison/redfull, /area/prison/hallway/entrance) "bvS" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison, /area/prison/hanger/main) "bvT" = ( @@ -19520,11 +19324,7 @@ /turf/open/floor/prison/floor_plate/southwest, /area/prison/cellblock/lowsec/sw) "bwn" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/bright_clean/southwest, /area/prison/yard) "bwo" = ( @@ -19562,11 +19362,7 @@ /turf/open/floor/prison/sterile_white/southwest, /area/prison/holding/holding1) "bwv" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/prison/bright_clean2/southwest, @@ -19832,11 +19628,7 @@ /turf/open/floor/prison/green/southeast, /area/prison/cellblock/lowsec/se) "bxR" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/east) "bxT" = ( @@ -19863,11 +19655,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/prison/holding/holding1) "bxX" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, @@ -20020,11 +19808,7 @@ /turf/open/floor/prison/darkred2/north, /area/prison/security/checkpoint/hangar) "byJ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkred2/northeast, /area/prison/security/checkpoint/hangar) "byK" = ( @@ -20055,11 +19839,7 @@ /turf/open/floor/prison/darkredfull2/southwest, /area/prison/monorail/east) "byQ" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/greenfull/northwest, /area/prison/monorail/west) "byR" = ( @@ -20185,6 +19965,7 @@ "bzw" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/rampbottom/north, /area/prison/holding/holding1) "bzx" = ( @@ -20347,11 +20128,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/green/north, /area/prison/security/monitoring/lowsec/sw) "bAq" = ( @@ -20569,19 +20346,11 @@ /turf/closed/wall/prison, /area/prison/security/monitoring/lowsec/sw) "bBk" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/darkredfull2/southwest, /area/prison/monorail/east) "bBl" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/prison/maintenance/residential/sw) "bBn" = ( @@ -21163,10 +20932,7 @@ /turf/open/floor/prison/green, /area/prison/cellblock/lowsec/se) "bDA" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/green, /area/prison/cellblock/lowsec/se) "bDB" = ( @@ -21514,11 +21280,7 @@ /turf/open/floor/prison, /area/prison/quarters/security) "bEF" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/prison/maintenance/hangar_barracks) "bEG" = ( @@ -21645,11 +21407,7 @@ /turf/open/floor/prison/red/north, /area/prison/cellblock/highsec/south/north) "bFg" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/red/north, /area/prison/cellblock/highsec/south/north) @@ -22154,11 +21912,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/prison/hallway/east) "bHa" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison, /area/prison/quarters/security) "bHb" = ( @@ -22204,11 +21958,7 @@ /turf/open/floor/prison/red/north, /area/prison/cellblock/highsec/south/north) "bHl" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison, /area/prison/maintenance/hangar_barracks) "bHn" = ( @@ -22324,11 +22074,7 @@ /turf/closed/wall/prison, /area/prison/holding/holding2) "bHK" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/open/floor/prison/bright_clean/southwest, @@ -22506,11 +22252,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/prison/telecomms) "bIz" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkbrown2/west, /area/prison/hallway/east) "bIB" = ( @@ -22724,11 +22466,7 @@ /turf/open/floor/prison/darkyellow2/north, /area/prison/storage/highsec/s) "bJv" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/north, /area/prison/storage/highsec/s) "bJw" = ( @@ -23390,11 +23128,7 @@ /turf/open/organic/grass, /area/prison/residential/central) "bLZ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/residential/south) "bMa" = ( @@ -23503,11 +23237,7 @@ /turf/open/floor/prison, /area/prison/telecomms) "bMB" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison, /area/prison/telecomms) "bMC" = ( @@ -24146,11 +23876,7 @@ /turf/open/floor/prison/darkyellow2/east, /area/prison/storage/medsec) "bPD" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkyellow2/west, /area/prison/storage/medsec) "bPF" = ( @@ -24172,11 +23898,7 @@ /turf/open/floor/wood, /area/prison/library) "bPJ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, @@ -24311,11 +24033,7 @@ /turf/open/floor/prison, /area/prison/security) "bQn" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/toilet/security) "bQo" = ( @@ -24480,11 +24198,7 @@ /turf/open/floor/prison/floor_plate/southwest, /area/prison/recreation/highsec/s) "bQR" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/bright_clean/southwest, /area/prison/laundry) "bQS" = ( @@ -25609,11 +25323,7 @@ /turf/open/floor/plating, /area/prison/maintenance/residential/access/south) "bVd" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/prison/maintenance/residential/access/south) "bVe" = ( @@ -25704,11 +25414,7 @@ /turf/open/floor/plating, /area/prison/security/checkpoint/medsec) "bVv" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/yellowfull, /area/prison/security/checkpoint/medsec) "bVw" = ( @@ -25936,11 +25642,7 @@ /turf/open/floor/prison/darkbrown2/east, /area/prison/hallway/east) "bWj" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkred2/southwest, /area/prison/intake) "bWl" = ( @@ -26178,11 +25880,7 @@ /turf/open/floor/plating, /area/prison/engineering) "bXh" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/prison/engineering) "bXj" = ( @@ -26198,10 +25896,7 @@ /turf/open/floor/prison/darkyellow2/west, /area/prison/engineering/atmos) "bXm" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/plating, /area/prison/engineering/atmos) "bXn" = ( @@ -26681,11 +26376,7 @@ /turf/open/floor/prison/darkyellow2/northwest, /area/prison/hallway/engineering) "bZl" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/north, /area/prison/hallway/engineering) "bZm" = ( @@ -27337,11 +27028,7 @@ /turf/open/floor/prison/floor_plate, /area/prison/recreation/medsec) "cbU" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/prison/recreation/medsec) "cbV" = ( @@ -27585,11 +27272,7 @@ /turf/open/floor/prison, /area/prison/security/head) "ccP" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison, /area/prison/security/head) "ccS" = ( @@ -27616,11 +27299,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/prison/cellblock/mediumsec/north) "ccY" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/yellow/west, /area/prison/cellblock/mediumsec/north) "cde" = ( @@ -27818,10 +27497,7 @@ /turf/open/floor/prison/darkred2/southeast, /area/prison/security) "cdY" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/darkred2/southwest, /area/prison/security) "cea" = ( @@ -28248,11 +27924,7 @@ /turf/open/floor/prison, /area/prison/execution) "cfK" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkred2/north, /area/prison/security/briefing) "cfM" = ( @@ -28425,11 +28097,7 @@ /turf/open/floor/prison/bluefull, /area/prison/cellblock/protective) "cgw" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/blue/northwest, /area/prison/cellblock/protective) "cgx" = ( @@ -28484,11 +28152,7 @@ /turf/closed/wall/r_wall/prison, /area/prison/disposal) "cgJ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/prison/parole/protective_custody) "cgK" = ( @@ -28534,11 +28198,7 @@ /turf/closed/wall/r_wall/prison, /area/prison/security/armory/riot) "cgU" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating, /area/prison/disposal) "cgV" = ( @@ -28850,11 +28510,7 @@ /turf/open/floor/prison, /area/prison/execution) "chY" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison, /area/prison/execution) "chZ" = ( @@ -28882,11 +28538,7 @@ /turf/open/floor/prison/darkred2/north, /area/prison/security/armory/lethal) "cig" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison/darkred2/east, /area/prison/security/armory/riot) @@ -28896,11 +28548,7 @@ /turf/open/floor/prison/darkredfull2/southwest, /area/prison/security) "cii" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/prison/darkred2/west, /area/prison/security/armory/lethal) @@ -28985,11 +28633,7 @@ /turf/open/floor/wood, /area/prison/security/head) "cix" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/red/west, /area/prison/cellblock/highsec/south/south) "ciz" = ( @@ -29514,11 +29158,7 @@ /obj/structure/machinery/computer/cameras{ network = list("PRISON") }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkredfull2/southwest, /area/prison/security/checkpoint/highsec_medsec) "ckD" = ( @@ -29713,11 +29353,7 @@ /turf/open/floor/prison/yellow/east, /area/prison/cellblock/mediumsec/north) "clr" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkred2/northwest, /area/prison/security/monitoring/protective) "cls" = ( @@ -30158,10 +29794,7 @@ /turf/open/floor/prison/darkred2, /area/prison/security/checkpoint/highsec_medsec) "cnn" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/darkred2, /area/prison/security/checkpoint/highsec_medsec) "cnp" = ( @@ -31159,10 +30792,7 @@ /turf/open/floor/prison/yellow, /area/prison/cellblock/mediumsec/west) "crv" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison/yellow, /area/prison/cellblock/mediumsec/west) "crw" = ( @@ -31942,11 +31572,7 @@ /turf/open/floor/prison/darkred2/west, /area/prison/security/monitoring/medsec/central) "cuF" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/darkred2/east, /area/prison/security/monitoring/medsec/central) "cuI" = ( @@ -32729,11 +32355,7 @@ /turf/open/floor/prison/floor_plate, /area/prison/cellblock/mediumsec/south) "cyc" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/yellow/north, /area/prison/cellblock/mediumsec/south) "cyd" = ( @@ -33086,11 +32708,7 @@ /obj/structure/bed/chair/comfy{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkred2/southwest, /area/prison/security/monitoring/medsec/south) "czK" = ( @@ -33259,11 +32877,7 @@ /turf/open/floor/prison/sterile_white/southwest, /area/prison/research/RD) "cYR" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/green/northeast, /area/prison/security/monitoring/lowsec/ne) "cZY" = ( @@ -34286,6 +33900,10 @@ }, /turf/open/floor/prison/greenfull/northwest, /area/prison/monorail/west) +"hmA" = ( +/obj/structure/machinery/power/apc/no_power/north, +/turf/open/floor/plating, +/area/prison/cellblock/mediumsec/east) "hmQ" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/microwave, @@ -34312,11 +33930,7 @@ /area/prison/quarters/research) "hoY" = ( /obj/structure/largecrate/random, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/prison/security/monitoring/highsec) "hpd" = ( @@ -35093,11 +34707,7 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/residential/north) "kdm" = ( @@ -35334,11 +34944,7 @@ /area/prison/quarters/research) "lfT" = ( /obj/structure/bed/chair/comfy, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/red/north, /area/prison/recreation/highsec/s) "liM" = ( @@ -35819,11 +35425,7 @@ /obj/effect/decal/siding/wood_siding{ icon_state = "wood_siding2" }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/sterile_white/southwest, /area/prison/residential/central) "ndW" = ( @@ -35931,11 +35533,7 @@ /turf/open/organic/grass, /area/prison/residential/south) "nIx" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/prison/maintenance/residential/se) "nIV" = ( @@ -36961,11 +36559,7 @@ /turf/open/floor/prison/floor_plate, /area/prison/cellblock/mediumsec/south) "saD" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/delivery, /area/prison/telecomms) "sdq" = ( @@ -37411,13 +37005,6 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/prison/red/east, /area/prison/cellblock/highsec/north/north) -"tXB" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, -/turf/open/floor/plating, -/area/prison/cellblock/mediumsec/east) "uaB" = ( /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/prison/bright_clean2/southwest, @@ -37573,11 +37160,7 @@ /turf/open/floor/prison/green/west, /area/prison/monorail/west) "uKd" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/canteen) "uKU" = ( @@ -69649,8 +69232,8 @@ cpU coM cqd cpU +hmA cpY -tXB chi cip cju diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 00134fefc158..54a56be13283 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -14,13 +14,11 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/servers) "aaq" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/organic/grass/astroturf, /area/fiorina/tumor/fiberbush) "aar" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/almayer, /area/fiorina/tumor/ship) "aas" = ( @@ -28,9 +26,7 @@ dir = 1; pixel_y = 21 }, -/obj/structure/machinery/power/apc{ - dir = 8 - }, +/obj/structure/machinery/power/apc/power/west, /turf/open/floor/wood, /area/fiorina/station/security/wardens) "aaR" = ( @@ -536,9 +532,7 @@ /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) "ast" = ( -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) "asz" = ( @@ -697,9 +691,7 @@ /turf/open/floor/prison/whitegreen/southwest, /area/fiorina/station/medbay) "ayG" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/prison/yellow/northwest, /area/fiorina/station/disco) "ayH" = ( @@ -6600,9 +6592,7 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/security/wardens) "eZi" = ( -/obj/structure/machinery/power/apc{ - dir = 8 - }, +/obj/structure/machinery/power/apc/power/west, /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) "eZr" = ( @@ -7367,7 +7357,7 @@ /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) "fEY" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/delivery, /area/fiorina/station/power_ring) "fFv" = ( @@ -7589,9 +7579,7 @@ /turf/open/floor/prison/blue/north, /area/fiorina/station/power_ring) "fPl" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/prison/yellow/north, /area/fiorina/station/lowsec) "fPB" = ( @@ -7912,9 +7900,7 @@ /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) "gaQ" = ( -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/prison, /area/fiorina/station/security) "gbf" = ( @@ -10170,9 +10156,7 @@ /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) "hIX" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/prison/green/north, /area/fiorina/station/chapel) "hJo" = ( @@ -10274,7 +10258,7 @@ /turf/open/floor/plating/prison, /area/fiorina/station/park) "hPq" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/prison/blue_plate/east, /area/fiorina/station/botany) "hPu" = ( @@ -11889,7 +11873,7 @@ /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/central_ring) "iYJ" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/prison/greenfull/east, /area/fiorina/tumor/civres) "iYQ" = ( @@ -13974,7 +13958,7 @@ /turf/open/floor/prison/whitepurple/west, /area/fiorina/station/research_cells) "kGo" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/prison/whitepurple, /area/fiorina/station/research_cells) "kGB" = ( @@ -17516,9 +17500,7 @@ "nqL" = ( /obj/structure/surface/rack, /obj/item/reagent_container/spray/cleaner, -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/plating/prison, /area/fiorina/maintenance) "nqN" = ( @@ -18501,9 +18483,7 @@ /turf/open/floor/plating/prison, /area/fiorina/maintenance) "obE" = ( -/obj/structure/machinery/power/apc{ - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/prison, /area/fiorina/station/flight_deck) "obI" = ( @@ -18623,9 +18603,7 @@ /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) "ofQ" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/central_ring) "oga" = ( @@ -18948,7 +18926,7 @@ /turf/open/floor/prison/bluecorner, /area/fiorina/station/power_ring) "ooF" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/wood, /area/fiorina/station/park) "ooO" = ( @@ -24213,7 +24191,7 @@ /turf/open/floor/prison/whitegreencorner/east, /area/fiorina/station/medbay) "sBO" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) "sBW" = ( @@ -27161,9 +27139,7 @@ /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/lz/near_lzI) "uNG" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "uNI" = ( @@ -29565,9 +29541,7 @@ /turf/open/floor/prison/floor_plate, /area/fiorina/station/lowsec) "wFM" = ( -/obj/structure/machinery/power/apc{ - dir = 8 - }, +/obj/structure/machinery/power/apc/power/west, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/telecomm/lz1_cargo) "wFS" = ( @@ -30096,9 +30070,7 @@ /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) "xbr" = ( -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/prison/green/north, /area/fiorina/station/transit_hub) "xbE" = ( @@ -30385,9 +30357,7 @@ /turf/open/organic/grass/astroturf, /area/fiorina/station/central_ring) "xpw" = ( -/obj/structure/machinery/power/apc{ - dir = 8 - }, +/obj/structure/machinery/power/apc/power/west, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) "xpx" = ( @@ -31159,9 +31129,7 @@ /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) "xYo" = ( -/obj/structure/machinery/power/apc{ - dir = 8 - }, +/obj/structure/machinery/power/apc/power/west, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) "xYJ" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm index 410ef56b0c1e..391adb456400 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm @@ -190,7 +190,7 @@ /turf/closed/shuttle/ert, /area/template_noop) "nV" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/almayer, /area/template_noop) "od" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm index 62e24f138207..e569ea379326 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm @@ -65,9 +65,7 @@ /turf/open/floor/prison/redfull, /area/template_noop) "s" = ( -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/prison, /area/template_noop) "t" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm index bd9ec72717b3..6743dfbef7ec 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm @@ -93,9 +93,7 @@ dir = 1; pixel_y = 21 }, -/obj/structure/machinery/power/apc{ - dir = 8 - }, +/obj/structure/machinery/power/apc/power/west, /turf/open/floor/wood, /area/template_noop) "T" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm index f30a796cdd74..ce8071106172 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm @@ -52,7 +52,7 @@ /turf/open/floor/prison/darkbrown2, /area/template_noop) "cU" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/wood, /area/template_noop) "dB" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineeroffice.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineeroffice.dmm index 55e933cf4d27..1f23f9fb037d 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineeroffice.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineeroffice.dmm @@ -15,7 +15,7 @@ /turf/open/floor/prison/greenfull/east, /area/template_noop) "n" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/prison/greenfull/east, /area/template_noop) "o" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm b/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm index 4cdabb8199c1..98b92955e2dd 100644 --- a/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm +++ b/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm @@ -516,9 +516,7 @@ /turf/open/floor/prison/redfull, /area/fiorina/station/security) "ty" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "tS" = ( @@ -1071,9 +1069,7 @@ /turf/open/floor/plating/prison, /area/fiorina/station/security) "Tn" = ( -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/prison, /area/fiorina/station/security) "Tp" = ( diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index af8650e3bdb2..49a72916fecf 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -692,11 +692,7 @@ /area/ice_colony/surface/requesitions) "acV" = ( /obj/item/lightstick/planted, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating/icefloor, /area/ice_colony/surface/requesitions) "acW" = ( @@ -837,11 +833,7 @@ "ady" = ( /obj/structure/surface/table, /obj/item/storage/box/lightstick, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/darkyellow2/east, /area/ice_colony/surface/engineering/electric) "adz" = ( @@ -1078,11 +1070,7 @@ /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, /obj/effect/spawner/random/tool, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/darkyellow2/north, /area/ice_colony/surface/engineering/tool) @@ -1550,11 +1538,7 @@ /turf/open/floor/dark2, /area/ice_colony/surface/engineering) "afV" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -1803,11 +1787,7 @@ /area/ice_colony/underground/hallway/north_west) "agM" = ( /obj/structure/surface/table, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/darkyellow2/east, /area/ice_colony/surface/engineering/generator) "agN" = ( @@ -2734,11 +2714,7 @@ /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/clearing/north) "akb" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkyellow2/north, /area/ice_colony/surface/substation/smes) "akc" = ( @@ -3002,11 +2978,7 @@ /turf/open/floor/freezerfloor, /area/ice_colony/surface/dorms/restroom_w) "akY" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/freezerfloor, /area/ice_colony/surface/dorms/restroom_w) "akZ" = ( @@ -3031,11 +3003,7 @@ /turf/open/floor/freezerfloor, /area/ice_colony/surface/dorms/restroom_e) "ald" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/freezerfloor, /area/ice_colony/surface/dorms/restroom_e) "ale" = ( @@ -3135,11 +3103,7 @@ /turf/open/floor/darkyellow2/north, /area/ice_colony/surface/substation) "aly" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkyellow2/north, /area/ice_colony/surface/substation) "alz" = ( @@ -3207,11 +3171,7 @@ "alN" = ( /obj/structure/surface/table, /obj/item/storage/bag/plants, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/darkgreen2/northeast, /area/ice_colony/surface/hydroponics/north) @@ -3281,11 +3241,7 @@ /turf/open/floor/plating, /area/ice_colony/surface/mining) "ama" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/ice_colony/surface/mining) "amb" = ( @@ -4332,11 +4288,7 @@ /turf/open/floor/whitered/north, /area/ice_colony/surface/clinic/treatment) "apG" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/item/storage/toolbox/emergency, /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -4421,11 +4373,7 @@ /turf/open/floor/freezerfloor, /area/ice_colony/surface/dorms/restroom_w) "apW" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/surface/table, /obj/structure/machinery/alarm{ dir = 4; @@ -5543,11 +5491,7 @@ pixel_x = 5; pixel_y = 3 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whitered/north, /area/ice_colony/surface/clinic/storage) "atG" = ( @@ -5689,10 +5633,7 @@ /turf/open/floor/whitered, /area/ice_colony/surface/clinic/lobby) "aug" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/whitered, /area/ice_colony/surface/clinic/lobby) "auh" = ( @@ -6430,11 +6371,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/darkgreen2/west, /area/ice_colony/surface/hydroponics/lobby) "awD" = ( @@ -6739,11 +6676,7 @@ /turf/open/floor/darkbrown2/north, /area/ice_colony/surface/dorms/lavatory) "axJ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/closet/crate/trashcart, /turf/open/floor/darkbrown2/north, /area/ice_colony/surface/dorms/lavatory) @@ -6771,11 +6704,7 @@ /turf/open/floor/darkgreen2/northwest, /area/ice_colony/surface/dorms/canteen) "axP" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkgreen2/north, /area/ice_colony/surface/dorms/canteen) "axQ" = ( @@ -7342,11 +7271,7 @@ /turf/open/floor/darkbrown2/north, /area/ice_colony/surface/garage/one) "azW" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkbrown2/north, /area/ice_colony/surface/garage/one) "azX" = ( @@ -7397,11 +7322,7 @@ /turf/open/floor/darkbrown2/north, /area/ice_colony/surface/garage/two) "aAg" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkbrown2/north, /area/ice_colony/surface/garage/two) "aAh" = ( @@ -7437,10 +7358,7 @@ /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/valley/south/excavation) "aAn" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/darkbrown2, /area/ice_colony/surface/disposals) "aAo" = ( @@ -7697,11 +7615,7 @@ }, /obj/structure/surface/table, /obj/effect/spawner/random/tool, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkyellow2/north, /area/ice_colony/surface/garage/repair) "aBk" = ( @@ -7788,11 +7702,7 @@ /area/ice_colony/surface/command/checkpoint) "aBA" = ( /obj/structure/closet/secure_closet/security, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkred2/north, /area/ice_colony/surface/command/checkpoint) "aBB" = ( @@ -8197,11 +8107,7 @@ /turf/open/floor/dark2, /area/ice_colony/surface/command/control/office) "aDd" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/darkblue2/east, /area/ice_colony/surface/command/control/office) "aDe" = ( @@ -8328,11 +8234,7 @@ /area/ice_colony/surface/hydroponics/south) "aDx" = ( /obj/structure/closet/crate/hydroponics, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkgreen2/northeast, /area/ice_colony/surface/hydroponics/south) "aDy" = ( @@ -9194,10 +9096,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/darkblue2, /area/ice_colony/surface/command/control) "aGq" = ( @@ -9246,11 +9145,7 @@ /area/ice_colony/exterior/surface/clearing/pass) "aGF" = ( /obj/structure/largecrate/random, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/vault2/west, /area/ice_colony/surface/storage_unit/power) "aGH" = ( @@ -9439,11 +9334,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/ice_colony/surface/command/crisis) "aHo" = ( @@ -9758,10 +9649,7 @@ /turf/open/floor/wood, /area/ice_colony/surface/command/control/pv1) "aIz" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /obj/structure/bed/chair/comfy/orange{ dir = 1 }, @@ -9782,10 +9670,7 @@ /obj/structure/bed/chair/comfy/orange{ dir = 1 }, -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/wood, /area/ice_colony/surface/command/control/pv2) "aID" = ( @@ -9962,11 +9847,7 @@ /area/ice_colony/surface/hangar/checkpoint) "aJm" = ( /obj/effect/landmark/crap_item, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/vault2/west, /area/ice_colony/surface/storage_unit/telecomms) "aJp" = ( @@ -10217,11 +10098,7 @@ /area/ice_colony/surface/hangar/checkpoint) "aKL" = ( /obj/structure/closet/secure_closet/security, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkred2/north, /area/ice_colony/surface/hangar/checkpoint) "aKN" = ( @@ -10853,10 +10730,7 @@ /turf/open/floor/plating, /area/ice_colony/surface/research) "aNn" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/vault2/west, /area/ice_colony/surface/storage_unit/research) "aNp" = ( @@ -11233,11 +11107,7 @@ /turf/open/floor/dark2, /area/ice_colony/surface/hangar/beta) "aOQ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -11253,11 +11123,7 @@ /turf/open/floor/dark2, /area/ice_colony/surface/hangar/hallway) "aOT" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -11403,10 +11269,7 @@ /area/ice_colony/surface/bar/canteen) "aPs" = ( /obj/structure/machinery/processor, -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/freezerfloor, /area/ice_colony/surface/bar/canteen) "aPt" = ( @@ -11465,10 +11328,7 @@ /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) "aPz" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) "aPA" = ( @@ -11596,11 +11456,7 @@ /turf/open/floor/darkbrown2/east, /area/ice_colony/surface/hangar/beta) "aQb" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -12206,11 +12062,7 @@ /turf/closed/wall, /area/ice_colony/surface/research/temporary) "aSC" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/dark2, /area/ice_colony/surface/research) "aSD" = ( @@ -12435,11 +12287,7 @@ /turf/open/floor/darkbrown2/west, /area/ice_colony/surface/hangar/alpha) "aTH" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/darkyellow2/west, /area/ice_colony/surface/research/temporary) "aTI" = ( @@ -13230,10 +13078,7 @@ /turf/open/floor/darkyellow2, /area/ice_colony/surface/research/tech_storage) "aWX" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/darkyellow2, /area/ice_colony/surface/research/tech_storage) "aWY" = ( @@ -14254,11 +14099,7 @@ /turf/open/ice, /area/ice_colony/exterior/surface/valley/south/excavation) "bbR" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/delivery, /area/ice_colony/surface/tcomms) "bbW" = ( @@ -14602,11 +14443,7 @@ /turf/open/floor/freezerfloor, /area/ice_colony/underground/requesition/storage) "bdH" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/freezerfloor, /area/ice_colony/underground/requesition/storage) "bdI" = ( @@ -14646,11 +14483,7 @@ /turf/open/floor/darkbrown2/north, /area/ice_colony/underground/requesition) "bdQ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkbrown2/north, /area/ice_colony/underground/requesition) "bdR" = ( @@ -14673,11 +14506,7 @@ /area/ice_colony/underground/hangar) "bdX" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating/icefloor, /area/ice_colony/surface/excavation/storage) "bdY" = ( @@ -15062,10 +14891,7 @@ /turf/open/floor/darkblue2, /area/ice_colony/surface/excavation) "bfA" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/darkpurple2, /area/ice_colony/surface/excavation) "bfB" = ( @@ -15296,11 +15122,7 @@ /turf/open/floor/darkbrown2/east, /area/ice_colony/underground/requesition) "bgG" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/ice_colony/underground/maintenance/north) "bgH" = ( @@ -15502,11 +15324,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/requesition/lobby) "bhA" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/warning_stripes{ icon_state = "W" }, @@ -15535,11 +15353,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/maintenance/north) "bhE" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating/icefloor/warnplate/west, /area/ice_colony/underground/hangar) "bhF" = ( @@ -16134,10 +15948,7 @@ /turf/open/floor/darkbrown2, /area/ice_colony/underground/requesition/sec_storage) "bkx" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/darkbrown2, /area/ice_colony/underground/requesition/sec_storage) "bky" = ( @@ -16613,11 +16424,7 @@ /turf/open/floor/carpet, /area/ice_colony/underground/crew/chapel) "bmy" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/carpet, /area/ice_colony/underground/crew/chapel) "bmz" = ( @@ -16625,11 +16432,7 @@ /turf/open/floor/dark2, /area/ice_colony/underground/crew/morgue) "bmD" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/dark2, /area/ice_colony/underground/crew/morgue) "bmE" = ( @@ -16647,11 +16450,7 @@ /turf/open/floor/wood, /area/ice_colony/underground/crew/library) "bmK" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/wood, /area/ice_colony/underground/crew/library) "bmL" = ( @@ -16875,11 +16674,7 @@ /turf/open/floor/dark2, /area/ice_colony/underground/engineering/locker) "bnF" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/darkyellow2/east, /area/ice_colony/underground/engineering/locker) "bnG" = ( @@ -17210,11 +17005,7 @@ }, /area/ice_colony/exterior/underground/caves) "boV" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkgreen2/north, /area/ice_colony/underground/hallway/north_west) "boW" = ( @@ -17764,11 +17555,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/engineering) "brp" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/darkyellow2/west, /area/ice_colony/underground/engineering) "brq" = ( @@ -18117,11 +17904,7 @@ /turf/open/floor/darkred2/north, /area/ice_colony/underground/reception/checkpoint_north) "bsE" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/darkgreen2/west, /area/ice_colony/underground/crew/bball) "bsH" = ( @@ -18287,11 +18070,7 @@ /turf/open/floor/white, /area/ice_colony/underground/medical/or) "btl" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/whitered/east, /area/ice_colony/underground/medical/or) "btm" = ( @@ -18314,11 +18093,7 @@ /turf/open/floor/dark2, /area/ice_colony/underground/reception/checkpoint_north) "btr" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/darkred2/east, /area/ice_colony/underground/reception/checkpoint_north) "bts" = ( @@ -19297,10 +19072,7 @@ /turf/closed/wall/r_wall, /area/ice_colony/exterior/underground/caves/open) "bwz" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/bcircuit, /area/ice_colony/underground/engineering/substation) "bwE" = ( @@ -19315,11 +19087,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/maintenance/research) "bwG" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/ice_colony/underground/maintenance/research) "bwH" = ( @@ -19441,10 +19209,7 @@ /turf/open/floor/darkgreen2, /area/ice_colony/underground/medical/lobby) "bxj" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/darkgreen2, /area/ice_colony/underground/medical/lobby) "bxk" = ( @@ -19549,11 +19314,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/maintenance/engineering) "bxG" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -19596,10 +19357,7 @@ /turf/open/floor/whitered, /area/ice_colony/underground/medical/treatment) "bxO" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/whitered, /area/ice_colony/underground/medical/treatment) "bxP" = ( @@ -19754,10 +19512,7 @@ /turf/open/floor/whitered, /area/ice_colony/underground/medical/hallway) "byy" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/whitered, /area/ice_colony/underground/medical/hallway) "byA" = ( @@ -19775,11 +19530,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/maintenance/central) "byD" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/ice_colony/underground/maintenance/central) "byE" = ( @@ -20143,10 +19894,7 @@ /turf/open/floor/whitered, /area/ice_colony/underground/medical/storage) "bAa" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /obj/structure/surface/rack, /turf/open/floor/whitered, /area/ice_colony/underground/medical/storage) @@ -20234,11 +19982,7 @@ /area/ice_colony/underground/security/detective) "bAs" = ( /obj/structure/bed/chair/comfy/black, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/ice_colony/underground/security/detective) "bAt" = ( @@ -20269,11 +20013,7 @@ /turf/open/floor/wood, /area/ice_colony/underground/security/marshal) "bAy" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/ice_colony/underground/security/marshal) "bAz" = ( @@ -20637,19 +20377,11 @@ /turf/open/floor/darkpurple2/north, /area/ice_colony/underground/research) "bBH" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkpurple2/north, /area/ice_colony/underground/research) "bBK" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkpurple2/northwest, /area/ice_colony/underground/research/storage) "bBL" = ( @@ -20834,11 +20566,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/maintenance/central) "bCz" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/darkblue2/east, /area/ice_colony/underground/command/center) "bCA" = ( @@ -20921,11 +20649,7 @@ /turf/open/floor/darkblue2/north, /area/ice_colony/underground/storage/highsec) "bCW" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkblue2/north, /area/ice_colony/underground/storage/highsec) "bCX" = ( @@ -21159,10 +20883,7 @@ /turf/open/floor/darkgreen2, /area/ice_colony/underground/crew/canteen) "bDR" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/darkgreen2, /area/ice_colony/underground/crew/canteen) "bDS" = ( @@ -21269,11 +20990,7 @@ /turf/open/floor/darkpurple2/north, /area/ice_colony/underground/research/sample) "bEl" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkpurple2/northeast, /area/ice_colony/underground/research/sample) "bEm" = ( @@ -21568,11 +21285,7 @@ /area/ice_colony/underground/command/pv1) "bFl" = ( /obj/structure/bed/chair/comfy/orange, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/ice_colony/underground/command/pv1) "bFm" = ( @@ -21594,11 +21307,7 @@ /area/ice_colony/underground/command/pv2) "bFp" = ( /obj/structure/bed/chair/comfy/orange, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/ice_colony/underground/command/pv2) "bFq" = ( @@ -21625,11 +21334,7 @@ /turf/open/floor/wood, /area/ice_colony/underground/crew/dorm_l) "bFv" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/ice_colony/underground/crew/dorm_l) "bFw" = ( @@ -21646,11 +21351,7 @@ /turf/open/floor/wood, /area/ice_colony/underground/crew/dorm_r) "bFz" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/ice_colony/underground/crew/dorm_r) "bFB" = ( @@ -21805,11 +21506,7 @@ /turf/open/floor/darkred2/northwest, /area/ice_colony/underground/security/interrogation) "bGr" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkred2/north, /area/ice_colony/underground/security/interrogation) "bGs" = ( @@ -21967,11 +21664,7 @@ /turf/open/floor/darkpurple2/northwest, /area/ice_colony/underground/research/work) "bGZ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/filingcabinet, /obj/item/paper/research_notes, /turf/open/floor/darkpurple2/north, @@ -22051,11 +21744,7 @@ /turf/open/floor/dark2, /area/ice_colony/underground/storage) "bHo" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkyellow2/north, /area/ice_colony/underground/storage) "bHp" = ( @@ -22087,11 +21776,7 @@ /turf/open/floor/darkred2/northwest, /area/ice_colony/underground/command/checkpoint) "bHu" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/closet/secure_closet/security, /turf/open/floor/darkred2/northeast, /area/ice_colony/underground/command/checkpoint) @@ -22914,11 +22599,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/darkred2/northeast, /area/ice_colony/underground/security/backroom) "bKx" = ( @@ -22968,11 +22649,7 @@ /turf/open/floor/dark2, /area/ice_colony/underground/security/hallway) "bKD" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/darkred2/east, /area/ice_colony/underground/security/hallway) "bKE" = ( @@ -23255,11 +22932,7 @@ /turf/open/floor/darkgreen2/north, /area/ice_colony/underground/hallway/south_east) "bLL" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkgreen2/north, /area/ice_colony/underground/hallway/south_east) "bLO" = ( @@ -23600,11 +23273,7 @@ /turf/open/floor/darkred2/north, /area/ice_colony/underground/security) "bMS" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkred2/north, /area/ice_colony/underground/security) "bMT" = ( @@ -23842,11 +23511,7 @@ /turf/open/floor/dark2, /area/ice_colony/underground/crew/disposals) "bNY" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkbrown2/north, /area/ice_colony/underground/crew/disposals) "bNZ" = ( @@ -23911,11 +23576,7 @@ /turf/closed/wall/r_wall, /area/ice_colony/underground/maintenance/south) "bOl" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/wood, /area/ice_colony/underground/crew/leisure) "bOn" = ( @@ -23932,11 +23593,7 @@ /area/ice_colony/underground/crew/leisure) "bOq" = ( /obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating, /area/ice_colony/underground/maintenance/security) "bOs" = ( @@ -24240,11 +23897,7 @@ /turf/open/floor/dark2, /area/ice_colony/underground/security/armory) "bPu" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkred2/north, /area/ice_colony/underground/security/armory) "bPv" = ( @@ -24272,11 +23925,7 @@ /turf/open/floor/dark2, /area/ice_colony/underground/security/brig) "bPC" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/darkred2/north, /area/ice_colony/underground/security/brig) "bPD" = ( @@ -24707,10 +24356,7 @@ /turf/open/floor/darkbrown2, /area/ice_colony/underground/crew/lavatory) "bRe" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/darkbrown2, /area/ice_colony/underground/crew/lavatory) "bRf" = ( @@ -25267,11 +24913,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/ice_colony/underground/maintenance/east) "bSQ" = ( @@ -25383,11 +25025,7 @@ /turf/open/floor/wood, /area/ice_colony/underground/reception) "bTj" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/ice_colony/underground/reception) "bTk" = ( @@ -25650,11 +25288,7 @@ /turf/open/floor/white, /area/ice_colony/underground/reception/toilet_men) "bUo" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/white, /area/ice_colony/underground/reception/toilet_men) "bUq" = ( @@ -25723,11 +25357,7 @@ /turf/open/floor/plating, /area/ice_colony/underground/reception/toilet_men) "bUC" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/ice_colony/underground/maintenance/south) "bUH" = ( @@ -26007,10 +25637,7 @@ /area/ice_colony/underground/reception/checkpoint_south) "bVD" = ( /obj/structure/filingcabinet/security, -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/darkred2/southeast, /area/ice_colony/underground/reception/checkpoint_south) "bVE" = ( @@ -26055,10 +25682,7 @@ /turf/open/floor/white, /area/ice_colony/underground/reception/toilet_women) "bVL" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/white, /area/ice_colony/underground/reception/toilet_women) "bVM" = ( @@ -26920,11 +26544,7 @@ /turf/open/floor/darkyellow2, /area/ice_colony/surface/tcomms) "gxg" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/darkbrown2/west, /area/ice_colony/surface/hangar/alpha) "gDb" = ( diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index c359e4ae0a0e..9f5c20a4e8e9 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -668,10 +668,7 @@ /turf/open/auto_turf/ice/layer0, /area/shiva/interior/caves/right_spiders) "acx" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/medseceng) "acA" = ( @@ -4131,8 +4128,7 @@ req_access_txt = "100"; specialfunctions = 4 }, -/obj/structure/machinery/power/apc{ - dir = 4; +/obj/structure/machinery/power/apc/power/east{ start_charge = 50 }, /turf/open/floor/shiva/floor3, @@ -6162,8 +6158,7 @@ /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) "bFP" = ( -/obj/structure/machinery/power/apc{ - dir = 4; +/obj/structure/machinery/power/apc/power/east{ start_charge = 10 }, /turf/open/floor/shiva/north, @@ -6544,7 +6539,7 @@ /turf/open/floor/shiva/floor3, /area/shiva/interior/lz2_habs) "ccu" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/plating, /area/shiva/exterior/telecomm/lz1_north) "ccI" = ( @@ -7848,10 +7843,7 @@ /turf/open/floor/shiva/multi_tiles/east, /area/shiva/interior/colony/research_hab) "dVw" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/shiva/interior/caves/research_caves) "dWp" = ( @@ -7999,10 +7991,7 @@ /turf/open/floor/shiva/snow_mat/north, /area/shiva/exterior/cp_lz2) "edW" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/shiva/exterior/cp_colony_grounds) "eep" = ( @@ -9685,10 +9674,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "grd" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/shiva/north, /area/shiva/interior/caves/s_lz2) "grk" = ( @@ -12038,10 +12024,7 @@ /turf/open/floor/shiva/north, /area/shiva/interior/garage) "iZX" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/shiva, /area/shiva/interior/bar) "jac" = ( @@ -13847,10 +13830,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) "liD" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/floor3, /area/shiva/interior/lz2_habs) "ljz" = ( @@ -13893,8 +13873,7 @@ /turf/open/floor/prison/kitchen, /area/shiva/interior/colony/central) "lnk" = ( -/obj/structure/machinery/power/apc{ - dir = 1; +/obj/structure/machinery/power/apc/power/north{ name = "telecomms relay power controller"; start_charge = 10 }, @@ -14005,10 +13984,8 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/interior/bar) "lro" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - name = "telecomms relay power controller"; - start_charge = 0 +/obj/structure/machinery/power/apc/no_power/west{ + name = "telecomms relay power controller" }, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) @@ -14267,10 +14244,7 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) "lKJ" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/central) "lKQ" = ( @@ -14400,10 +14374,7 @@ /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) "lTN" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/darkbrown2/east, /area/shiva/interior/valley_huts/disposals) "lUF" = ( @@ -14746,10 +14717,7 @@ /area/shiva/interior/bar) "mpt" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/asphalt/cement, /area/shiva/interior/warehouse) "mpI" = ( @@ -15575,9 +15543,7 @@ /turf/open/floor/shiva/purplefull/east, /area/shiva/interior/colony/research_hab) "nmt" = ( -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/plating, /area/shiva/exterior/telecomm/lz2_southeast) "nmT" = ( @@ -16005,10 +15971,7 @@ /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/research_hab) "nNX" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/north, /area/shiva/interior/warehouse/caves) "nOd" = ( @@ -16552,7 +16515,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/fortbiceps) "owY" = ( -/obj/structure/machinery/power/apc, +/obj/structure/machinery/power/apc/power/south, /turf/open/floor/plating, /area/shiva/exterior/telecomm/lz2_northeast) "oxP" = ( @@ -16560,10 +16523,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "oyc" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/n_admin) "oyw" = ( @@ -17111,10 +17071,7 @@ /turf/open/auto_turf/ice/layer0, /area/shiva/interior/caves/s_lz2) "prb" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/yellow/north, /area/shiva/interior/garage) "prO" = ( @@ -17660,10 +17617,7 @@ /turf/open/floor/prison/kitchen, /area/shiva/interior/colony/central) "pOM" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/delivery, /area/shiva/interior/telecomm/lz1_biceps) "pPt" = ( @@ -18300,10 +18254,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) "qEt" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/shiva/exterior/junkyard) "qEB" = ( @@ -18594,10 +18545,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/research_caves) "raQ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/shiva/exterior/junkyard/cp_bar) "rbc" = ( @@ -19322,10 +19270,7 @@ /turf/open/floor/shiva/wred/northwest, /area/shiva/interior/colony/medseceng) "san" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) "sax" = ( @@ -20310,10 +20255,7 @@ /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/botany) "tnU" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/shiva/exterior/cp_lz2) "too" = ( @@ -20828,10 +20770,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 8; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/botany) "tRq" = ( @@ -21101,10 +21040,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/fortbiceps) "ufb" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) "ufd" = ( @@ -22404,9 +22340,7 @@ /area/shiva/interior/aerodrome) "vIi" = ( /obj/effect/landmark/crap_item, -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/shiva/floor3, /area/shiva/interior/valley_huts/no2) "vIy" = ( @@ -22591,10 +22525,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "vXw" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating, /area/shiva/interior/caves/cp_camp) "vYm" = ( @@ -23799,10 +23730,7 @@ /turf/open/floor/shiva/north, /area/shiva/interior/bar) "xMH" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/deck) "xMQ" = ( diff --git a/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm b/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm index e3fe7e69221b..1c1d89a883c3 100644 --- a/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm +++ b/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm @@ -40,9 +40,7 @@ /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/exterior/lz2_fortress) "q" = ( -/obj/structure/machinery/power/apc{ - dir = 8 - }, +/obj/structure/machinery/power/apc/power/west, /turf/open/floor/plating, /area/shiva/exterior/cp_lz2) "r" = ( @@ -116,9 +114,7 @@ /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/exterior/lz2_fortress) "Y" = ( -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) "Z" = ( diff --git a/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/closed.dmm b/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/closed.dmm index c4ff89c41af2..2cf87d93972d 100644 --- a/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/closed.dmm +++ b/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/closed.dmm @@ -23,9 +23,7 @@ /turf/open/floor/shiva/radiator_tile, /area/shiva/exterior/lz2_fortress) "m" = ( -/obj/structure/machinery/power/apc{ - dir = 8 - }, +/obj/structure/machinery/power/apc/power/west, /turf/open/floor/plating, /area/shiva/exterior/cp_lz2) "o" = ( @@ -54,9 +52,7 @@ /turf/open/floor/shiva/floor3, /area/shiva/exterior/lz2_fortress) "v" = ( -/obj/structure/machinery/power/apc{ - dir = 4 - }, +/obj/structure/machinery/power/apc/power/east, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) "w" = ( diff --git a/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm b/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm index 30848fc8f513..da4415b5bcea 100644 --- a/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm +++ b/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm @@ -294,10 +294,7 @@ /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) "mC" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) "mI" = ( @@ -612,10 +609,7 @@ /turf/open/floor/shiva/multi_tiles/west, /area/shiva/interior/colony/s_admin) "wY" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard/cp_bar) "xa" = ( diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index ab9ccc4c399e..c0ad66e5aecb 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -925,10 +925,7 @@ /turf/open/floor/plating/kutjevo/panelscorched, /area/kutjevo/interior/complex/botany/east_tech) "buo" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/kutjevo/colors/orange/inner_corner, /area/kutjevo/interior/foremans_office) "bux" = ( @@ -1221,11 +1218,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/foremans_office) "bQk" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/kutjevo/colors/orange/edge/north, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) "bQy" = ( @@ -1475,11 +1468,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_pad) "coF" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/kutjevo/tan/grey_edge/north, /area/kutjevo/interior/complex/Northwest_Dorms) "coL" = ( @@ -5426,11 +5415,7 @@ /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/construction) "hIp" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/kutjevo/colors/orange/edge/west, /area/kutjevo/interior/power_pt2_electric_boogaloo) "hJN" = ( @@ -5655,11 +5640,7 @@ /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/complex/med/pano) "ifE" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/kutjevo/tan/grey_edge/west, /area/kutjevo/interior/construction) "ifT" = ( @@ -6167,11 +6148,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/kutjevo/colors/cyan/edge/west, /area/kutjevo/interior/complex/med/auto_doc) "jcl" = ( @@ -7568,11 +7545,7 @@ /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) "lfb" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/kutjevo/multi_tiles/west, /area/kutjevo/interior/complex/med/locks) "lfm" = ( @@ -7692,11 +7665,7 @@ /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/exterior/complex_border/med_rec) "lpF" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/kutjevo/colors/cyan/edge/north, /area/kutjevo/interior/complex/med/triage) "lpJ" = ( @@ -8204,11 +8173,7 @@ /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) "mdw" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 29; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east) "mej" = ( @@ -9187,11 +9152,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_central/mine_elevator) "nyp" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/item/clothing/suit/armor/vest/security, /turf/open/floor/kutjevo/colors/cyan/edge/north, /area/kutjevo/interior/complex/med/operating) @@ -9311,11 +9272,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) "nFY" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 29; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/telecomm/lz1_south) "nGg" = ( @@ -11181,11 +11138,7 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/med/pano) @@ -11256,11 +11209,7 @@ /area/kutjevo/interior/oob) "qwT" = ( /obj/item/tool/wirecutters/clippers, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/complex/botany) "qxc" = ( @@ -11509,11 +11458,7 @@ /area/kutjevo/interior/complex/botany) "qQp" = ( /obj/item/frame/rack, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east_tech) "qQU" = ( @@ -11567,11 +11512,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "qVe" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 29; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/telecomm/lz2_north) "qVg" = ( @@ -11602,11 +11543,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) "qXd" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) "qYn" = ( @@ -11842,11 +11779,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/lz_pad) "rsM" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/colony_South/power2) "rsV" = ( @@ -11880,11 +11813,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany) "rvZ" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) "rwj" = ( @@ -14631,11 +14560,7 @@ /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/scrubland) "vqQ" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 29; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/telecomm/lz2_south) "vre" = ( @@ -15574,11 +15499,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) "wNh" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/light{ dir = 1 }, @@ -15589,11 +15510,7 @@ /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) "wOI" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/light{ dir = 4 }, @@ -15741,11 +15658,7 @@ /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/complex/botany/east) "xca" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/kutjevo/tan/alt_inner_edge/north, /area/kutjevo/interior/complex/Northwest_Flight_Control) "xcG" = ( @@ -15865,11 +15778,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_South) "xof" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 29; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) "xoq" = ( @@ -16193,11 +16102,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power) "xRx" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/platform/kutjevo/smooth{ dir = 1 }, diff --git a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm index c392400aa31d..be6e937531c1 100644 --- a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm +++ b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm @@ -198,8 +198,8 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/structure/surface/rack, /turf/open/floor/kutjevo/grey/plate, diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index f0860d688645..99b0c784e8b3 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -329,8 +329,8 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms/glass) "akk" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor) @@ -1333,8 +1333,8 @@ /area/lv522/indoors/a_block/security/glass) "aUN" = ( /obj/item/stack/sheet/wood/large_stack, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, @@ -1630,8 +1630,8 @@ /turf/open/floor/prison/floor_plate, /area/lv522/indoors/c_block/cargo) "bbL" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/east) @@ -4802,8 +4802,8 @@ /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) "cTf" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/west) @@ -5912,8 +5912,8 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull/east, @@ -6184,8 +6184,8 @@ pixel_y = 5 }, /obj/item/tool/pen/blue/clicky, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/corsat/plate, /area/lv522/atmos/command_centre) @@ -6603,8 +6603,8 @@ /area/lv522/atmos/east_reactor/east) "dLf" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/strata/white_cyan1/east, /area/lv522/indoors/a_block/corpo/glass) @@ -6983,8 +6983,8 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) "dVU" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/strata/white_cyan1/east, /area/lv522/indoors/a_block/medical) @@ -8032,8 +8032,8 @@ /area/lv522/landing_zone_1/tunnel/far) "evg" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/weak{ - dir = 8 +/obj/structure/machinery/power/apc/power/west{ + start_charge = 20 }, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) @@ -8838,8 +8838,8 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/strata/blue1, /area/lv522/outdoors/colony_streets/windbreaker/observation) @@ -9558,8 +9558,8 @@ "fiG" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen/glass) @@ -9861,8 +9861,8 @@ /turf/open/floor/corsat/squares, /area/lv522/atmos/west_reactor) "fsj" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/corsat/plate, @@ -11574,8 +11574,8 @@ /area/lv522/indoors/b_block/bar) "ghw" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) @@ -11913,8 +11913,8 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) "gqf" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -11974,8 +11974,8 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) @@ -12124,8 +12124,8 @@ }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "guZ" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) @@ -12407,8 +12407,8 @@ pixel_x = 3; pixel_y = 7 }, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/strata/white_cyan1, /area/lv522/indoors/lone_buildings/chunk) @@ -12758,8 +12758,8 @@ /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_east_street) "gLd" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/organic/grass, /area/lv522/indoors/a_block/garden) @@ -13366,8 +13366,8 @@ /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/dorm_north) "gZJ" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/indoors/lone_buildings/storage_blocks) @@ -13995,8 +13995,8 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/north) @@ -15266,8 +15266,8 @@ /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/nw_rockies) "hQE" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/structure/machinery/light{ dir = 8 @@ -16667,8 +16667,8 @@ /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) "izT" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, @@ -18194,8 +18194,8 @@ /area/lv522/atmos/cargo_intake) "jjq" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/strata/blue1, /area/lv522/indoors/a_block/dorm_north) @@ -19065,8 +19065,8 @@ /area/lv522/indoors/a_block/fitness/glass) "jBu" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/outdoor_bot) @@ -19985,8 +19985,8 @@ /turf/open/floor/plating, /area/lv522/landing_zone_2) "jVz" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -20119,8 +20119,8 @@ /turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "jYE" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) @@ -21328,8 +21328,8 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) "kxz" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) @@ -21452,8 +21452,8 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) "kAn" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/wood, /area/lv522/indoors/b_block/bar) @@ -21970,8 +21970,8 @@ /obj/structure/platform/stair_cut{ icon_state = "platform_stair_alt" }, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/indoors/a_block/bridges/dorms_fitness) @@ -22617,8 +22617,8 @@ /area/lv522/indoors/a_block/kitchen/damage) "lag" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/way_in_command_centre) @@ -23637,8 +23637,8 @@ /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/dorms) "lAk" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue_plate/north, @@ -24089,8 +24089,8 @@ /area/lv522/atmos/reactor_garage) "lLL" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/c_block/t_comm) @@ -27273,7 +27273,9 @@ /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/nw_rockies) "nky" = ( -/obj/structure/machinery/power/apc/weak, +/obj/structure/machinery/power/apc/power/south{ + start_charge = 20 + }, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/engineering) "nkX" = ( @@ -28114,8 +28116,8 @@ /area/lv522/landing_zone_1) "nFt" = ( /obj/structure/pipes/vents/pump, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/corsat/plate, /area/lv522/atmos/filt) @@ -29065,8 +29067,8 @@ /turf/open/floor/prison/cell_stripe/east, /area/lv522/indoors/c_block/cargo) "nYv" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/blue/northwest, /area/lv522/indoors/a_block/hallway) @@ -29577,8 +29579,8 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) "ojw" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/shiva/radiator_tile2, @@ -29718,8 +29720,8 @@ /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel/far) "ooG" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/shiva/radiator_tile2, /area/lv522/indoors/a_block/bridges) @@ -30014,8 +30016,8 @@ current_rounds = 0 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) @@ -30587,8 +30589,8 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/mining) "oKm" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, @@ -31583,8 +31585,8 @@ pixel_x = 2; pixel_y = 6 }, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) @@ -32950,8 +32952,8 @@ /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/bridges) "pQG" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull/east, @@ -33201,8 +33203,8 @@ /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) "pWx" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/structure/machinery/light{ dir = 4 @@ -33919,8 +33921,8 @@ pixel_y = 10 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) @@ -34252,8 +34254,8 @@ /obj/item/toy/dice, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/a_block/fitness/glass) @@ -34634,8 +34636,8 @@ /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/admin) "qCd" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -39111,8 +39113,8 @@ /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) "syy" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, @@ -43284,8 +43286,8 @@ /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) "uqe" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) @@ -43441,8 +43443,8 @@ /turf/open/floor/prison/floor_plate, /area/lv522/atmos/way_in_command_centre) "utR" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /obj/structure/surface/table/reinforced/prison, /obj/item/tool/pen/blue, @@ -44710,8 +44712,8 @@ dir = 8 }, /obj/item/ashtray/bronze, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) @@ -45445,8 +45447,8 @@ /turf/open/floor/strata/white_cyan3/west, /area/lv522/indoors/a_block/medical/glass) "vnq" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/bridges/op_centre) @@ -45742,8 +45744,8 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) "vtl" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/bridges/corpo) @@ -46397,8 +46399,8 @@ /obj/item/device/flashlight/lamp, /obj/effect/landmark/objective_landmark/medium, /obj/effect/decal/cleanable/cobweb, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) @@ -46867,8 +46869,8 @@ /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) "vSO" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/a_block/fitness) @@ -49078,8 +49080,8 @@ /turf/open/floor/plating, /area/lv522/oob) "wVf" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/west_reactor) @@ -49256,8 +49258,8 @@ /obj/structure/barricade/deployable{ dir = 8 }, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/admin) @@ -51487,8 +51489,8 @@ "yct" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/weak{ - dir = 1 +/obj/structure/machinery/power/apc/power/north{ + start_charge = 20 }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 98c56dde6098..87a83cf09d19 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -1796,9 +1796,7 @@ /area/lv624/ground/river/east_river) "akh" = ( /obj/item/trash/candy, -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /obj/structure/machinery/door_control{ id = "secure_outer_blast"; name = "Secure Outer Doors"; @@ -2717,9 +2715,7 @@ /turf/open/floor/green/northwest, /area/lv624/lazarus/hydroponics) "aru" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/green/northwest, /area/lv624/lazarus/hydroponics) "arv" = ( @@ -3677,9 +3673,7 @@ /turf/open/floor/whitepurple/northeast, /area/lv624/lazarus/fitness) "aww" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whitepurplecorner/east, /area/lv624/lazarus/fitness) "awx" = ( @@ -4217,9 +4211,7 @@ /turf/open/floor/vault2/west, /area/lv624/lazarus/robotics) "azc" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/vault2, /area/lv624/lazarus/robotics) "azd" = ( @@ -4610,9 +4602,7 @@ }, /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whitepurple/northeast, /area/lv624/lazarus/research) "aAS" = ( @@ -4620,9 +4610,7 @@ /obj/item/toy/deck, /obj/item/storage/fancy/cigarettes/wypacket, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/bluecorner, /area/lv624/lazarus/sleep_male) "aAU" = ( @@ -5281,9 +5269,7 @@ /turf/open/floor/purple/northwest, /area/lv624/lazarus/sleep_female) "aDE" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 8 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) "aDF" = ( @@ -5437,9 +5423,7 @@ /obj/structure/machinery/light/small{ dir = 1 }, -/obj/structure/machinery/power/apc/nocharge{ - dir = 8 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/freezerfloor, /area/lv624/lazarus/toilet) "aEB" = ( @@ -5518,9 +5502,7 @@ /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/chapel/north, /area/lv624/lazarus/chapel) "aEL" = ( @@ -5622,9 +5604,7 @@ /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whiteyellowfull/east, /area/lv624/lazarus/quart) "aFa" = ( @@ -6256,9 +6236,7 @@ /obj/structure/surface/table, /obj/effect/landmark/crap_item, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/white, /area/lv624/lazarus/main_hall) "aIi" = ( @@ -6707,9 +6685,7 @@ /area/lv624/lazarus/yggdrasil) "aKq" = ( /obj/structure/flora/jungle/vines/light_1, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKr" = ( @@ -7287,9 +7263,7 @@ /turf/open/floor/red/southwest, /area/lv624/lazarus/security) "aNR" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/red, /area/lv624/lazarus/security) "aNS" = ( @@ -7399,9 +7373,7 @@ /turf/open/gm/dirt, /area/lv624/ground/jungle/east_central_jungle) "aOy" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 8 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/cult, /area/lv624/lazarus/armory) "aOA" = ( @@ -7895,9 +7867,7 @@ /turf/open/floor/barber/west, /area/lv624/lazarus/kitchen) "aQQ" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 8 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/bar, /area/lv624/lazarus/canteen) "aQX" = ( @@ -8188,9 +8158,7 @@ /turf/open/floor/whiteyellowfull/east, /area/lv624/ground/caves/south_east_caves) "aSq" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 8 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/grimy, /area/lv624/lazarus/captain) "aSs" = ( @@ -8464,8 +8432,7 @@ /turf/open/floor/brown/northwest, /area/lv624/lazarus/comms) "aTJ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; +/obj/structure/machinery/power/apc/power/north{ start_charge = 15 }, /turf/open/floor/delivery, @@ -8550,9 +8517,7 @@ /area/lv624/lazarus/kitchen) "aUc" = ( /obj/structure/surface/rack, -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/freezerfloor, /area/lv624/lazarus/kitchen) "aUd" = ( @@ -8727,8 +8692,7 @@ /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) "aUR" = ( -/obj/structure/machinery/power/apc{ - dir = 1; +/obj/structure/machinery/power/apc/power/north{ start_charge = 200 }, /turf/open/floor/greengrid, @@ -9341,9 +9305,7 @@ /area/lv624/ground/jungle/east_central_jungle) "aXs" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/delivery, /area/lv624/lazarus/engineering) "aXt" = ( @@ -12200,7 +12162,7 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) "fqM" = ( -/obj/structure/machinery/power/apc/nocharge, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/asteroidwarning/east, /area/lv624/ground/colony/telecomm/sw_lz2) "frV" = ( @@ -12339,7 +12301,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/engineering) "fFZ" = ( -/obj/structure/machinery/power/apc/nocharge, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/asteroidfloor/north, /area/lv624/ground/colony/telecomm/cargo) "fGn" = ( @@ -13895,9 +13857,7 @@ /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "jcb" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 4 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/purple/northwest, /area/lv624/lazarus/sleep_female) "jcn" = ( @@ -14295,9 +14255,7 @@ /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/grimy, /area/lv624/lazarus/hop) "jRm" = ( @@ -16977,9 +16935,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/barrens/north_east_barrens) "pgf" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whiteblue/north, /area/lv624/lazarus/medbay) "pgD" = ( @@ -20508,9 +20464,7 @@ "whr" = ( /obj/item/ammo_magazine/smg/mp5, /obj/item/ammo_magazine/smg/mp5, -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/whiteblue/northwest, /area/lv624/lazarus/corporate_dome) "whv" = ( diff --git a/maps/map_files/LV624/armory/10.cheese.dmm b/maps/map_files/LV624/armory/10.cheese.dmm index 127e19a04809..15080595810e 100644 --- a/maps/map_files/LV624/armory/10.cheese.dmm +++ b/maps/map_files/LV624/armory/10.cheese.dmm @@ -121,9 +121,7 @@ /obj/item/reagent_container/food/snacks/cheesewedge/verymature{ pixel_y = 6 }, -/obj/structure/machinery/power/apc/nocharge{ - dir = 8 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/cult, /area/lv624/lazarus/armory) "w" = ( diff --git a/maps/map_files/LV624/armory/10.extra.dmm b/maps/map_files/LV624/armory/10.extra.dmm index 7acd81bb8e97..dc85ff54c4e7 100644 --- a/maps/map_files/LV624/armory/10.extra.dmm +++ b/maps/map_files/LV624/armory/10.extra.dmm @@ -126,9 +126,7 @@ /turf/open/floor/red/northeast, /area/lv624/lazarus/security) "u" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 8 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/cult, /area/lv624/lazarus/armory) "w" = ( diff --git a/maps/map_files/LV624/armory/10.looted.dmm b/maps/map_files/LV624/armory/10.looted.dmm index 87fbccfce955..0cd0a701efc9 100644 --- a/maps/map_files/LV624/armory/10.looted.dmm +++ b/maps/map_files/LV624/armory/10.looted.dmm @@ -93,9 +93,7 @@ /turf/open/floor/red/northeast, /area/lv624/lazarus/security) "u" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 8 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/cult, /area/lv624/lazarus/armory) "w" = ( diff --git a/maps/map_files/LV624/gym/20.pool.dmm b/maps/map_files/LV624/gym/20.pool.dmm index e0f24e9fdfdd..19361c37ecf1 100644 --- a/maps/map_files/LV624/gym/20.pool.dmm +++ b/maps/map_files/LV624/gym/20.pool.dmm @@ -168,9 +168,7 @@ /area/lv624/lazarus/fitness) "Be" = ( /obj/effect/decal/remains/human, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whitepurplecorner/east, /area/lv624/lazarus/fitness) "Ei" = ( diff --git a/maps/map_files/LV624/gym/30.alternate.dmm b/maps/map_files/LV624/gym/30.alternate.dmm index f0e7ac35b806..b75bf2a4de5f 100644 --- a/maps/map_files/LV624/gym/30.alternate.dmm +++ b/maps/map_files/LV624/gym/30.alternate.dmm @@ -495,9 +495,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/fitness) "Wy" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whitepurplecorner/east, /area/lv624/lazarus/fitness) "Xu" = ( diff --git a/maps/map_files/LV624/medbay/10.destroyed.dmm b/maps/map_files/LV624/medbay/10.destroyed.dmm index a676d0ff68bd..35ae2dd0a047 100644 --- a/maps/map_files/LV624/medbay/10.destroyed.dmm +++ b/maps/map_files/LV624/medbay/10.destroyed.dmm @@ -33,9 +33,7 @@ /turf/open/floor/plating/platingdmg3, /area/lv624/lazarus/medbay) "hW" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/white, /area/lv624/lazarus/medbay) "ih" = ( diff --git a/maps/map_files/LV624/medbay/30.larvasurgery.dmm b/maps/map_files/LV624/medbay/30.larvasurgery.dmm index f03f922bf828..c97297c24ad5 100644 --- a/maps/map_files/LV624/medbay/30.larvasurgery.dmm +++ b/maps/map_files/LV624/medbay/30.larvasurgery.dmm @@ -267,9 +267,7 @@ "qP" = ( /obj/effect/landmark/corpsespawner/colonist/random/burst, /obj/effect/decal/cleanable/blood, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whiteblue/north, /area/lv624/lazarus/medbay) "tr" = ( diff --git a/maps/map_files/LV624/science/10.yautja.dmm b/maps/map_files/LV624/science/10.yautja.dmm index 8b44093643e7..84029eff76a0 100644 --- a/maps/map_files/LV624/science/10.yautja.dmm +++ b/maps/map_files/LV624/science/10.yautja.dmm @@ -380,9 +380,7 @@ /area/lv624/lazarus/research) "Hj" = ( /obj/effect/landmark/crap_item, -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whitepurple/northeast, /area/lv624/lazarus/research) "Lo" = ( diff --git a/maps/map_files/LV624/science/40.fullylocked.dmm b/maps/map_files/LV624/science/40.fullylocked.dmm index 9dbf737c1b11..a42cfb5d5945 100644 --- a/maps/map_files/LV624/science/40.fullylocked.dmm +++ b/maps/map_files/LV624/science/40.fullylocked.dmm @@ -333,9 +333,7 @@ /turf/open/floor/whitepurple/northeast, /area/lv624/lazarus/research) "Fm" = ( -/obj/structure/machinery/power/apc/nocharge{ - dir = 1 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/whitepurple/northeast, /area/lv624/lazarus/research) "Jv" = ( diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm index 177ecbd6e450..177b8895c558 100644 --- a/maps/map_files/LV624/standalone/clfship.dmm +++ b/maps/map_files/LV624/standalone/clfship.dmm @@ -1297,9 +1297,7 @@ /area/lv624/lazarus/crashed_ship) "Px" = ( /obj/structure/machinery/autolathe, -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/almayer/orange/northwest, /area/lv624/lazarus/crashed_ship) "PA" = ( diff --git a/maps/map_files/LV624/standalone/corporatedome.dmm b/maps/map_files/LV624/standalone/corporatedome.dmm index e4fb2114f273..1f654499ea88 100644 --- a/maps/map_files/LV624/standalone/corporatedome.dmm +++ b/maps/map_files/LV624/standalone/corporatedome.dmm @@ -646,9 +646,7 @@ /turf/open/floor/whiteyellow/northwest, /area/lv624/lazarus/corporate_dome) "HK" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /obj/effect/spawner/random/powercell, /obj/item/tool/crowbar/red{ pixel_x = 8; diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 5febdceb5e06..9dc30d41f4b7 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -759,17 +759,11 @@ /area/varadero/exterior/lz2_near) "aCY" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) "aDu" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/floor3, /area/varadero/interior/cargo) "aDF" = ( @@ -1845,11 +1839,7 @@ /turf/open/floor/shiva/greenfull/west, /area/varadero/interior/hall_SE) "bvE" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) "bvF" = ( @@ -2175,9 +2165,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/asteroidfloor/north, /area/varadero/interior/comms1) "bJH" = ( @@ -2434,9 +2422,7 @@ /turf/open/shuttle/elevator/grating, /area/varadero/interior/records) "bSD" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) "bSQ" = ( @@ -3046,11 +3032,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) "crC" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/security) "csb" = ( @@ -3108,11 +3090,7 @@ /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/electrical) "cud" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/yellow/west, /area/varadero/interior/electrical) "cug" = ( @@ -3326,10 +3304,7 @@ /turf/open/floor/wood, /area/varadero/interior/library) "cGd" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/shiva/green, /area/varadero/interior/mess) "cGx" = ( @@ -4015,11 +3990,7 @@ /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) "diK" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -30; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/item/stack/sheet/wood, /obj/item/tool/kitchen/knife/butcher{ pixel_x = -7; @@ -6718,11 +6689,7 @@ /turf/open/floor/shiva/yellow/west, /area/varadero/interior/hall_NW) "fpe" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/wood, /area/varadero/interior/library) "fpf" = ( @@ -7265,11 +7232,7 @@ /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "fPq" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/eastbeach) "fPy" = ( @@ -7564,11 +7527,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/pontoon_beach) "gan" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/green/west, /area/varadero/interior/court) "gar" = ( @@ -7902,9 +7861,7 @@ /turf/open/floor/wood, /area/varadero/interior/research) "gkw" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/comms4) "gkx" = ( @@ -8897,11 +8854,7 @@ /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_N) "hcz" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) "hcI" = ( @@ -8936,11 +8889,7 @@ /area/varadero/interior/mess) "heu" = ( /obj/item/device/flashlight/lamp/tripod, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/north_research) "hfn" = ( @@ -11318,11 +11267,7 @@ /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) "iZT" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/item/shard{ icon_state = "medium" }, @@ -11365,11 +11310,7 @@ /turf/open/floor/shiva/yellow/east, /area/varadero/interior/technical_storage) "jcB" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva/purple/north, /area/varadero/interior/research) @@ -11573,11 +11514,7 @@ /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) "jjl" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/filingcabinet{ density = 0; icon_state = "chestdrawer"; @@ -12118,11 +12055,7 @@ /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) "jGz" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/white, /area/varadero/interior/toilets) "jGA" = ( @@ -13061,11 +12994,7 @@ /turf/open/floor/shiva/greenfull/west, /area/varadero/interior/hall_SE) "kuE" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) "kuO" = ( @@ -13944,11 +13873,7 @@ /turf/open/gm/coast/beachcorner/north_east, /area/varadero/interior/caves/east) "ldJ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood/wood_broken3, /area/varadero/interior/hall_SE) "leF" = ( @@ -16674,11 +16599,7 @@ /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) "neU" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_N) "nfk" = ( @@ -17082,11 +17003,7 @@ /turf/open/floor/shiva/yellow/north, /area/varadero/interior/technical_storage) "nBl" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/yellowfull/west, /area/varadero/interior/disposals) "nBD" = ( @@ -17525,11 +17442,7 @@ /turf/open/gm/dirt/desert3, /area/varadero/interior/maintenance/north) "nRP" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/item/cell/high, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/technical_storage) @@ -18004,11 +17917,7 @@ /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/security) "ola" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz2_near) "olD" = ( @@ -18856,11 +18765,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz1_near) "oWr" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood, /area/varadero/interior/administration) "oWs" = ( @@ -21058,11 +20963,7 @@ /turf/open/floor/wood, /area/varadero/interior/research) "qBR" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/carpet, /area/varadero/interior/chapel) "qBU" = ( @@ -21532,11 +21433,7 @@ /turf/open/floor/shiva/yellow, /area/varadero/interior/comms3) "qSJ" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/shiva/floor3, /area/varadero/interior/morgue) "qSR" = ( @@ -22803,11 +22700,7 @@ /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) "rSI" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/filingcabinet{ density = 0; icon_state = "chestdrawer"; @@ -23872,11 +23765,7 @@ /turf/open/floor/shiva/purple, /area/varadero/interior/research) "sDQ" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/shiva/wred/east, /area/varadero/interior/medical) "sDZ" = ( @@ -25826,22 +25715,14 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) "umA" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/red/north, /area/varadero/interior/security) "umO" = ( /obj/structure/bed/chair{ dir = 1 }, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_NW) "umT" = ( @@ -26053,10 +25934,7 @@ /turf/open/floor/wood, /area/varadero/interior/hall_SE) "uuv" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/white, /area/varadero/interior/laundry) "uuN" = ( @@ -29066,11 +28944,7 @@ /area/varadero/interior/cargo) "wGs" = ( /obj/effect/landmark/hunter_primary, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/yellowfull/west, /area/varadero/interior/comms3) "wGQ" = ( diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index ad54d9e129ae..c2622e78ba80 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -1328,11 +1328,7 @@ /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/deep/minehead) "aeR" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/deep/structures/res) "aeS" = ( @@ -2425,11 +2421,7 @@ /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 10 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/dorms/maintenance) "aiK" = ( @@ -3441,10 +3433,7 @@ /area/strata/ag/interior/outpost/canteen/personal_storage) "amM" = ( /obj/structure/bedsheetbin, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/canteen/personal_storage) "amN" = ( @@ -3576,10 +3565,7 @@ /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/strata/white_cyan1/east, /area/strata/ag/interior/dorms/canteen) "anr" = ( @@ -3832,11 +3818,7 @@ /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/research_decks/security) "aoz" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /obj/structure/machinery/light/small{ dir = 4 }, @@ -4958,10 +4940,7 @@ /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/canteen/lower_cafeteria) "asM" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/canteen/lower_cafeteria) "asN" = ( @@ -6339,10 +6318,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /obj/effect/landmark/survivor_spawner, /turf/open/floor/interior/tatami, /area/strata/ag/interior/outpost/canteen) @@ -6642,11 +6618,7 @@ /area/strata/ag/exterior/paths/north_outpost) "ayY" = ( /obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) "aza" = ( @@ -7992,10 +7964,7 @@ /area/strata/ag/interior/outpost/maint/canteen_e_1) "aEs" = ( /obj/structure/closet/crate/freezer/rations, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/maint/canteen_e_1) "aEt" = ( @@ -8009,10 +7978,7 @@ /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/jungle/deep/minehead/ruins) "aEu" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/jungle/deep/minehead/ruins) @@ -8530,11 +8496,7 @@ /turf/open/floor/strata, /area/strata/ag/exterior/research_decks) "aGl" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi) "aGm" = ( @@ -9261,10 +9223,7 @@ /area/strata/ag/exterior/paths/adminext) "aJr" = ( /obj/structure/machinery/computer/crew, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata, /area/strata/ag/interior/outpost/admin) "aJs" = ( @@ -11210,11 +11169,7 @@ /area/strata/ag/interior/dorms/south) "aQA" = ( /obj/structure/bed/chair, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/floor3, /area/strata/ag/interior/dorms/south) "aQB" = ( @@ -12162,11 +12117,7 @@ /area/strata/ag/interior/outpost/gen/foyer) "aUM" = ( /obj/structure/closet/secure_closet/personal, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/gen/foyer) @@ -12653,10 +12604,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/interior/plastic, /area/strata/ag/interior/paths/cabin_area/central) @@ -12772,11 +12720,7 @@ /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/nearlz1) "aXx" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/strata/floor3, /area/strata/ag/interior/nearlz1) "aXy" = ( @@ -13104,10 +13048,7 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/river) "aZm" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/gen/bball/nest) "aZn" = ( @@ -13711,10 +13652,7 @@ /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/canteen/bar) "bbF" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/strata, /area/strata/ag/interior/outpost/maint/canteen_e_1) "bbG" = ( @@ -13747,10 +13685,7 @@ /area/strata/ug/interior/outpost/jung/dorms/admin4) "bbM" = ( /obj/structure/closet/wardrobe/pjs, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata, /area/strata/ug/interior/outpost/jung/dorms/admin4) @@ -16383,10 +16318,7 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/southresearch) "bmP" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/interior/plastic, /area/strata/ag/interior/paths/cabin_area/central) "bmQ" = ( @@ -17208,10 +17140,7 @@ dir = 1; pixel_y = 20 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/cyan1/east, /area/strata/ug/interior/outpost/jung/dorms/med1) "bpZ" = ( @@ -18735,11 +18664,7 @@ "bwV" = ( /obj/structure/surface/rack, /obj/item/storage/bible/booze, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata, /area/strata/ag/interior/disposals) "bwW" = ( @@ -18823,10 +18748,7 @@ /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/deep/minehead) "bxn" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /obj/structure/kitchenspike, /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/deep/minehead) @@ -18881,11 +18803,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/nearlz2) "bxE" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/administration) "bxF" = ( @@ -19165,11 +19083,7 @@ /obj/structure/machinery/light/small{ dir = 8 }, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/admin) "bzd" = ( @@ -19256,10 +19170,7 @@ /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/engi/drome) "bzx" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) "bzG" = ( @@ -19720,10 +19631,7 @@ /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) "bDv" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/dorms/hive) "bDy" = ( @@ -20408,10 +20316,7 @@ /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) "bKn" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/gen/bball) "bKp" = ( @@ -20649,10 +20554,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/nearlz2) "bNm" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/exterior/research_decks) "bNq" = ( @@ -20700,11 +20602,7 @@ dir = 4 }, /obj/effect/landmark/survivor_spawner, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) "bOq" = ( @@ -23334,18 +23232,11 @@ "cnV" = ( /obj/item/stack/catwalk, /obj/item/tool/wrench, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/almayer/plate, /area/strata/ag/interior/outpost/engi/drome/shuttle) "cnZ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/red1, /area/strata/ag/interior/dorms/flight_control) "coa" = ( @@ -23369,10 +23260,7 @@ /area/strata/ag/interior/outpost/canteen/bar) "coi" = ( /obj/structure/reagent_dispensers/beerkeg, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/canteen/bar) "cok" = ( @@ -23656,11 +23544,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/outpost/canteen) "crM" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/dorms) "crN" = ( @@ -25013,10 +24897,7 @@ /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/exterior/research_decks) "era" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/deep/structures/engi) "erq" = ( @@ -25951,11 +25832,7 @@ /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/red1, /area/strata/ag/interior/landingzone_checkpoint) "gih" = ( @@ -26310,9 +26187,7 @@ /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/tcomms) "gSz" = ( -/obj/structure/machinery/power/apc{ - dir = 1 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/plating, /area/strata/ag/exterior/marsh/center) "gSR" = ( @@ -26425,11 +26300,7 @@ /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) "haU" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = -28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/strata/ag/exterior/marsh/crash) "haZ" = ( @@ -26825,11 +26696,7 @@ /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/nearlz2) "ibE" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -23; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/vanyard) "ibH" = ( @@ -27112,11 +26979,7 @@ /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/dorms/hive) "iAA" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/structure/closet/emcloset, /turf/open/floor/strata, /area/strata/ag/interior/tcomms) @@ -27897,10 +27760,7 @@ dir = 1; pixel_y = 20 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata, /area/strata/ug/interior/outpost/jung/dorms/med2) "kdm" = ( @@ -28073,11 +27933,7 @@ /obj/structure/platform/strata/metal{ dir = 1 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/strata/ag/exterior/paths/dorms_quad) "kxF" = ( @@ -28608,10 +28464,7 @@ /area/strata/ug/interior/jungle/platform/east/scrub) "lxp" = ( /obj/structure/machinery/photocopier, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata, /area/strata/ug/interior/outpost/jung/dorms/admin1) "lyv" = ( @@ -28695,11 +28548,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/north_carp) "lIG" = ( -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 28; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/strata, /area/strata/ag/interior/landingzone_checkpoint) "lIR" = ( @@ -29424,10 +29273,7 @@ /turf/open/asphalt/cement, /area/strata/ug/interior/jungle/platform/east/scrub) "mWM" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /obj/effect/decal/cleanable/blood, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/strata/white_cyan2/west, @@ -30673,12 +30519,8 @@ /turf/open/floor/plating/platebot, /area/strata/ag/interior/outpost/engi/drome/shuttle) "pGf" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -23; - start_charge = 0 - }, -/turf/open/auto_turf/snow/brown_base/layer2, +/obj/structure/machinery/power/apc/no_power/west, +/turf/open/floor/plating, /area/strata/ag/exterior/tcomms/tcomms_deck) "pGt" = ( /turf/closed/shuttle/ert{ @@ -31796,10 +31638,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/south_dorms) "rSE" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, @@ -32115,11 +31954,7 @@ /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" }, -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata/red1, /area/strata/ag/interior/research_decks/security) "sDE" = ( @@ -32865,10 +32700,7 @@ /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/center) "tZF" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/jung/dorms/sec2) "tZV" = ( @@ -33317,10 +33149,7 @@ /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/nearlz2) "uTv" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/jung/dorms/admin3) "uTL" = ( @@ -33819,11 +33648,7 @@ /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkredfull2, /area/strata/ag/interior/landingzone_checkpoint) "vMr" = ( @@ -33874,10 +33699,7 @@ /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/jung/dorms/admin3) "vTN" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/structure/machinery/power/apc/power/north, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata/white_cyan2/west, diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 705f141d4c9b..2764da8aaa78 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -214,9 +214,7 @@ /turf/open/floor/almayer/plate, /area/almayer/living/offices/flight) "abH" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, /area/almayer/living/offices/flight) "abK" = ( @@ -763,9 +761,7 @@ /turf/open/floor/almayer/plate, /area/almayer/living/officer_study) "aeP" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/living/officer_study) "aeQ" = ( @@ -895,9 +891,7 @@ /turf/open/floor/prison/kitchen, /area/almayer/living/cafeteria_officer) "afJ" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/living/cafeteria_officer) "afK" = ( @@ -920,9 +914,7 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/starboard_atmos) "afN" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/cargo_arrow, /area/almayer/engineering/starboard_atmos) "afO" = ( @@ -1697,9 +1689,7 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) "amI" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/silver/north, /area/almayer/command/cichallway) "amM" = ( @@ -2096,9 +2086,7 @@ /turf/open/floor/plating/almayer/no_build, /area/almayer/stair_clone/upper) "apt" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/living/pilotbunks) "apz" = ( @@ -2404,9 +2392,8 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/power/apc/almayer{ - cell_type = /obj/item/cell/hyper; - dir = 1 +/obj/structure/machinery/power/apc/almayer/north{ + cell_type = /obj/item/cell/hyper }, /turf/open/floor/almayer/plate, /area/almayer/command/telecomms) @@ -2502,9 +2489,7 @@ /turf/open/floor/almayer/silver/north, /area/almayer/command/cic) "arG" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/hardened/north, /turf/open/floor/almayer/silver/north, /area/almayer/command/cic) "arH" = ( @@ -2859,9 +2844,7 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/cic) "atS" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) "atT" = ( @@ -3147,9 +3130,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) "avV" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /obj/structure/bed/chair, /turf/open/floor/grass, /area/almayer/living/starboard_garden) @@ -3346,9 +3327,7 @@ pixel_x = -3; pixel_y = 4 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/hydroponics) "awR" = ( @@ -4429,9 +4408,7 @@ /turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/morgue) "aCp" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/upper_medical) "aCt" = ( @@ -4714,9 +4691,7 @@ icon_state = "NW-out"; pixel_y = 1 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_umbilical) "aEg" = ( @@ -5320,9 +5295,7 @@ /turf/open/floor/plating, /area/almayer/medical/medical_science) "aIq" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) "aIr" = ( @@ -6679,9 +6652,7 @@ /turf/open/floor/almayer/plate, /area/almayer/living/captain_mess) "aRC" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/living/captain_mess) "aRE" = ( @@ -6969,7 +6940,7 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/squads/bravo) "aTx" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, /turf/open/floor/almayer/orange/east, @@ -7381,9 +7352,7 @@ /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/chief_mp_office) "aWk" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/living/bridgebunks) "aWm" = ( @@ -7603,9 +7572,7 @@ /turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/operating_room_one) "aYR" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/operating_room_two) "aZe" = ( @@ -7632,9 +7599,7 @@ /turf/open/floor/wood/ship, /area/almayer/living/chapel) "aZs" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/wood/ship, /area/almayer/living/chapel) "aZv" = ( @@ -8411,9 +8376,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) "bfz" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -8491,9 +8454,7 @@ /area/almayer/hallways/hangar) "bgk" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /obj/structure/machinery/reagentgrinder{ pixel_y = 3 }, @@ -8723,9 +8684,7 @@ /turf/open/floor/almayer/bluefull, /area/almayer/living/bridgebunks) "bhR" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/fore_hallway) "bhT" = ( @@ -8783,9 +8742,7 @@ /area/almayer/medical/chemistry) "biy" = ( /obj/structure/pipes/unary/freezer, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /obj/structure/sign/safety/autodoc{ pixel_x = 20; pixel_y = 32 @@ -9043,9 +9000,7 @@ /turf/open/floor/almayer/silver/east, /area/almayer/living/cryo_cells) "blf" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, /obj/item/tool/pen, @@ -10124,9 +10079,7 @@ /turf/open/floor/almayer/sterile_green_corner/north, /area/almayer/medical/operating_room_one) "buj" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/operating_room_one) "bur" = ( @@ -10429,7 +10382,7 @@ /turf/open/floor/almayer/redfull, /area/almayer/living/cryo_cells) "bxA" = ( -/obj/structure/machinery/power/apc/almayer/hardened, +/obj/structure/machinery/power/apc/almayer/hardened/south, /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; pixel_x = -1 @@ -10577,7 +10530,7 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lockerroom) "bzo" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/operating_room_four) "bzz" = ( @@ -10683,9 +10636,7 @@ /turf/open/floor/almayer/red/north, /area/almayer/shipboard/weapon_room) "bAP" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/weapon_room) "bAQ" = ( @@ -11397,9 +11348,7 @@ /turf/open/floor/almayer/red/southwest, /area/almayer/living/cryo_cells) "bFt" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/orange/east, /area/almayer/engineering/upper_engineering/starboard) "bFA" = ( @@ -13130,12 +13079,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"bTu" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, -/turf/open/floor/almayer/sterile_green_side/northwest, -/area/almayer/medical/lower_medical_medbay) "bTx" = ( /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) @@ -14068,9 +14011,7 @@ "cdm" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) "cdn" = ( @@ -14441,9 +14382,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) "chS" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -15083,9 +15022,7 @@ dir = 4; pixel_x = -17 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/silver/north, /area/almayer/command/computerlab) "cnH" = ( @@ -15210,7 +15147,7 @@ /turf/open/floor/almayer/emerald/east, /area/almayer/squads/charlie) "coj" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, /turf/open/floor/almayer/blue/east, @@ -16754,9 +16691,7 @@ /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/starboard_midship_hallway) "cVq" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/hardened/north, /turf/open/floor/almayer, /area/almayer/command/corporateliaison) "cVt" = ( @@ -17072,9 +17007,7 @@ /turf/closed/wall/almayer/aicore/hull, /area/almayer/command/airoom) "daF" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) "daI" = ( @@ -17833,9 +17766,7 @@ /turf/open/floor/almayer, /area/almayer/living/chapel) "duo" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/prison/kitchen, /area/almayer/living/grunt_rnr) "dut" = ( @@ -18358,7 +18289,7 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) "dEm" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -20052,9 +19983,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/s_bow) "eoy" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_midship_hallway) "eoE" = ( @@ -20350,9 +20279,7 @@ /turf/open/floor/almayer/red, /area/almayer/command/lifeboat) "ets" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /obj/effect/decal/warning_stripes{ icon_state = "N"; layer = 3.33; @@ -21354,9 +21281,7 @@ /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "eQm" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_bow) "eQz" = ( @@ -21593,9 +21518,7 @@ pixel_x = 8; pixel_y = 18 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /obj/structure/sign/safety/rewire{ pixel_x = -17; pixel_y = 17 @@ -22140,7 +22063,7 @@ pixel_x = 8; pixel_y = -32 }, -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/s_bow) "fgh" = ( @@ -23118,7 +23041,7 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) "fEC" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/plate, /area/almayer/medical/morgue) "fEF" = ( @@ -24207,7 +24130,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /obj/structure/sign/safety/rewire{ pixel_y = -38 }, @@ -24443,9 +24366,7 @@ /turf/open/floor/almayer/plate, /area/almayer/command/cic) "gll" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "gls" = ( @@ -24870,9 +24791,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_p) "gtU" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /obj/structure/sign/safety/rewire{ pixel_x = -17; pixel_y = 17 @@ -25054,9 +24973,7 @@ density = 0; pixel_y = 30 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/plate, /area/almayer/living/numbertwobunks) "gym" = ( @@ -25260,9 +25177,7 @@ /obj/item/storage/bag/trash{ pixel_x = -3 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/plating, /area/almayer/maint/lower/constr) "gBW" = ( @@ -25289,9 +25204,8 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "gCB" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - cell_type = /obj/item/cell/hyper; - dir = 1 +/obj/structure/machinery/power/apc/almayer/hardened/north{ + cell_type = /obj/item/cell/hyper }, /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -25522,9 +25436,7 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/ce_room) "gIm" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) "gIz" = ( @@ -25824,7 +25736,7 @@ /obj/structure/sign/safety/maint{ pixel_x = -17 }, -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/s_bow) "gNo" = ( @@ -25985,9 +25897,7 @@ /turf/open/floor/almayer/orangecorner/west, /area/almayer/hallways/lower/port_umbilical) "gRP" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) "gSa" = ( @@ -26079,7 +25989,7 @@ /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/general_equipment) "gUi" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/lower/s_bow) "gUn" = ( @@ -26554,9 +26464,8 @@ /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/medical_science) "heo" = ( -/obj/structure/machinery/power/apc/almayer{ - cell_type = /obj/item/cell/hyper; - dir = 1 +/obj/structure/machinery/power/apc/almayer/north{ + cell_type = /obj/item/cell/hyper }, /obj/structure/sign/safety/rewire{ pixel_x = -15; @@ -27303,7 +27212,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/chief_mp_office) "hsr" = ( @@ -27348,9 +27257,7 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "htk" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer/plate, /area/almayer/maint/lower/cryo_cells) "htl" = ( @@ -27598,9 +27505,7 @@ /turf/open/floor/almayer, /area/almayer/hallways/upper/midship_hallway) "hyV" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /obj/structure/sign/safety/rewire{ pixel_x = 32; pixel_y = 24 @@ -28142,7 +28047,7 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/s_bow) "hMN" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/operating_room_three) "hNh" = ( @@ -28548,9 +28453,7 @@ dir = 4; pixel_y = -12 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /obj/structure/sign/safety/rewire{ pixel_x = 32; pixel_y = 17 @@ -28970,9 +28873,7 @@ /turf/open/floor/prison/kitchen, /area/almayer/living/grunt_rnr) "ied" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) "ien" = ( @@ -29406,7 +29307,7 @@ /turf/closed/wall/almayer, /area/almayer/command/securestorage) "ioV" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /obj/structure/sign/safety/rewire{ pixel_y = -38 }, @@ -29894,9 +29795,7 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_a_s) "iBl" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /obj/structure/sign/safety/rewire{ pixel_x = 7; pixel_y = -30 @@ -30061,9 +29960,7 @@ dir = 4 }, /obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /obj/structure/sign/safety/maint{ pixel_x = -17 }, @@ -30376,7 +30273,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) "iNH" = ( @@ -30834,7 +30731,7 @@ /obj/structure/closet/secure_closet/surgical{ pixel_x = -30 }, -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /obj/structure/sign/safety/rewire{ pixel_y = -38 }, @@ -31009,9 +30906,7 @@ /turf/open/floor/almayer, /area/almayer/living/briefing) "iXW" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/sterile_green_corner, /area/almayer/medical/lower_medical_lobby) "iYe" = ( @@ -32314,9 +32209,7 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) "jvP" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/cryo) "jvX" = ( @@ -32412,9 +32305,7 @@ /turf/open/floor/plating, /area/almayer/living/bridgebunks) "jxX" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/starboard_aft_hallway) "jyb" = ( @@ -32721,9 +32612,7 @@ /turf/open/floor/prison/kitchen, /area/almayer/living/grunt_rnr) "jFI" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) "jFM" = ( @@ -32830,9 +32719,7 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/engineering/lower/engine_core) "jJk" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/blue/northeast, /area/almayer/living/port_emb) "jKn" = ( @@ -33106,7 +32993,7 @@ /turf/open/floor/almayer/red/east, /area/almayer/hallways/upper/starboard) "jOE" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) "jOG" = ( @@ -33626,9 +33513,7 @@ /turf/open/floor/almayer/red/east, /area/almayer/hallways/upper/starboard) "jZU" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, /area/almayer/medical/containment/cell/cl) "jZY" = ( @@ -33690,9 +33575,7 @@ /turf/open/floor/almayer/bluefull, /area/almayer/squads/charlie_delta_shared) "kaO" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer/silver/west, /area/almayer/hallways/upper/midship_hallway) "kaQ" = ( @@ -33958,9 +33841,7 @@ /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/vehiclehangar) "kgV" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /obj/effect/decal/warning_stripes{ icon_state = "E"; layer = 3.33; @@ -34611,9 +34492,7 @@ /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/processing) "kuK" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) "kvf" = ( @@ -34708,9 +34587,7 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/living/port_emb) "kxe" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/p_bow) "kxo" = ( @@ -35588,9 +35465,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/blue/northeast, /area/almayer/living/basketball) "kPG" = ( @@ -39339,9 +39214,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) "myl" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - cell_type = /obj/item/cell/hyper; - dir = 1 +/obj/structure/machinery/power/apc/almayer/hardened/north{ + cell_type = /obj/item/cell/hyper }, /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -39612,7 +39486,7 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) "mCJ" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_f_p) "mCL" = ( @@ -39817,9 +39691,7 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) "mHb" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/red/east, /area/almayer/shipboard/brig/processing) "mHo" = ( @@ -40021,9 +39893,7 @@ icon_state = "N"; pixel_y = 1 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/red, /area/almayer/hallways/upper/port) "mKq" = ( @@ -40993,9 +40863,7 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "neO" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/navigation) "neS" = ( @@ -41444,9 +41312,7 @@ /turf/open/floor/almayer/cargo_arrow/north, /area/almayer/living/briefing) "nlI" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_s) "nlW" = ( @@ -41968,9 +41834,7 @@ /turf/open/floor/almayer/mono, /area/almayer/engineering/upper_engineering/starboard) "nwW" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/port_missiles) "nwY" = ( @@ -42074,9 +41938,7 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/starboard_hallway) "nAd" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) "nAm" = ( @@ -42514,9 +42376,7 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/port_missiles) "nIG" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/silver/northeast, /area/almayer/command/securestorage) "nIN" = ( @@ -42582,9 +42442,7 @@ /area/almayer/engineering/lower/workshop) "nLk" = ( /obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/orange/east, /area/almayer/engineering/upper_engineering/port) "nLp" = ( @@ -42832,9 +42690,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) "nQv" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/plating_striped/west, /area/almayer/squads/req) "nQA" = ( @@ -43275,9 +43131,7 @@ /turf/open/floor/almayer, /area/almayer/hallways/upper/midship_hallway) "nZR" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/panic) "nZW" = ( @@ -43705,9 +43559,7 @@ /obj/structure/pipes/vents/pump{ dir = 8 }, -/obj/structure/machinery/power/apc/almayer/hardened{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/hardened/east, /turf/open/floor/almayer, /area/almayer/command/lifeboat) "oit" = ( @@ -43718,7 +43570,7 @@ /turf/open/floor/almayer/redfull, /area/almayer/shipboard/port_missiles) "oix" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /obj/structure/sign/safety/rewire{ pixel_y = -38 }, @@ -45266,9 +45118,7 @@ /turf/open/floor/almayer/plating/northeast, /area/almayer/medical/upper_medical) "oNK" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) "oNM" = ( @@ -45324,7 +45174,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/red/north, /area/almayer/hallways/upper/starboard) "oOO" = ( @@ -45643,9 +45493,7 @@ /obj/structure/platform{ dir = 8 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/silver/north, /area/almayer/hallways/lower/repair_bay) "oUG" = ( @@ -46542,7 +46390,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) "ppV" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_midship_hallway) "pqc" = ( @@ -46630,9 +46478,7 @@ /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) "prl" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, @@ -47714,9 +47560,8 @@ /turf/open/floor/almayer/plate, /area/almayer/squads/charlie_delta_shared) "pQI" = ( -/obj/structure/machinery/power/apc/almayer{ - cell_type = /obj/item/cell/hyper; - dir = 1 +/obj/structure/machinery/power/apc/almayer/north{ + cell_type = /obj/item/cell/hyper }, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/mp_bunks) @@ -47748,9 +47593,7 @@ /turf/open/floor/almayer/plate, /area/almayer/living/offices) "pRn" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /obj/structure/machinery/medical_pod/sleeper, /turf/open/floor/almayer/mono, /area/almayer/medical/medical_science) @@ -48472,7 +48315,7 @@ /turf/open/floor/almayer, /area/almayer/squads/delta) "qgU" = ( -/obj/structure/machinery/power/apc/almayer/hardened, +/obj/structure/machinery/power/apc/almayer/hardened/south, /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; pixel_x = 1 @@ -49138,9 +48981,7 @@ /turf/open/floor/almayer/silvercorner/east, /area/almayer/hallways/upper/midship_hallway) "qvC" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/plating, /area/almayer/living/port_emb) "qvE" = ( @@ -49764,7 +49605,7 @@ /turf/open/floor/almayer/red/north, /area/almayer/squads/alpha_bravo_shared) "qGf" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /obj/structure/sign/safety/rewire{ pixel_y = -38 }, @@ -50374,9 +50215,7 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_s) "qTu" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_umbilical) "qTA" = ( @@ -50727,9 +50566,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) "qZT" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_fore_hallway) "qZX" = ( @@ -50930,7 +50767,7 @@ /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/lower_medical_lobby) "rdT" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_fore_hallway) "rdZ" = ( @@ -51302,9 +51139,7 @@ /area/almayer/living/synthcloset) "rlh" = ( /obj/structure/closet/firecloset, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/shipboard/starboard_point_defense) "rll" = ( @@ -52510,7 +52345,7 @@ /obj/structure/sign/safety/rewire{ pixel_x = 32 }, -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/port_aft_hallway) "rKA" = ( @@ -52955,6 +52790,13 @@ /obj/structure/machinery/part_fabricator/dropship, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/repair_bay) +"rVB" = ( +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/lower/starboard_umbilical) "rVC" = ( /obj/structure/pipes/vents/pump/on, /obj/structure/machinery/light{ @@ -53063,9 +52905,7 @@ /obj/structure/sign/safety/hazard{ pixel_y = -32 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer, /area/almayer/shipboard/brig/execution) "rXF" = ( @@ -53108,9 +52948,7 @@ /area/almayer/engineering/lower/workshop) "rYi" = ( /obj/structure/bed/chair, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/living/gym) "rYp" = ( @@ -53435,9 +53273,7 @@ /obj/item/roller/medevac, /obj/item/roller/medevac, /obj/item/roller/medevac, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/lockerroom) @@ -54857,9 +54693,7 @@ /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/morgue) "sKf" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower) "sKI" = ( @@ -55201,9 +55035,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_midship_hallway) "sTV" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ - cell_type = /obj/item/cell/hyper; - dir = 1 +/obj/structure/machinery/power/apc/almayer/hardened/north{ + cell_type = /obj/item/cell/hyper }, /turf/open/floor/plating, /area/almayer/command/airoom) @@ -57003,9 +56836,7 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_s) "tBY" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/mess) "tCd" = ( @@ -57823,9 +57654,7 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 13 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_s) "tXb" = ( @@ -57861,9 +57690,7 @@ /turf/open/floor/almayer/test_floor4, /area/almayer/squads/req) "tXn" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) "tXo" = ( @@ -58592,7 +58419,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/containment) "uoj" = ( @@ -59455,13 +59282,6 @@ }, /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_midship_hallway) -"uGi" = ( -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/lower/starboard_umbilical) "uGN" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, @@ -60293,9 +60113,7 @@ /turf/open/floor/almayer/emerald/southwest, /area/almayer/living/port_emb) "uZF" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop) "uZH" = ( @@ -60926,9 +60744,7 @@ /turf/open/floor/almayer/plate, /area/almayer/maint/lower/s_bow) "vkR" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /obj/structure/bed/sofa/south/grey, /turf/open/floor/almayer/silver/north, /area/almayer/shipboard/brig/cic_hallway) @@ -61255,9 +61071,7 @@ /area/almayer/engineering/upper_engineering/starboard) "vqL" = ( /obj/item/clothing/under/shorts/black, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer/dark_sterile, /area/almayer/engineering/laundry) "vqW" = ( @@ -61576,7 +61390,7 @@ /turf/open/floor/almayer/dark_sterile, /area/almayer/living/port_emb) "vwj" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_m_p) "vwC" = ( @@ -61808,9 +61622,7 @@ /turf/open/floor/almayer/orange/north, /area/almayer/hallways/hangar) "vAx" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) "vAz" = ( @@ -61839,9 +61651,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/stern_point_defense) "vAQ" = ( @@ -63704,9 +63514,7 @@ /area/almayer/medical/upper_medical) "wjC" = ( /obj/structure/closet/firecloset, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/shipboard/port_point_defense) "wjL" = ( @@ -63884,9 +63692,7 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "wmg" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/starboard_missiles) "wmo" = ( @@ -64596,9 +64402,7 @@ /area/almayer/hallways/upper/fore_hallway) "wCs" = ( /obj/structure/machinery/vending/security, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) "wCI" = ( @@ -64997,9 +64801,8 @@ /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_aft_hallway) "wKF" = ( -/obj/structure/machinery/power/apc/almayer{ - cell_type = /obj/item/cell/hyper; - dir = 1 +/obj/structure/machinery/power/apc/almayer/north{ + cell_type = /obj/item/cell/hyper }, /turf/open/floor/almayer/plate, /area/almayer/command/combat_correspondent) @@ -65443,9 +65246,7 @@ /area/almayer/shipboard/brig/lobby) "wSx" = ( /obj/structure/platform_decoration, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) "wSB" = ( @@ -65535,9 +65336,7 @@ /turf/closed/wall/almayer/research/containment/wall/south, /area/almayer/medical/containment/cell) "wTN" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/living/auxiliary_officer_office) "wUd" = ( @@ -65885,9 +65684,7 @@ /turf/open/floor/almayer/plate, /area/almayer/living/gym) "xbI" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) "xcI" = ( @@ -65985,7 +65782,7 @@ /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop) "xer" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) "xeU" = ( @@ -66188,9 +65985,7 @@ /turf/closed/wall/almayer/outer, /area/almayer/maint/hull/upper/p_bow) "xiW" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_a_p) "xjb" = ( @@ -66298,17 +66093,13 @@ /turf/open/floor/almayer, /area/almayer/squads/bravo) "xlC" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/orangecorner/east, /area/almayer/engineering/ce_room) "xlO" = ( /obj/structure/filingcabinet, /obj/item/folder/yellow, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower/workshop/hangar) "xmg" = ( @@ -66376,9 +66167,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/req) "xnX" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_a_s) "xnZ" = ( @@ -67497,9 +67286,7 @@ /area/almayer/engineering/upper_engineering/starboard) "xKT" = ( /obj/effect/decal/cleanable/cobweb, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer, /area/almayer/living/synthcloset) "xLi" = ( @@ -68167,9 +67954,7 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/starboard_point_defense) "xYE" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/plating, /area/almayer/maint/lower/constr) "xYP" = ( @@ -68578,9 +68363,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, +/obj/structure/machinery/power/apc/almayer/west, /obj/item/storage/briefcase{ pixel_y = 15 }, @@ -68600,6 +68383,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/lifeboat) +"ygf" = ( +/obj/structure/machinery/power/apc/almayer/west, +/turf/open/floor/almayer/sterile_green_side/northwest, +/area/almayer/medical/lower_medical_medbay) "ygp" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -84164,7 +83951,7 @@ lxd dPk nBV dyq -uGi +rVB uaG lYN byr @@ -96764,7 +96551,7 @@ rlZ egc thP beW -bTu +ygf rlZ fqZ beW diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index 2d5bc23cb5a3..9a8fa63a5e8e 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -978,9 +978,7 @@ /turf/open/gm/grass/gbcorner/north_west, /area/whiskey_outpost/outside/lane/one_south) "eq" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -1003,9 +1001,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/living) "ev" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) "ex" = ( @@ -1030,9 +1026,7 @@ /turf/open/floor/whitegreenfull, /area/whiskey_outpost/inside/hospital/triage) "eF" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/prison, /area/whiskey_outpost/inside/cic) "eG" = ( @@ -1900,9 +1894,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/living) "im" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/whitegreen/east, /area/whiskey_outpost/inside/hospital) "in" = ( @@ -2885,9 +2877,7 @@ /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, /area/whiskey_outpost/outside/lane/four_north) "mC" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/prison, /area/whiskey_outpost) "mD" = ( @@ -3306,9 +3296,7 @@ /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/supply) "ow" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/mortar_pit) "ox" = ( @@ -3766,9 +3754,7 @@ /turf/open/floor/white, /area/whiskey_outpost/inside/hospital) "qC" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/engineering) @@ -3874,9 +3860,7 @@ /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/mortar_pit) "qW" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/open/gm/dirt, /area/whiskey_outpost/inside/caves/tunnel) "qX" = ( @@ -3890,9 +3874,7 @@ /turf/open/gm/grass/grassbeach/west, /area/whiskey_outpost/outside/lane/one_south) "ra" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer/east, /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/bunker) "rb" = ( @@ -4784,9 +4766,7 @@ /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/supply) "uP" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/supply) @@ -5763,7 +5743,7 @@ /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/north) "zl" = ( -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) "zm" = ( @@ -9501,9 +9481,7 @@ /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/two_south) "SG" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/four) "SH" = ( @@ -9704,7 +9682,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/hypospray, /obj/item/reagent_container/hypospray, -/obj/structure/machinery/power/apc/almayer, +/obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/whitegreen, /area/whiskey_outpost/inside/hospital/triage) "TC" = ( @@ -9977,9 +9955,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/three_south) "UX" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/one) "UY" = ( @@ -10618,9 +10594,7 @@ /turf/open/jungle, /area/whiskey_outpost/outside/lane/three_south) "XV" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/two) "XW" = ( @@ -10662,9 +10636,7 @@ /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north) "Yj" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, +/obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/three) "Yk" = ( diff --git a/maps/map_files/generic/Admin_level.dmm b/maps/map_files/generic/Admin_level.dmm index 51623753bc0d..3b8eeac1009a 100644 --- a/maps/map_files/generic/Admin_level.dmm +++ b/maps/map_files/generic/Admin_level.dmm @@ -578,9 +578,6 @@ /obj/structure/machinery/medical_pod/bodyscanner, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station) -"tx" = ( -/turf/open/floor/carpet, -/area/centcom/living) "tP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -9715,7 +9712,7 @@ ds eE eY eY -tx +eY eY eY eY diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index 2931fd42b111..70bfb5c2914b 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -1803,8 +1803,7 @@ color = "#6b675e"; layer = 2.79 }, -/obj/structure/machinery/power/apc/almayer{ - dir = 4; +/obj/structure/machinery/power/apc/almayer/east{ pixel_y = 25 }, /obj/item/weapon/twohanded/yautja/spear, diff --git a/maps/shuttles/ert_shuttle_big.dmm b/maps/shuttles/ert_shuttle_big.dmm index 0dbd1adcfb47..b7dbd500e823 100644 --- a/maps/shuttles/ert_shuttle_big.dmm +++ b/maps/shuttles/ert_shuttle_big.dmm @@ -855,7 +855,7 @@ /turf/open/floor/plating/almayer, /area/shuttle/ert) "YN" = ( -/obj/structure/machinery/power/apc/almayer{ +/obj/structure/machinery/power/apc/almayer/south{ cell_type = /obj/item/cell/hyper }, /turf/open/floor/almayer/tcomms, diff --git a/maps/shuttles/trijentshuttle2.dmm b/maps/shuttles/trijentshuttle2.dmm index b4ea080e4cfa..7947f6824e7f 100644 --- a/maps/shuttles/trijentshuttle2.dmm +++ b/maps/shuttles/trijentshuttle2.dmm @@ -38,11 +38,7 @@ /turf/open/shuttle/escapepod, /area/shuttle/trijent_shuttle/elevator) "n" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 26; - start_charge = 0 - }, +/obj/structure/machinery/power/apc/no_power/north, /obj/item/tool/wirecutters{ pixel_y = -7 }, diff --git a/tools/UpdatePaths/Scripts/6686-apc-replacement.txt b/tools/UpdatePaths/Scripts/6686-apc-replacement.txt new file mode 100644 index 000000000000..33686acbcee7 --- /dev/null +++ b/tools/UpdatePaths/Scripts/6686-apc-replacement.txt @@ -0,0 +1,179 @@ +/obj/structure/machinery/power/apc{dir=1;start_charge=0} : /obj/structure/machinery/power/apc/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=2;start_charge=0} : /obj/structure/machinery/power/apc/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=4;start_charge=0} : /obj/structure/machinery/power/apc/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=8;start_charge=0} : /obj/structure/machinery/power/apc/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=1;start_charge=0;pixel_y=@ANY} : /obj/structure/machinery/power/apc/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=2;start_charge=0;pixel_y=@ANY} : /obj/structure/machinery/power/apc/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=4;start_charge=0;pixel_x=@ANY} : /obj/structure/machinery/power/apc/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=8;start_charge=0;pixel_x=@ANY} : /obj/structure/machinery/power/apc/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{start_charge=0} : /obj/structure/machinery/power/apc/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} + +/obj/structure/machinery/power/apc{dir=1;start_charge=90} : /obj/structure/machinery/power/apc/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=2;start_charge=90} : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=4;start_charge=90} : /obj/structure/machinery/power/apc/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=8;start_charge=90} : /obj/structure/machinery/power/apc/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=1;start_charge=90;pixel_y=@ANY} : /obj/structure/machinery/power/apc/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=2;start_charge=90;pixel_y=@ANY} : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=4;start_charge=90;pixel_x=@ANY} : /obj/structure/machinery/power/apc/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{dir=8;start_charge=90;pixel_x=@ANY} : /obj/structure/machinery/power/apc/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc{start_charge=90} : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} + +/obj/structure/machinery/power/apc{dir=1} : /obj/structure/machinery/power/apc/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc{dir=2} : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc{dir=4} : /obj/structure/machinery/power/apc/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc{dir=8} : /obj/structure/machinery/power/apc/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc{dir=1;pixel_y=@ANY} : /obj/structure/machinery/power/apc/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc{dir=2;pixel_y=@ANY} : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc{dir=4;pixel_x=@ANY} : /obj/structure/machinery/power/apc/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc{dir=8;pixel_x=@ANY} : /obj/structure/machinery/power/apc/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} + +/obj/structure/machinery/power/apc/weak{dir=1;start_charge=0} : /obj/structure/machinery/power/apc/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/weak{dir=2;start_charge=0} : /obj/structure/machinery/power/apc/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/weak{dir=4;start_charge=0} : /obj/structure/machinery/power/apc/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/weak{dir=8;start_charge=0} : /obj/structure/machinery/power/apc/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/weak{dir=1;start_charge=0;pixel_y=@ANY} : /obj/structure/machinery/power/apc/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/weak{dir=2;start_charge=0;pixel_y=@ANY} : /obj/structure/machinery/power/apc/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/weak{dir=4;start_charge=0;pixel_x=@ANY} : /obj/structure/machinery/power/apc/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/weak{dir=8;start_charge=0;pixel_x=@ANY} : /obj/structure/machinery/power/apc/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/weak{start_charge=0} : /obj/structure/machinery/power/apc/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} + +/obj/structure/machinery/power/apc/weak{dir=1;start_charge=90} : /obj/structure/machinery/power/apc/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=2;start_charge=90} : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=4;start_charge=90} : /obj/structure/machinery/power/apc/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=8;start_charge=90} : /obj/structure/machinery/power/apc/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=1;start_charge=90;pixel_y=@ANY} : /obj/structure/machinery/power/apc/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=2;start_charge=90;pixel_y=@ANY} : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=4;start_charge=90;pixel_x=@ANY} : /obj/structure/machinery/power/apc/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=8;start_charge=90;pixel_x=@ANY} : /obj/structure/machinery/power/apc/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{start_charge=90} : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=20} + +/obj/structure/machinery/power/apc/weak{dir=1} : /obj/structure/machinery/power/apc/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=2} : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=4} : /obj/structure/machinery/power/apc/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=8} : /obj/structure/machinery/power/apc/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=1;pixel_y=@ANY} : /obj/structure/machinery/power/apc/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=2;pixel_y=@ANY} : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=4;pixel_x=@ANY} : /obj/structure/machinery/power/apc/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak{dir=8;pixel_x=@ANY} : /obj/structure/machinery/power/apc/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=20} +/obj/structure/machinery/power/apc/weak : /obj/structure/machinery/power/apc/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=20} + +/obj/structure/machinery/power/apc/high{dir=1;start_charge=0} : /obj/structure/machinery/power/apc/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=2;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=4;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=8;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=1;start_charge=0;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=2;start_charge=0;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=4;start_charge=0;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=8;start_charge=0;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} + +/obj/structure/machinery/power/apc/high{dir=1;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=2;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=4;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=8;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=1;start_charge=90;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=2;start_charge=90;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=4;start_charge=90;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{dir=8;start_charge=90;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/high{start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} + +/obj/structure/machinery/power/apc/high{dir=1} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/high{dir=2} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/high{dir=4} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/high{dir=8} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/high{dir=1;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/high{dir=2;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/high{dir=4;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/high{dir=8;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/high : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} + +/obj/structure/machinery/power/apc/super{dir=1;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=2;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=4;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=8;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=1;start_charge=0;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=2;start_charge=0;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=4;start_charge=0;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=8;start_charge=0;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} + +/obj/structure/machinery/power/apc/super{dir=1;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=2;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=4;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=8;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=1;start_charge=90;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=2;start_charge=90;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=4;start_charge=90;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{dir=8;start_charge=90;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/super{start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} + +/obj/structure/machinery/power/apc/super{dir=1} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/super{dir=2} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/super{dir=4} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/super{dir=8} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/super{dir=1;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/super{dir=2;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/super{dir=4;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/super{dir=8;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/super : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} + +/obj/structure/machinery/power/apc/hyper{dir=1;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=2;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=4;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=8;start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=1;start_charge=0;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=2;start_charge=0;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=4;start_charge=0;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=8;start_charge=0;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{start_charge=0} : /obj/structure/machinery/power/apc/upgraded/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} + +/obj/structure/machinery/power/apc/hyper{dir=1;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=2;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=4;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=8;start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=1;start_charge=90;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=2;start_charge=90;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=4;start_charge=90;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=8;start_charge=90;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/hyper{start_charge=90} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} + +/obj/structure/machinery/power/apc/hyper{dir=1} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=2} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=4} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=8} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=1;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=2;pixel_y=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=4;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/hyper{dir=8;pixel_x=@ANY} : /obj/structure/machinery/power/apc/upgraded/power/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/hyper : /obj/structure/machinery/power/apc/upgraded/power/south{@OLD;pixel_y=@SKIP;dir=@SKIP} + +/obj/structure/machinery/power/apc/nocharge{dir=1} : /obj/structure/machinery/power/apc/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/nocharge{dir=2} : /obj/structure/machinery/power/apc/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/nocharge{dir=4} : /obj/structure/machinery/power/apc/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/nocharge{dir=8} : /obj/structure/machinery/power/apc/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/nocharge{dir=1;pixel_y=@ANY} : /obj/structure/machinery/power/apc/no_power/north{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/nocharge{dir=2;pixel_y=@ANY} : /obj/structure/machinery/power/apc/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/nocharge{dir=4;pixel_x=@ANY} : /obj/structure/machinery/power/apc/no_power/east{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/nocharge{dir=8;pixel_x=@ANY} : /obj/structure/machinery/power/apc/no_power/west{@OLD;pixel_x=@SKIP;dir=@SKIP;start_charge=@SKIP} +/obj/structure/machinery/power/apc/nocharge : /obj/structure/machinery/power/apc/no_power/south{@OLD;pixel_y=@SKIP;dir=@SKIP;start_charge=@SKIP} + +/obj/structure/machinery/power/apc/almayer{dir=1} : /obj/structure/machinery/power/apc/almayer/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer{dir=2} : /obj/structure/machinery/power/apc/almayer/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer{dir=4} : /obj/structure/machinery/power/apc/almayer/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer{dir=8} : /obj/structure/machinery/power/apc/almayer/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer{dir=1;pixel_y=@ANY} : /obj/structure/machinery/power/apc/almayer/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer{dir=2;pixel_y=@ANY} : /obj/structure/machinery/power/apc/almayer/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer{dir=4;pixel_x=@ANY} : /obj/structure/machinery/power/apc/almayer/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer{dir=8;pixel_x=@ANY} : /obj/structure/machinery/power/apc/almayer/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer : /obj/structure/machinery/power/apc/almayer/south{@OLD;pixel_y=@SKIP;dir=@SKIP} + +/obj/structure/machinery/power/apc/almayer/hardened{dir=1} : /obj/structure/machinery/power/apc/almayer/hardened/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer/hardened{dir=2} : /obj/structure/machinery/power/apc/almayer/hardened/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer/hardened{dir=4} : /obj/structure/machinery/power/apc/almayer/hardened/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer/hardened{dir=8} : /obj/structure/machinery/power/apc/almayer/hardened/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer/hardened{dir=1;pixel_y=@ANY} : /obj/structure/machinery/power/apc/almayer/hardened/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer/hardened{dir=2;pixel_y=@ANY} : /obj/structure/machinery/power/apc/almayer/hardened/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer/hardened{dir=4;pixel_x=@ANY} : /obj/structure/machinery/power/apc/almayer/hardened/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer/hardened{dir=8;pixel_x=@ANY} : /obj/structure/machinery/power/apc/almayer/hardened/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/structure/machinery/power/apc/almayer/hardened : /obj/structure/machinery/power/apc/almayer/hardened/south{@OLD;pixel_y=@SKIP;dir=@SKIP} \ No newline at end of file