Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 8b31735

Browse files
Yogbot-13Yogbot-13
committed
TGS Test Merge (#21854)
2 parents ec3dc54 + 70fc2ef commit 8b31735

File tree

17 files changed

+5854
-4095
lines changed

17 files changed

+5854
-4095
lines changed

‎_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,6 @@
9797
},
9898
/turf/open/floor/plasteel,
9999
/area/clerk)
100-
"g" = (
101-
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
102-
dir = 1
103-
},
104-
/obj/effect/turf_decal/tile/yellow/opposingcorners,
105-
/obj/effect/turf_decal/tile/green/opposingcorners{
106-
dir = 1
107-
},
108-
/turf/open/floor/plasteel,
109-
/area/clerk)
110100
"h" = (
111101
/obj/machinery/light{
112102
dir = 4
@@ -274,6 +264,19 @@
274264
},
275265
/turf/open/floor/plasteel,
276266
/area/clerk)
267+
"u" = (
268+
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
269+
dir = 1
270+
},
271+
/obj/effect/turf_decal/tile/yellow/opposingcorners,
272+
/obj/effect/turf_decal/tile/green/opposingcorners{
273+
dir = 1
274+
},
275+
/obj/machinery/light_switch{
276+
pixel_x = 23
277+
},
278+
/turf/open/floor/plasteel,
279+
/area/clerk)
277280
"v" = (
278281
/obj/structure/rack,
279282
/obj/item/book/random,
@@ -689,7 +692,7 @@ l
689692
o
690693
Y
691694
j
692-
g
695+
u
693696
E
694697
z
695698
i

‎_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,6 @@
2828
},
2929
/turf/open/floor/wood,
3030
/area/clerk)
31-
"f" = (
32-
/obj/structure/table/wood,
33-
/obj/item/coinstack,
34-
/obj/item/coin/gold,
35-
/obj/item/coin/gold,
36-
/obj/item/coin/gold,
37-
/obj/item/coin/plasma,
38-
/obj/item/coin/uranium,
39-
/obj/item/coin/diamond,
40-
/obj/item/coin/iron,
41-
/obj/item/coin/iron,
42-
/turf/open/floor/carpet/black,
43-
/area/clerk)
4431
"g" = (
4532
/obj/structure/table/wood/poker,
4633
/obj/machinery/door/poddoor/shutters{
@@ -234,6 +221,22 @@
234221
},
235222
/turf/open/floor/wood,
236223
/area/clerk)
224+
"M" = (
225+
/obj/structure/table/wood,
226+
/obj/item/coinstack,
227+
/obj/item/coin/gold,
228+
/obj/item/coin/gold,
229+
/obj/item/coin/gold,
230+
/obj/item/coin/plasma,
231+
/obj/item/coin/uranium,
232+
/obj/item/coin/diamond,
233+
/obj/item/coin/iron,
234+
/obj/item/coin/iron,
235+
/obj/machinery/light_switch{
236+
pixel_x = 23
237+
},
238+
/turf/open/floor/carpet/black,
239+
/area/clerk)
237240
"N" = (
238241
/obj/structure/table/wood,
239242
/obj/machinery/paystand/register{
@@ -441,7 +444,7 @@ G
441444
G
442445
F
443446
u
444-
f
447+
M
445448
G
446449
w
447450
A

‎_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,13 @@
267267
},
268268
/turf/open/floor/plasteel/dark,
269269
/area/clerk)
270+
"H" = (
271+
/obj/effect/turf_decal/tile/yellow/opposingcorners,
272+
/obj/machinery/light_switch{
273+
pixel_x = 23
274+
},
275+
/turf/open/floor/plasteel/dark,
276+
/area/clerk)
270277
"I" = (
271278
/obj/effect/landmark/event_spawn,
272279
/obj/effect/turf_decal/tile/yellow/opposingcorners,
@@ -471,7 +478,7 @@ o
471478
U
472479
a
473480
X
474-
g
481+
H
475482
q
476483
t
477484
Z

‎_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,6 @@
4949
},
5050
/turf/open/floor/pod/dark,
5151
/area/clerk)
52-
"h" = (
53-
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
54-
dir = 1
55-
},
56-
/obj/structure/chair/americandiner{
57-
dir = 4
58-
},
59-
/turf/open/floor/plasteel/dark,
60-
/area/clerk)
6152
"i" = (
6253
/obj/structure/rack,
6354
/obj/effect/turf_decal/trimline/secred/filled/line/lower,
@@ -305,6 +296,18 @@
305296
},
306297
/turf/open/floor/plasteel/dark,
307298
/area/clerk)
299+
"G" = (
300+
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
301+
dir = 1
302+
},
303+
/obj/structure/chair/americandiner{
304+
dir = 4
305+
},
306+
/obj/machinery/light_switch{
307+
pixel_x = -23
308+
},
309+
/turf/open/floor/plasteel/dark,
310+
/area/clerk)
308311
"I" = (
309312
/obj/structure/rack,
310313
/obj/machinery/airalarm{
@@ -381,8 +384,8 @@
381384
/obj/structure/table/reinforced,
382385
/obj/machinery/door/firedoor/border_only,
383386
/obj/machinery/door/poddoor/multi_tile/four_tile_hor{
384-
id = "giftshop";
385-
armor = list("melee" = 50, "bullet" = 80, "laser" = 80, "energy" = 100, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
387+
armor = list("melee" = 50, "bullet" = 80, "laser" = 80, "energy" = 100, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70);
388+
id = "giftshop"
386389
},
387390
/turf/open/floor/plasteel/dark,
388391
/area/clerk)
@@ -477,9 +480,9 @@
477480
},
478481
/obj/structure/table/reinforced,
479482
/obj/item/toy/plush/nukeplushie{
480-
pixel_y = 7;
483+
desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. This one seems to be skilled at guitar.";
481484
pixel_x = 4;
482-
desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. This one seems to be skilled at guitar."
485+
pixel_y = 7
483486
},
484487
/obj/item/instrument/eguitar{
485488
pixel_x = 4;
@@ -570,7 +573,7 @@ T
570573
a
571574
c
572575
p
573-
h
576+
G
574577
a
575578
E
576579
x

‎_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm‎

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@
107107
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
108108
/turf/open/floor/plasteel,
109109
/area/engine/engineering)
110-
"cA" = (
111-
/obj/effect/turf_decal/pool{
112-
dir = 8
113-
},
114-
/turf/open/floor/plasteel,
115-
/area/engine/engineering)
116110
"df" = (
117111
/obj/machinery/light/small{
118112
dir = 1
@@ -234,6 +228,15 @@
234228
},
235229
/turf/open/floor/noslip,
236230
/area/engine/engineering)
231+
"io" = (
232+
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
233+
dir = 6
234+
},
235+
/obj/machinery/light_switch{
236+
pixel_x = -23
237+
},
238+
/turf/open/floor/plasteel,
239+
/area/engine/engineering)
237240
"is" = (
238241
/obj/effect/spawner/structure/window/plasma/reinforced,
239242
/obj/structure/cable/yellow{
@@ -427,6 +430,15 @@
427430
},
428431
/turf/open/floor/carpet/royalblack,
429432
/area/engine/engineering)
433+
"oq" = (
434+
/obj/effect/turf_decal/stripes/line{
435+
dir = 6
436+
},
437+
/obj/machinery/light_switch{
438+
pixel_x = 23
439+
},
440+
/turf/open/floor/plasteel/dark,
441+
/area/engine/engineering)
430442
"oz" = (
431443
/obj/machinery/atmospherics/pipe/simple/brown/visible{
432444
dir = 8
@@ -605,6 +617,15 @@
605617
/obj/machinery/atmospherics/pipe/simple/brown/visible,
606618
/turf/open/floor/plating,
607619
/area/engine/engineering)
620+
"tz" = (
621+
/obj/effect/turf_decal/pool{
622+
dir = 8
623+
},
624+
/obj/machinery/light_switch{
625+
pixel_x = 23
626+
},
627+
/turf/open/floor/plasteel,
628+
/area/engine/engineering)
608629
"tZ" = (
609630
/obj/machinery/computer/station_alert,
610631
/obj/machinery/airalarm{
@@ -958,12 +979,6 @@
958979
},
959980
/turf/open/floor/engine,
960981
/area/engine/engineering)
961-
"Fd" = (
962-
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
963-
dir = 6
964-
},
965-
/turf/open/floor/plasteel,
966-
/area/engine/engineering)
967982
"Fl" = (
968983
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
969984
dir = 8
@@ -1414,12 +1429,6 @@
14141429
},
14151430
/turf/open/floor/plasteel/dark,
14161431
/area/engine/engineering)
1417-
"Qp" = (
1418-
/obj/effect/turf_decal/stripes/line{
1419-
dir = 6
1420-
},
1421-
/turf/open/floor/plasteel/dark,
1422-
/area/engine/engineering)
14231432
"Qt" = (
14241433
/obj/effect/turf_decal/stripes/corner{
14251434
dir = 1
@@ -1482,6 +1491,12 @@
14821491
"Sr" = (
14831492
/turf/template_noop,
14841493
/area/template_noop)
1494+
"Ss" = (
1495+
/obj/machinery/light_switch{
1496+
pixel_x = -23
1497+
},
1498+
/turf/open/floor/plasteel,
1499+
/area/engine/engineering)
14851500
"Sz" = (
14861501
/obj/structure/cable/yellow{
14871502
icon_state = "1-2"
@@ -1988,7 +2003,7 @@ BT
19882003
Ue
19892004
uK
19902005
Ue
1991-
Fd
2006+
io
19922007
Oh
19932008
dH
19942009
Li
@@ -2259,7 +2274,7 @@ ri
22592274
dH
22602275
tZ
22612276
PR
2262-
Qp
2277+
oq
22632278
Az
22642279
Dv
22652280
Ue
@@ -2268,7 +2283,7 @@ yn
22682283
oz
22692284
rW
22702285
Rd
2271-
cA
2286+
tz
22722287
Uc
22732288
dH
22742289
cg
@@ -2427,7 +2442,7 @@ Sr
24272442
Sr
24282443
uu
24292444
kM
2430-
Ue
2445+
Ss
24312446
dH
24322447
qH
24332448
Xk

0 commit comments

Comments
 (0)