Merge pull request #13297 from Detective-Google/more-snaxi-changes

another batch of snaxi improvements
This commit is contained in:
silicons
2020-08-29 21:40:39 -07:00
committed by GitHub
3 changed files with 3100 additions and 2585 deletions
+220 -214
View File
@@ -112,7 +112,7 @@
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 8 dir = 8
}, },
/turf/closed/mineral/random/snow, /turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/unexplored/rivers) /area/icemoon/underground/unexplored/rivers)
"eH" = ( "eH" = (
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -581,7 +581,7 @@
desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks."; desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks.";
name = "charred bike horn" name = "charred bike horn"
}, },
/turf/closed/mineral/random/snow, /turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/unexplored/rivers) /area/icemoon/underground/unexplored/rivers)
"nN" = ( "nN" = (
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
@@ -722,6 +722,9 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/mine/living_quarters) /area/mine/living_quarters)
"rs" = (
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/unexplored/rivers)
"ry" = ( "ry" = (
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 8 dir = 8
@@ -809,6 +812,9 @@
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/mine/living_quarters) /area/mine/living_quarters)
"sL" = (
/turf/open/transparent/openspace/icemoon,
/area/icemoon/underground/unexplored/rivers)
"sM" = ( "sM" = (
/obj/structure/table, /obj/structure/table,
/obj/item/storage/firstaid/toxin{ /obj/item/storage/firstaid/toxin{
@@ -2367,7 +2373,7 @@
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 1 dir = 1
}, },
/turf/closed/mineral/random/snow, /turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/unexplored/rivers) /area/icemoon/underground/unexplored/rivers)
"WE" = ( "WE" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{ /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -29940,9 +29946,9 @@ ah
ah ah
ah ah
ah ah
rs
ah ah
ah rs
ah
ah ah
ah ah
ah ah
@@ -30199,8 +30205,8 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -30456,8 +30462,8 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -30712,10 +30718,10 @@ ah
ah ah
ah ah
nE nE
ah rs
ah sL
ah sL
ah rs
ah ah
ah ah
ah ah
@@ -30968,11 +30974,11 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
ah rs
ah sL
ah rs
ah ah
ah ah
ah ah
@@ -31498,8 +31504,8 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -31749,14 +31755,14 @@ ah
ah ah
ah ah
ah ah
rs
rs
rs
rs
ah ah
ah rs
ah rs
ah rs
ah
ah
ah
ah
ah ah
ah ah
ah ah
@@ -32005,14 +32011,14 @@ Gw
op op
nd nd
ah ah
ah sL
ah rs
ah rs
ah rs
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -32262,15 +32268,15 @@ GI
Lg Lg
nd nd
ah ah
ah sL
ah sL
ah rs
op op
WE WE
op op
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -32519,17 +32525,17 @@ GN
Lu Lu
nd nd
ah ah
ah rs
ah rs
ah rs
op op
sa sa
op op
ah rs
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -32782,11 +32788,11 @@ nd
op op
WM WM
op op
ah rs
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -33039,10 +33045,10 @@ Rx
ry ry
WO WO
op op
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -33296,9 +33302,9 @@ sa
sa sa
sa sa
op op
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -33553,8 +33559,8 @@ TA
sa sa
Xf Xf
op op
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -33810,8 +33816,8 @@ TA
sa sa
sa sa
op op
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -37651,8 +37657,8 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
op op
sa sa
Ho Ho
@@ -37908,8 +37914,8 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
op op
ET ET
HY HY
@@ -38165,18 +38171,18 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
op op
op op
Iq Iq
op op
op op
ah rs
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -38422,19 +38428,19 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
ah rs
op op
Iv Iv
op op
ah rs
ah rs
ah rs
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -38680,18 +38686,18 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
op op
Ho Ho
op op
ah rs
ah rs
ah sL
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -38937,18 +38943,18 @@ ah
ah ah
ah ah
ah ah
ah sL
ah rs
op op
Ho Ho
op op
ah rs
ah sL
ah sL
ah sL
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -39193,21 +39199,21 @@ ah
ah ah
ah ah
ah ah
ah sL
ah sL
ah rs
op op
Ho Ho
op op
ah rs
ah sL
ah sL
ah sL
ah rs
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -39444,26 +39450,26 @@ ah
ah ah
ah ah
ah ah
rs
rs
rs
ah ah
ah ah
ah ah
ah ah
ah rs
ah rs
ah
ah
ah
er er
IB IB
er er
ah rs
ah sL
ah sL
ah rs
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -39700,24 +39706,24 @@ ah
ah ah
ah ah
ah ah
rs
rs
rs
rs
rs
ah ah
ah ah
ah ah
ah rs
ah rs
ah
ah
ah
ah
ah
er er
IB IB
er er
ah rs
ah sL
ah sL
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -39957,24 +39963,24 @@ ah
ah ah
ah ah
ah ah
ah rs
eZ eZ
fB fB
er er
rs
ah ah
ah ah
ah ah
ah rs
ah rs
ah
er er
IB IB
er er
ah rs
ah rs
ah sL
ah sL
ah rs
ah ah
ah ah
ah ah
@@ -40213,25 +40219,25 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
er er
fC fC
er er
rs
rs
ah ah
ah ah
ah rs
ah rs
ah
ah
er er
IF IF
er er
ah rs
ah rs
ah sL
ah sL
ah rs
ah ah
ah ah
ah ah
@@ -40470,25 +40476,25 @@ ah
ah ah
ah ah
ah ah
ah rs
er er
er er
fD fD
er er
er er
rs
ah ah
ah rs
ah rs
ah
Be Be
er er
IK IK
er er
er er
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -40743,8 +40749,8 @@ IM
gS gS
er er
eq eq
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -40983,7 +40989,7 @@ ah
ah ah
ah ah
ah ah
ah rs
eq eq
eH eH
fb fb
@@ -41000,8 +41006,8 @@ IB
fC fC
Nt Nt
eq eq
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -41240,7 +41246,7 @@ ah
ah ah
ah ah
ah ah
ah rs
er er
eI eI
fc fc
@@ -41497,7 +41503,7 @@ ah
ah ah
ah ah
ah ah
ah rs
er er
eJ eJ
fd fd
@@ -41774,8 +41780,8 @@ er
Tk Tk
NK NK
er er
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -42009,7 +42015,7 @@ ah
ah ah
ah ah
ah ah
ah rs
dW dW
ei ei
es es
@@ -42031,9 +42037,9 @@ Rf
Tn Tn
NP NP
VC VC
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -42265,8 +42271,8 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
dX dX
ej ej
et et
@@ -42288,8 +42294,8 @@ er
To To
UJ UJ
er er
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -42522,8 +42528,8 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
dX dX
ej ej
eu eu
@@ -42780,7 +42786,7 @@ ah
ah ah
ah ah
ah ah
ah rs
dW dW
ek ek
ew ew
@@ -44069,9 +44075,9 @@ ah
ah ah
ah ah
ex ex
ah rs
ah rs
ah rs
ex ex
ah ah
ah ah
@@ -44324,13 +44330,13 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
ah rs
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -44581,13 +44587,13 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
ah rs
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -44839,11 +44845,11 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -45097,9 +45103,9 @@ ah
ah ah
ah ah
ah ah
ah rs
ah rs
ah rs
ah ah
ah ah
ah ah
@@ -5,6 +5,9 @@
"b" = ( "b" = (
/turf/closed/mineral/random/high_chance/snow, /turf/closed/mineral/random/high_chance/snow,
/area/icemoon/underground/unexplored/rivers) /area/icemoon/underground/unexplored/rivers)
"c" = (
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/unexplored/rivers)
"d" = ( "d" = (
/turf/closed/wall, /turf/closed/wall,
/area/icemoon/underground/explored) /area/icemoon/underground/explored)
@@ -19,6 +22,9 @@
/obj/item/gps/mining, /obj/item/gps/mining,
/turf/open/floor/plating/asteroid/snow/icemoon, /turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/explored) /area/icemoon/underground/explored)
"G" = (
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/mine/maintenance)
"N" = ( "N" = (
/obj/item/flashlight/lantern{ /obj/item/flashlight/lantern{
on = 1 on = 1
@@ -33,6 +39,22 @@
/obj/structure/ladder, /obj/structure/ladder,
/turf/open/floor/plating/asteroid/snow/icemoon, /turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/explored) /area/icemoon/underground/explored)
"X" = (
/obj/machinery/telecomms/relay/preset/mining,
/obj/machinery/bluespace_beacon,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced,
/obj/machinery/door/window/eastright{
dir = 8;
req_access_txt = "48"
},
/turf/open/floor/circuit,
/area/icemoon/underground/explored)
(1,1,1) = {" (1,1,1) = {"
a a
@@ -39499,9 +39521,9 @@ a
a a
a a
a a
a c
a c
a c
a a
a a
a a
@@ -40011,13 +40033,13 @@ a
a a
a a
a a
a c
e e
i i
h h
h h
e e
a c
a a
a a
a a
@@ -40268,13 +40290,13 @@ a
a a
a a
a a
a c
h h
h h
T T
h h
h h
a c
a a
a a
a a
@@ -40525,13 +40547,13 @@ a
a a
a a
a a
a c
e e
N N
h h
h G
e e
a c
a a
a a
a a
@@ -40786,7 +40808,7 @@ a
d d
O O
h h
e X
d d
a a
a a
@@ -41041,9 +41063,9 @@ a
a a
a a
a a
a c
a c
a c
a a
a a
a a
File diff suppressed because it is too large Load Diff