From e010988fcefcdd2963a305a134aad3ff8bd00aba Mon Sep 17 00:00:00 2001 From: Return <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 26 Sep 2025 18:46:31 -0500 Subject: [PATCH] Fixes Nebulastation power distribution (#4738) ## About The Pull Request We added these templates to fix NebulaStation's power grid. Now that upstream has fixed it, these are breaking it. So, it's time to get rid of them. Until this PR is merged, you can fix power by putting a power cable into the gravgen room shown in the proof of testing screenshot. ## Why It's Good For The Game Engineers are no longer gaslit into believing the power grid works ## Proof Of Testing image ## Changelog :cl: ReturnToZender fix: NebulaStation's power grid now properly distributes power /:cl: --- .../bubber/automapper/automapper_config.toml | 16 -- .../NebulaStation/nebulastation_gravgen.dmm | 17 -- .../nebulastation_supermatter.dmm | 162 ------------------ 3 files changed, 195 deletions(-) delete mode 100644 _maps/bubber/automapper/templates/NebulaStation/nebulastation_gravgen.dmm delete mode 100644 _maps/bubber/automapper/templates/NebulaStation/nebulastation_supermatter.dmm diff --git a/_maps/bubber/automapper/automapper_config.toml b/_maps/bubber/automapper/automapper_config.toml index 2f00b8ac7b8..28e2cfe6444 100644 --- a/_maps/bubber/automapper/automapper_config.toml +++ b/_maps/bubber/automapper/automapper_config.toml @@ -516,14 +516,6 @@ required_map = "NebulaStation.dmm" coordinates = [90, 132, 1] trait_name = "Station" -# Nebulastation Gravity Generator -[templates.nebulastation_gravgen] -map_files = ["nebulastation_gravgen.dmm"] -directory = "_maps/bubber/automapper/templates/NebulaStation/" -required_map = "NebulaStation.dmm" -coordinates = [119, 114, 1] -trait_name = "Station" - # Nebulastation Library East [templates.nebulastation_library_e] map_files = ["nebulastation_library_e.dmm"] @@ -556,14 +548,6 @@ required_map = "NebulaStation.dmm" coordinates = [64, 108, 1] trait_name = "Station" -# Nebulastation Supermatter -[templates.nebulastation_supermatter] -map_files = ["nebulastation_supermatter.dmm"] -directory = "_maps/bubber/automapper/templates/NebulaStation/" -required_map = "NebulaStation.dmm" -coordinates = [112, 93, 1] -trait_name = "Station" - # TRAMSTATION MAP EDITS # Tramstation Armory [templates.tramstation_armory] diff --git a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_gravgen.dmm b/_maps/bubber/automapper/templates/NebulaStation/nebulastation_gravgen.dmm deleted file mode 100644 index 1516030601a..00000000000 --- a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_gravgen.dmm +++ /dev/null @@ -1,17 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Grav Gen Maintenance" - }, -/turf/open/floor/plating, -/area/station/engineering/gravity_generator) - -(1,1,1) = {" -a -"} diff --git a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_supermatter.dmm b/_maps/bubber/automapper/templates/NebulaStation/nebulastation_supermatter.dmm deleted file mode 100644 index 7a27106b7de..00000000000 --- a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_supermatter.dmm +++ /dev/null @@ -1,162 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/template_noop, -/area/station/engineering/supermatter/room) -"c" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/template_noop, -/area/station/engineering/supermatter/room) -"n" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter/room) -"o" = ( -/obj/machinery/shower/directional/east, -/turf/open/floor/noslip, -/area/station/engineering/supermatter/room) -"w" = ( -/obj/machinery/button/delam_scram, -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter/room) -"C" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/template_noop, -/area/station/engineering/supermatter/room) -"E" = ( -/obj/machinery/shower/directional/west, -/turf/open/floor/noslip, -/area/station/engineering/supermatter/room) -"O" = ( -/obj/machinery/atmospherics/components/unary/delam_scram/directional/east{ - dir = 8 - }, -/turf/template_noop, -/area/station/engineering/supermatter) -"Q" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/structure/cable/layer1, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) -"T" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/sign/delam_procedure/directional/north, -/turf/template_noop, -/area/station/engineering/supermatter/room) -"V" = ( -/obj/structure/cable, -/obj/structure/cable/layer1, -/turf/open/floor/noslip, -/area/station/engineering/supermatter/room) -"Y" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/structure/cable/layer1, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) - -(1,1,1) = {" -a -c -Q -a -a -a -a -a -a -a -"} -(2,1,1) = {" -a -w -C -a -a -a -a -a -a -a -"} -(3,1,1) = {" -a -o -C -a -a -a -a -O -a -a -"} -(4,1,1) = {" -a -V -C -a -a -a -a -a -a -a -"} -(5,1,1) = {" -a -E -C -a -a -a -a -a -a -a -"} -(6,1,1) = {" -a -n -T -a -a -a -a -a -a -a -"} -(7,1,1) = {" -a -b -Y -a -a -a -a -a -a -a -"}