Merge pull request #5157 from Heroman3003/purple-flakes

Fixes outdoors tiles having phoron flaking on them
This commit is contained in:
Novacat
2019-04-29 06:35:08 -04:00
committed by GitHub
2 changed files with 253 additions and 290 deletions
+91 -103
View File
@@ -1510,7 +1510,7 @@
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/plating,
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
"acO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5699,6 +5699,76 @@
},
/turf/simulated/floor/tiled,
/area/rnd/xenobiology)
"ajC" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/railing{
dir = 4
},
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
"ajD" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/catwalk,
/obj/structure/railing{
dir = 1
},
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
"ajE" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/catwalk,
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
"ajF" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/catwalk,
/obj/structure/railing,
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
"ajG" = (
/obj/structure/cable/heavyduty{
icon_state = "1-4"
},
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
"ajH" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/railing{
dir = 1
},
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
"ajI" = (
/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/structure/cable/heavyduty{
icon_state = "0-8"
},
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
"ajN" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
@@ -25675,13 +25745,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden)
"cGe" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/tether/surfacebase/outside/outside1)
"cHO" = (
/obj/machinery/alarm{
dir = 8;
@@ -26262,16 +26325,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos/processing)
"ezH" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/catwalk,
/obj/structure/railing{
dir = 1
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/outside/outside1)
"eAn" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 6
@@ -26505,18 +26558,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"frA" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/railing{
dir = 4
},
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/outside/outside1)
"frE" = (
/obj/effect/floor_decal/techfloor{
dir = 6
@@ -26558,18 +26599,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"fAq" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/railing{
dir = 8
},
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/outside/outside1)
"fEe" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -27856,14 +27885,6 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/showers)
"jRG" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/catwalk,
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/tether/surfacebase/outside/outside1)
"jRT" = (
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
/obj/machinery/atmospherics/pipe/simple/visible/supply,
@@ -29321,15 +29342,6 @@
/obj/effect/floor_decal/corner/lightgrey/bordercorner,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_one)
"ozS" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/railing{
dir = 1
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/outside/outside1)
"oAC" = (
/obj/structure/railing{
dir = 4
@@ -30923,21 +30935,6 @@
/obj/structure/closet/crate,
/turf/simulated/floor/tiled/techfloor,
/area/tether/surfacebase/public_garden_one)
"tMg" = (
/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/structure/cable/heavyduty{
icon_state = "0-8"
},
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/outside/outside1)
"tNq" = (
/obj/machinery/atmospherics/portables_connector{
dir = 8
@@ -31228,15 +31225,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"vbd" = (
/obj/structure/cable/heavyduty{
icon_state = "1-4"
},
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/outside/outside1)
"vbQ" = (
/obj/structure/table,
/obj/item/frame,
@@ -42066,23 +42054,23 @@ jUH
(71,1,1) = {"
aaa
acN
fAq
frA
frA
frA
frA
frA
frA
ezH
cGe
cGe
cGe
cGe
cGe
cGe
jRG
frA
vbd
aDx
ajC
ajC
ajC
ajC
ajC
ajC
ajD
ajE
ajE
ajE
ajE
ajE
ajE
ajF
ajC
ajG
aah
aah
aah
@@ -42224,7 +42212,7 @@ aad
aad
aad
aad
ozS
ajH
aah
aah
aah
@@ -42366,7 +42354,7 @@ aad
aad
aad
aad
ozS
ajH
aah
aah
aah
@@ -42508,7 +42496,7 @@ aad
aFv
aad
aad
tMg
ajI
aah
aao
aao
+162 -187
View File
@@ -113,12 +113,16 @@
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/outpost/mining_main/storage)
"av" = (
/obj/structure/cable/ender{
icon_state = "1-2";
id = "surface-mining"
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
icon_state = "map_vent_out";
name = "Large Waste Vent";
pressure_checks = 2;
pressure_checks_default = 2;
use_power = 1
},
/turf/simulated/floor/plating,
/area/mine/explored)
/turf/simulated/floor/virgo3b,
/area/outpost/mining_main/maintenance)
"aw" = (
/obj/machinery/light/small,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
@@ -138,6 +142,22 @@
"az" = (
/turf/simulated/wall/r_wall,
/area/outpost/mining_main/break_room)
"aA" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/turf/simulated/floor/virgo3b,
/area/mine/explored)
"aB" = (
/obj/structure/cable/heavyduty{
icon_state = "1-4"
},
/obj/structure/railing,
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/virgo3b,
/area/mine/explored)
"aC" = (
/obj/structure/cable/green{
d1 = 2;
@@ -166,6 +186,33 @@
},
/turf/simulated/wall/r_wall,
/area/outpost/mining_main/break_room)
"aF" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/railing,
/obj/structure/railing{
dir = 1
},
/turf/simulated/floor/virgo3b,
/area/mine/explored)
"aG" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/railing{
dir = 8
},
/obj/structure/catwalk,
/turf/simulated/floor/virgo3b,
/area/mine/explored)
"aH" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/catwalk,
/turf/simulated/floor/virgo3b,
/area/mine/explored)
"aI" = (
/obj/structure/reagent_dispensers/water_cooler/full,
/obj/effect/floor_decal/borderfloor{
@@ -182,6 +229,16 @@
},
/turf/simulated/floor/tiled,
/area/outpost/mining_main/break_room)
"aJ" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/railing{
dir = 4
},
/obj/structure/catwalk,
/turf/simulated/floor/virgo3b,
/area/mine/explored)
"aK" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -209,6 +266,18 @@
},
/turf/simulated/floor/tiled,
/area/outpost/mining_main/break_room)
"aL" = (
/obj/structure/cable/heavyduty{
icon_state = "2-8"
},
/obj/structure/railing{
dir = 4
},
/obj/structure/railing{
dir = 1
},
/turf/simulated/floor/virgo3b,
/area/mine/explored)
"aM" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -225,6 +294,25 @@
/obj/item/weapon/storage/belt,
/turf/simulated/floor/tiled,
/area/outpost/mining_main/break_room)
"aN" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/railing{
dir = 4
},
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/virgo3b,
/area/mine/explored)
"aO" = (
/obj/structure/cable/ender{
icon_state = "1-2";
id = "surface-mining"
},
/turf/simulated/floor/virgo3b,
/area/mine/explored)
"aR" = (
/obj/structure/window/reinforced/full,
/obj/machinery/door/firedoor/glass,
@@ -490,16 +578,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/outpost/mining_main/airlock)
"el" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/railing{
dir = 8
},
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/mine/explored)
"hK" = (
/turf/simulated/wall/r_wall,
/area/outpost/mining_main/dorms)
@@ -524,18 +602,6 @@
},
/turf/simulated/floor/tiled,
/area/outpost/mining_main/break_room)
"jh" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/railing{
dir = 4
},
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/plating,
/area/mine/explored)
"jq" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -578,30 +644,6 @@
/obj/machinery/vending/cola,
/turf/simulated/floor/tiled,
/area/outpost/mining_main/break_room)
"lb" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/railing{
dir = 4
},
/obj/structure/railing{
dir = 8
},
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/mine/explored)
"ld" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
icon_state = "map_vent_out";
name = "Large Waste Vent";
pressure_checks = 2;
pressure_checks_default = 2;
use_power = 1
},
/turf/simulated/floor/plating,
/area/outpost/mining_main/maintenance)
"mH" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
@@ -609,18 +651,6 @@
/obj/machinery/atmospherics/pipe/simple/visible/red,
/turf/simulated/floor/tiled/techfloor,
/area/outpost/mining_main/maintenance)
"ng" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/obj/structure/railing{
dir = 8
},
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/plating,
/area/mine/explored)
"ol" = (
/obj/structure/cable/green{
d1 = 4;
@@ -787,16 +817,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/outpost/mining_main/airlock)
"wN" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/railing{
dir = 4
},
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/mine/explored)
"xA" = (
/obj/effect/floor_decal/techfloor{
dir = 10
@@ -899,16 +919,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/outpost/mining_main/airlock)
"Eu" = (
/obj/structure/cable/heavyduty{
icon_state = "1-4"
},
/obj/structure/railing,
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/plating,
/area/mine/explored)
"Ex" = (
/obj/machinery/power/apc{
dir = 1;
@@ -929,13 +939,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/outpost/mining_main/maintenance)
"EH" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/mine/explored)
"Fa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -992,18 +995,6 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/outpost/mining_main/maintenance)
"FV" = (
/obj/structure/cable/heavyduty{
icon_state = "2-8"
},
/obj/structure/railing{
dir = 4
},
/obj/structure/railing{
dir = 1
},
/turf/simulated/floor/plating,
/area/mine/explored)
"Gs" = (
/obj/machinery/power/apc{
dir = 1;
@@ -1058,16 +1049,6 @@
/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
/turf/simulated/floor/tiled/techfloor,
/area/outpost/mining_main/maintenance)
"Il" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/railing,
/obj/structure/railing{
dir = 1
},
/turf/simulated/floor/plating,
/area/mine/explored)
"Ir" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -1129,12 +1110,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/outpost/mining_main/maintenance)
"KF" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/mine/explored)
"KJ" = (
/obj/effect/floor_decal/techfloor,
/turf/simulated/floor/tiled/techfloor,
@@ -3313,7 +3288,7 @@ ab
ab
ab
ab
ld
av
ab
ab
ab
@@ -3601,8 +3576,8 @@ so
jq
xA
aR
ng
Eu
aA
aB
ab
ab
ab
@@ -3744,7 +3719,7 @@ MV
KJ
SF
ab
Il
aF
ab
ab
ab
@@ -3886,7 +3861,7 @@ MV
KJ
SF
ab
Il
aF
ab
ab
ab
@@ -4028,7 +4003,7 @@ MV
KJ
SF
ab
Il
aF
ab
ab
ab
@@ -4170,7 +4145,7 @@ MV
KL
SF
ab
Il
aF
ab
ab
ab
@@ -4312,7 +4287,7 @@ XA
Vk
po
ab
Il
aF
ab
ab
ab
@@ -4454,7 +4429,7 @@ ay
ay
ay
ab
Il
aF
ab
ab
ab
@@ -4596,7 +4571,7 @@ WK
JA
hK
ab
Il
aF
ab
ab
ab
@@ -4738,7 +4713,7 @@ Fa
uE
hK
ab
Il
aF
ab
ab
ab
@@ -4880,7 +4855,7 @@ Ma
hK
hK
ab
Il
aF
ab
ab
ab
@@ -5022,7 +4997,7 @@ Fn
kB
az
ab
Il
aF
ab
ab
ab
@@ -5164,7 +5139,7 @@ by
DV
az
ab
Il
aF
ab
ab
ab
@@ -5306,7 +5281,7 @@ by
US
az
ab
Il
aF
ab
ab
ab
@@ -5448,7 +5423,7 @@ ef
Px
Px
ab
Il
aF
ab
ab
ab
@@ -5590,7 +5565,7 @@ VG
om
Px
ab
Il
aF
ab
ab
ab
@@ -5732,7 +5707,7 @@ DX
om
Px
ab
Il
aF
ab
ab
ab
@@ -5874,7 +5849,7 @@ QZ
BD
Px
ab
Il
aF
ab
ab
ab
@@ -6016,7 +5991,7 @@ Zn
vx
Px
ab
Il
aF
ab
ab
ab
@@ -6158,7 +6133,7 @@ vG
rp
Px
ab
Il
aF
ab
ab
ab
@@ -6300,7 +6275,7 @@ di
GU
Px
ab
Il
aF
ab
ab
ab
@@ -6442,7 +6417,7 @@ rH
HP
ab
ab
Il
aF
ab
ab
ab
@@ -6584,7 +6559,7 @@ al
al
ab
ab
Il
aF
ab
ab
ab
@@ -6726,7 +6701,7 @@ af
al
ab
af
el
aG
ab
ab
ab
@@ -6868,7 +6843,7 @@ al
al
ab
af
EH
aH
ab
ab
ab
@@ -7010,7 +6985,7 @@ al
ck
al
af
EH
aH
ab
ab
ab
@@ -7152,7 +7127,7 @@ al
cl
al
af
EH
aH
ab
ab
ab
@@ -7294,7 +7269,7 @@ al
al
ab
af
EH
aH
ab
ab
ab
@@ -7436,7 +7411,7 @@ al
al
ab
al
EH
aH
ab
ab
ab
@@ -7578,7 +7553,7 @@ al
af
ab
al
EH
aH
ab
ab
ab
@@ -7720,7 +7695,7 @@ af
al
al
al
EH
aH
ab
ab
ab
@@ -7862,7 +7837,7 @@ af
al
al
al
wN
aJ
ab
ab
ab
@@ -8004,7 +7979,7 @@ al
ab
ab
ab
Il
aF
ab
ab
ab
@@ -8146,7 +8121,7 @@ al
ab
ab
ab
Il
aF
ab
ab
ab
@@ -8288,7 +8263,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -8430,7 +8405,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -8572,7 +8547,7 @@ af
ab
ab
ab
Il
aF
ab
ab
ab
@@ -8714,7 +8689,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -8856,7 +8831,7 @@ af
ab
ab
ab
Il
aF
ab
ab
ab
@@ -8998,7 +8973,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -9140,7 +9115,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -9282,7 +9257,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -9424,7 +9399,7 @@ ab
af
ab
ab
Il
aF
ab
ab
ab
@@ -9566,7 +9541,7 @@ af
ab
ab
ab
Il
aF
ab
ab
ab
@@ -9708,7 +9683,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -9850,7 +9825,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -9992,7 +9967,7 @@ ab
af
ab
ab
Il
aF
ab
ab
ab
@@ -10134,7 +10109,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -10276,7 +10251,7 @@ af
ab
ab
ab
Il
aF
ab
ab
ab
@@ -10418,7 +10393,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -10560,7 +10535,7 @@ af
ab
ab
ab
Il
aF
ab
ab
ab
@@ -10702,7 +10677,7 @@ af
ab
ab
ab
Il
aF
ab
ab
ab
@@ -10844,7 +10819,7 @@ ab
ab
ab
ab
Il
aF
ab
ab
ab
@@ -10986,7 +10961,7 @@ af
ab
ab
ab
Il
aF
ab
ab
ab
@@ -11128,7 +11103,7 @@ af
af
ab
ab
Il
aF
ab
ab
ab
@@ -11270,7 +11245,7 @@ ab
af
ab
ab
Il
aF
ab
ab
ab
@@ -11412,7 +11387,7 @@ ab
af
ab
ab
Il
aF
ab
ab
ab
@@ -11554,17 +11529,17 @@ ab
af
ab
ab
FV
jh
jh
jh
jh
jh
jh
jh
lb
KF
av
aL
aN
aN
aN
aN
aN
aN
aN
aN
aA
aO
aa
"}
(72,1,1) = {"