Skip to content

Commit

Permalink
Merge pull request #463 from mnoblin792/tramstation-incinerator-atmos…
Browse files Browse the repository at this point in the history
…-fix

add supply and scrubbing pipes to atmos system for incinerator room i
  • Loading branch information
dwasint authored Oct 23, 2023
2 parents eeff194 + 8c049da commit 2d9982e
Showing 1 changed file with 65 additions and 15 deletions.
80 changes: 65 additions & 15 deletions _maps/map_files/tramstation/tramstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,8 @@
dir = 9
},
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"ach" = (
Expand Down Expand Up @@ -9385,6 +9387,8 @@
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"bJP" = (
Expand Down Expand Up @@ -11615,6 +11619,8 @@
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"csR" = (
Expand Down Expand Up @@ -11883,6 +11889,14 @@
/obj/item/storage/box/lights/tubes,
/turf/open/floor/iron,
/area/station/service/janitor)
"cxM" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/obj/machinery/atmospherics/components/binary/valve/digital/layer2{
name = "Chamber Waste Release"
},
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"cxV" = (
/obj/machinery/light/directional/east,
/obj/structure/chair/office{
Expand Down Expand Up @@ -14878,6 +14892,8 @@
/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"dyB" = (
Expand Down Expand Up @@ -22201,6 +22217,8 @@
dir = 5
},
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"fTz" = (
Expand Down Expand Up @@ -22347,6 +22365,14 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
"fXi" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"fXB" = (
/obj/structure/chair/pew,
/turf/open/floor/iron/chapel{
Expand Down Expand Up @@ -24107,6 +24133,7 @@
dir = 1
},
/obj/structure/cable,
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron,
/area/station/maintenance/disposal/incinerator)
"gEy" = (
Expand Down Expand Up @@ -25268,6 +25295,8 @@
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"gWx" = (
Expand Down Expand Up @@ -25840,6 +25869,8 @@
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"hik" = (
Expand Down Expand Up @@ -30762,6 +30793,8 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"iQH" = (
Expand Down Expand Up @@ -33631,6 +33664,7 @@
dir = 1
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"jKZ" = (
Expand Down Expand Up @@ -39264,6 +39298,8 @@
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"lyQ" = (
Expand Down Expand Up @@ -43543,6 +43579,8 @@
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"mVu" = (
Expand Down Expand Up @@ -43712,6 +43750,8 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"mZt" = (
Expand Down Expand Up @@ -44545,6 +44585,8 @@
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/obj/machinery/meter,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"nmP" = (
Expand Down Expand Up @@ -45093,6 +45135,8 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"nvB" = (
Expand Down Expand Up @@ -54580,6 +54624,8 @@
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"qzJ" = (
Expand Down Expand Up @@ -56127,6 +56173,8 @@
"qXA" = (
/obj/effect/turf_decal/trimline/brown/filled/corner,
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"qXS" = (
Expand Down Expand Up @@ -66596,10 +66644,6 @@
},
/turf/open/floor/iron/dark/airless,
/area/station/science/ordnance/freezerchamber)
"urq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"urv" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/firecloset,
Expand Down Expand Up @@ -67013,6 +67057,8 @@
dir = 5
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"uxq" = (
Expand Down Expand Up @@ -68925,6 +68971,8 @@
dir = 9
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"vaR" = (
Expand Down Expand Up @@ -77706,6 +77754,8 @@
/area/station/maintenance/department/crew_quarters/dorms)
"xUC" = (
/obj/effect/spawner/random/engineering/tracking_beacon,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"xUG" = (
Expand Down Expand Up @@ -112237,13 +112287,13 @@ hmF
iQU
gqL
xat
urq
urq
urq
urq
urq
urq
urq
gqL
gqL
gqL
gqL
gqL
gqL
gqL
wQm
wQm
wQm
Expand Down Expand Up @@ -112757,8 +112807,8 @@ wQm
fja
wQm
wQm
urq
bZW
gqL
fXi
wQm
kdw
aOV
Expand Down Expand Up @@ -113015,7 +113065,7 @@ oqh
wQm
wQm
eaq
bZW
fXi
wQm
oaX
tsp
Expand Down Expand Up @@ -118420,7 +118470,7 @@ vde
atC
gqV
atP
atP
cxM
auf
aum
aup
Expand Down

0 comments on commit 2d9982e

Please sign in to comment.