Fixes Massive overhaul on Southern Cross cables, atmos, and disposals 2.0 MERGE WHEN ABLE (#12023)

This commit is contained in:
Zack
2025-11-23 03:08:53 +01:00
committed by GitHub
parent a6a2eb2b12
commit f3cf9ba60f
3 changed files with 48 additions and 26 deletions
@@ -4783,6 +4783,9 @@
/obj/effect/floor_decal/corner/green/border{
dir = 4
},
/obj/structure/cable{
icon_state = "0-8"
},
/turf/simulated/floor/tiled,
/area/hallway/primary/firstdeck/ascenter)
"ayf" = (
@@ -81189,7 +81192,7 @@ eTN
fXY
dVK
isy
jJe
lkw
jJe
mse
ofL
@@ -278,6 +278,22 @@
},
/turf/simulated/floor/tiled,
/area/engineering/hallway/engineer_hallway)
"aaD" = (
/obj/machinery/alarm{
dir = 8;
pixel_x = 22
},
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
},
/obj/effect/floor_decal/corner/purple/border{
dir = 4
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/rnd/research)
"aaE" = (
/obj/machinery/space_heater,
/turf/simulated/floor/tiled,
@@ -1604,10 +1620,12 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/turf/simulated/floor,
/area/maintenance/engineering)
"add" = (
@@ -1899,16 +1917,6 @@
},
/turf/simulated/floor,
/area/maintenance/engineering)
"adF" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/purple/border,
/obj/machinery/door/airlock/glass_research,
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/rnd/research)
"adG" = (
/obj/machinery/light,
/obj/effect/floor_decal/borderfloorwhite,
@@ -10556,6 +10564,9 @@
name = "lightsout"
},
/obj/structure/disposalpipe/segment,
/obj/structure/cable/green{
icon_state = "1-2"
},
/turf/simulated/floor/tiled,
/area/engineering/foyer)
"aGQ" = (
@@ -48478,8 +48489,8 @@
},
/obj/machinery/door/airlock/glass_research,
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/rnd/research)
@@ -50285,14 +50296,6 @@
},
/turf/simulated/floor/tiled,
/area/security/security_hallway)
"hqB" = (
/obj/effect/floor_decal/borderfloorwhite/corner,
/obj/effect/floor_decal/corner/purple/bordercorner,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/rnd/research)
"hqU" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -50591,6 +50594,7 @@
dir = 5
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/rnd/research)
"hBM" = (
@@ -50738,6 +50742,7 @@
},
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/rnd/research)
"hGd" = (
@@ -51725,11 +51730,13 @@
name = "lightsout"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/rnd/research)
"idT" = (
@@ -54636,6 +54643,9 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/wood,
/area/crew_quarters/cafeteria)
"jHn" = (
@@ -63946,6 +63956,9 @@
dir = 5
},
/obj/structure/disposalpipe/segment,
/obj/structure/cable/green{
icon_state = "1-2"
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay)
"pfZ" = (
@@ -69827,6 +69840,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/genetics)
"sKG" = (
@@ -119654,8 +119670,8 @@ dyy
eHo
flC
gcd
hqB
cDa
adD
aaD
cEu
jXU
kTw
@@ -124040,7 +124056,7 @@ cBa
cBa
cBa
gpB
adF
hti
iih
jgy
kmj
@@ -14022,6 +14022,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/obj/structure/cable/blue{
icon_state = "1-2"
},
/turf/simulated/floor/tiled,
/area/surface/outpost/main/corridor/left_upper)
"Bb" = (