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

Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/

Browse Source
This commit is contained in:
Artur
2020-04-23 12:36:42 +03:00
parent 80b47ec1c0
commit 67e0b95407
40 changed files with 157715 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/Academy.dmm
+13 -22
View File
@@ -3598,9 +3598,6 @@
/turf/open/floor/carpet,
/area/awaymission/academy/academygate)
"km" = (
/obj/machinery/gateway{
dir = 9
},
/obj/structure/cable{
icon_state = "1-4"
},
@@ -3638,25 +3635,16 @@
/turf/open/floor/plasteel,
/area/awaymission/academy/classrooms)
"kr" = (
/obj/machinery/gateway{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/academy/academygate)
"ks" = (
/obj/machinery/gateway{
dir = 10
},
/turf/open/floor/plating,
/turf/open/floor/plating,
/area/awaymission/academy/academygate)
"kt" = (
/obj/machinery/gateway,
/turf/open/floor/plating,
/area/awaymission/academy/academygate)
"ku" = (
/obj/machinery/gateway{
dir = 6
},
/turf/open/floor/plating,
/area/awaymission/academy/academygate)
"kv" = (
@@ -3743,6 +3731,7 @@
/turf/open/floor/plasteel,
/area/awaymission/academy/academyaft)
"kI" = (
/obj/machinery/gateway/away,
/obj/structure/cable,
/obj/machinery/gateway/centeraway{
calibrated = 1
@@ -13008,10 +12997,11 @@ jU
jZ
kb
ke
kj
km
kp
ks
ke
kf
kf
kf
ke
kf
kf
ky
@@ -13139,9 +13129,10 @@ jY
kc
jW
kf
kn
kf
kI
kt
ke
ke
kf
kf
ky
@@ -13269,9 +13260,9 @@ jY
kc
jW
kf
ko
kr
ku
kf
kf
kf
kf
kf
ky
_maps/RandomZLevels/Cabin.dmm
+1 -1
View File
@@ -656,7 +656,7 @@
/turf/open/floor/wood,
/area/awaymission/cabin)
"cp" = (
/obj/machinery/gateway/centeraway,
/obj/machinery/gateway/away,
/turf/open/floor/wood,
/area/awaymission/cabin)
"cq" = (
_maps/RandomZLevels/SnowCabin.dmm
+71128
View File
File diff suppressed because it is too large Load Diff
_maps/RandomZLevels/TheBeach.dmm
+9 -85
View File
@@ -224,65 +224,15 @@
/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)
"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/machinery/gateway/away,
/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" = (
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{
pixel_x = -12;
@@ -295,32 +245,6 @@
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)
@@ -6908,9 +6832,9 @@ ak
ak
ak
ak
aL
aP
aU
bf
bp
bx
ak
ak
ba
@@ -7015,9 +6939,9 @@ ak
ak
ak
ak
aM
bg
aQ
aV
by
ba
ba
ba
@@ -7122,9 +7046,9 @@ ak
ak
ak
ak
aN
aR
aW
bh
br
bz
ak
ak
ak
_maps/RandomZLevels/caves.dmm
+10 -28
View File
@@ -398,49 +398,34 @@
},
/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/centeraway{
/obj/machinery/gateway/away{
calibrated = 0
},
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"bn" = (
/obj/machinery/gateway{
dir = 4
},
"bn" = (
/turf/open/floor/engine/cult{
initial_gas_mix = "n2=23;o2=14"
},
@@ -453,9 +438,6 @@
},
/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"
},
@@ -58111,9 +58093,9 @@ ao
ao
ao
bf
bi
bl
bp
ao
ao
ao
aw
ao
bz
@@ -58368,9 +58350,9 @@ ao
ao
bf
ap
bj
ao
bm
bq
ao
bf
bw
bA
@@ -58625,9 +58607,9 @@ ao
ao
ao
bf
bk
bn
br
ao
ao
ao
ao
ao
bz
_maps/RandomZLevels/challenge.dmm
+8 -125
View File
@@ -902,129 +902,12 @@
},
/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/centeraway{
/obj/machinery/gateway/away{
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
},
@@ -29072,9 +28955,9 @@ cd
cn
cH
cN
cR
cV
cY
co
co
co
db
dg
cd
@@ -29329,7 +29212,7 @@ cd
cn
cH
cN
cS
co
cW
cZ
dc
@@ -29586,9 +29469,9 @@ cd
cn
cH
cN
cT
cX
da
co
co
co
db
dh
cd
_maps/RandomZLevels/moonoutpost19.dmm
+6 -106
View File
@@ -193,45 +193,6 @@
},
/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
},
@@ -292,50 +253,14 @@
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/centeraway{
/obj/machinery/gateway/away{
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
@@ -378,29 +303,7 @@
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
},
@@ -416,9 +319,6 @@
},
/area/awaymission/moonoutpost19/syndicate)
"aY" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -42041,8 +41941,8 @@ ac
at
az
aG
aO
aW
aG
aG
aV
br
bB
@@ -42297,7 +42197,7 @@ ac
ac
at
aA
aH
aG
aP
aX
bg
@@ -42554,8 +42454,8 @@ ac
ac
at
aB
aI
aQ
aG
aG
aY
bh
bt
_maps/RandomZLevels/research.dmm
+1 -23
View File
@@ -592,27 +592,18 @@
/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
},
@@ -764,24 +755,18 @@
/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/centeraway{
/obj/machinery/gateway/away{
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
},
@@ -830,24 +815,17 @@
/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
},
_maps/RandomZLevels/snowdin.dmm
+5 -44
View File
@@ -2526,23 +2526,6 @@
/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)
@@ -2907,15 +2890,12 @@
/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/centeraway{
/obj/machinery/gateway/away{
calibrated = 0
},
/obj/effect/turf_decal/bot,
@@ -2925,13 +2905,6 @@
/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
@@ -3274,16 +3247,7 @@
/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"
@@ -3295,9 +3259,6 @@
/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,
@@ -26667,7 +26628,7 @@ en
fh
fG
gw
hl
gw
hR
iA
ju
@@ -26922,7 +26883,7 @@ bE
dK
eo
fh
fH
fG
gx
hm
hS
@@ -27179,8 +27140,8 @@ dk
dK
ep
fh
fI
gy
fG
fG
hn
hT
iC
_maps/RandomZLevels/spacebattle.dmm
+9 -55
View File
@@ -978,24 +978,6 @@
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"ec" = (
/obj/machinery/gateway{
dir = 9
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"ed" = (
/obj/machinery/gateway{
dir = 1
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"ee" = (
/obj/machinery/gateway{
dir = 5
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"ef" = (
/mob/living/simple_animal/hostile/syndicate/melee/spacebattle,
/turf/open/floor/mineral/plastitanium/red,
@@ -1033,24 +1015,12 @@
"el" = (
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
"em" = (
/obj/machinery/gateway{
dir = 8
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"en" = (
/obj/machinery/gateway/centeraway{
/obj/machinery/gateway/away{
calibrated = 0
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"eo" = (
/obj/machinery/gateway{
dir = 4
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"ep" = (
/obj/structure/chair{
dir = 1
@@ -1064,22 +1034,6 @@
"er" = (
/turf/closed/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate4)
"et" = (
/obj/machinery/gateway{
dir = 10
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"eu" = (
/obj/machinery/gateway,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"ev" = (
/obj/machinery/gateway{
dir = 6
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"ew" = (
/obj/structure/chair,
/turf/open/floor/mineral/plastitanium/red,
@@ -26938,9 +26892,9 @@ cc
cc
bT
cK
ec
em
et
cK
cK
cK
cK
cK
cK
@@ -27195,9 +27149,9 @@ cA
cc
bT
cK
ed
cK
en
eu
cK
cK
cK
cK
@@ -27452,9 +27406,9 @@ cc
cc
bT
cK
ee
eo
ev
cK
cK
cK
cK
jF
fb
_maps/RandomZLevels/undergroundoutpost45.dmm
+7 -118
View File
@@ -3360,45 +3360,6 @@
},
/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
},
@@ -3673,50 +3634,14 @@
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/centeraway{
/obj/machinery/gateway/away{
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
@@ -3997,24 +3922,6 @@
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{
@@ -4034,24 +3941,6 @@
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
@@ -33349,8 +33238,8 @@ ad
gv
gJ
gR
ht
hY
gR
gR
it
iO
jh
@@ -33605,7 +33494,7 @@ ad
ad
gv
gJ
gS
gR
hu
hZ
iu
@@ -33862,9 +33751,9 @@ ad
ad
gw
gJ
gT
hv
ia
gR
gR
gR
iv
iQ
jj
_maps/RandomZLevels/wildwest.dmm
+9 -55
View File
@@ -65,58 +65,12 @@
/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/centeraway{
/obj/machinery/gateway/away{
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,
@@ -47563,9 +47517,9 @@ aa
ab
ab
ab
ar
au
ax
ao
ao
ao
ao
ao
ao
@@ -47820,9 +47774,9 @@ aa
ab
ab
ab
as
ao
av
ay
ao
ao
ao
ao
@@ -48077,9 +48031,9 @@ aa
aa
ab
ab
at
aw
az
ao
ao
ao
ao
ao
ao
_maps/map_files/BoxStation/BoxStation.dmm
+2 -79
View File
@@ -11418,9 +11418,6 @@
/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
@@ -11441,9 +11438,6 @@
/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
@@ -11458,9 +11452,6 @@
/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
@@ -11945,43 +11936,9 @@
/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,
@@ -12320,40 +12277,6 @@
},
/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{
@@ -13424,8 +13347,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"aEQ" = (
/obj/structure/table,
/obj/item/paper/pamphlet/gateway,
/obj/machinery/computer/gateway_control,
/turf/open/floor/plasteel,
/area/gateway)
"aER" = (
@@ -13439,6 +13361,7 @@
},
/obj/item/storage/firstaid/regular,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/paper/pamphlet/gateway,
/turf/open/floor/plasteel,
/area/gateway)
"aES" = (
_maps/map_files/Deltastation/DeltaStation2.dmm
+3 -37
View File
@@ -76431,6 +76431,8 @@
/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" = (
@@ -76441,9 +76443,6 @@
/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{
@@ -76459,9 +76458,6 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"cyF" = (
/obj/machinery/gateway{
dir = 1
},
/obj/machinery/status_display/evac{
pixel_y = 32
},
@@ -76480,9 +76476,6 @@
/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{
@@ -77421,9 +77414,6 @@
/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{
@@ -77446,24 +77436,6 @@
/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{
@@ -78274,9 +78246,6 @@
/turf/closed/wall,
/area/gateway)
"cBD" = (
/obj/machinery/gateway{
dir = 10
},
/obj/machinery/light{
dir = 8
},
@@ -78317,9 +78286,6 @@
/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";
@@ -159678,7 +159644,7 @@ aAb
aAb
aAb
aIL
ePi
arB
aLz
aLz
aLz
_maps/map_files/Donutstation/Donutstation_LVL2.dmm
+86395
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/KiloStation/KiloStation.dmm
+19 -22
View File
@@ -2575,14 +2575,33 @@
},
/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
@@ -7443,9 +7462,6 @@
/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
@@ -13963,9 +13979,6 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/gateway{
dir = 10
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
dir = 4;
@@ -78936,9 +78949,6 @@
/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
@@ -79005,9 +79015,6 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/gateway{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Gateway";
@@ -80154,9 +80161,6 @@
dir = 8
},
/obj/effect/decal/cleanable/greenglow,
/obj/machinery/gateway{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/gateway)
@@ -80176,9 +80180,6 @@
dir = 4
},
/obj/effect/decal/cleanable/greenglow,
/obj/machinery/gateway{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/gateway)
@@ -80238,7 +80239,6 @@
dir = 8
},
/obj/effect/decal/cleanable/greenglow,
/obj/machinery/gateway,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "0-2"
@@ -80255,9 +80255,6 @@
/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
+1 -65
View File
@@ -44652,9 +44652,6 @@
/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
@@ -44669,9 +44666,6 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"bJZ" = (
/obj/machinery/gateway{
dir = 1
},
/obj/machinery/status_display/evac{
pixel_y = 32
},
@@ -44689,9 +44683,6 @@
/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
@@ -45380,11 +45371,10 @@
/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
},
@@ -45395,9 +45385,6 @@
/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
@@ -45415,23 +45402,6 @@
/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"
@@ -46295,23 +46265,6 @@
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{
@@ -46330,23 +46283,6 @@
},
/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"
_maps/map_files/PubbyStation/PubbyStation.dmm
+2 -66
View File
@@ -5787,9 +5787,6 @@
/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
@@ -5804,9 +5801,6 @@
/turf/open/floor/plasteel/dark,
/area/gateway)
"aoB" = (
/obj/machinery/gateway{
dir = 1
},
/obj/machinery/light{
dir = 1
},
@@ -5824,9 +5818,6 @@
/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
@@ -6161,9 +6152,6 @@
/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
@@ -6181,23 +6169,6 @@
/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
@@ -6378,25 +6349,7 @@
"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
@@ -6410,23 +6363,6 @@
},
/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,12 +7240,11 @@
c_tag = "Gateway";
dir = 4
},
/obj/structure/table,
/obj/structure/sign/warning/biohazard{
pixel_x = -32
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/paper/pamphlet,
/obj/machinery/computer/gateway_control,
/turf/open/floor/plasteel,
/area/gateway)
"arY" = (
@@ -7366,6 +7301,7 @@
pixel_x = 32
},
/obj/item/radio/off,
/obj/item/paper/pamphlet,
/turf/open/floor/plasteel,
/area/gateway)
"asb" = (
code/__DEFINES/logging.dm
+1
View File
@@ -37,6 +37,7 @@
#define LOG_ADMIN_PRIVATE (1 << 14)
#define LOG_ASAY (1 << 15)
#define LOG_VIRUS (1 << 16)
#define LOG_SHUTTLE (1 << 18)
//Individual logging panel pages
#define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK)
code/__HELPERS/_logging.dm
+4
View File
@@ -126,6 +126,10 @@
if (CONFIG_GET(flag/log_vote))
WRITE_LOG(GLOB.world_game_log, "VOTE: [text]")
/proc/log_shuttle(text)
if (CONFIG_GET(flag/log_shuttle))
WRITE_LOG(GLOB.world_shuttle_log, "SHUTTLE: [text]")
/proc/log_craft(text)
if (CONFIG_GET(flag/log_craft))
WRITE_LOG(GLOB.world_crafting_log, "CRAFT: [text]")
code/__HELPERS/unsorted.dm
+2
View File
@@ -1485,6 +1485,8 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
set waitfor = FALSE
return call(source, proctype)(arglist(arguments))
#define TURF_FROM_COORDS_LIST(List) (locate(List[1], List[2], List[3]))
/proc/num2sign(numeric)
if(numeric > 0)
return 1
code/_globalvars/lists/mapping.dm
+1 -2
View File
@@ -38,8 +38,7 @@ GLOBAL_LIST_EMPTY(servant_spawns) //Servants of Ratvar spawn here
GLOBAL_LIST_EMPTY(city_of_cogs_spawns) //Anyone entering the City of Cogs spawns here
GLOBAL_LIST_EMPTY(ruin_landmarks)
//away missions
GLOBAL_LIST_EMPTY(awaydestinations) //a list of landmarks that the warpgate can take you to
//away missions
GLOBAL_LIST_EMPTY(vr_spawnpoints)
//used by jump-to-area etc. Updated by area/updateName()
code/_globalvars/logging.dm
+2 -2
View File
@@ -45,10 +45,10 @@ GLOBAL_LIST_EMPTY(lastsignalers) //keeps last 100 signals here in format: "[src]
GLOBAL_PROTECT(lastsignalers)
GLOBAL_LIST_EMPTY(lawchanges) //Stores who uploaded laws to which silicon-based lifeform, and what the law was
GLOBAL_PROTECT(lawchanges)
GLOBAL_VAR(tgui_log)
GLOBAL_PROTECT(tgui_log)
GLOBAL_VAR(world_shuttle_log)
GLOBAL_PROTECT(world_shuttle_log)
GLOBAL_LIST_EMPTY(combatlog)
GLOBAL_PROTECT(combatlog)
GLOBAL_LIST_EMPTY(IClog)
code/_onclick/observer.dm
+3 -12
View File
@@ -63,18 +63,9 @@
// And here are some good things for free:
// Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu
/obj/machinery/gateway/centerstation/attack_ghost(mob/user)
if(awaygate)
user.forceMove(awaygate.loc)
else
to_chat(user, "[src] has no destination.")
return ..()
/obj/machinery/gateway/centeraway/attack_ghost(mob/user)
if(stationgate)
user.forceMove(stationgate.loc)
else
to_chat(user, "[src] has no destination.")
/obj/effect/gateway_portal_bumper/attack_ghost(mob/user)
if(gateway)
gateway.Transfer(user)
return ..()
/obj/machinery/teleport/hub/attack_ghost(mob/user)
code/controllers/configuration/entries/general.dm
+2
View File
@@ -56,6 +56,8 @@
/datum/config_entry/flag/log_adminchat // log admin chat messages
protection = CONFIG_ENTRY_LOCKED
/datum/config_entry/flag/log_shuttle // log shuttle related actions, ie shuttle computers, shuttle manipulator, emergency console
/datum/config_entry/flag/log_pda // log pda messages
/datum/config_entry/flag/log_telecomms // log telecomms messages
code/controllers/subsystem/mapping.dm
-12
View File
@@ -450,18 +450,6 @@ GLOBAL_LIST_EMPTY(the_station_areas)
message_admins("Loading [away_name] failed!")
return
if(GLOB.the_gateway)
//Link any found away gate with station gate
var/obj/machinery/gateway/centeraway/new_gate
for(var/obj/machinery/gateway/centeraway/G in GLOB.machines)
if(G.z == away_level.z_value) //I'll have to refactor gateway shitcode before multi-away support.
new_gate = G
break
//Link station gate with away gate and remove wait time.
GLOB.the_gateway.awaygate = new_gate
GLOB.the_gateway.wait = world.time
/datum/controller/subsystem/mapping/proc/RequestBlockReservation(width, height, z, type = /datum/turf_reservation, turf_type_override, border_type_override)
UNTIL((!z || reservation_ready["[z]"]) && !clearing_reserved_turfs)
var/datum/turf_reservation/reserve = new type
code/controllers/subsystem/shuttle.dm
+2 -2
View File
@@ -255,7 +255,7 @@ SUBSYSTEM_DEF(shuttle)
var/area/A = get_area(user)
log_shuttle("[key_name(user)] has called the emergency shuttle.")
deadchat_broadcast(" has called the shuttle at <span class='name'>[A.name]</span>.", "<span class='name'>[user.real_name]</span>", user, message_type=DEADCHAT_ANNOUNCEMENT)
deadchat_broadcast(" has called the shuttle at <span class='name'>[A.name]</span>.", "<span class='name'>[user.real_name]</span>", user)
if(call_reason)
SSblackbox.record_feedback("text", "shuttle_reason", 1, "[call_reason]")
log_shuttle("Shuttle call reason: [call_reason]")
@@ -394,7 +394,7 @@ SUBSYSTEM_DEF(shuttle)
emergency.setTimer(emergencyDockTime)
priority_announce("Hostile environment resolved. \
You have 3 minutes to board the Emergency Shuttle.",
null, 'sound/ai/shuttledock.ogg', "Priority")
null, 'shuttledock', "Priority")
//try to move/request to dockHome if possible, otherwise dockAway. Mainly used for admin buttons
/datum/controller/subsystem/shuttle/proc/toggleShuttle(shuttleId, dockHome, dockAway, timed)
code/datums/shuttles.dm
+3
View File
@@ -105,6 +105,9 @@
rack.AddComponent(/datum/component/magnetic_catch)
//Whatever special stuff you want
/datum/map_template/shuttle/proc/post_load(obj/docking_port/mobile/M)
return
/datum/map_template/shuttle/proc/on_bought()
return
code/game/atoms.dm
+2
View File
@@ -864,6 +864,8 @@
log_game(log_text)
if(LOG_GAME)
log_game(log_text)
if(LOG_SHUTTLE)
log_shuttle(log_text)
else
stack_trace("Invalid individual logging type: [message_type]. Defaulting to [LOG_GAME] (LOG_GAME).")
log_game(log_text)
code/game/machinery/announcement_system.dm
+42 -52
View File
@@ -39,7 +39,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
icon_state = (panel_open ? "AAS_Off_Open" : "AAS_Off")
/obj/machinery/announcement_system/update_overlays()
. =..()
. = ..()
if(arrivalToggle)
. += greenlight
@@ -54,19 +54,15 @@ GLOBAL_LIST_EMPTY(announcement_systems)
GLOB.announcement_systems -= src //"OH GOD WHY ARE THERE 100,000 LISTED ANNOUNCEMENT SYSTEMS?!!"
return ..()
/obj/machinery/announcement_system/power_change()
..()
update_icon()
/obj/machinery/announcement_system/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/screwdriver))
if(P.tool_behaviour == TOOL_SCREWDRIVER)
P.play_tool_sound(src)
panel_open = !panel_open
to_chat(user, "<span class='notice'>You [panel_open ? "open" : "close"] the maintenance hatch of [src].</span>")
update_icon()
else if(default_deconstruction_crowbar(P))
return
else if(istype(P, /obj/item/multitool) && panel_open && (stat & BROKEN))
else if(P.tool_behaviour == TOOL_MULTITOOL && panel_open && (stat & BROKEN))
to_chat(user, "<span class='notice'>You reset [src]'s firmware.</span>")
stat &= ~BROKEN
update_icon()
@@ -88,10 +84,6 @@ GLOBAL_LIST_EMPTY(announcement_systems)
message = CompileText(arrival, user, rank)
else if(message_type == "NEWHEAD" && newheadToggle)
message = CompileText(newhead, user, rank)
//CITADEL EDIT for cryopods
else if(message_type == "CRYOSTORAGE")
message = CompileText("%PERSON, %RANK has been moved to cryo storage.", user, rank)
//END EDIT
else if(message_type == "ARRIVALS_BROKEN")
message = "The arrivals shuttle has been damaged. Docking for repairs..."
@@ -103,59 +95,59 @@ GLOBAL_LIST_EMPTY(announcement_systems)
//config stuff
/obj/machinery/announcement_system/ui_interact(mob/user)
/obj/machinery/announcement_system/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
. = ..()
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "AutomatedAnnouncement", "Automated Announcement System", 500, 225, master_ui, state)
ui = new(user, src, ui_key, "announcement_system", "Automated Announcement System", 500, 225, master_ui, state)
ui.open()
/obj/machinery/announcement_system/ui_data()
var/list/data = list()
data["arrival"] = arrival
data["arrivalToggle"] = arrivalToggle
data["newhead"] = newhead
data["newheadToggle"] = newheadToggle
return data
var/contents = "Arrival Announcement: <A href='?src=[REF(src)];ArrivalT-Topic=1'>([(arrivalToggle ? "On" : "Off")])</a><br>\n<A href='?src=[REF(src)];ArrivalTopic=1'>[arrival]</a><br><br>\n"
contents += "Departmental Head Announcement: <A href='?src=[REF(src)];NewheadT-Topic=1'>([(newheadToggle ? "On" : "Off")])</a><br>\n<A href='?src=[REF(src)];NewheadTopic=1'>[newhead]</a><br><br>\n"
var/datum/browser/popup = new(user, "announcement_config", "Automated Announcement Configuration", 370, 220)
popup.set_content(contents)
popup.open()
/obj/machinery/announcement_system/Topic(href, href_list)
if(..())
/obj/machinery/announcement_system/ui_act(action, param)
. = ..()
if(.)
return
if(!usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
if(!usr.canUseTopic(src, !issilicon(usr)))
return
if(stat & BROKEN)
visible_message("<span class='warning'>[src] buzzes.</span>", "<span class='italics'>You hear a faint buzz.</span>")
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1)
visible_message("<span class='warning'>[src] buzzes.</span>", "<span class='hear'>You hear a faint buzz.</span>")
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, TRUE)
return
if(href_list["ArrivalTopic"])
var/NewMessage = stripped_input(usr, "Enter in the arrivals announcement configuration.", "Arrivals Announcement Config", arrival)
if(!usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
return
if(NewMessage)
arrival = NewMessage
else if(href_list["NewheadTopic"])
var/NewMessage = stripped_input(usr, "Enter in the departmental head announcement configuration.", "Head Departmental Announcement Config", newhead)
if(!usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
return
if(NewMessage)
newhead = NewMessage
else if(href_list["NewheadT-Topic"])
newheadToggle = !newheadToggle
update_icon()
else if(href_list["ArrivalT-Topic"])
arrivalToggle = !arrivalToggle
update_icon()
switch(action)
if("ArrivalText")
var/NewMessage = trim(html_encode(param["newText"]), MAX_MESSAGE_LEN)
if(!usr.canUseTopic(src, !issilicon(usr)))
return
if(NewMessage)
arrival = NewMessage
log_game("The arrivals announcement was updated: [NewMessage] by:[key_name(usr)]")
if("NewheadText")
var/NewMessage = trim(html_encode(param["newText"]), MAX_MESSAGE_LEN)
if(!usr.canUseTopic(src, !issilicon(usr)))
return
if(NewMessage)
newhead = NewMessage
log_game("The head announcement was updated: [NewMessage] by:[key_name(usr)]")
if("NewheadToggle")
newheadToggle = !newheadToggle
update_icon()
if("ArrivalToggle")
arrivalToggle = !arrivalToggle
update_icon()
add_fingerprint(usr)
interact(usr)
/obj/machinery/announcement_system/attack_robot(mob/living/silicon/user)
. = attack_ai(user)
/obj/machinery/announcement_system/attack_ai(mob/user)
if(!user.canUseTopic(src, !hasSiliconAccessInArea(user)))
if(!user.canUseTopic(src, !issilicon(user)))
return
if(stat & BROKEN)
to_chat(user, "<span class='warning'>[src]'s firmware appears to be malfunctioning!</span>")
@@ -163,8 +155,8 @@ GLOBAL_LIST_EMPTY(announcement_systems)
interact(user)
/obj/machinery/announcement_system/proc/act_up() //does funny breakage stuff
stat |= BROKEN
update_icon()
if(!obj_break()) // if badmins flag this unbreakable or its already broken
return
arrival = pick("#!@%ERR-34%2 CANNOT LOCAT@# JO# F*LE!", "CRITICAL ERROR 99.", "ERR)#: DA#AB@#E NOT F(*ND!")
newhead = pick("OV#RL()D: \[UNKNOWN??\] DET*#CT)D!", "ER)#R - B*@ TEXT F*O(ND!", "AAS.exe is not responding. NanoOS is searching for a solution to the problem.")
@@ -175,9 +167,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
act_up()
/obj/machinery/announcement_system/emag_act()
. = ..()
if(obj_flags & EMAGGED)
return
obj_flags |= EMAGGED
act_up()
return TRUE
code/game/machinery/computer/communications.dm
+1
View File
@@ -175,6 +175,7 @@
M.load_template(S)
M.existing_shuttle = SSshuttle.emergency
M.action_load(S)
log_shuttle("[key_name(usr)] has purchased [S.name].")
message_admins("[S.name] loaded, purchased by [usr]")
else
to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.")
code/modules/assembly/infrared.dm
-2
View File
@@ -4,8 +4,6 @@
icon_state = "infrared"
custom_materials = list(/datum/material/iron=1000, /datum/material/glass=500)
is_position_sensitive = TRUE
drop_sound = 'sound/items/handling/component_drop.ogg'
pickup_sound = 'sound/items/handling/component_pickup.ogg'
var/ui_x = 225
var/ui_y = 110
var/on = FALSE
code/modules/assembly/proximity.dm
-2
View File
@@ -4,8 +4,6 @@
icon_state = "prox"
custom_materials = list(/datum/material/iron=800, /datum/material/glass=200)
attachable = TRUE
drop_sound = 'sound/items/handling/component_drop.ogg'
pickup_sound = 'sound/items/handling/component_pickup.ogg'
var/ui_x = 250
var/ui_y = 185
var/scanning = FALSE
code/modules/assembly/signaler.dm
-2
View File
@@ -8,8 +8,6 @@
custom_materials = list(/datum/material/iron=400, /datum/material/glass=120)
wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
attachable = TRUE
drop_sound = 'sound/items/handling/component_drop.ogg'
pickup_sound = 'sound/items/handling/component_pickup.ogg'
var/ui_x = 280
var/ui_y = 132
var/code = DEFAULT_SIGNALER_CODE
code/modules/assembly/timer.dm
-2
View File
@@ -4,8 +4,6 @@
icon_state = "timer"
custom_materials = list(/datum/material/iron=500, /datum/material/glass=50)
attachable = TRUE
drop_sound = 'sound/items/handling/component_drop.ogg'
pickup_sound = 'sound/items/handling/component_pickup.ogg'
var/ui_x = 275
var/ui_y = 115
var/timing = FALSE
code/modules/awaymissions/zlevel.dm
+17 -16
View File
@@ -2,33 +2,34 @@
GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "[global.config.directory]/awaymissionconfig.txt"))
/proc/createRandomZlevel()
if(GLOB.awaydestinations.len) //crude, but it saves another var!
return
if(GLOB.potentialRandomZlevels && GLOB.potentialRandomZlevels.len)
to_chat(world, "<span class='boldannounce'>Loading away mission...</span>")
var/map = pick(GLOB.potentialRandomZlevels)
load_new_z_level(map, "Away Mission")
to_chat(world, "<span class='boldannounce'>Away mission loaded.</span>")
/proc/reset_gateway_spawns(reset = FALSE)
for(var/obj/machinery/gateway/G in world)
if(reset)
G.randomspawns = GLOB.awaydestinations
else
G.randomspawns.Add(GLOB.awaydestinations)
/obj/effect/landmark/awaystart
name = "away mission spawn"
desc = "Randomly picked away mission spawn points."
var/id
var/delay = TRUE // If the generated destination should be delayed by configured gateway delay
/obj/effect/landmark/awaystart/New()
GLOB.awaydestinations += src
..()
/obj/effect/landmark/awaystart/Initialize()
. = ..()
var/datum/gateway_destination/point/current
for(var/datum/gateway_destination/point/D in GLOB.gateway_destinations)
if(D.id == id)
current = D
if(!current)
current = new
current.id = id
if(delay)
current.wait = CONFIG_GET(number/gateway_delay)
GLOB.gateway_destinations += current
current.target_turfs += get_turf(src)
/obj/effect/landmark/awaystart/Destroy()
GLOB.awaydestinations -= src
return ..()
/obj/effect/landmark/awaystart/nodelay
delay = FALSE
/proc/generateMapList(filename)
. = list()
code/modules/mining/aux_base.dm
+1
View File
@@ -92,6 +92,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
say("<span class='danger'>Launch sequence activated! Prepare for drop!!</span>")
playsound(loc, 'sound/machines/warning-buzzer.ogg', 70, 0)
launch_warning = FALSE
log_shuttle("[key_name(usr)] has launched the auxillary base.")
else if(!shuttle_error)
say("Shuttle request uploaded. Please stand away from the doors.")
else
code/modules/shuttle/computer.dm
+2 -1
View File
@@ -57,6 +57,7 @@
switch(SSshuttle.moveShuttle(shuttleId, href_list["move"], 1))
if(0)
say("Shuttle departing. Please stand away from the doors.")
log_shuttle("[key_name(usr)] has sent shuttle \"[M]\" towards \"[href_list["move"]]\", using [src].")
if(1)
to_chat(usr, "<span class='warning'>Invalid shuttle requested.</span>")
else
@@ -73,4 +74,4 @@
/obj/machinery/computer/shuttle/proc/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE)
if(port && (shuttleId == initial(shuttleId) || override))
shuttleId = port.id
shuttleId = port.id
code/modules/shuttle/emergency.dm
+2 -2
View File
@@ -144,7 +144,7 @@
authorized += ID
message_admins("[ADMIN_LOOKUPFLW(user)] has authorized early shuttle launch")
log_game("[key_name(user)] has authorized early shuttle launch in [COORD(src)]")
log_shuttle("[key_name(user)] has authorized early shuttle launch in [COORD(src)]")
// Now check if we're on our way
. = TRUE
process()
@@ -250,7 +250,7 @@
var/time = TIME_LEFT
message_admins("[ADMIN_LOOKUPFLW(user.client)] has emagged the emergency shuttle [time] seconds before launch.")
log_game("[key_name(user)] has emagged the emergency shuttle in [COORD(src)] [time] seconds before launch.")
log_shuttle("[key_name(user)] has emagged the emergency shuttle in [COORD(src)] [time] seconds before launch.")
obj_flags |= EMAGGED
SSshuttle.emergency.movement_force = list("KNOCKDOWN" = 60, "THROW" = 20)//YOUR PUNY SEATBELTS can SAVE YOU NOW, MORTAL
var/datum/species/S = new
icons/obj/machines/gateway.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 16 KiB