From a166015fc30d06727ad4901d9043405ca05fbecd Mon Sep 17 00:00:00 2001
From: san7890 <34697715+san7890@users.noreply.github.com>
Date: Sun, 13 Feb 2022 16:22:35 -0700
Subject: [PATCH] The Purge Of Non-Auto APCs (#64866)
* The Purge Of Non-Auto APCs
This PR removes all non-autonaming/varedited APCs found across our miscellaneous maps.
It's a lot better to use these than the varedited ones. We've also been seeing some weird CI stuff crop up lately, so this is a good step to make to rule out some potential causes of that.
---
_maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 27 ++--
_maps/RandomRuins/SpaceRuins/oldstation.dmm | 121 ++++++------------
_maps/RandomZLevels/Academy.dmm | 5 +-
_maps/map_files/debug/multiz.dmm | 36 +-----
_maps/shuttles/ruin_pirate_cutter.dmm | 6 +-
5 files changed, 56 insertions(+), 139 deletions(-)
diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
index 1cb687f4ff5..4926f8f3e10 100644
--- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -62,13 +62,10 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"ao" = (
-/obj/machinery/power/apc{
- dir = 4;
- name = "Cargo Bay APC";
- pixel_x = 25;
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east{
start_charge = 0
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"ap" = (
@@ -655,13 +652,10 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"ca" = (
-/obj/machinery/power/apc{
- dir = 4;
- name = "Power Storage APC";
- pixel_x = 25;
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east{
start_charge = 0
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"cb" = (
@@ -738,12 +732,10 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost)
"ck" = (
-/obj/machinery/power/apc{
- name = "Tradepost APC";
- pixel_y = -25;
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south{
start_charge = 0
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost)
"cl" = (
@@ -1452,13 +1444,10 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"el" = (
-/obj/machinery/power/apc{
- dir = 4;
- name = "Cargo Storage APC";
- pixel_x = 25;
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east{
start_charge = 0
},
-/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"eo" = (
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 9d45f681dbb..550bf659261 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -744,10 +744,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 1;
- name = "Beta Station Main Corridor APC";
- pixel_y = 25;
+/obj/machinery/power/apc/auto_name/directional/north{
start_charge = 0
},
/turf/open/floor/iron,
@@ -1368,12 +1365,6 @@
"dS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/machinery/power/apc{
- dir = 8;
- name = "Charlie Security APC";
- pixel_x = -25;
- start_charge = 0
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -1384,6 +1375,9 @@
dir = 8
},
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west{
+ start_charge = 0
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/sec)
"dT" = (
@@ -1432,14 +1426,11 @@
dir = 8
},
/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 1;
- name = "Charlie Station Bridge APC";
- pixel_y = 25;
- start_charge = 0
- },
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/light_switch/directional/west,
+/obj/machinery/power/apc/auto_name/directional/north{
+ start_charge = 0
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/comm)
"dX" = (
@@ -1470,10 +1461,7 @@
"ec" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 1;
- name = "Delta Station RnD APC";
- pixel_y = 25;
+/obj/machinery/power/apc/auto_name/directional/north{
start_charge = 0
},
/turf/open/floor/iron/white,
@@ -2212,14 +2200,11 @@
"ge" = (
/obj/structure/alien/weeds,
/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 4;
- name = "Delta Station Artifical Program Core APC";
- pixel_x = 25;
- start_charge = 0
- },
/obj/effect/decal/cleanable/blood/gibs/old,
/obj/effect/decal/cleanable/blood/old,
+/obj/machinery/power/apc/auto_name/directional/east{
+ start_charge = 0
+ },
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/ancientstation/deltaai)
"gf" = (
@@ -2439,15 +2424,13 @@
dir = 4
},
/obj/structure/cable,
-/obj/machinery/power/apc{
- name = "Charlie Station Garden APC ";
- pixel_y = -25;
- start_charge = 0
- },
/obj/item/reagent_containers/glass/bottle/nutrient/ez,
/obj/item/reagent_containers/glass/bottle/nutrient/l4z,
/obj/item/reagent_containers/glass/bottle/nutrient/rh,
/obj/structure/closet/crate/hydroponics,
+/obj/machinery/power/apc/auto_name/directional/south{
+ start_charge = 0
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/hydroponics)
"gG" = (
@@ -3269,12 +3252,6 @@
/obj/structure/rack,
/obj/item/stack/cable_coil,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc{
- dir = 4;
- name = "Charlie Engineering APC";
- pixel_x = 25;
- start_charge = 0
- },
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -3283,6 +3260,9 @@
dir = 8
},
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east{
+ start_charge = 0
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/engi)
"iy" = (
@@ -3917,12 +3897,6 @@
"jQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
-/obj/machinery/power/apc{
- dir = 4;
- name = "Charlie Main Corridor APC";
- pixel_x = 25;
- start_charge = 0
- },
/obj/structure/cable,
/obj/item/stack/sheet/glass{
amount = 50
@@ -3930,6 +3904,9 @@
/obj/item/stack/sheet/glass{
amount = 25
},
+/obj/machinery/power/apc/auto_name/directional/east{
+ start_charge = 0
+ },
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation)
"jS" = (
@@ -3992,12 +3969,6 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/hydroponics)
"jY" = (
-/obj/machinery/power/apc{
- dir = 4;
- name = "Beta Atmospherics APC";
- pixel_x = 25;
- start_charge = 0
- },
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/effect/turf_decal/tile/yellow{
@@ -4005,6 +3976,9 @@
},
/obj/effect/turf_decal/tile/yellow,
/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/machinery/power/apc/auto_name/directional/east{
+ start_charge = 0
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/atmo)
"jZ" = (
@@ -4063,13 +4037,10 @@
/area/ruin/space/has_grav/ancientstation/proto)
"kg" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc{
- dir = 1;
- name = "Delta Prototype Lab APC";
- pixel_y = 25;
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north{
start_charge = 0
},
-/obj/structure/cable,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/ancientstation/proto)
"kh" = (
@@ -4540,14 +4511,11 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 4;
- name = "Delta Station Corridor APC";
- pixel_x = 25;
- start_charge = 0
- },
/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
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/deltacorridor)
"lw" = (
@@ -4556,14 +4524,11 @@
/area/ruin/space/has_grav/ancientstation/deltacorridor)
"lx" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc{
- dir = 1;
- name = "Charlie Station Kitchen APC";
- pixel_y = 25;
- start_charge = 0
- },
/obj/structure/cable,
/obj/machinery/light/small/directional/north,
+/obj/machinery/power/apc/auto_name/directional/north{
+ start_charge = 0
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/ancientstation/kitchen)
"ly" = (
@@ -4919,12 +4884,6 @@
info = "*Prototype Sleeper*
We have deliverted the lastest in medical technology to the medical bay for your use."
},
/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 1;
- name = "Beta Station Medbay APC";
- pixel_y = 25;
- start_charge = 0
- },
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -4932,6 +4891,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
+/obj/machinery/power/apc/auto_name/directional/north{
+ start_charge = 0
+ },
/turf/open/floor/iron/airless,
/area/ruin/space/has_grav/ancientstation/medbay)
"mv" = (
@@ -5089,17 +5051,15 @@
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/sec)
"mQ" = (
-/obj/machinery/power/apc{
- name = "Beta Station Mining Equipment APC ";
- pixel_y = -25;
- start_charge = 0
- },
/obj/effect/turf_decal/tile/brown{
dir = 8
},
/obj/effect/turf_decal/tile/brown,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south{
+ start_charge = 0
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/mining)
"mR" = (
@@ -5973,13 +5933,10 @@
icon_state = "medium"
},
/obj/effect/decal/cleanable/glass,
-/obj/machinery/power/apc{
- dir = 8;
- name = "Beta Storage APC";
- pixel_x = -25;
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west{
start_charge = 0
},
-/obj/structure/cable,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/ancientstation/betastorage)
"oQ" = (
diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm
index 314299839ea..c35e72b6e8f 100644
--- a/_maps/RandomZLevels/Academy.dmm
+++ b/_maps/RandomZLevels/Academy.dmm
@@ -2493,11 +2493,8 @@
/turf/open/floor/vault,
/area/awaymission/academy/academyengine)
"lp" = (
-/obj/machinery/power/apc{
- dir = 1;
- pixel_y = 25
- },
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/vault,
/area/awaymission/academy/academyengine)
"lq" = (
diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm
index 6974ff016c3..026911e3967 100644
--- a/_maps/map_files/debug/multiz.dmm
+++ b/_maps/map_files/debug/multiz.dmm
@@ -224,11 +224,8 @@
"bd" = (
/obj/structure/table,
/obj/item/weldingtool/experimental,
-/obj/machinery/power/apc{
- dir = 8;
- pixel_x = -25
- },
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/plating,
/area/engineering/main)
"bf" = (
@@ -240,11 +237,7 @@
dir = 8
},
/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 8;
- name = "Gravity Generator APC";
- pixel_x = -25
- },
+/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron,
/area/engineering/gravity_generator)
"bh" = (
@@ -260,15 +253,12 @@
},
/area/engineering/gravity_generator)
"bj" = (
-/obj/machinery/power/apc{
- dir = 8;
- pixel_x = -25
- },
/obj/machinery/light/directional/south,
/obj/structure/table,
/obj/item/analyzer,
/obj/item/wrench,
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/plating,
/area/engineering/atmos)
"bk" = (
@@ -358,16 +348,13 @@
/turf/closed/wall/r_wall,
/area/hallway/primary/central)
"bB" = (
-/obj/machinery/power/apc{
- dir = 8;
- pixel_x = -25
- },
/obj/machinery/airalarm/directional/north{
locked = 0;
pixel_y = 23
},
/obj/structure/closet/jcloset,
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron,
/area/hallway/primary/central)
"bC" = (
@@ -395,12 +382,9 @@
locked = 0;
pixel_y = 23
},
-/obj/machinery/power/apc{
- dir = 8;
- pixel_x = -25
- },
/obj/structure/closet/secure_closet/captains,
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron{
dir = 8
},
@@ -454,12 +438,9 @@
locked = 0;
pixel_y = 23
},
-/obj/machinery/power/apc{
- dir = 8;
- pixel_x = -25
- },
/obj/structure/closet/firecloset/full,
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron{
dir = 9
},
@@ -704,14 +685,11 @@
locked = 0;
pixel_y = 23
},
-/obj/machinery/power/apc{
- dir = 8;
- pixel_x = -25
- },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron,
/area/commons/storage/primary)
"db" = (
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm
index 8d1a82bb483..f3e3e870335 100644
--- a/_maps/shuttles/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin_pirate_cutter.dmm
@@ -696,17 +696,13 @@
/turf/open/floor/plating,
/area/shuttle/caravan/pirate)
"Cb" = (
-/obj/machinery/power/apc{
- dir = 8;
- name = "Pirate Cutter APC";
- pixel_x = -25
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/airalarm/all_access{
dir = 4;
pixel_x = 24
},
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/plating,
/area/shuttle/caravan/pirate)
"DY" = (