Merge pull request #5299 from Heroman3003/mapfixespiping

Some minor piping fixes
This commit is contained in:
Novacat
2019-06-03 12:35:24 -04:00
committed by GitHub
2 changed files with 257 additions and 196 deletions
+28 -10
View File
@@ -6005,6 +6005,21 @@
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"aki" = (
/obj/structure/cable{
icon_state = "1-8"
},
/obj/structure/catwalk,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
icon_state = "intact-scrubbers";
dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/lower/research)
"akj" = (
/obj/structure/catwalk,
/obj/effect/decal/cleanable/dirt,
@@ -6014,6 +6029,17 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"akk" = (
/obj/structure/catwalk,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/visible/supply{
dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/lower/research)
"akm" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -13834,14 +13860,6 @@
},
/turf/simulated/floor/tiled,
/area/storage/art)
"aEZ" = (
/obj/structure/cable{
icon_state = "1-8"
},
/obj/structure/catwalk,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/lower/research)
"aFb" = (
/obj/structure/bed/chair/wood{
dir = 4
@@ -43152,7 +43170,7 @@ aBW
aDl
aDI
aEp
aEZ
aki
lVl
bEX
qaO
@@ -43294,7 +43312,7 @@ aCB
aDm
aDJ
aDL
jRT
akk
jso
xJz
xoJ
+229 -186
View File
@@ -3291,13 +3291,25 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/hallway)
"eJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor/glass/hidden/steel{
/obj/effect/floor_decal/corner/lightgrey{
dir = 9
},
/obj/effect/floor_decal/corner/lightgrey{
dir = 6
},
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
},
/obj/machinery/vending/nifsoft_shop,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
/area/hallway/station/port)
"eK" = (
/obj/effect/floor_decal/borderfloor{
dir = 5
@@ -3334,29 +3346,28 @@
/turf/space,
/area/space)
"eN" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
/obj/machinery/vending/coffee,
/obj/effect/floor_decal/corner/lightgrey{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
/obj/effect/floor_decal/corner/lightgrey{
dir = 6
},
/obj/machinery/door/firedoor/glass/hidden/steel{
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
},
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
/area/hallway/station/port)
"eO" = (
/obj/machinery/alarm{
pixel_y = 22
@@ -10747,48 +10758,55 @@
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"pQ" = (
/obj/effect/floor_decal/corner/lightgrey{
dir = 9
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/effect/floor_decal/corner/lightgrey{
dir = 6
},
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/machinery/vending/nifsoft_shop,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
/area/hallway/station/port)
"pR" = (
/obj/machinery/vending/coffee,
/obj/effect/floor_decal/corner/lightgrey{
dir = 9
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/effect/floor_decal/corner/lightgrey{
dir = 6
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/effect/floor_decal/steeldecal/steel_decals9{
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
},
/obj/machinery/light{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
/area/hallway/station/port)
"pS" = (
/turf/simulated/wall/r_wall,
/area/hallway/station/starboard)
@@ -11267,56 +11285,6 @@
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"qC" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"qD" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"qE" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -11337,7 +11305,22 @@
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
/area/hallway/station/port)
"qD" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"qE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"qF" = (
/obj/structure/cable{
d1 = 1;
@@ -11737,15 +11720,6 @@
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"rp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"rq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -11754,7 +11728,21 @@
},
/obj/machinery/door/firedoor/glass/hidden/steel,
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
/area/hallway/station/port)
"rq" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 8
},
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"rr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -12209,19 +12197,17 @@
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"sd" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 1
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 8
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
/area/tether/station/stairs_two)
"se" = (
/obj/structure/flora/pottedplant/stoutbush,
/obj/effect/floor_decal/borderfloor{
@@ -12384,11 +12370,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ai_server_room)
"sz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"sA" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -12407,6 +12388,19 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"sA" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"sB" = (
@@ -13039,11 +13033,11 @@
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"tJ" = (
/obj/structure/cable,
/obj/machinery/power/apc{
dir = 4;
name = "east bump";
pixel_x = 28
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -13057,6 +13051,8 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"tK" = (
@@ -13361,17 +13357,8 @@
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"up" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
@@ -13703,14 +13690,11 @@
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"uS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"uT" = (
/obj/machinery/light{
/obj/structure/cable,
/obj/machinery/power/apc{
dir = 4;
icon_state = "tube1"
name = "east bump";
pixel_x = 28
},
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -13724,14 +13708,16 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 5
},
/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
dir = 5
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"uT" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"uU" = (
/obj/machinery/alarm{
dir = 4;
@@ -19748,6 +19734,71 @@
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"EA" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"EB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"EC" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 5
},
/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"ED" = (
/obj/structure/table/rack{
dir = 8;
layer = 2.9
},
/obj/random/maintenance/clean,
/turf/simulated/floor,
/area/maintenance/station/sec_lower)
"EE" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
@@ -19757,7 +19808,7 @@
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"EB" = (
"EF" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
@@ -19766,7 +19817,7 @@
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"EC" = (
"EG" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_r"
@@ -19776,14 +19827,6 @@
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"ED" = (
/obj/structure/table/rack{
dir = 8;
layer = 2.9
},
/obj/random/maintenance/clean,
/turf/simulated/floor,
/area/maintenance/station/sec_lower)
"EH" = (
/obj/random/junk,
/obj/effect/floor_decal/techfloor{
@@ -29835,11 +29878,11 @@ pK
UU
rg
rT
eJ
sz
sz
sz
uS
sd
sA
up
uT
EB
vu
uP
sw
@@ -29977,11 +30020,11 @@ pL
qr
rh
rU
eN
sA
sz
tJ
up
uT
uS
EA
EC
vv
vv
sw
@@ -31535,10 +31578,10 @@ fu
fq
oR
kj
eJ
pQ
qC
nU
sc
qD
rP
sD
tk
tM
@@ -31677,10 +31720,10 @@ fu
fq
oS
kj
eN
pR
qD
rp
sc
qE
rP
sD
tl
tN
@@ -31819,10 +31862,10 @@ fw
fq
kj
kj
pS
qE
pO
qC
rp
rq
sd
sE
sE
sE
@@ -32554,11 +32597,11 @@ AN
Ci
Bw
yY
EA
EB
EB
EB
EC
EE
EF
EF
EF
EG
yY
ac
ac