From 190786c616c73542b0930d7dc68d92b52efdfe9e Mon Sep 17 00:00:00 2001 From: Helg2 <93882977+Helg2@users.noreply.github.com> Date: Sun, 16 Apr 2023 06:35:22 +0300 Subject: [PATCH] Adds helpers for apc. (#74651) ## About The Pull Request I asked someone in discord if it was worth it, they said it was, from what i remember at least. ## Why It's Good For The Game More comfort with apc's for mappers. --------- Co-authored-by: san7890 --- .../IceRuins/icemoon_surface_engioutpost.dmm | 5 +- .../IceRuins/icemoon_surface_pizza.dmm | 10 +- .../LavaRuins/lavaland_surface_pizzaparty.dmm | 6 +- .../lavaland_surface_syndicate_base1.dmm | 61 ++---- .../commswilding_1.dmm | 6 +- .../commswilding_2.dmm | 6 +- .../commswilding_3.dmm | 6 +- .../mistake_feasible.dmm | 5 +- .../mistake_inevitable.dmm | 5 +- .../mistake_unlikely.dmm | 5 +- _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm | 8 +- _maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 20 +- _maps/RandomRuins/SpaceRuins/crashedship.dmm | 7 +- .../SpaceRuins/dangerous_research.dmm | 34 +--- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 55 ++---- .../SpaceRuins/derelict_sulaco.dmm | 2 +- .../RandomRuins/SpaceRuins/forgottenship.dmm | 18 +- _maps/RandomRuins/SpaceRuins/hellfactory.dmm | 6 +- _maps/RandomRuins/SpaceRuins/interdyne.dmm | 3 +- .../SpaceRuins/listeningstation.dmm | 7 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 95 ++++------ .../SpaceRuins/russian_derelict.dmm | 175 +++++++----------- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 60 +++--- .../RandomRuins/SpaceRuins/thelizardsgas.dmm | 2 +- .../RandomRuins/SpaceRuins/travelers_rest.dmm | 4 +- _maps/RandomZLevels/moonoutpost19.dmm | 27 ++- _maps/RandomZLevels/research.dmm | 27 +-- _maps/RandomZLevels/undergroundoutpost45.dmm | 50 +++-- .../map_files/Deltastation/DeltaStation2.dmm | 3 +- .../map_files/IceBoxStation/IceBoxStation.dmm | 6 +- _maps/map_files/KiloStation/KiloStation.dmm | 6 +- _maps/map_files/MetaStation/MetaStation.dmm | 3 +- _maps/map_files/tramstation/tramstation.dmm | 3 +- _maps/shuttles/infiltrator_advanced.dmm | 59 +++--- _maps/shuttles/ruin_cyborg_mothership.dmm | 2 +- _maps/shuttles/ruin_syndicate_dropship.dmm | 7 +- .../shuttles/ruin_syndicate_fighter_shiv.dmm | 7 +- _maps/templates/battlecruiser_starfury.dmm | 9 +- code/__DEFINES/layers.dm | 2 +- code/datums/wires/apc.dm | 4 +- code/modules/mapping/mapping_helpers.dm | 136 ++++++++++++++ code/modules/power/apc/apc_main.dm | 46 +++++ code/modules/power/apc/apc_mapping.dm | 25 +-- icons/effects/mapping_helpers.dmi | Bin 21166 -> 23608 bytes .../Scripts/74651_apc_to_apc_helpers.txt | 38 ++++ 45 files changed, 554 insertions(+), 517 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm index 2f052271031..1a1d07b6a99 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm @@ -44,9 +44,8 @@ dir = 8 }, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron, /area/ruin/planetengi) "au" = ( diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm index da2316b4929..21bc5a318d6 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm @@ -260,9 +260,8 @@ /area/ruin/pizzeria/kitchen) "jY" = ( /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/effect/decal/cleanable/ash, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -563,9 +562,8 @@ /area/ruin/pizzeria/kitchen) "yS" = ( /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 1b0274a5fce..5eac34187fd 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -387,10 +387,8 @@ /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/random/decoration/glowstick, /obj/effect/spawner/random/decoration/paint, -/obj/machinery/power/apc/unlocked{ - pixel_y = 25; - dir = 1 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/unlocked, /turf/open/floor/plating/lavaland_atmos, /area/ruin/unpowered) "xP" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 304a845796d..8d1b543e6d1 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -325,11 +325,8 @@ /area/ruin/syndicate_lava_base/cargo) "dA" = ( /obj/structure/closet/l3closet, -/obj/machinery/power/apc/syndicate{ - dir = 8; - name = "Chemistry APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ dir = 6 }, @@ -493,11 +490,8 @@ /area/ruin/syndicate_lava_base/cargo) "ef" = ( /obj/machinery/light/small/directional/north, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Cargo Bay APC"; - pixel_y = 25 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/closet/emcloset/anchored, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -720,11 +714,8 @@ pixel_y = 2 }, /obj/item/storage/box/syringes, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Virology APC"; - pixel_y = 25 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/iron/white/side{ @@ -1515,11 +1506,8 @@ /turf/open/floor/plating/lavaland_atmos, /area/lavaland/surface/outdoors) "ji" = ( -/obj/machinery/power/apc/syndicate{ - dir = 8; - name = "Primary Hallway APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -2081,10 +2069,8 @@ "mv" = ( /obj/structure/table/wood, /obj/machinery/light/small/directional/south, -/obj/machinery/power/apc/syndicate{ - name = "Bar APC"; - pixel_y = -25 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /turf/open/floor/wood, /area/ruin/syndicate_lava_base/bar) @@ -2271,11 +2257,8 @@ "oc" = ( /obj/machinery/light/small/directional/south, /obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/power/apc/syndicate{ - dir = 4; - name = "Medbay APC"; - pixel_x = 25 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/iron/white/side{ @@ -2418,11 +2401,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Arrival Hallway APC"; - pixel_y = 25 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -3570,11 +3550,8 @@ /area/ruin/syndicate_lava_base/dormitories) "JQ" = ( /obj/machinery/light/small/directional/north, -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Engineering APC"; - pixel_y = 25 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/iron, @@ -4372,10 +4349,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/power/apc/syndicate{ - name = "Dormitories APC"; - pixel_y = -25 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/effect/turf_decal/tile/neutral, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_1.dmm index f37752d58f5..25aab3ccf7b 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_1.dmm @@ -77,10 +77,8 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/power/apc/syndicate{ - name = "Telecommunications APC"; - pixel_y = -25 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_2.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_2.dmm index 56bf133ef9a..0beb9632095 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_2.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_2.dmm @@ -31,10 +31,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/power/apc/syndicate{ - name = "Telecommunications APC"; - pixel_y = -25 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/syndicate_access, /turf/open/floor/wood, /area/ruin/syndicate_lava_base/telecomms) "k" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_3.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_3.dmm index b3274359a26..bae1b50984b 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_3.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/commswilding_3.dmm @@ -46,10 +46,8 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/power/apc/syndicate{ - name = "Telecommunications APC"; - pixel_y = -25 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /turf/open/floor/iron, /area/ruin/syndicate_lava_base/telecomms) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm index 162045cebbb..ca428942e32 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_feasible.dmm @@ -272,9 +272,8 @@ "X" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south{ - req_access = list("syndicate") - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm index 1b2fb4ec37a..8006f2a0bb1 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm @@ -9,9 +9,8 @@ /area/ruin/syndicate_lava_base/testlab) "be" = ( /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south{ - req_access = list("syndicate") - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/syndicate_access, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) "bs" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_unlikely.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_unlikely.dmm index 33352d483e5..1d4646b9a39 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_unlikely.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_unlikely.dmm @@ -63,9 +63,8 @@ dir = 4 }, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west{ - req_access = list("syndicate") - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, /turf/open/floor/iron/dark, /area/ruin/syndicate_lava_base/testlab) "N" = ( diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index 6e5bdecdd44..588dc37d736 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -429,14 +429,12 @@ /obj/structure/rack, /obj/effect/spawner/random/maintenance, /obj/structure/cable, -/obj/machinery/power/apc/unlocked{ - dir = 8; +/obj/machinery/power/apc/worn_out/directional/west{ environ = 0; - lighting = 0; - name = "Worn-out APC"; - pixel_x = -25 + lighting = 0 }, /obj/item/melee/baton/security/cattleprod, +/obj/effect/mapping_helpers/apc/unlocked, /turf/open/floor/iron/dark/side, /area/ruin/space/has_grav/abandonedzoo) "Mb" = ( diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index f03dc768611..315eb923063 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -56,9 +56,8 @@ /area/ruin/space/has_grav/derelictoutpost/cargobay) "ao" = ( /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron, /area/ruin/space/has_grav/derelictoutpost/cargobay) "ap" = ( @@ -498,9 +497,8 @@ /area/ruin/space/has_grav/derelictoutpost/powerstorage) "ca" = ( /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron, /area/ruin/space/has_grav/derelictoutpost/powerstorage) "cb" = ( @@ -540,9 +538,8 @@ /area/ruin/space/has_grav/derelictoutpost) "ck" = ( /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron, /area/ruin/space/has_grav/derelictoutpost) "cl" = ( @@ -1032,9 +1029,8 @@ /area/ruin/space/has_grav/derelictoutpost/cargostorage) "el" = ( /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron, /area/ruin/space/has_grav/derelictoutpost/cargostorage) "eo" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index 412fc40d8df..75dda39e173 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -240,11 +240,10 @@ /area/awaymission/bmpship/aft) "lx" = ( /obj/structure/cable, -/obj/machinery/power/apc/unlocked{ - dir = 1; - environ = 0; - pixel_y = 25 +/obj/machinery/power/apc/auto_name/directional/north{ + environ = 0 }, +/obj/effect/mapping_helpers/apc/unlocked, /turf/open/floor/iron/airless, /area/awaymission/bmpship/midship) "lG" = ( diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index c223b20fc70..da21f9ffb4a 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -2670,10 +2670,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/power/apc/away{ - name = "ASRC Lobby"; - pixel_y = -25 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/away_general_access, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, /area/ruin/space/has_grav/dangerous_research) @@ -2758,11 +2756,8 @@ "JN" = ( /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/structure/cable, -/obj/machinery/power/apc/away{ - dir = 8; - name = "ASRC Dorms"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/away_general_access, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/diagonal, /area/ruin/space/has_grav/dangerous_research/dorms) @@ -3807,11 +3802,8 @@ /area/ruin/space/has_grav/dangerous_research/maint) "XI" = ( /obj/structure/cable, -/obj/machinery/power/apc/away{ - dir = 1; - name = "ASRC Maintenance"; - pixel_y = 25 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/away_general_access, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/oil/slippery, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -3861,11 +3853,8 @@ /area/ruin/space/has_grav/dangerous_research/lab) "Yr" = ( /obj/structure/cable, -/obj/machinery/power/apc/away{ - dir = 1; - name = "ASRC Laboratory"; - pixel_y = 25 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/away_general_access, /obj/effect/turf_decal/tile/neutral/half, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/dangerous_research/lab) @@ -3902,11 +3891,8 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable, -/obj/machinery/power/apc/away{ - dir = 4; - name = "ASRC Medical Facility"; - pixel_x = 25 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/away_general_access, /turf/open/floor/iron/white, /area/ruin/space/has_grav/dangerous_research/medical) "YZ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 447f0002329..5b9a0200a71 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -131,10 +131,8 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/crusher) "aE" = ( -/obj/machinery/power/apc/away{ - name = "Recycling APC"; - pixel_y = -25 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/away_general_access, /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/has_grav/deepstorage/crusher) @@ -636,10 +634,8 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) "bN" = ( -/obj/machinery/power/apc/away{ - name = "Kitchen APC"; - pixel_y = -25 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/away_general_access, /obj/structure/cable, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/deepstorage/kitchen) @@ -780,9 +776,8 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/hydroponics) "cg" = ( -/obj/machinery/power/apc/highcap/five_k/directional/east{ - name = "Hydroponics APC" - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/hydroponics) @@ -1063,9 +1058,8 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage) "cQ" = ( -/obj/machinery/power/apc/highcap/five_k/directional/east{ - name = "Storage APC" - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/iron, @@ -1433,10 +1427,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/power/apc/away{ - name = "Main Area APC"; - pixel_y = -25 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/away_general_access, /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -1489,9 +1481,8 @@ /obj/item/storage/backpack/duffelbag/sec/surgery{ pixel_y = 5 }, -/obj/machinery/power/apc/highcap/five_k/directional/east{ - name = "Armory APC" - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/deepstorage/armory) @@ -1718,11 +1709,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden{ dir = 10 }, -/obj/machinery/power/apc/away{ - dir = 1; - name = "Airlock Control APC"; - pixel_y = 25 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/away_general_access, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/iron, @@ -1974,11 +1962,8 @@ /area/ruin/space/has_grav/deepstorage/airlock) "fx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/machinery/power/apc/away{ - dir = 8; - name = "Power and Atmospherics APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/away_general_access, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/iron, @@ -2025,9 +2010,8 @@ /area/ruin/space/has_grav/deepstorage/power) "fE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/apc/highcap/five_k/directional/east{ - name = "Dormitory APC" - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/iron, @@ -2751,7 +2735,8 @@ /area/ruin/space/has_grav/deepstorage/dorm) "Az" = ( /obj/structure/cable, -/obj/machinery/power/apc/highcap/ten_k/directional/east, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_10k, /turf/open/floor/engine, /area/ruin/space/has_grav/deepstorage/pharmacy) "AI" = ( diff --git a/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm b/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm index 8dcd6939ca9..3383d24bedc 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm @@ -859,11 +859,11 @@ /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north{ start_charge = 25; - locked = 0; equipment = 0; environ = 0; lighting = 0 }, +/obj/effect/mapping_helpers/apc/unlocked, /turf/open/floor/plating/airless, /area/ruin/space/has_grav/derelictsulaco) "DJ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index b8e14aaf89c..27626b3466d 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -322,12 +322,9 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicate_forgotten_ship) "bf" = ( -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Syndicate Cargo Pod APC"; - pixel_y = 25; - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /obj/structure/closet/crate/secure/gear{ req_access = list("syndicate") @@ -439,12 +436,9 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicate_forgotten_cargopod) "bv" = ( -/obj/machinery/power/apc/syndicate{ - dir = 1; - name = "Syndicate Forgotten Ship APC"; - pixel_y = 25; - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicate_forgotten_ship) diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm index 431f5f805fa..438e36acb59 100644 --- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm +++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm @@ -647,7 +647,8 @@ /area/ruin/space/has_grav/hellfactory) "cm" = ( /obj/structure/cable, -/obj/machinery/power/apc/highcap/ten_k/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_10k, /turf/open/floor/plating, /area/ruin/space/has_grav/hellfactory) "cn" = ( @@ -909,7 +910,8 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hellfactory) "wv" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, /turf/open/floor/iron/grimy, /area/ruin/space/has_grav/hellfactoryoffice) diff --git a/_maps/RandomRuins/SpaceRuins/interdyne.dmm b/_maps/RandomRuins/SpaceRuins/interdyne.dmm index c590e9e962d..321c368f843 100644 --- a/_maps/RandomRuins/SpaceRuins/interdyne.dmm +++ b/_maps/RandomRuins/SpaceRuins/interdyne.dmm @@ -810,7 +810,8 @@ /area/ruin/space/has_grav/interdyne) "Fe" = ( /obj/structure/cable, -/obj/machinery/power/apc/highcap/ten_k/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_10k, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/interdyne) "Fw" = ( diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index dcdb6374685..cb6f2621841 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -463,11 +463,8 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/listeningstation) "yH" = ( -/obj/machinery/power/apc/syndicate{ - dir = 4; - name = "Syndicate Listening Post APC"; - pixel_x = 25 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index c5e357821a6..b52d531e461 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -417,9 +417,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/hall) @@ -1040,9 +1039,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, @@ -1069,9 +1067,8 @@ /obj/structure/cable, /obj/effect/decal/cleanable/cobweb, /obj/machinery/light_switch/directional/west, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, @@ -1115,9 +1112,8 @@ "ec" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron/white, /area/ruin/space/ancientstation/delta/rnd) "ed" = ( @@ -1748,9 +1744,8 @@ /obj/structure/cable, /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron/dark, /area/ruin/space/ancientstation/delta/ai) "gf" = ( @@ -1906,9 +1901,8 @@ /area/ruin/space/ancientstation/charlie/hydro) "gF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -2853,9 +2847,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/atmospherics/pipe/layer_manifold, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -3293,9 +3286,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /obj/machinery/duct, /turf/open/floor/iron, /area/ruin/space/ancientstation/delta/hall) @@ -3718,9 +3710,8 @@ "mQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/ruin/space/ancientstation/beta/mining) @@ -4488,9 +4479,8 @@ /obj/structure/mirror/directional/north, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/dorms) @@ -5087,9 +5077,8 @@ "uG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine/airless, /area/ruin/space/ancientstation/beta/supermatter) @@ -6263,9 +6252,8 @@ default_raw_text = "*Prototype Sleeper*

We have deliverted the lastest in medical technology to the medical bay for your use." }, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, @@ -7205,9 +7193,8 @@ "Mh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron/cafeteria, /area/ruin/space/ancientstation/charlie/kitchen) "Ms" = ( @@ -7570,9 +7557,8 @@ "PA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -7798,9 +7784,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ancientstation/charlie/engie) @@ -7816,9 +7801,8 @@ /area/ruin/space/ancientstation/delta/hall) "RO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/plating/rust, /area/ruin/space/ancientstation/charlie/hall) @@ -7829,9 +7813,8 @@ /area/ruin/space/ancientstation/charlie/sec) "RV" = ( /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, @@ -8134,9 +8117,8 @@ "UB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron/white/textured, /area/ruin/space/ancientstation/delta/proto) "UE" = ( @@ -8213,9 +8195,8 @@ dir = 1; pixel_y = 23 }, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/ancientstation/charlie/storage) diff --git a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm index 6d90cca2791..8f251fa24d3 100644 --- a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm @@ -21,9 +21,8 @@ /area/ruin/space/ks13/command/bridge) "ah" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron/airless, /area/ruin/space/ks13/service/cafe) "ai" = ( @@ -204,9 +203,8 @@ "cn" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/plating/airless, /area/ruin/space/ks13/security/cell) @@ -225,9 +223,8 @@ /area/ruin/space/ks13/security/sec) "cu" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/security/court_hall) @@ -257,15 +254,13 @@ dir = 4 }, /obj/structure/cable, -/obj/machinery/power/apc/unlocked{ - dir = 8; +/obj/machinery/power/apc/auto_name/directional/west{ environ = 0; equipment = 0; - lighting = 0; - name = "Aft Solar APC"; - pixel_x = -25; - start_charge = 0 + lighting = 0 }, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/unlocked, /turf/open/floor/iron, /area/ruin/space/ks13/engineering/sb_bow_solars_control) "de" = ( @@ -837,9 +832,8 @@ /obj/structure/rack, /obj/item/stock_parts/cell/lead, /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/plating/airless, /area/ruin/space/ks13/engineering/aux_storage) "mb" = ( @@ -861,9 +855,8 @@ /turf/open/floor/iron/airless, /area/ruin/space/ks13/hallway/central) "mv" = ( -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/hallway/aft) @@ -948,9 +941,8 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "nK" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /obj/structure/table_frame, /obj/item/bot_assembly/medbot, @@ -1182,9 +1174,8 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/plating/airless, /area/ruin/space/ks13/engineering/atmos) @@ -1419,9 +1410,8 @@ "qJ" = ( /obj/structure/table_frame, /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/plating/airless, /area/ruin/space/ks13/service/hydro) "qK" = ( @@ -1807,9 +1797,8 @@ "sA" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/engineering/secure_storage) @@ -1877,9 +1866,8 @@ /turf/open/floor/iron/airless, /area/ruin/space/ks13/engineering/tech_storage) "sM" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ks13/hallway/starboard_bow) @@ -1906,9 +1894,8 @@ "sS" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/plating/airless, /area/ruin/space/ks13/engineering/singulo) @@ -2110,9 +2097,8 @@ /area/ruin/space/ks13/service/chapel) "ug" = ( /obj/structure/table/glass, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/plating/airless, /area/ruin/space/ks13/science/genetics) @@ -2677,9 +2663,8 @@ /turf/open/floor/plating, /area/ruin/space/ks13/security/court) "xA" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /obj/structure/rack, /obj/item/pushbroom, @@ -2790,9 +2775,8 @@ /obj/item/mop, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron/airless, /area/ruin/space/ks13/service/jani) "yc" = ( @@ -3213,9 +3197,8 @@ /turf/open/floor/iron/airless, /area/ruin/space/ks13/hallway/central) "Am" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/iron, @@ -4085,9 +4068,8 @@ /turf/open/floor/iron/airless, /area/ruin/space/ks13/engineering/secure_storage) "EI" = ( -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ks13/command/bridge_hall) @@ -4869,9 +4851,8 @@ /obj/item/stack/cable_coil/cut, /obj/effect/decal/cleanable/glass, /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/plating/airless, /area/ruin/space/ks13/science/ordnance_hall) "IY" = ( @@ -5066,9 +5047,8 @@ /turf/open/floor/plating/airless, /area/ruin/space/ks13/engineering/atmos) "JS" = ( -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, @@ -5535,9 +5515,8 @@ "MJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/hallway/central) @@ -5682,9 +5661,8 @@ /turf/open/floor/plating/airless, /area/ruin/space/ks13/ai/vault) "Ns" = ( -/obj/machinery/power/apc/auto_name/directional/east{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/service/bar) @@ -5809,9 +5787,8 @@ pixel_x = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/iron/airless, /area/ruin/space/ks13/science/rnd) "Og" = ( @@ -5879,9 +5856,8 @@ /obj/effect/mapping_helpers/burnt_floor, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /turf/open/floor/plating/airless, /area/ruin/space/ks13/security/sec) "OA" = ( @@ -6049,9 +6025,8 @@ /area/ruin/space/ks13/ai/corridor) "Pq" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ks13/security/court) @@ -6130,9 +6105,8 @@ /obj/structure/frame/machine{ anchored = 1 }, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/service/kitchen) @@ -6150,9 +6124,8 @@ /area/ruin/space/ks13/engineering/singulo) "PH" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/engineering/tech_storage) @@ -6203,9 +6176,8 @@ /area/ruin/space/ks13/ai/corridor) "PX" = ( /obj/effect/mapping_helpers/burnt_floor, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/dorms) @@ -6492,9 +6464,8 @@ /area/ruin/space/ks13/service/chapel) "RH" = ( /obj/structure/table_frame, -/obj/machinery/power/apc/auto_name/directional/south{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/dark, /area/ruin/space/ks13/medical/morgue) @@ -7061,9 +7032,8 @@ /turf/open/floor/plating, /area/ruin/space/ks13/science/ordnance) "Ug" = ( -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/plating/airless, /area/ruin/space/ks13/engineering/grav_gen) @@ -7630,9 +7600,8 @@ /area/ruin/space/ks13/service/cafe) "Xi" = ( /obj/machinery/computer/atmos_alert, -/obj/machinery/power/apc/auto_name/directional/north{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron, /area/ruin/space/ks13/ai/corridor) @@ -7713,9 +7682,8 @@ /turf/open/floor/iron/white/airless, /area/ruin/space/ks13/medical/medbay) "XJ" = ( -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/ai/vault) @@ -7810,9 +7778,8 @@ }, /obj/item/stack/cable_coil/cut, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/west{ - start_charge = 0 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/no_charge, /obj/structure/cable, /turf/open/floor/iron/airless, /area/ruin/space/ks13/tool_storage) @@ -8051,15 +8018,13 @@ /turf/open/floor/plating/airless, /area/ruin/space/ks13/engineering/atmos) "Zz" = ( -/obj/machinery/power/apc/unlocked{ - dir = 8; +/obj/machinery/power/apc/auto_name/directional/west{ environ = 0; equipment = 0; - lighting = 0; - name = "Starboard Solar APC"; - pixel_x = -25; - start_charge = 0 + lighting = 0 }, +/obj/effect/mapping_helpers/apc/no_charge, +/obj/effect/mapping_helpers/apc/unlocked, /obj/structure/cable, /turf/open/floor/plating/airless, /area/ruin/space/ks13/engineering/aft_solars_control) diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index fe39a8c6f08..61c3e62e341 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -1,9 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ae" = ( /obj/structure/cable, -/obj/machinery/power/apc/highcap/five_k/directional/south{ - name = "Guest Room APC" - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_5k, /turf/open/floor/carpet/purple, /area/ruin/space/has_grav/hotel/guestroom/room_5) "ag" = ( @@ -98,9 +97,8 @@ }, /area/ruin/space/has_grav/hotel/workroom) "bj" = ( -/obj/machinery/power/apc/highcap/five_k/directional/north{ - name = "Guest Room APC" - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/hotel/guestroom/room_2) @@ -189,9 +187,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/power/apc/highcap/five_k/directional/south{ - name = "Dock APC" - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /obj/structure/chair{ dir = 1 @@ -792,9 +789,8 @@ /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) "hT" = ( -/obj/machinery/power/apc/highcap/five_k/directional/south{ - name = "Kitchen APC" - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /turf/open/floor/iron/cafeteria, /area/ruin/space/has_grav/hotel/bar) @@ -1366,9 +1362,8 @@ /turf/open/floor/iron/sepia, /area/ruin/space/has_grav/hotel/pool) "mh" = ( -/obj/machinery/power/apc/highcap/five_k/directional/south{ - name = "Guest Room APC" - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/hotel/guestroom/room_3) @@ -1785,9 +1780,8 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/hotel) "qG" = ( -/obj/machinery/power/apc/highcap/five_k/directional/south{ - name = "Custodial APC" - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /obj/structure/sink/directional/west, /obj/item/reagent_containers/spray/cleaner, @@ -2889,9 +2883,8 @@ "EJ" = ( /obj/structure/table/wood/fancy/purple, /obj/item/paper_bin, -/obj/machinery/power/apc/highcap/five_k/directional/north{ - name = "Guest Room APC" - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /obj/item/pen, /turf/open/floor/carpet/lone, @@ -3031,9 +3024,8 @@ /area/ruin/space/has_grav/hotel) "Gd" = ( /obj/structure/cable, -/obj/machinery/power/apc/highcap/five_k/directional/north{ - name = "Power Storage APC" - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_5k, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "Gg" = ( @@ -3494,9 +3486,8 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/hotel) "MQ" = ( -/obj/machinery/power/apc/highcap/five_k/directional/south{ - name = "Pool Room APC" - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /turf/open/floor/iron/freezer, /area/ruin/space/has_grav/hotel/pool) @@ -3665,9 +3656,8 @@ /area/ruin/space/has_grav/hotel) "OW" = ( /obj/structure/table/wood/fancy/orange, -/obj/machinery/power/apc/highcap/five_k/directional/south{ - name = "Guest Room APC" - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /turf/open/floor/carpet/royalblue, /area/ruin/space/has_grav/hotel/guestroom/room_4) @@ -4212,9 +4202,8 @@ /area/template_noop) "VM" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/power/apc/highcap/five_k/directional/south{ - name = "Staff Room APC" - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /obj/item/gps/spaceruin{ name = "hotel gps" @@ -4516,9 +4505,8 @@ "YE" = ( /obj/structure/table/wood/fancy/royalblue, /obj/item/paper_bin, -/obj/machinery/power/apc/highcap/five_k/directional/south{ - name = "Guest Room APC" - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /obj/item/pen, /turf/open/floor/carpet/orange, diff --git a/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm b/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm index 1f07cd0f25d..5f09680f185 100644 --- a/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm +++ b/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm @@ -245,10 +245,10 @@ }, /obj/machinery/power/apc/auto_name/directional/north{ coverlocked = 0; - locked = 0; network_id = null; start_charge = 60 }, +/obj/effect/mapping_helpers/apc/unlocked, /obj/structure/cable, /obj/item/paper/fluff/spaceruins/lizardsgas/memorandum, /obj/effect/spawner/random/contraband/cannabis/lizardsgas, diff --git a/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm b/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm index 7a9a4a89234..b08b516d1fd 100644 --- a/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm +++ b/_maps/RandomRuins/SpaceRuins/travelers_rest.dmm @@ -100,9 +100,9 @@ /obj/machinery/power/apc/auto_name/directional/east{ environ = 0; equipment = 0; - lighting = 0; - locked = 0 + lighting = 0 }, +/obj/effect/mapping_helpers/apc/unlocked, /obj/effect/spawner/random/engineering/toolbox, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index afa8e78d92e..88fc43ef68a 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -848,11 +848,10 @@ }, /area/awaymission/moonoutpost19/syndicate) "cK" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/south{ - locked = 0; - name = "Worn Out APC"; - start_charge = 100 - }, +/obj/machinery/power/apc/worn_out, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron{ @@ -2378,11 +2377,10 @@ }, /area/awaymission/moonoutpost19/research) "gG" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/east{ - locked = 0; - name = "Worn Out APC"; - start_charge = 100 - }, +/obj/machinery/power/apc/worn_out, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white{ @@ -3610,11 +3608,10 @@ }, /area/awaymission/moonoutpost19/arrivals) "jH" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/north{ - locked = 0; - name = "Worn Out APC"; - start_charge = 100 - }, +/obj/machinery/power/apc/worn_out, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, /turf/open/floor/iron{ heat_capacity = 1e+006 diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 93c2c2c0731..bc6878f0953 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -274,7 +274,8 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/machinery/power/apc/highcap/ten_k/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, /turf/open/floor/iron/white, /area/awaymission/research/interior/engineering) @@ -471,9 +472,8 @@ /turf/open/floor/iron/dark, /area/awaymission/research/interior/gateway) "cb" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/east{ - name = "Gateway APC" - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/research/interior/gateway) @@ -1190,9 +1190,8 @@ /turf/open/floor/iron/dark, /area/awaymission/research/interior/secure) "fy" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/east{ - name = "Vault APC" - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/research/interior/secure) @@ -2175,9 +2174,8 @@ /turf/open/floor/iron/white, /area/awaymission/research/interior/medbay) "kp" = ( -/obj/machinery/power/apc/highcap/five_k/directional/east{ - name = "Dorms APC" - }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/research/interior/maint) @@ -2430,7 +2428,8 @@ dir = 8 }, /obj/structure/cable, -/obj/machinery/power/apc/highcap/five_k/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/cell_5k, /turf/open/floor/iron, /area/awaymission/research/interior/dorm) "lo" = ( @@ -3405,7 +3404,8 @@ "DC" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/structure/cable, -/obj/machinery/power/apc/highcap/five_k/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/cell_5k, /turf/open/floor/iron/dark, /area/awaymission/research/interior/genetics) "DO" = ( @@ -3745,7 +3745,8 @@ dir = 1 }, /obj/structure/cable, -/obj/machinery/power/apc/highcap/five_k/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_5k, /turf/open/floor/iron/white, /area/awaymission/research/interior/cryo) "Or" = ( diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 1159dc1c33c..8379a5185d3 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -1991,11 +1991,10 @@ c_tag = "Hydroponics"; network = list("uo45") }, -/obj/machinery/power/apc/highcap/ten_k/directional/south{ - locked = 0; - name = "UO45 Hydroponics APC"; - start_charge = 100 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron{ @@ -3891,11 +3890,10 @@ }, /area/awaymission/undergroundoutpost45/crew_quarters) "jV" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/north{ - locked = 0; - name = "UO45 Bar APC"; - start_charge = 100 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron{ @@ -4770,10 +4768,9 @@ }, /area/awaymission/undergroundoutpost45/research) "lH" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/south{ - name = "UO45 Research Division APC"; - start_charge = 100 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -5232,11 +5229,10 @@ }, /area/awaymission/undergroundoutpost45/gateway) "mE" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/south{ - locked = 0; - name = "UO45 Gateway APC"; - start_charge = 100 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/rack, /obj/item/clothing/shoes/magboots, /obj/effect/turf_decal/stripes/line{ @@ -7508,10 +7504,9 @@ /turf/closed/wall/r_wall, /area/awaymission/undergroundoutpost45/engineering) "rp" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/west{ - name = "UO45 Engineering APC"; - start_charge = 100 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -8016,11 +8011,10 @@ }, /area/awaymission/undergroundoutpost45/mining) "sj" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/south{ - locked = 0; - name = "UO45 Mining APC"; - start_charge = 100 - }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/mapping_helpers/apc/unlocked, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ dir = 4 diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index e97f0347cbb..76a74aab332 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -86628,7 +86628,8 @@ /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/directional/north, -/obj/machinery/power/apc/sm_apc/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_10k, /turf/open/floor/plating, /area/station/engineering/supermatter/room) "vFm" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 84117c48e7e..cfa022f61d7 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -25588,7 +25588,8 @@ "ijn" = ( /obj/structure/cable, /obj/item/reagent_containers/cup/glass/bottle/hooch, -/obj/machinery/power/apc/highcap/five_k/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_5k, /turf/open/floor/plating, /area/mine/storage) "ijp" = ( @@ -34926,7 +34927,8 @@ /area/station/hallway/primary/starboard) "lfp" = ( /obj/structure/cable, -/obj/machinery/power/apc/sm_apc/directional/south, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_10k, /turf/open/floor/plating, /area/station/engineering/supermatter/room) "lfs" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 4e6f16c4f1e..4ead7e4f190 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -19747,7 +19747,8 @@ /obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/power/apc/sm_apc/directional/south, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/engineering/supermatter/room) @@ -60257,7 +60258,8 @@ pixel_y = 6 }, /obj/item/food/grown/poppy/lily, -/obj/machinery/power/apc/highcap/five_k/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 364310804b9..422be050b44 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -28795,7 +28795,8 @@ /area/station/maintenance/starboard/fore) "kxw" = ( /obj/structure/cable, -/obj/machinery/power/apc/sm_apc/directional/east, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_10k, /turf/open/floor/plating, /area/station/engineering/supermatter/room) "kxz" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index d7773ca23fa..d454829cc29 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -67450,7 +67450,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/power/apc/sm_apc/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm index 4efe992d433..1a2e99fea5c 100644 --- a/_maps/shuttles/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator_advanced.dmm @@ -185,12 +185,11 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/syndicate{ - aidisabled = 1; - area = "/area/shuttle/syndicate/bridge"; - name = "Infiltrator E.V.A APC"; - pixel_y = -25 +/obj/machinery/power/apc/auto_name/directional/south{ + area = "/area/shuttle/syndicate/bridge" }, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/bridge) @@ -332,13 +331,11 @@ name = "tactical chair" }, /obj/effect/turf_decal/bot, -/obj/machinery/power/apc/syndicate{ - aidisabled = 1; - area = "/area/shuttle/syndicate/airlock"; - dir = 4; - name = "Infiltrator Airlock APC"; - pixel_x = 25 +/obj/machinery/power/apc/auto_name/directional/east{ + area = "/area/shuttle/syndicate/airlock" }, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate/airlock) @@ -403,13 +400,11 @@ pixel_x = -6; pixel_y = -2 }, -/obj/machinery/power/apc/syndicate{ - aidisabled = 1; - area = "/area/shuttle/syndicate/hallway"; - dir = 1; - name = "Infiltrator APC"; - pixel_y = 25 +/obj/machinery/power/apc/auto_name/directional/north{ + area = "/area/shuttle/syndicate/hallway" }, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/machinery/airalarm/syndicate{ dir = 4; pixel_x = 25 @@ -869,13 +864,11 @@ /obj/machinery/suit_storage_unit/syndicate, /obj/effect/turf_decal/box, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/syndicate{ - aidisabled = 1; - area = "/area/shuttle/syndicate/eva"; - dir = 1; - name = "Infiltrator E.V.A APC"; - pixel_y = 25 +/obj/machinery/power/apc/auto_name/directional/north{ + area = "/area/shuttle/syndicate/eva" }, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /turf/open/floor/pod/dark, /area/shuttle/syndicate/eva) @@ -1720,13 +1713,11 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/machinery/power/apc/syndicate{ - aidisabled = 1; - area = "/area/shuttle/syndicate/medical"; - dir = 8; - name = "Infiltrator Medical APC"; - pixel_x = -25 +/obj/machinery/power/apc/auto_name/directional/west{ + area = "/area/shuttle/syndicate/medical" }, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/pod/dark, @@ -1782,13 +1773,11 @@ /obj/item/flashlight/seclite, /obj/item/flashlight/seclite, /obj/item/extinguisher/mini, -/obj/machinery/power/apc/syndicate{ - aidisabled = 1; - area = "/area/shuttle/syndicate/armory"; - dir = 4; - name = "Infiltrator Armory APC"; - pixel_x = 25 +/obj/machinery/power/apc/auto_name/directional/east{ + area = "/area/shuttle/syndicate/armory" }, +/obj/effect/mapping_helpers/apc/cut_AI_wire, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /turf/open/floor/pod/dark, /area/shuttle/syndicate/armory) diff --git a/_maps/shuttles/ruin_cyborg_mothership.dmm b/_maps/shuttles/ruin_cyborg_mothership.dmm index 7b49ff360a1..0b3bc064bd5 100644 --- a/_maps/shuttles/ruin_cyborg_mothership.dmm +++ b/_maps/shuttles/ruin_cyborg_mothership.dmm @@ -193,9 +193,9 @@ /obj/machinery/power/apc/auto_name/directional/south{ environ = 0; equipment = 0; - locked = 0; lighting = 0 }, +/obj/effect/mapping_helpers/apc/unlocked, /turf/open/floor/circuit/airless, /area/shuttle/ruin/cyborg_mothership) "mc" = ( diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index ea8862e512d..f2378b9c468 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -319,11 +319,8 @@ "Jm" = ( /obj/structure/chair/comfy/shuttle, /obj/machinery/light/small/directional/west, -/obj/machinery/power/apc/syndicate{ - dir = 8; - name = "Syndicate Drop Ship APC"; - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/pod/dark, diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index cab4b074cc0..8db823566c2 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -90,10 +90,9 @@ /turf/open/floor/plating, /area/shuttle/ruin/caravan/syndicate1) "YY" = ( -/obj/machinery/power/apc/highcap/ten_k/directional/west{ - name = "Syndicate Fighter Power Controller"; - req_access = list("syndicate") - }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/syndicate_access, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/machinery/computer/security{ dir = 1; network = list("caravansyndicate1") diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index e5cf632dced..0dfdd46b5dd 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -2987,12 +2987,9 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/sbc_starfury) "jf" = ( -/obj/machinery/power/apc/syndicate{ - cell_type = /obj/item/stock_parts/cell/high; - dir = 1; - name = "Syndicate Battlecruiser APC"; - pixel_y = 25 - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/mapping_helpers/apc/cell_10k, +/obj/effect/mapping_helpers/apc/syndicate_access, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/shuttle/sbc_starfury) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 5b86a3ee433..a5ed899e17f 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -158,7 +158,7 @@ #define LOW_SIGIL_LAYER 2.52 #define SIGIL_LAYER 2.53 #define HIGH_PIPE_LAYER 2.54 -// Anything aboe this layer is not "on" a turf for the purposes of washing +// Anything above this layer is not "on" a turf for the purposes of washing // I hate this life of ours #define FLOOR_CLEAN_LAYER 2.55 diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm index 92e3254210f..eebab28613a 100644 --- a/code/datums/wires/apc.dm +++ b/code/datums/wires/apc.dm @@ -40,9 +40,9 @@ A.aidisabled = TRUE addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 1 SECONDS) -/datum/wires/apc/on_cut(index, mend) +/datum/wires/apc/on_cut(wire, mend) var/obj/machinery/power/apc/A = holder - switch(index) + switch(wire) if(WIRE_POWER1, WIRE_POWER2) // Short out. if(mend && !is_cut(WIRE_POWER1) && !is_cut(WIRE_POWER2)) A.shorted = FALSE diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 9e676c386bb..4ef5b4cfe0d 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -245,6 +245,142 @@ else airlock.autoname = TRUE +//apc helpers +/obj/effect/mapping_helpers/apc + desc = "You shouldn't see this. Report it please." + layer = DOOR_HELPER_LAYER + late = TRUE + +/obj/effect/mapping_helpers/apc/Initialize(mapload) + . = ..() + if(!mapload) + log_mapping("[src] spawned outside of mapload!") + return INITIALIZE_HINT_QDEL + + var/obj/machinery/power/apc/target = locate(/obj/machinery/power/apc) in loc + if(isnull(target)) + var/area/target_area = get_area(target) + log_mapping("[src] failed to find an apc at [AREACOORD(src)] ([target_area.type]).") + else + payload(target) + + return INITIALIZE_HINT_LATELOAD + +/obj/effect/mapping_helpers/apc/LateInitialize() + . = ..() + var/obj/machinery/power/apc/target = locate(/obj/machinery/power/apc) in loc + + if(isnull(target)) + qdel(src) + return + if(target.cut_AI_wire) + target.wires.cut(WIRE_AI) + if(target.cell_5k) + target.install_cell_5k() + if(target.cell_10k) + target.install_cell_10k() + if(target.unlocked) + target.unlock() + if(target.syndicate_access) + target.give_syndicate_access() + if(target.away_general_access) + target.give_away_general_access() + if(target.no_charge) + target.set_no_charge() + if(target.full_charge) + target.set_full_charge() + if(target.cell_5k && target.cell_10k) + CRASH("Tried to combine non-combinable cell_5k and cell_10k APC helpers!") + if(target.syndicate_access && target.away_general_access) + CRASH("Tried to combine non-combinable syndicate_access and away_general_access APC helpers!") + if(target.no_charge && target.full_charge) + CRASH("Tried to combine non-combinable no_charge and full_charge APC helpers!") + target.update_appearance() + qdel(src) + +/obj/effect/mapping_helpers/apc/proc/payload(obj/machinery/power/apc/target) + return + +/obj/effect/mapping_helpers/apc/cut_AI_wire + name = "apc AI wire mended helper" + icon_state = "apc_cut_AIwire_helper" + +/obj/effect/mapping_helpers/apc/cut_AI_wire/payload(obj/machinery/power/apc/target) + if(target.cut_AI_wire) + var/area/apc_area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(apc_area.type)] tried to mend the AI wire on the [target] but it's already cut!") + target.cut_AI_wire = TRUE + +/obj/effect/mapping_helpers/apc/cell_5k + name = "apc 5k cell helper" + icon_state = "apc_5k_cell_helper" + +/obj/effect/mapping_helpers/apc/cell_5k/payload(obj/machinery/power/apc/target) + if(target.cell_5k) + var/area/apc_area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(apc_area.type)] tried to change [target]'s cell to cell_5k but it's already changed!") + target.cell_5k = TRUE + +/obj/effect/mapping_helpers/apc/cell_10k + name = "apc 10k cell helper" + icon_state = "apc_10k_cell_helper" + +/obj/effect/mapping_helpers/apc/cell_10k/payload(obj/machinery/power/apc/target) + if(target.cell_10k) + var/area/apc_area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(apc_area.type)] tried to change [target]'s cell to cell_10k but it's already changed!") + target.cell_10k = TRUE + +/obj/effect/mapping_helpers/apc/syndicate_access + name = "apc syndicate access helper" + icon_state = "apc_syndicate_access_helper" + +/obj/effect/mapping_helpers/apc/syndicate_access/payload(obj/machinery/power/apc/target) + if(target.syndicate_access) + var/area/apc_area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(apc_area.type)] tried to adjust [target]'s access to syndicate but it's already changed!") + target.syndicate_access = TRUE + +/obj/effect/mapping_helpers/apc/away_general_access + name = "apc away access helper" + icon_state = "apc_away_general_access_helper" + +/obj/effect/mapping_helpers/apc/away_general_access/payload(obj/machinery/power/apc/target) + if(target.away_general_access) + var/area/apc_area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(apc_area.type)] tried to adjust [target]'s access to away_general but it's already changed!") + target.away_general_access = TRUE + +/obj/effect/mapping_helpers/apc/unlocked + name = "apc unlocked interface helper" + icon_state = "apc_unlocked_interface_helper" + +/obj/effect/mapping_helpers/apc/unlocked/payload(obj/machinery/power/apc/target) + if(target.unlocked) + var/area/apc_area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(apc_area.type)] tried to unlock the [target] but it's already unlocked!") + target.unlocked = TRUE + +/obj/effect/mapping_helpers/apc/no_charge + name = "apc no charge helper" + icon_state = "apc_no_charge_helper" + +/obj/effect/mapping_helpers/apc/no_charge/payload(obj/machinery/power/apc/target) + if(target.no_charge) + var/area/apc_area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(apc_area.type)] tried to set [target]'s charge to 0 but it's already at 0!") + target.no_charge = TRUE + +/obj/effect/mapping_helpers/apc/full_charge + name = "apc full charge helper" + icon_state = "apc_full_charge_helper" + +/obj/effect/mapping_helpers/apc/full_charge/payload(obj/machinery/power/apc/target) + if(target.full_charge) + var/area/apc_area = get_area(target) + log_mapping("[src] at [AREACOORD(src)] [(apc_area.type)] tried to set [target]'s charge to 100 but it's already at 100!") + target.full_charge = TRUE + //needs to do its thing before spawn_rivers() is called INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm index 89f451beb2b..2699bb052f7 100644 --- a/code/modules/power/apc/apc_main.dm +++ b/code/modules/power/apc/apc_main.dm @@ -109,6 +109,22 @@ var/datum/alarm_handler/alarm_manager /// Offsets the object by APC_PIXEL_OFFSET (defined in apc_defines.dm) pixels in the direction we want it placed in. This allows the APC to be embedded in a wall, yet still inside an area (like mapping). var/offset_old + /// Used for apc helper called cut_AI_wire to make apc's wore responsible for ai connectione mended. + var/cut_AI_wire = FALSE + /// Used for apc helper called unlocked to make apc unlocked. + var/unlocked = FALSE + /// Used for apc helper called syndicate_access to make apc's required access syndicate_access. + var/syndicate_access = FALSE + /// Used for apc helper called away_general_access to make apc's required access away_general_access. + var/away_general_access = FALSE + /// Used for apc helper called cell_5k to install 5k cell into apc. + var/cell_5k = FALSE + /// Used for apc helper called cell_10k to install 10k cell into apc. + var/cell_10k = FALSE + /// Used for apc helper called no_charge to make apc's charge at 0% meter. + var/no_charge = FALSE + /// Used for apc helper called full_charge to make apc's charge at 100% meter. + var/full_charge = FALSE armor_type = /datum/armor/power_apc /datum/armor/power_apc @@ -655,6 +671,36 @@ update_appearance(UPDATE_ICON) update() +///Used for cell_5k apc helper, which installs 5k cell into apc. +/obj/machinery/power/apc/proc/install_cell_5k() + cell_type = /obj/item/stock_parts/cell/upgraded/plus + cell = new cell_type(src) + +/// Used for cell_10k apc helper, which installs 10k cell into apc. +/obj/machinery/power/apc/proc/install_cell_10k() + cell_type = /obj/item/stock_parts/cell/high + cell = new cell_type(src) + +/// Used for unlocked apc helper, which unlocks the apc. +/obj/machinery/power/apc/proc/unlock() + locked = FALSE + +/// Used for syndicate_access apc helper, which sets apc's required access to syndicate_access. +/obj/machinery/power/apc/proc/give_syndicate_access() + req_access = list(ACCESS_SYNDICATE) + +///Used for away_general_access apc helper, which set apc's required access to away_general_access. +/obj/machinery/power/apc/proc/give_away_general_access() + req_access = list(ACCESS_AWAY_GENERAL) + +/// Used for no_charge apc helper, which sets apc charge to 0%. +/obj/machinery/power/apc/proc/set_no_charge() + cell.charge = 0 + +/// Used for full_charge apc helper, which sets apc charge to 100%. +/obj/machinery/power/apc/proc/set_full_charge() + cell.charge = 100 + /*Power module, used for APC construction*/ /obj/item/electronics/apc name = "power control module" diff --git a/code/modules/power/apc/apc_mapping.dm b/code/modules/power/apc/apc_mapping.dm index ead66d3813f..1463c20d600 100644 --- a/code/modules/power/apc/apc_mapping.dm +++ b/code/modules/power/apc/apc_mapping.dm @@ -1,26 +1,9 @@ -/obj/machinery/power/apc/unlocked - locked = FALSE - -/obj/machinery/power/apc/syndicate //general syndicate access - req_access = list(ACCESS_SYNDICATE) - -/obj/machinery/power/apc/away //general away mission access - req_access = list(ACCESS_AWAY_GENERAL) - -/obj/machinery/power/apc/highcap/five_k - cell_type = /obj/item/stock_parts/cell/upgraded/plus - -/obj/machinery/power/apc/highcap/ten_k - cell_type = /obj/item/stock_parts/cell/high +///Used to change name for apcs on away missions +/obj/machinery/power/apc/worn_out + name = "Worn out APC" /obj/machinery/power/apc/auto_name auto_name = TRUE -/obj/machinery/power/apc/sm_apc - auto_name = TRUE - cell_type = /obj/item/stock_parts/cell/high - +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/worn_out, APC_PIXEL_OFFSET) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, APC_PIXEL_OFFSET) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/highcap/five_k, APC_PIXEL_OFFSET) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/highcap/ten_k, APC_PIXEL_OFFSET) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/sm_apc, APC_PIXEL_OFFSET) diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 5666ae2a82822ca458e8edcd011d8e998521080f..1e7fcef6f6a017bdf0b61c345499dc97e0d08d2a 100644 GIT binary patch literal 23608 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 KSq;Q9?!N$@B{7@; diff --git a/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt b/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt new file mode 100644 index 00000000000..34c4c581f52 --- /dev/null +++ b/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt @@ -0,0 +1,38 @@ +#comment Repaths subtypes and some commonly used properties of apc to apc helpers. You really should change it if you have other apc's that this or else it might break everything. + +/obj/machinery/power/apc/unlocked : /obj/machinery/power/apc/auto_name{@OLD}, /obj/effect/mapping_helpers/apc/unlocked +/obj/machinery/power/apc/syndicate : /obj/machinery/power/apc/auto_name{@OLD}, /obj/effect/mapping_helpers/apc/syndicate_access +/obj/machinery/power/apc/away : /obj/machinery/power/apc/auto_name{@OLD}, /obj/effect/mapping_helpers/apc/away_general_access +/obj/machinery/power/apc/highcap/five_k : /obj/machinery/power/apc/auto_name{@OLD}, /obj/effect/mapping_helpers/apc/cell_5k +/obj/machinery/power/apc/highcap/five_k/directional/north : /obj/machinery/power/apc/auto_name/directional/north{@OLD}, /obj/effect/mapping_helpers/apc/cell_5k +/obj/machinery/power/apc/highcap/five_k/directional/south : /obj/machinery/power/apc/auto_name/directional/south{@OLD}, /obj/effect/mapping_helpers/apc/cell_5k +/obj/machinery/power/apc/highcap/five_k/directional/east : /obj/machinery/power/apc/auto_name/directional/east{@OLD}, /obj/effect/mapping_helpers/apc/cell_5k +/obj/machinery/power/apc/highcap/five_k/directional/west : /obj/machinery/power/apc/auto_name/directional/west{@OLD}, /obj/effect/mapping_helpers/apc/cell_5k +/obj/machinery/power/apc/highcap/ten_k : /obj/machinery/power/apc/auto_name{@OLD}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/highcap/ten_k/directional/north : /obj/machinery/power/apc/auto_name/directional/north{@OLD}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/highcap/ten_k/directional/south : /obj/machinery/power/apc/auto_name/directional/south{@OLD}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/highcap/ten_k/directional/east : /obj/machinery/power/apc/auto_name/directional/east{@OLD}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/highcap/ten_k/directional/west : /obj/machinery/power/apc/auto_name/directional/west{@OLD}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/sm_apc : /obj/machinery/power/apc/auto_name{@OLD}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/sm_apc/directional/north : /obj/machinery/power/apc/auto_name/directional/north{@OLD}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/sm_apc/directional/south : /obj/machinery/power/apc/auto_name/directional/south{@OLD}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/sm_apc/directional/east : /obj/machinery/power/apc/auto_name/directional/east{@OLD}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/sm_apc/directional/west : /obj/machinery/power/apc/auto_name/directional/west{@OLD}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/@SUBTYPES{pixel_y = 25} : /obj/machinery/power/apc/auto_name/directional/north{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/machinery/power/apc/@SUBTYPES{pixel_y = -25} : /obj/machinery/power/apc/auto_name/directional/south{@OLD;pixel_y=@SKIP;dir=@SKIP} +/obj/machinery/power/apc/@SUBTYPES{pixel_x = 25} : /obj/machinery/power/apc/auto_name/directional/east{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/machinery/power/apc/@SUBTYPES{pixel_x = -25} : /obj/machinery/power/apc/auto_name/directional/west{@OLD;pixel_x=@SKIP;dir=@SKIP} +/obj/machinery/power/apc/@SUBTYPES{name = "Worn Out APC"} : /obj/machinery/power/apc/worn_out{@OLD;name=@SKIP} +/obj/machinery/power/apc/auto_name/directional/north : /obj/machinery/power/apc/auto_name/directional/north{@OLD;name=@SKIP} +/obj/machinery/power/apc/auto_name/directional/south : /obj/machinery/power/apc/auto_name/directional/south{@OLD;name=@SKIP} +/obj/machinery/power/apc/auto_name/directional/east : /obj/machinery/power/apc/auto_name/directional/east{@OLD;name=@SKIP} +/obj/machinery/power/apc/auto_name/directional/west : /obj/machinery/power/apc/auto_name/directional/west{@OLD;name=@SKIP} +/obj/machinery/power/apc/@SUBTYPES{aidisabled = 1} : @OLD{@OLD;aidisabled=@SKIP}, /obj/effect/mapping_helpers/apc/cut_AI_wire +/obj/machinery/power/apc/@SUBTYPES{locked = 0} : @OLD{@OLD;locked=@SKIP}, /obj/effect/mapping_helpers/apc/unlocked +/obj/machinery/power/apc/@SUBTYPES{req_access = list(ACCESS_AWAY_GENERAL)} : @OLD{@OLD;req_access=@SKIP}, /obj/effect/mapping_helpers/apc/away_general_access +/obj/machinery/power/apc/@SUBTYPES{req_access = list(ACCESS_SYNDICATE)} : @OLD{@OLD;req_access=@SKIP}, /obj/effect/mapping_helpers/apc/syndicate_access +/obj/machinery/power/apc/@SUBTYPES{req_access = list("syndicate")} : @OLD{@OLD;req_access=@SKIP}, /obj/effect/mapping_helpers/apc/syndicate_access +/obj/machinery/power/apc/@SUBTYPES{cell_type = /obj/item/stock_parts/cell/upgraded/plus} : @OLD{@OLD;cell_type=@SKIP}, /obj/effect/mapping_helpers/apc/cell_5k +/obj/machinery/power/apc/@SUBTYPES{cell_type = /obj/item/stock_parts/cell/high} : @OLD{@OLD;cell_type=@SKIP}, /obj/effect/mapping_helpers/apc/cell_10k +/obj/machinery/power/apc/@SUBTYPES{start_charge = 100} : @OLD{@OLD;start_charge=@SKIP}, /obj/effect/mapping_helpers/apc/full_charge +/obj/machinery/power/apc/@SUBTYPES{start_charge = 0} : @OLD{@OLD;start_charge=@SKIP}, /obj/effect/mapping_helpers/apc/no_charge \ No newline at end of file