Skip to content

Commit

Permalink
update pipes(merge upsteram)
Browse files Browse the repository at this point in the history
  • Loading branch information
Legendaxe committed Feb 25, 2024
1 parent 2384e6f commit d403586
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
20 changes: 10 additions & 10 deletions _maps/map_files220/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1962,7 +1962,7 @@
/obj/structure/window/plasmareinforced{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter{
layer = 3.3
},
Expand Down Expand Up @@ -45872,7 +45872,7 @@
/turf/simulated/wall/r_wall,
/area/station/engineering/atmos)
"dTX" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 10
},
Expand Down Expand Up @@ -48668,7 +48668,7 @@
},
/area/station/supply/office)
"fjU" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 5
},
Expand Down Expand Up @@ -52108,7 +52108,7 @@
/turf/simulated/floor/engine,
/area/station/science/explab/chamber)
"gNG" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/turf/simulated/wall/r_wall,
Expand Down Expand Up @@ -54788,7 +54788,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/garden)
"hVw" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 9
},
Expand Down Expand Up @@ -59725,7 +59725,7 @@
},
/area/station/security/main)
"krx" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
},
/turf/simulated/floor/plasteel,
Expand Down Expand Up @@ -64405,7 +64405,7 @@
/obj/structure/window/plasmareinforced{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter{
layer = 3.3
},
Expand Down Expand Up @@ -72835,7 +72835,7 @@
},
/area/station/medical/exam_room)
"qnp" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
},
Expand Down Expand Up @@ -79429,7 +79429,7 @@
/turf/simulated/floor/carpet,
/area/station/command/office/captain/bedroom)
"tug" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/door_control/shutter/east{
id = "toxinaccess";
name = "Toxins Access";
Expand Down Expand Up @@ -85085,7 +85085,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"wsu" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/light/small/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
Expand Down
14 changes: 7 additions & 7 deletions _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -34739,7 +34739,7 @@
pixel_x = 3;
pixel_y = -3
},
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
Expand Down Expand Up @@ -47670,7 +47670,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
Expand Down Expand Up @@ -67712,7 +67712,7 @@
/turf/simulated/floor/grass,
/area/station/service/hydroponics)
"lRi" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 8
},
/obj/machinery/atmospherics/binary/pump{
Expand Down Expand Up @@ -74228,7 +74228,7 @@
name = "Biohazard Shutter"
},
/obj/effect/spawner/window/reinforced/plasma/grilled,
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
"ojj" = (
Expand Down Expand Up @@ -75552,7 +75552,7 @@
},
/area/station/turret_protected/ai_upload)
"oGU" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 8
},
/obj/machinery/atmospherics/binary/valve{
Expand Down Expand Up @@ -85356,7 +85356,7 @@
/area/station/maintenance/apmaint)
"smz" = (
/obj/effect/spawner/window/reinforced/plasma/grilled,
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"smJ" = (
Expand Down Expand Up @@ -94561,7 +94561,7 @@
},
/area/station/command/office/ce)
"vBv" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter{
layer = 3.3
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/map_files220/delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -45463,7 +45463,7 @@
},
/area/station/hallway/secondary/exit)
"dOz" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
Expand Down Expand Up @@ -48764,7 +48764,7 @@
},
/area/station/medical/paramedic)
"ehm" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -55482,7 +55482,7 @@
/area/station/medical/virology)
"gpn" = (
/obj/effect/spawner/window/reinforced/plasma/grilled,
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"gpy" = (
Expand Down Expand Up @@ -88687,7 +88687,7 @@
},
/area/station/public/pool)
"qJA" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 8
},
/turf/simulated/floor/plasteel/white,
Expand Down Expand Up @@ -102571,7 +102571,7 @@
dir = 1
},
/obj/structure/window/plasmareinforced,
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter{
layer = 3.3
},
Expand Down

0 comments on commit d403586

Please sign in to comment.