From 0fbecd8f7fc039e52a0a45c4e285bef3ace6adc2 Mon Sep 17 00:00:00 2001 From: SchrodingersWolf <108938550+SchrodingersWolf@users.noreply.github.com> Date: Sat, 3 Aug 2024 23:37:44 -0400 Subject: [PATCH] Upgrades Atmos APC power cell roundstart (#25905) * I'm sorry I cheated on you StrongDMM I won't do it again * Deconflicted DeltaStation * Deconflicts DeltaStation... for real * I have no idea why that thing is there - Misclick? --- _maps/map_files/stations/boxstation.dmm | 8 +--- _maps/map_files/stations/cerestation.dmm | 4 +- _maps/map_files/stations/deltastation.dmm | 51 +++++++++++------------ _maps/map_files/stations/metastation.dmm | 4 +- 4 files changed, 30 insertions(+), 37 deletions(-) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 49e3eb2fe00..a0ecf52a0ab 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -39697,9 +39697,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/apc/directional/north{ - shock_proof = 1 - }, +/obj/machinery/power/apc/important/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/distribution) "cDm" = ( @@ -47409,14 +47407,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 6 }, -/obj/machinery/power/apc/directional/west{ - shock_proof = 1 - }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/power/apc/important/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "deP" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 945e7d77213..53d30bf966a 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -14711,7 +14711,6 @@ "bFb" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, -/obj/machinery/power/apc/directional/north, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -14722,6 +14721,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/power/apc/important/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkyellow"; dir = 1 @@ -71857,13 +71857,13 @@ /obj/effect/turf_decal/stripes/end{ dir = 4 }, -/obj/machinery/power/apc/directional/west, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/power/apc/important/directional/west, /turf/simulated/floor/plating, /area/station/engineering/atmos/distribution) "pXf" = ( diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 6efd32b683e..bb93409e11a 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -23054,16 +23054,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/distribution) -"brG" = ( -/obj/machinery/suit_storage_unit/atmos/secure, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc/critical/directional/west, -/turf/simulated/floor/plasteel, -/area/station/engineering/atmos) "brH" = ( /obj/structure/cable{ d1 = 1; @@ -24522,21 +24512,6 @@ icon_state = "caution" }, /area/station/engineering/atmos/distribution) -"bvJ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 - }, -/obj/machinery/power/apc/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/meter{ - autolink_id = "wloop_atm_meter"; - name = "Waste Loop" - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "caution" - }, -/area/station/engineering/atmos/distribution) "bvK" = ( /obj/machinery/status_display, /turf/simulated/wall/r_wall, @@ -75480,6 +75455,18 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/break_room) +"kxY" = ( +/obj/machinery/atmospherics/meter, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/important/directional/east, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "caution" + }, +/area/station/engineering/atmos/distribution) "kyq" = ( /obj/machinery/light_switch{ dir = 4; @@ -78460,6 +78447,16 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/break_room) +"mnZ" = ( +/obj/machinery/suit_storage_unit/atmos/secure, +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/important/directional/west, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos) "moa" = ( /obj/structure/window/reinforced{ dir = 8 @@ -124562,7 +124559,7 @@ bpE brF btl but -bvJ +kxY bwU bys bzR @@ -125073,7 +125070,7 @@ bkE bmB aOb bpG -brG +mnZ btm buu aOg diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index e009aa46276..ddae62ae840 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -47797,8 +47797,8 @@ pixel_x = -24; pixel_y = -6 }, -/obj/machinery/power/apc/directional/north, /obj/machinery/suit_storage_unit/atmos/secure, +/obj/machinery/power/apc/important/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -81519,7 +81519,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/apc/directional/west, +/obj/machinery/power/apc/important/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "caution"