TGS Test Merge (#21854)

yogstation13 · Apr 18, 2024 · 0b6bb28 · 0b6bb28
2 parents 5e6cd40 + 70fc2ef
commit 0b6bb28
Show file tree

Hide file tree

Showing 17 changed files with 5,854 additions and 4,095 deletions.
diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm
@@ -97,16 +97,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/clerk)
-"g" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/effect/turf_decal/tile/green/opposingcorners{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/clerk)
 "h" = (
 /obj/machinery/light{
 	dir = 4
@@ -274,6 +264,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/clerk)
+"u" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow/opposingcorners,
+/obj/effect/turf_decal/tile/green/opposingcorners{
+	dir = 1
+	},
+/obj/machinery/light_switch{
+	pixel_x = 23
+	},
+/turf/open/floor/plasteel,
+/area/clerk)
 "v" = (
 /obj/structure/rack,
 /obj/item/book/random,
@@ -689,7 +692,7 @@ l
 o
 Y
 j
-g
+u
 E
 z
 i

diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm
@@ -28,19 +28,6 @@
 	},
 /turf/open/floor/wood,
 /area/clerk)
-"f" = (
-/obj/structure/table/wood,
-/obj/item/coinstack,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/obj/item/coin/plasma,
-/obj/item/coin/uranium,
-/obj/item/coin/diamond,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/turf/open/floor/carpet/black,
-/area/clerk)
 "g" = (
 /obj/structure/table/wood/poker,
 /obj/machinery/door/poddoor/shutters{
@@ -234,6 +221,22 @@
 	},
 /turf/open/floor/wood,
 /area/clerk)
+"M" = (
+/obj/structure/table/wood,
+/obj/item/coinstack,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/obj/item/coin/plasma,
+/obj/item/coin/uranium,
+/obj/item/coin/diamond,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/machinery/light_switch{
+	pixel_x = 23
+	},
+/turf/open/floor/carpet/black,
+/area/clerk)
 "N" = (
 /obj/structure/table/wood,
 /obj/machinery/paystand/register{
@@ -441,7 +444,7 @@ G
 G
 F
 u
-f
+M
 G
 w
 A

diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm
@@ -267,6 +267,13 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/clerk)
+"H" = (
+/obj/effect/turf_decal/tile/yellow/opposingcorners,
+/obj/machinery/light_switch{
+	pixel_x = 23
+	},
+/turf/open/floor/plasteel/dark,
+/area/clerk)
 "I" = (
 /obj/effect/landmark/event_spawn,
 /obj/effect/turf_decal/tile/yellow/opposingcorners,
@@ -471,7 +478,7 @@ o
 U
 a
 X
-g
+H
 q
 t
 Z

diff --git a/_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm b/_maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm
@@ -49,15 +49,6 @@
 	},
 /turf/open/floor/pod/dark,
 /area/clerk)
-"h" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
-/obj/structure/chair/americandiner{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/clerk)
 "i" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/trimline/secred/filled/line/lower,
@@ -305,6 +296,18 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/clerk)
+"G" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/structure/chair/americandiner{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	pixel_x = -23
+	},
+/turf/open/floor/plasteel/dark,
+/area/clerk)
 "I" = (
 /obj/structure/rack,
 /obj/machinery/airalarm{
@@ -381,8 +384,8 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/poddoor/multi_tile/four_tile_hor{
-	id = "giftshop";
-	armor = list("melee" = 50, "bullet" = 80, "laser" = 80, "energy" = 100, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
+	armor = list("melee" = 50, "bullet" = 80, "laser" = 80, "energy" = 100, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70);
+	id = "giftshop"
 	},
 /turf/open/floor/plasteel/dark,
 /area/clerk)
@@ -477,9 +480,9 @@
 	},
 /obj/structure/table/reinforced,
 /obj/item/toy/plush/nukeplushie{
-	pixel_y = 7;
+	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.";
 	pixel_x = 4;
-	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."
+	pixel_y = 7
 	},
 /obj/item/instrument/eguitar{
 	pixel_x = 4;
@@ -570,7 +573,7 @@ T
 a
 c
 p
-h
+G
 a
 E
 x

diff --git a/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm b/_maps/RandomRuins/StationRuins/BoxStation/engine_reactor.dmm
@@ -107,12 +107,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"cA" = (
-/obj/effect/turf_decal/pool{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
 "df" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -234,6 +228,15 @@
 	},
 /turf/open/floor/noslip,
 /area/engine/engineering)
+"io" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+	dir = 6
+	},
+/obj/machinery/light_switch{
+	pixel_x = -23
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
 "is" = (
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /obj/structure/cable/yellow{
@@ -427,6 +430,15 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/engine/engineering)
+"oq" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/machinery/light_switch{
+	pixel_x = 23
+	},
+/turf/open/floor/plasteel/dark,
+/area/engine/engineering)
 "oz" = (
 /obj/machinery/atmospherics/pipe/simple/brown/visible{
 	dir = 8
@@ -605,6 +617,15 @@
 /obj/machinery/atmospherics/pipe/simple/brown/visible,
 /turf/open/floor/plating,
 /area/engine/engineering)
+"tz" = (
+/obj/effect/turf_decal/pool{
+	dir = 8
+	},
+/obj/machinery/light_switch{
+	pixel_x = 23
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
 "tZ" = (
 /obj/machinery/computer/station_alert,
 /obj/machinery/airalarm{
@@ -958,12 +979,6 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
-"Fd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 6
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
 "Fl" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
 	dir = 8
@@ -1414,12 +1429,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
-"Qp" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/turf/open/floor/plasteel/dark,
-/area/engine/engineering)
 "Qt" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
@@ -1482,6 +1491,12 @@
 "Sr" = (
 /turf/template_noop,
 /area/template_noop)
+"Ss" = (
+/obj/machinery/light_switch{
+	pixel_x = -23
+	},
+/turf/open/floor/plasteel,
+/area/engine/engineering)
 "Sz" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -1988,7 +2003,7 @@ BT
 Ue
 uK
 Ue
-Fd
+io
 Oh
 dH
 Li
@@ -2259,7 +2274,7 @@ ri
 dH
 tZ
 PR
-Qp
+oq
 Az
 Dv
 Ue
@@ -2268,7 +2283,7 @@ yn
 oz
 rW
 Rd
-cA
+tz
 Uc
 dH
 cg
@@ -2427,7 +2442,7 @@ Sr
 Sr
 uu
 kM
-Ue
+Ss
 dH
 qH
 Xk