shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hard resets _maps to master

Browse Source
This commit is contained in:
Artur
2020-06-16 16:09:05 +03:00
parent 5df0cbfc40
commit bc30fb7710
17 changed files with 869 additions and 71211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/spacediner.dmm
+1
View File
@@ -932,6 +932,7 @@
/obj/machinery/airalarm/all_access{
dir = 1;
icon_state = "alarm0";
pixel_x = 0;
pixel_y = -24
},
/turf/open/floor/plasteel/dark,
_maps/RandomZLevels/SnowCabin.dmm
-71120
View File
File diff suppressed because it is too large Load Diff
_maps/RandomZLevels/away_mission/Cabin.dmm
+1 -1
View File
@@ -656,7 +656,7 @@
/turf/open/floor/wood,
/area/awaymission/cabin)
"cp" = (
/obj/machinery/gateway/away,
/obj/machinery/gateway/centeraway,
/turf/open/floor/wood,
/area/awaymission/cabin)
"cq" = (
_maps/RandomZLevels/away_mission/TheBeach.dmm
+86 -10
View File
@@ -224,13 +224,63 @@
/mob/living/simple_animal/crab,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aL" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 9
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aM" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 1
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aN" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 5
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aO" = (
/obj/effect/baseturf_helper/beach/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aQ" = (
/obj/machinery/gateway/away,
"aP" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 8
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aQ" = (
/obj/machinery/gateway/centeraway,
/obj/effect/turf_decal/sand,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aR" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 4
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aS" = (
@@ -245,6 +295,32 @@
dir = 8
},
/area/awaymission/beach)
"aU" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 10
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aV" = (
/obj/machinery/gateway,
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/stripes/asteroid/line,
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aW" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/stripes/asteroid/line{
dir = 6
},
/turf/open/floor/plating/beach/sand,
/area/awaymission/beach)
"aX" = (
/turf/closed/wall/mineral/sandstone,
/area/awaymission/beach)
@@ -6832,9 +6908,9 @@ ak
ak
ak
ak
bf
bp
bx
aL
aP
aU
ak
ak
ba
@@ -6939,9 +7015,9 @@ ak
ak
ak
ak
bg
aM
aQ
by
aV
ba
ba
ba
@@ -7046,9 +7122,9 @@ ak
ak
ak
ak
bh
br
bz
aN
aR
aW
ak
ak
ak
_maps/RandomZLevels/away_mission/caves.dmm
+28 -10
View File
@@ -398,34 +398,49 @@
},
/area/awaymission/caves/BMP_asteroid/level_three)
"bi" = (
/obj/machinery/gateway{
dir = 9
},
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"bj" = (
/obj/machinery/gateway{
dir = 1
},
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"bk" = (
/obj/machinery/gateway{
dir = 5
},
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"bl" = (
/obj/machinery/gateway{
dir = 8
},
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"bm" = (
/obj/machinery/gateway/away{
/obj/machinery/gateway/centeraway{
calibrated = 0
},
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"bn" = (
"bn" = (
/obj/machinery/gateway{
dir = 4
},
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14"
},
@@ -438,6 +453,9 @@
},
/area/awaymission/caves/BMP_asteroid/level_three)
"bp" = (
/obj/machinery/gateway{
dir = 10
},
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14"
},
@@ -58093,9 +58111,9 @@ ao
ao
ao
bf
ao
ao
ao
bi
bl
bp
aw
ao
bz
@@ -58350,9 +58368,9 @@ ao
ao
bf
ap
ao
bj
bm
ao
bq
bf
bw
bA
@@ -58607,9 +58625,9 @@ ao
ao
ao
bf
ao
ao
ao
bk
bn
br
ao
ao
bz
_maps/RandomZLevels/away_mission/challenge.dmm
+125 -8
View File
@@ -902,12 +902,129 @@
},
/turf/open/floor/plating,
/area/awaymission/challenge/end)
"cR" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/awaymission/challenge/end)
"cS" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/awaymission/challenge/end)
"cT" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/awaymission/challenge/end)
"cV" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/awaymission/challenge/end)
"cW" = (
/obj/machinery/gateway/away{
/obj/machinery/gateway/centeraway{
calibrated = 0
},
/turf/open/floor/plasteel/dark,
/area/awaymission/challenge/end)
"cX" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/awaymission/challenge/end)
"cY" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/awaymission/challenge/end)
"cZ" = (
/obj/machinery/gateway,
/obj/structure/cable{
icon_state = "0-2"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/awaymission/challenge/end)
"da" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -28955,9 +29072,9 @@ cd
cn
cH
cN
co
co
co
cR
cV
cY
db
dg
cd
@@ -29212,7 +29329,7 @@ cd
cn
cH
cN
co
cS
cW
cZ
dc
@@ -29469,9 +29586,9 @@ cd
cn
cH
cN
co
co
co
cT
cX
da
db
dh
cd
_maps/RandomZLevels/away_mission/moonoutpost19.dmm
+106 -6
View File
@@ -193,6 +193,45 @@
},
/area/awaymission/moonoutpost19/syndicate)
"aG" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/syndicate)
"aH" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/syndicate)
"aI" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -253,14 +292,50 @@
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/syndicate)
"aO" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/syndicate)
"aP" = (
/obj/machinery/gateway/away{
/obj/machinery/gateway/centeraway{
calibrated = 0
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/syndicate)
"aQ" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/syndicate)
"aR" = (
/obj/machinery/light{
dir = 4
@@ -303,7 +378,29 @@
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/syndicate)
"aW" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/syndicate)
"aX" = (
/obj/machinery/gateway,
/obj/structure/cable{
icon_state = "0-2"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -319,6 +416,9 @@
},
/area/awaymission/moonoutpost19/syndicate)
"aY" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -41941,8 +42041,8 @@ ac
at
az
aG
aG
aG
aO
aW
aV
br
bB
@@ -42197,7 +42297,7 @@ ac
ac
at
aA
aG
aH
aP
aX
bg
@@ -42454,8 +42554,8 @@ ac
ac
at
aB
aG
aG
aI
aQ
aY
bh
bt
_maps/RandomZLevels/away_mission/research.dmm
+25 -3
View File
@@ -592,18 +592,27 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/gateway)
"bA" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/gateway)
"bB" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/gateway)
"bC" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -755,18 +764,24 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/gateway)
"bS" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/gateway)
"bT" = (
/obj/machinery/gateway/away{
/obj/machinery/gateway/centeraway{
calibrated = 0
},
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/gateway)
"bU" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -815,17 +830,24 @@
/turf/open/floor/plasteel/white,
/area/awaymission/research/interior/engineering)
"bY" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/gateway)
"bZ" = (
/obj/machinery/gateway,
/obj/effect/landmark/awaystart,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/gateway)
"ca" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -1360,7 +1382,7 @@
/obj/structure/closet/crate,
/obj/item/disk/data{
desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
genetic_makeup_buffer = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
name = "dusty genetics data disk";
read_only = 1
},
@@ -1749,7 +1771,7 @@
/obj/structure/closet/crate,
/obj/item/disk/data{
desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off with the words 'DO NOT CLONE' hastily written over it.";
genetic_makeup_buffer = list("label" = "Buffer1:George Melons", "UI" = "3c300f11b5421ca7014d8", "SE" = "430431205660551642142504334461413202111310233445620533134255", "UE" = "6893e6a0b0076a41897776b10cc2b324", "name" = "George Melons", "blood_type" = "B+");
fields = list("label" = "Buffer1:George Melons", "UI" = "3c300f11b5421ca7014d8", "SE" = "430431205660551642142504334461413202111310233445620533134255", "UE" = "6893e6a0b0076a41897776b10cc2b324", "name" = "George Melons", "blood_type" = "B+");
name = "old genetics data disk"
},
/obj/item/disk/data{
_maps/RandomZLevels/away_mission/snowdin.dmm
+44 -5
View File
@@ -2526,6 +2526,23 @@
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"fG" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"fH" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"fI" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
@@ -2890,12 +2907,15 @@
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"gw" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"gx" = (
/obj/machinery/gateway/away{
/obj/machinery/gateway/centeraway{
calibrated = 0
},
/obj/effect/turf_decal/bot,
@@ -2905,6 +2925,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"gy" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"gz" = (
/obj/machinery/light/broken{
dir = 4
@@ -3247,7 +3274,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"hl" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"hm" = (
/obj/machinery/gateway,
/obj/effect/turf_decal/bot,
/obj/structure/cable/yellow{
icon_state = "0-2"
@@ -3259,6 +3295,9 @@
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"hn" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -26628,7 +26667,7 @@ en
fh
fG
gw
gw
hl
hR
iA
ju
@@ -26883,7 +26922,7 @@ bE
dK
eo
fh
fG
fH
gx
hm
hS
@@ -27140,8 +27179,8 @@ dk
dK
ep
fh
fG
fG
fI
gy
hn
hT
iC
_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
+118 -7
View File
@@ -3360,6 +3360,45 @@
},
/area/awaymission/undergroundoutpost45/central)
"gR" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
"gS" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
"gT" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -3634,14 +3673,50 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"ht" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
"hu" = (
/obj/machinery/gateway/away{
/obj/machinery/gateway/centeraway{
calibrated = 0
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
"hv" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
"hw" = (
/obj/structure/chair{
dir = 8
@@ -3922,6 +3997,24 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/central)
"hY" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
"hZ" = (
/obj/machinery/gateway,
/obj/structure/cable{
@@ -3941,6 +4034,24 @@
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
"ia" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark{
heat_capacity = 1e+006
},
/area/awaymission/undergroundoutpost45/gateway)
"ib" = (
/obj/structure/chair{
dir = 8
@@ -33238,8 +33349,8 @@ ad
gv
gJ
gR
gR
gR
ht
hY
it
iO
jh
@@ -33494,7 +33605,7 @@ ad
ad
gv
gJ
gR
gS
hu
hZ
iu
@@ -33751,9 +33862,9 @@ ad
ad
gw
gJ
gR
gR
gR
gT
hv
ia
iv
iQ
jj
_maps/RandomZLevels/away_mission/wildwest.dmm
+55 -9
View File
@@ -65,12 +65,58 @@
/obj/structure/destructible/cult/pylon,
/turf/open/floor/circuit/green/off,
/area/awaymission/wildwest/vault)
"ar" = (
/obj/machinery/gateway{
dir = 9
},
/turf/open/floor/circuit/green/off,
/area/awaymission/wildwest/vault)
"as" = (
/obj/machinery/gateway{
dir = 1
},
/turf/open/floor/circuit/green/off,
/area/awaymission/wildwest/vault)
"at" = (
/obj/machinery/gateway{
dir = 5
},
/turf/open/floor/circuit/green/off,
/area/awaymission/wildwest/vault)
"au" = (
/obj/machinery/gateway{
dir = 8
},
/turf/open/floor/circuit/green/off,
/area/awaymission/wildwest/vault)
"av" = (
/obj/machinery/gateway/away{
/obj/machinery/gateway/centeraway{
calibrated = 0
},
/turf/open/floor/circuit/green/off,
/area/awaymission/wildwest/vault)
"aw" = (
/obj/machinery/gateway{
dir = 4
},
/turf/open/floor/circuit/green/off,
/area/awaymission/wildwest/vault)
"ax" = (
/obj/machinery/gateway{
dir = 10
},
/turf/open/floor/circuit/green/off,
/area/awaymission/wildwest/vault)
"ay" = (
/obj/machinery/gateway,
/turf/open/floor/circuit/green/off,
/area/awaymission/wildwest/vault)
"az" = (
/obj/machinery/gateway{
dir = 6
},
/turf/open/floor/circuit/green/off,
/area/awaymission/wildwest/vault)
"aA" = (
/obj/effect/meatgrinder,
/turf/open/floor/circuit/green/off,
@@ -47517,9 +47563,9 @@ aa
ab
ab
ab
ao
ao
ao
ar
au
ax
ao
ao
ao
@@ -47774,9 +47820,9 @@ aa
ab
ab
ab
ao
as
av
ao
ay
ao
ao
ao
@@ -48031,9 +48077,9 @@ aa
aa
ab
ab
ao
ao
ao
at
aw
az
ao
ao
ao
_maps/map_files/BoxStation/BoxStation.dmm
+84 -6
View File
@@ -11789,6 +11789,9 @@
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"azJ" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -11809,6 +11812,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"azL" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -11823,6 +11829,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"azM" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -12307,9 +12316,43 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
/area/ai_monitored/nuke_storage)
"aBd" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"aBe" = (
/turf/open/floor/plasteel/dark,
/area/gateway)
"aBf" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"aBg" = (
/obj/machinery/gateway/centerstation,
/turf/open/floor/plasteel/dark,
@@ -12648,7 +12691,42 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"aBX" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"aBY" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"aBZ" = (
/obj/machinery/gateway,
/obj/structure/cable{
icon_state = "0-2"
},
@@ -13717,7 +13795,8 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"aEQ" = (
/obj/machinery/computer/gateway_control,
/obj/structure/table,
/obj/item/paper/pamphlet/gateway,
/turf/open/floor/plasteel,
/area/gateway)
"aER" = (
@@ -13731,7 +13810,6 @@
},
/obj/item/storage/firstaid/regular,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/paper/pamphlet/gateway,
/turf/open/floor/plasteel,
/area/gateway)
"aES" = (
@@ -83976,8 +84054,8 @@ awb
axt
ayG
azJ
azM
azL
aBd
aBX
aDi
aEQ
aFW
@@ -84490,8 +84568,8 @@ vgJ
hSl
ayG
azL
azM
azJ
aBf
aBY
aDw
aES
aJh
_maps/map_files/Deltastation/DeltaStation2.dmm
+39 -3
View File
@@ -64841,6 +64841,7 @@
pixel_x = -26
},
/obj/structure/sign/painting/library{
pixel_x = 0;
pixel_y = -32
},
/turf/open/floor/wood,
@@ -75566,8 +75567,6 @@
/obj/structure/table,
/obj/item/storage/firstaid/regular,
/obj/effect/turf_decal/bot,
/obj/item/paper/pamphlet/gateway,
/obj/item/paper/pamphlet/gateway,
/turf/open/floor/plasteel,
/area/gateway)
"cyD" = (
@@ -75578,6 +75577,9 @@
/turf/open/floor/plating,
/area/gateway)
"cyE" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
@@ -75593,6 +75595,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"cyF" = (
/obj/machinery/gateway{
dir = 1
},
/obj/machinery/status_display/evac{
pixel_y = 32
},
@@ -75611,6 +75616,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"cyG" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
@@ -76568,6 +76576,9 @@
/turf/open/floor/plating,
/area/gateway)
"cAi" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
@@ -76590,6 +76601,24 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/gateway)
"cAk" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"cAl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
@@ -77399,6 +77428,9 @@
/turf/closed/wall,
/area/gateway)
"cBD" = (
/obj/machinery/gateway{
dir = 10
},
/obj/machinery/light{
dir = 8
},
@@ -77439,6 +77471,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"cBF" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Bridge - Gateway Chamber";
@@ -125421,6 +125456,7 @@
/area/chapel/office)
"iNK" = (
/obj/structure/sign/painting/library{
pixel_x = 0;
pixel_y = -32
},
/turf/open/floor/wood,
@@ -170067,7 +170103,7 @@ cul
cvE
cvz
cyG
cyG
cAk
cBF
cDm
cFa
_maps/map_files/KiloStation/KiloStation.dmm
+22 -19
View File
@@ -2536,33 +2536,14 @@
},
/area/space/nearstation)
"aeG" = (
<<<<<<< HEAD
/obj/machinery/atmospherics/pipe/simple/general/visible{
=======
/obj/machinery/light/small,
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating/airless,
/area/maintenance/starboard/fore)
"aeH" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
>>>>>>> d02e0cc... Gateway refactor (#49868)
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
<<<<<<< HEAD
/obj/effect/turf_decal/tile/blue{
dir = 1
=======
/obj/machinery/computer/gateway_control,
/turf/open/floor/plasteel/dark,
/area/gateway)
"aeI" = (
/obj/effect/turf_decal/tile/red{
dir = 8
>>>>>>> d02e0cc... Gateway refactor (#49868)
},
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -7224,6 +7205,9 @@
/turf/open/floor/plasteel/dark,
/area/tcommsat/computer)
"amk" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -13620,6 +13604,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/gateway{
dir = 10
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
dir = 4;
@@ -76347,6 +76334,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/gateway{
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/box/corners{
dir = 4
@@ -76413,6 +76403,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/gateway{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Gateway";
@@ -77558,6 +77551,9 @@
dir = 8
},
/obj/effect/decal/cleanable/greenglow,
/obj/machinery/gateway{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/gateway)
@@ -77577,6 +77573,9 @@
dir = 4
},
/obj/effect/decal/cleanable/greenglow,
/obj/machinery/gateway{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/gateway)
@@ -77636,6 +77635,7 @@
dir = 8
},
/obj/effect/decal/cleanable/greenglow,
/obj/machinery/gateway,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "0-2"
@@ -77652,6 +77652,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/gateway{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/gateway)
_maps/map_files/MetaStation/MetaStation.dmm
+66 -1
View File
@@ -44581,6 +44581,9 @@
/turf/open/floor/plating,
/area/gateway)
"bJY" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -44595,6 +44598,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"bJZ" = (
/obj/machinery/gateway{
dir = 1
},
/obj/machinery/status_display/evac{
pixel_y = 32
},
@@ -44612,6 +44618,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"bKa" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -45283,10 +45292,11 @@
/turf/open/floor/plasteel,
/area/gateway)
"bLB" = (
/obj/structure/table,
/obj/item/paper/pamphlet/gateway,
/obj/effect/turf_decal/bot{
dir = 1
},
/obj/machinery/computer/gateway_control,
/turf/open/floor/plasteel{
dir = 1
},
@@ -45297,6 +45307,9 @@
/turf/open/floor/plating,
/area/gateway)
"bLD" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -45314,6 +45327,23 @@
/obj/machinery/gateway/centerstation,
/turf/open/floor/plasteel/dark,
/area/gateway)
"bLF" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"bLG" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -46165,6 +46195,23 @@
dir = 1
},
/area/gateway)
"bNp" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"bNq" = (
/obj/machinery/gateway,
/obj/structure/cable/yellow{
@@ -46183,6 +46230,23 @@
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"bNr" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"bNs" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -67109,6 +67173,7 @@
name = "Test Chamber Telescreen";
network = list("toxins");
pixel_x = -32;
pixel_y = 0
},
/turf/open/floor/plasteel,
/area/science/mixing)
_maps/map_files/OmegaStation/OmegaStation.dmm
+3 -1
View File
@@ -4290,7 +4290,8 @@
department = "Head of Security's Desk";
departmentType = 5;
name = "Head of Security RC";
pixel_x = 30
pixel_x = 30;
pixel_y = 0
},
/obj/machinery/computer/security/hos{
icon_state = "computer";
@@ -13316,6 +13317,7 @@
dir = 9
},
/obj/machinery/computer/security/wooden_tv{
pixel_x = 0;
pixel_y = 4
},
/turf/open/floor/wood,
_maps/map_files/PubbyStation/PubbyStation.dmm
+66 -2
View File
@@ -5811,6 +5811,9 @@
/turf/closed/wall,
/area/maintenance/fore)
"aoA" = (
/obj/machinery/gateway{
dir = 9
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -5825,6 +5828,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"aoB" = (
/obj/machinery/gateway{
dir = 1
},
/obj/machinery/light{
dir = 1
},
@@ -5842,6 +5848,9 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"aoC" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -6181,6 +6190,9 @@
/turf/open/space,
/area/space/nearstation)
"apq" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -6198,6 +6210,23 @@
/obj/machinery/gateway/centerstation,
/turf/open/floor/plasteel/dark,
/area/gateway)
"aps" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"apt" = (
/obj/structure/chair{
dir = 4
@@ -6383,7 +6412,25 @@
"apT" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/nuke_storage)
"apU" = (
/obj/machinery/gateway{
dir = 10
},
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"apV" = (
/obj/machinery/gateway,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -6397,6 +6444,23 @@
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"apW" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/gateway)
"apX" = (
/turf/closed/wall,
/area/crew_quarters/dorms)
@@ -7304,11 +7368,12 @@
c_tag = "Gateway";
dir = 4
},
/obj/structure/table,
/obj/structure/sign/warning/biohazard{
pixel_x = -32
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/computer/gateway_control,
/obj/item/paper/pamphlet,
/turf/open/floor/plasteel,
/area/gateway)
"arY" = (
@@ -7365,7 +7430,6 @@
pixel_x = 32
},
/obj/item/radio/off,
/obj/item/paper/pamphlet,
/turf/open/floor/plasteel,
/area/gateway)
"asb" = (