From 34069549499501d0bc3152dc1e0fc5be64417d27 Mon Sep 17 00:00:00 2001 From: Hopek Date: Fri, 6 Mar 2020 02:03:29 -0600 Subject: [PATCH 1/4] Adds 4 Variations to bomb testing range Spice! --- _maps/map_files/YogStation/YogStation.dmm | 604 +++++++----------- .../BoxStation/testingsite_range1.dmm | 411 ++++++++++++ .../BoxStation/testingsite_range2.dmm | 414 ++++++++++++ .../BoxStation/testingsite_range3.dmm | 413 ++++++++++++ .../BoxStation/testingsite_range4.dmm | 422 ++++++++++++ yogstation/code/datums/ruins/station.dm | 20 + .../code/game/objects/effects/landmarks.dm | 3 + 7 files changed, 1915 insertions(+), 372 deletions(-) create mode 100644 _maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm create mode 100644 _maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm create mode 100644 _maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm create mode 100644 _maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range4.dmm diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index a4d134c796b2..ebfb41807fdc 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -13010,14 +13010,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) -"aAX" = ( -/obj/item/target, -/obj/structure/window/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) "aAY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 5 @@ -13146,23 +13138,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/port/fore) -"aBm" = ( -/obj/machinery/camera{ - active_power_usage = 0; - c_tag = "Bomb Test Site"; - desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; - dir = 8; - invuln = 1; - name = "Hardened Bomb-Test Camera"; - network = list("toxins"); - use_power = 0 - }, -/obj/item/target/alien/anchored, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) "aBn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 8 @@ -16245,14 +16220,6 @@ /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) -"aHq" = ( -/obj/item/target, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating/airless, -/area/science/test_area) "aHr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -17791,10 +17758,6 @@ }, /turf/open/floor/plasteel, /area/storage/tools) -"aKr" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating/airless, -/area/science/test_area) "aKs" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/structure/window, @@ -41439,9 +41402,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/mixing) -"bGe" = ( -/turf/closed/wall, -/area/science/test_area) "bGf" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, @@ -42695,34 +42655,6 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"bIX" = ( -/obj/structure/sign/warning/securearea{ - desc = "A warning sign which reads 'BOMB RANGE"; - name = "BOMB RANGE" - }, -/turf/closed/wall, -/area/science/test_area) -"bIY" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"bIZ" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"bJa" = ( -/obj/item/flashlight/lamp, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) "bJc" = ( /obj/docking_port/stationary{ dir = 8; @@ -43159,24 +43091,6 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel, /area/science/mixing) -"bKg" = ( -/turf/open/floor/plating/airless, -/area/science/test_area) -"bKh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"bKi" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) "bKj" = ( /obj/machinery/camera{ c_tag = "Mining Dock External"; @@ -43601,29 +43515,6 @@ }, /turf/open/floor/plating, /area/science/mixing) -"bLn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"bLo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"bLp" = ( -/obj/item/beacon, -/turf/open/floor/plating/airless, -/area/science/test_area) -"bLq" = ( -/turf/closed/indestructible{ - desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; - icon_state = "riveted"; - name = "hyper-reinforced wall" - }, -/area/science/test_area) "bLr" = ( /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -44133,21 +44024,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"bMD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"bME" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) "bMF" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/engine/plasma, @@ -44605,29 +44481,6 @@ /obj/structure/closet/wardrobe/grey, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"bND" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"bNE" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"bNF" = ( -/obj/item/flashlight/lamp, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating/airless, -/area/science/test_area) "bNG" = ( /obj/structure/cable{ icon_state = "2-8" @@ -56299,6 +56152,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) +"oRz" = ( +/obj/effect/landmark/stationroom/box/testingsite, +/turf/template_noop, +/area/space) "oSz" = ( /obj/machinery/door/airlock/maintenance{ id_tag = "commissarydoor"; @@ -58525,6 +58382,9 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"udO" = ( +/turf/template_noop, +/area/space) "ueh" = ( /obj/machinery/computer/med_data{ dir = 1 @@ -118814,21 +118674,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaf -aaa -aaa -aaa -aaa -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +oRz aaa aaa aaa @@ -119071,21 +118931,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaa -aaf -aaf -aaa -aaa -aaa -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -119328,21 +119188,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaf -aaf -aKr -bLo -aKr -aaf -aaf -aaa -aaa -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -119585,21 +119445,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaf -aaf -bIX -aKr -bLn -aKr -bIX -aaf -aaf -aaa -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -119842,21 +119702,21 @@ aaa aaa aaa aaa -aaa -aaa -aaf -aaf -aKr -aKr -bKh -bLo -bMD -aKr -aKr -aaf -aaf -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -120099,21 +119959,21 @@ aaa aaa aaa aaa -aaa -aaa -aaf -bGe -bGe -bIY -bKg -bKg -bKg -bND -bGe -bGe -aaf -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -120356,21 +120216,21 @@ aaa aaa aaa aaa -aaf -aaf -aaf -aKr -aAX -bJa -bKg -bLp -bKg -bNF -aHq -aKr -aaf -aaf -aaf +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -120613,21 +120473,21 @@ aaa aaa aaa aaa -aaa -aaa -aaf -bGe -bGe -bIZ -bKg -bKg -bKg -bNE -bGe -bGe -aaf -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -120870,21 +120730,21 @@ aaa aaa aaa aaa -aaa -aaa -aaf -aaf -aKr -aKr -bKi -aBm -bME -aKr -aKr -aaf -aaf -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -121127,21 +120987,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaf -aaf -bIX -aKr -bLq -aKr -bIX -aaf -aaf -aaa -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -121384,21 +121244,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaf -aaf -aKr -bGe -aKr -aaf -aaf -aaa -aaa -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -121641,21 +121501,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaf -aaf -aaf -aaa -aaa -aaa -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -121898,21 +121758,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaf -aaa -aaa -aaa -aaa -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -122155,21 +122015,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa -aaa -aaa -aaa -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa @@ -122412,21 +122272,21 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa -aaa -aaa -aaa -aaa -aaa +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO +udO aaa aaa aaa diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm new file mode 100644 index 000000000000..047a609d1e98 --- /dev/null +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm @@ -0,0 +1,411 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"c" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) +"e" = ( +/obj/structure/sign/warning/securearea{ + desc = "A warning sign which reads 'BOMB RANGE"; + name = "BOMB RANGE" + }, +/turf/closed/wall, +/area/science/test_area) +"f" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"h" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"j" = ( +/turf/open/space/basic, +/area/space) +"l" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"m" = ( +/turf/closed/indestructible{ + desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; + icon_state = "riveted"; + name = "hyper-reinforced wall" + }, +/area/science/test_area) +"p" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"q" = ( +/obj/item/flashlight/lamp, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"r" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"t" = ( +/turf/closed/wall, +/area/science/test_area) +"u" = ( +/obj/item/target, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/science/test_area) +"w" = ( +/obj/item/beacon, +/turf/open/floor/plating/airless, +/area/science/test_area) +"z" = ( +/obj/item/flashlight/lamp, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/science/test_area) +"B" = ( +/turf/open/floor/plating/airless, +/area/science/test_area) +"E" = ( +/obj/item/target, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"H" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"I" = ( +/obj/machinery/camera{ + active_power_usage = 0; + c_tag = "Bomb Test Site"; + desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; + dir = 8; + invuln = 1; + name = "Hardened Bomb-Test Camera"; + network = list("toxins"); + use_power = 0 + }, +/obj/item/target/alien/anchored, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"J" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"N" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"O" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"P" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"S" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/airless, +/area/science/test_area) + +(1,1,1) = {" +j +j +j +j +j +j +c +j +c +j +j +j +j +j +j +"} +(2,1,1) = {" +j +j +j +j +j +c +c +j +c +c +j +j +j +j +j +"} +(3,1,1) = {" +j +j +j +j +c +c +S +h +S +c +c +j +j +j +j +"} +(4,1,1) = {" +j +j +j +c +c +e +S +f +S +e +c +c +j +j +j +"} +(5,1,1) = {" +j +j +c +c +S +S +l +h +O +S +S +c +c +j +j +"} +(6,1,1) = {" +j +j +c +t +t +J +B +B +B +p +t +t +c +j +j +"} +(7,1,1) = {" +c +c +c +S +E +q +B +w +B +z +u +S +c +c +c +"} +(8,1,1) = {" +j +j +c +t +t +N +B +B +B +P +t +t +c +j +j +"} +(9,1,1) = {" +j +j +c +c +S +S +H +I +r +S +S +c +c +j +j +"} +(10,1,1) = {" +j +j +j +c +c +e +S +m +S +e +c +c +j +j +j +"} +(11,1,1) = {" +j +j +j +j +c +c +S +t +S +c +c +j +j +j +j +"} +(12,1,1) = {" +j +j +j +j +j +c +c +c +c +c +j +j +j +j +j +"} +(13,1,1) = {" +j +j +j +j +j +j +c +c +c +j +j +j +j +j +j +"} +(14,1,1) = {" +j +j +j +j +j +j +j +c +j +j +j +j +j +j +j +"} +(15,1,1) = {" +j +j +j +j +j +j +j +c +j +j +j +j +j +j +j +"} diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm new file mode 100644 index 000000000000..7f158e9984da --- /dev/null +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm @@ -0,0 +1,414 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"c" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) +"d" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/target/alien, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"e" = ( +/obj/structure/sign/warning/securearea{ + desc = "A warning sign which reads 'BOMB RANGE"; + name = "BOMB RANGE" + }, +/turf/closed/wall, +/area/science/test_area) +"f" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"g" = ( +/obj/structure/table, +/obj/item/flashlight/lamp, +/turf/open/floor/plating/airless, +/area/science/test_area) +"h" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"j" = ( +/turf/open/space/basic, +/area/space) +"l" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"m" = ( +/turf/closed/indestructible{ + desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; + icon_state = "riveted"; + name = "hyper-reinforced wall" + }, +/area/science/test_area) +"p" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/science/test_area) +"r" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"t" = ( +/turf/closed/wall, +/area/science/test_area) +"u" = ( +/obj/item/target, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/science/test_area) +"w" = ( +/obj/item/beacon, +/turf/open/floor/plating/airless, +/area/science/test_area) +"y" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"B" = ( +/turf/open/floor/plating/airless, +/area/science/test_area) +"D" = ( +/obj/machinery/camera{ + active_power_usage = 0; + c_tag = "Bomb Test Site"; + desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; + dir = 8; + invuln = 1; + name = "Hardened Bomb-Test Camera"; + network = list("toxins"); + use_power = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"E" = ( +/obj/item/target, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"G" = ( +/obj/structure/table, +/obj/item/storage/box/mre, +/turf/open/floor/plating/airless, +/area/science/test_area) +"H" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"N" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"O" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"P" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"T" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) + +(1,1,1) = {" +j +j +j +j +j +j +c +j +c +j +j +j +j +j +j +"} +(2,1,1) = {" +j +j +j +j +j +c +c +j +c +c +j +j +j +j +j +"} +(3,1,1) = {" +j +j +j +j +c +c +t +h +t +c +c +j +j +j +j +"} +(4,1,1) = {" +j +j +j +c +c +e +t +f +t +e +c +c +j +j +j +"} +(5,1,1) = {" +j +j +c +c +t +t +l +h +O +t +t +c +c +j +j +"} +(6,1,1) = {" +j +j +c +t +t +l +B +B +B +O +t +t +c +j +j +"} +(7,1,1) = {" +c +c +c +t +E +T +y +w +y +p +u +t +c +c +c +"} +(8,1,1) = {" +j +j +c +t +t +N +G +B +g +P +t +t +c +j +j +"} +(9,1,1) = {" +j +j +c +c +t +t +H +D +r +t +t +c +c +j +j +"} +(10,1,1) = {" +j +j +j +c +c +e +t +d +t +e +c +c +j +j +j +"} +(11,1,1) = {" +j +j +j +j +c +c +t +m +t +c +c +j +j +j +j +"} +(12,1,1) = {" +j +j +j +j +j +c +c +c +c +c +j +j +j +j +j +"} +(13,1,1) = {" +j +j +j +j +j +j +c +c +c +j +j +j +j +j +j +"} +(14,1,1) = {" +j +j +j +j +j +j +j +c +j +j +j +j +j +j +j +"} +(15,1,1) = {" +j +j +j +j +j +j +j +c +j +j +j +j +j +j +j +"} diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm new file mode 100644 index 000000000000..8ddc6322b987 --- /dev/null +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm @@ -0,0 +1,413 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"b" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"c" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) +"d" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"e" = ( +/obj/structure/sign/warning/securearea{ + desc = "A warning sign which reads 'BOMB RANGE"; + name = "BOMB RANGE" + }, +/turf/closed/wall, +/area/science/test_area) +"f" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"g" = ( +/obj/machinery/camera{ + active_power_usage = 0; + c_tag = "Bomb Test Site"; + desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; + dir = 8; + invuln = 1; + name = "Hardened Bomb-Test Camera"; + network = list("toxins"); + use_power = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/target/syndicate, +/turf/open/floor/plating/airless, +/area/science/test_area) +"h" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"j" = ( +/turf/open/space/basic, +/area/space) +"l" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"m" = ( +/turf/closed/indestructible{ + desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; + icon_state = "riveted"; + name = "hyper-reinforced wall" + }, +/area/science/test_area) +"n" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"t" = ( +/turf/closed/wall, +/area/science/test_area) +"w" = ( +/obj/item/beacon, +/turf/open/floor/plating/airless, +/area/science/test_area) +"y" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/chair, +/turf/open/floor/plating/airless, +/area/science/test_area) +"A" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"B" = ( +/turf/open/floor/plating/airless, +/area/science/test_area) +"C" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"G" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/flashlight/lamp, +/turf/open/floor/plating/airless, +/area/science/test_area) +"I" = ( +/obj/item/toy/nuke, +/turf/open/floor/plating/airless, +/area/science/test_area) +"J" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"K" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/science/test_area) +"O" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"R" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/item/flashlight/lamp, +/turf/open/floor/plating/airless, +/area/science/test_area) +"S" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/airless, +/area/science/test_area) +"U" = ( +/obj/item/target/syndicate, +/turf/open/floor/plating/airless, +/area/science/test_area) + +(1,1,1) = {" +j +j +j +j +j +j +c +j +c +j +j +j +j +j +j +"} +(2,1,1) = {" +j +j +j +j +j +c +c +j +c +c +j +j +j +j +j +"} +(3,1,1) = {" +j +j +j +j +c +c +S +h +S +c +c +j +j +j +j +"} +(4,1,1) = {" +j +j +j +c +c +e +S +f +S +e +c +c +j +j +j +"} +(5,1,1) = {" +j +j +c +c +S +S +l +h +O +S +S +c +c +j +j +"} +(6,1,1) = {" +j +j +c +t +t +y +B +B +B +C +t +t +c +j +j +"} +(7,1,1) = {" +c +c +c +S +G +d +B +w +B +K +R +S +c +c +c +"} +(8,1,1) = {" +j +j +c +t +t +A +U +I +U +n +t +t +c +j +j +"} +(9,1,1) = {" +j +j +c +c +S +S +b +g +J +S +S +c +c +j +j +"} +(10,1,1) = {" +j +j +j +c +c +e +S +m +S +e +c +c +j +j +j +"} +(11,1,1) = {" +j +j +j +j +c +c +S +t +S +c +c +j +j +j +j +"} +(12,1,1) = {" +j +j +j +j +j +c +c +c +c +c +j +j +j +j +j +"} +(13,1,1) = {" +j +j +j +j +j +j +c +c +c +j +j +j +j +j +j +"} +(14,1,1) = {" +j +j +j +j +j +j +j +c +j +j +j +j +j +j +j +"} +(15,1,1) = {" +j +j +j +j +j +j +j +c +j +j +j +j +j +j +j +"} diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range4.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range4.dmm new file mode 100644 index 000000000000..865ae18e7b51 --- /dev/null +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range4.dmm @@ -0,0 +1,422 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"c" = ( +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) +"e" = ( +/obj/structure/sign/warning/securearea{ + desc = "A warning sign which reads 'BOMB RANGE"; + name = "BOMB RANGE" + }, +/turf/closed/wall, +/area/science/test_area) +"f" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"h" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"j" = ( +/turf/open/space/basic, +/area/space) +"k" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/science/test_area) +"l" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"m" = ( +/turf/closed/indestructible{ + desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; + icon_state = "riveted"; + name = "hyper-reinforced wall" + }, +/area/science/test_area) +"n" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/target/clown, +/turf/open/floor/plating/airless, +/area/science/test_area) +"o" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/grown/bananapeel, +/turf/open/floor/plating/airless, +/area/science/test_area) +"p" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"q" = ( +/obj/machinery/camera{ + active_power_usage = 0; + c_tag = "Bomb Test Site"; + desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; + dir = 8; + invuln = 1; + name = "Hardened Bomb-Test Camera"; + network = list("toxins"); + use_power = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/flashlight/lamp/bananalamp{ + pixel_y = 3 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"r" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"t" = ( +/turf/closed/wall, +/area/science/test_area) +"w" = ( +/obj/item/beacon, +/turf/open/floor/plating/airless, +/area/science/test_area) +"B" = ( +/turf/open/floor/plating/airless, +/area/science/test_area) +"G" = ( +/obj/item/target/clown, +/turf/open/floor/plating/airless, +/area/science/test_area) +"H" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"I" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/item/target/clown, +/turf/open/floor/plating/airless, +/area/science/test_area) +"J" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"N" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"O" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"P" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"S" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/airless, +/area/science/test_area) +"U" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) + +(1,1,1) = {" +j +j +j +j +j +j +c +j +c +j +j +j +j +j +j +"} +(2,1,1) = {" +j +j +j +j +j +c +c +j +c +c +j +j +j +j +j +"} +(3,1,1) = {" +j +j +j +j +c +c +S +h +S +c +c +j +j +j +j +"} +(4,1,1) = {" +j +j +j +c +c +e +S +f +S +e +c +c +j +j +j +"} +(5,1,1) = {" +j +j +c +c +S +S +l +o +O +S +S +c +c +j +j +"} +(6,1,1) = {" +j +j +c +t +t +J +B +G +B +p +t +t +c +j +j +"} +(7,1,1) = {" +c +c +c +S +n +U +B +w +B +k +I +S +c +c +c +"} +(8,1,1) = {" +j +j +c +t +t +N +B +B +B +P +t +t +c +j +j +"} +(9,1,1) = {" +j +j +c +c +S +S +H +q +r +S +S +c +c +j +j +"} +(10,1,1) = {" +j +j +j +c +c +e +S +m +S +e +c +c +j +j +j +"} +(11,1,1) = {" +j +j +j +j +c +c +S +t +S +c +c +j +j +j +j +"} +(12,1,1) = {" +j +j +j +j +j +c +c +c +c +c +j +j +j +j +j +"} +(13,1,1) = {" +j +j +j +j +j +j +c +c +c +j +j +j +j +j +j +"} +(14,1,1) = {" +j +j +j +j +j +j +j +c +j +j +j +j +j +j +j +"} +(15,1,1) = {" +j +j +j +j +j +j +j +c +j +j +j +j +j +j +j +"} diff --git a/yogstation/code/datums/ruins/station.dm b/yogstation/code/datums/ruins/station.dm index 041f9405485b..11cd592fd60a 100644 --- a/yogstation/code/datums/ruins/station.dm +++ b/yogstation/code/datums/ruins/station.dm @@ -89,3 +89,23 @@ id = "maint_detective" suffix = "maint_detective.dmm" name = "Detective Room" + +/datum/map_template/ruin/station/box/testingsite + id = "testing_site_1" + suffix = "testingsite_range1.dmm" + name = "Bomb Range" + +/datum/map_template/ruin/station/box/testingsite/bunker + id = "testing_site_2" + suffix = "testingsite_range2.dmm" + name = "Bunker Bomb Range" + +/datum/map_template/ruin/station/box/testingsite/syndicate + id = "testing_site_3" + suffix = "testingsite_range3.dmm" + name = "Syndicate Bomb Range" + +/datum/map_template/ruin/station/box/testingsite/clown + id = "testing_site_4" + suffix = "testingsite_range4.dmm" + name = "Clown Bomb Range" diff --git a/yogstation/code/game/objects/effects/landmarks.dm b/yogstation/code/game/objects/effects/landmarks.dm index 3ef737fe2d8e..5e613ea1cc70 100644 --- a/yogstation/code/game/objects/effects/landmarks.dm +++ b/yogstation/code/game/objects/effects/landmarks.dm @@ -90,3 +90,6 @@ /obj/effect/landmark/stationroom/box/aftmaint template_names = list("Roleplaying Room", "Detective Room") + +/obj/effect/landmark/stationroom/box/testingsite + template_names = list("Bomb Range", "Bunker Bomb Range","Syndicate Bomb Range","Clown Bomb Range") From e6f5d21db47cc4e1af6c9f6d748fd12d429041ef Mon Sep 17 00:00:00 2001 From: Hopek Date: Fri, 6 Mar 2020 11:36:02 -0600 Subject: [PATCH 2/4] Moved camera over (Thanks Lyis) --- .../BoxStation/testingsite_range2.dmm | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm index 7f158e9984da..6cfce62bfaf0 100644 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm @@ -57,13 +57,23 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/science/test_area) -"r" = ( +"s" = ( /obj/structure/chair{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/camera{ + active_power_usage = 0; + c_tag = "Bomb Test Site"; + desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; + dir = 8; + invuln = 1; + name = "Hardened Bomb-Test Camera"; + network = list("toxins"); + use_power = 0 + }, /turf/open/floor/plating/airless, /area/science/test_area) "t" = ( @@ -90,22 +100,6 @@ "B" = ( /turf/open/floor/plating/airless, /area/science/test_area) -"D" = ( -/obj/machinery/camera{ - active_power_usage = 0; - c_tag = "Bomb Test Site"; - desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; - dir = 8; - invuln = 1; - name = "Hardened Bomb-Test Camera"; - network = list("toxins"); - use_power = 0 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) "E" = ( /obj/item/target, /obj/structure/window/reinforced, @@ -301,8 +295,8 @@ c t t H -D -r +f +s t t c From 23f5e7eb62eca261cc97522071d635e2db362828 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 15 Mar 2020 17:35:51 -0500 Subject: [PATCH 3/4] Removed original variation. Added windows to "bunker" --- .../BoxStation/testingsite_range1.dmm | 139 +++--- .../BoxStation/testingsite_range2.dmm | 191 ++++---- .../BoxStation/testingsite_range3.dmm | 171 +++---- .../BoxStation/testingsite_range4.dmm | 422 ------------------ yogstation/code/datums/ruins/station.dm | 15 +- .../code/game/objects/effects/landmarks.dm | 2 +- 6 files changed, 264 insertions(+), 676 deletions(-) delete mode 100644 _maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range4.dmm diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm index 047a609d1e98..34f2b5d315b0 100644 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm @@ -3,6 +3,16 @@ /obj/structure/lattice, /turf/open/space, /area/space/nearstation) +"d" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/target/alien, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) "e" = ( /obj/structure/sign/warning/securearea{ desc = "A warning sign which reads 'BOMB RANGE"; @@ -16,6 +26,11 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) +"g" = ( +/obj/structure/table, +/obj/item/flashlight/lamp, +/turf/open/floor/plating/airless, +/area/science/test_area) "h" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -39,28 +54,26 @@ }, /area/science/test_area) "p" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"q" = ( -/obj/item/flashlight/lamp, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/science/test_area) -"r" = ( +"s" = ( /obj/structure/chair{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/camera{ + active_power_usage = 0; + c_tag = "Bomb Test Site"; + desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; + dir = 8; + invuln = 1; + name = "Hardened Bomb-Test Camera"; + network = list("toxins"); + use_power = 0 + }, /turf/open/floor/plating/airless, /area/science/test_area) "t" = ( @@ -78,9 +91,10 @@ /obj/item/beacon, /turf/open/floor/plating/airless, /area/science/test_area) -"z" = ( -/obj/item/flashlight/lamp, -/obj/effect/turf_decal/stripes/line, +"y" = ( +/obj/structure/chair{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/science/test_area) "B" = ( @@ -94,6 +108,11 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) +"G" = ( +/obj/structure/table, +/obj/item/storage/box/mre, +/turf/open/floor/plating/airless, +/area/science/test_area) "H" = ( /obj/structure/chair{ dir = 8 @@ -103,28 +122,8 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"I" = ( -/obj/machinery/camera{ - active_power_usage = 0; - c_tag = "Bomb Test Site"; - desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; - dir = 8; - invuln = 1; - name = "Hardened Bomb-Test Camera"; - network = list("toxins"); - use_power = 0 - }, -/obj/item/target/alien/anchored, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) "J" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/science/test_area) "N" = ( @@ -149,8 +148,10 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"S" = ( -/obj/effect/spawner/structure/window/reinforced, +"T" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/science/test_area) @@ -195,9 +196,9 @@ j j c c -S +t h -S +t c c j @@ -212,9 +213,9 @@ j c c e -S +t f -S +t e c c @@ -227,13 +228,13 @@ j j c c -S -S +t +t l h O -S -S +t +t c c j @@ -245,11 +246,11 @@ j c t t -J +l B B B -p +O t t c @@ -260,15 +261,15 @@ j c c c -S +J E -q -B +T +y w -B -z +y +p u -S +J c c c @@ -280,9 +281,9 @@ c t t N +G B -B -B +g P t t @@ -295,13 +296,13 @@ j j c c -S -S +t +t H -I -r -S -S +f +s +t +t c c j @@ -314,9 +315,9 @@ j c c e -S -m -S +t +d +t e c c @@ -331,9 +332,9 @@ j j c c -S t -S +m +t c c j diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm index 6cfce62bfaf0..8ddc6322b987 100644 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm @@ -1,15 +1,20 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"b" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) "c" = ( /obj/structure/lattice, /turf/open/space, /area/space/nearstation) "d" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/target/alien, /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 1 }, /turf/open/floor/plating/airless, /area/science/test_area) @@ -27,8 +32,20 @@ /turf/open/floor/plating/airless, /area/science/test_area) "g" = ( -/obj/structure/table, -/obj/item/flashlight/lamp, +/obj/machinery/camera{ + active_power_usage = 0; + c_tag = "Bomb Test Site"; + desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; + dir = 8; + invuln = 1; + name = "Hardened Bomb-Test Camera"; + network = list("toxins"); + use_power = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/target/syndicate, /turf/open/floor/plating/airless, /area/science/test_area) "h" = ( @@ -53,80 +70,67 @@ name = "hyper-reinforced wall" }, /area/science/test_area) -"p" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating/airless, -/area/science/test_area) -"s" = ( -/obj/structure/chair{ - dir = 8 - }, +"n" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/camera{ - active_power_usage = 0; - c_tag = "Bomb Test Site"; - desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; - dir = 8; - invuln = 1; - name = "Hardened Bomb-Test Camera"; - network = list("toxins"); - use_power = 0 - }, /turf/open/floor/plating/airless, /area/science/test_area) "t" = ( /turf/closed/wall, /area/science/test_area) -"u" = ( -/obj/item/target, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating/airless, -/area/science/test_area) "w" = ( /obj/item/beacon, /turf/open/floor/plating/airless, /area/science/test_area) "y" = ( -/obj/structure/chair{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/chair, +/turf/open/floor/plating/airless, +/area/science/test_area) +"A" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, /turf/open/floor/plating/airless, /area/science/test_area) "B" = ( /turf/open/floor/plating/airless, /area/science/test_area) -"E" = ( -/obj/item/target, -/obj/structure/window/reinforced, +"C" = ( /obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/chair{ dir = 1 }, /turf/open/floor/plating/airless, /area/science/test_area) "G" = ( -/obj/structure/table, -/obj/item/storage/box/mre, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/flashlight/lamp, /turf/open/floor/plating/airless, /area/science/test_area) -"H" = ( +"I" = ( +/obj/item/toy/nuke, +/turf/open/floor/plating/airless, +/area/science/test_area) +"J" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, /obj/structure/chair{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, /turf/open/floor/plating/airless, /area/science/test_area) -"N" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, +"K" = ( +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/science/test_area) "O" = ( @@ -135,19 +139,20 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"P" = ( -/obj/structure/chair{ +"R" = ( +/obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, +/obj/effect/turf_decal/stripes/line, +/obj/item/flashlight/lamp, /turf/open/floor/plating/airless, /area/science/test_area) -"T" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, +"S" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/airless, +/area/science/test_area) +"U" = ( +/obj/item/target/syndicate, /turf/open/floor/plating/airless, /area/science/test_area) @@ -192,9 +197,9 @@ j j c c -t +S h -t +S c c j @@ -209,9 +214,9 @@ j c c e -t +S f -t +S e c c @@ -224,13 +229,13 @@ j j c c -t -t +S +S l h O -t -t +S +S c c j @@ -242,11 +247,11 @@ j c t t -l +y B B B -O +C t t c @@ -257,15 +262,15 @@ j c c c -t -E -T -y +S +G +d +B w -y -p -u -t +B +K +R +S c c c @@ -276,11 +281,11 @@ j c t t -N -G -B -g -P +A +U +I +U +n t t c @@ -292,13 +297,13 @@ j j c c -t -t -H -f -s -t -t +S +S +b +g +J +S +S c c j @@ -311,9 +316,9 @@ j c c e -t -d -t +S +m +S e c c @@ -328,9 +333,9 @@ j j c c +S t -m -t +S c c j diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm index 8ddc6322b987..865ae18e7b51 100644 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm @@ -1,23 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"b" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) "c" = ( /obj/structure/lattice, /turf/open/space, /area/space/nearstation) -"d" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) "e" = ( /obj/structure/sign/warning/securearea{ desc = "A warning sign which reads 'BOMB RANGE"; @@ -31,23 +16,6 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"g" = ( -/obj/machinery/camera{ - active_power_usage = 0; - c_tag = "Bomb Test Site"; - desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; - dir = 8; - invuln = 1; - name = "Hardened Bomb-Test Camera"; - network = list("toxins"); - use_power = 0 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/target/syndicate, -/turf/open/floor/plating/airless, -/area/science/test_area) "h" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -57,6 +25,10 @@ "j" = ( /turf/open/space/basic, /area/space) +"k" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating/airless, +/area/science/test_area) "l" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -71,66 +43,100 @@ }, /area/science/test_area) "n" = ( +/obj/structure/window/reinforced, /obj/effect/turf_decal/stripes/line{ - dir = 6 + dir = 1 }, +/obj/item/target/clown, /turf/open/floor/plating/airless, /area/science/test_area) -"t" = ( -/turf/closed/wall, +"o" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/grown/bananapeel, +/turf/open/floor/plating/airless, /area/science/test_area) -"w" = ( -/obj/item/beacon, +"p" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /turf/open/floor/plating/airless, /area/science/test_area) -"y" = ( +"q" = ( +/obj/machinery/camera{ + active_power_usage = 0; + c_tag = "Bomb Test Site"; + desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; + dir = 8; + invuln = 1; + name = "Hardened Bomb-Test Camera"; + network = list("toxins"); + use_power = 0 + }, /obj/effect/turf_decal/stripes/line{ - dir = 9 + dir = 4 + }, +/obj/item/flashlight/lamp/bananalamp{ + pixel_y = 3 }, -/obj/structure/chair, /turf/open/floor/plating/airless, /area/science/test_area) -"A" = ( +"r" = ( +/obj/structure/chair{ + dir = 8 + }, /obj/effect/turf_decal/stripes/line{ - dir = 5 + dir = 6 }, /turf/open/floor/plating/airless, /area/science/test_area) -"B" = ( +"t" = ( +/turf/closed/wall, +/area/science/test_area) +"w" = ( +/obj/item/beacon, /turf/open/floor/plating/airless, /area/science/test_area) -"C" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/chair{ - dir = 1 - }, +"B" = ( /turf/open/floor/plating/airless, /area/science/test_area) "G" = ( -/obj/structure/window/reinforced, +/obj/item/target/clown, +/turf/open/floor/plating/airless, +/area/science/test_area) +"H" = ( +/obj/structure/chair{ + dir = 8 + }, /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 5 }, -/obj/item/flashlight/lamp, /turf/open/floor/plating/airless, /area/science/test_area) "I" = ( -/obj/item/toy/nuke, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/item/target/clown, /turf/open/floor/plating/airless, /area/science/test_area) "J" = ( +/obj/structure/chair, /obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/chair{ - dir = 8 + dir = 9 }, /turf/open/floor/plating/airless, /area/science/test_area) -"K" = ( -/obj/effect/turf_decal/stripes/line, +"N" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, /turf/open/floor/plating/airless, /area/science/test_area) "O" = ( @@ -139,12 +145,13 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"R" = ( -/obj/structure/window/reinforced{ +"P" = ( +/obj/structure/chair{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, -/obj/item/flashlight/lamp, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, /turf/open/floor/plating/airless, /area/science/test_area) "S" = ( @@ -152,7 +159,9 @@ /turf/open/floor/plating/airless, /area/science/test_area) "U" = ( -/obj/item/target/syndicate, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/science/test_area) @@ -232,7 +241,7 @@ c S S l -h +o O S S @@ -247,11 +256,11 @@ j c t t -y -B +J B +G B -C +p t t c @@ -263,13 +272,13 @@ c c c S -G -d +n +U B w B -K -R +k +I S c c @@ -281,11 +290,11 @@ j c t t -A -U -I -U -n +N +B +B +B +P t t c @@ -299,9 +308,9 @@ c c S S -b -g -J +H +q +r S S c diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range4.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range4.dmm deleted file mode 100644 index 865ae18e7b51..000000000000 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range4.dmm +++ /dev/null @@ -1,422 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"c" = ( -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) -"e" = ( -/obj/structure/sign/warning/securearea{ - desc = "A warning sign which reads 'BOMB RANGE"; - name = "BOMB RANGE" - }, -/turf/closed/wall, -/area/science/test_area) -"f" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"h" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"j" = ( -/turf/open/space/basic, -/area/space) -"k" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating/airless, -/area/science/test_area) -"l" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"m" = ( -/turf/closed/indestructible{ - desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; - icon_state = "riveted"; - name = "hyper-reinforced wall" - }, -/area/science/test_area) -"n" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/target/clown, -/turf/open/floor/plating/airless, -/area/science/test_area) -"o" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/item/grown/bananapeel, -/turf/open/floor/plating/airless, -/area/science/test_area) -"p" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"q" = ( -/obj/machinery/camera{ - active_power_usage = 0; - c_tag = "Bomb Test Site"; - desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site."; - dir = 8; - invuln = 1; - name = "Hardened Bomb-Test Camera"; - network = list("toxins"); - use_power = 0 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/flashlight/lamp/bananalamp{ - pixel_y = 3 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"r" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"t" = ( -/turf/closed/wall, -/area/science/test_area) -"w" = ( -/obj/item/beacon, -/turf/open/floor/plating/airless, -/area/science/test_area) -"B" = ( -/turf/open/floor/plating/airless, -/area/science/test_area) -"G" = ( -/obj/item/target/clown, -/turf/open/floor/plating/airless, -/area/science/test_area) -"H" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"I" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/item/target/clown, -/turf/open/floor/plating/airless, -/area/science/test_area) -"J" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"N" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"O" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"P" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) -"S" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating/airless, -/area/science/test_area) -"U" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/science/test_area) - -(1,1,1) = {" -j -j -j -j -j -j -c -j -c -j -j -j -j -j -j -"} -(2,1,1) = {" -j -j -j -j -j -c -c -j -c -c -j -j -j -j -j -"} -(3,1,1) = {" -j -j -j -j -c -c -S -h -S -c -c -j -j -j -j -"} -(4,1,1) = {" -j -j -j -c -c -e -S -f -S -e -c -c -j -j -j -"} -(5,1,1) = {" -j -j -c -c -S -S -l -o -O -S -S -c -c -j -j -"} -(6,1,1) = {" -j -j -c -t -t -J -B -G -B -p -t -t -c -j -j -"} -(7,1,1) = {" -c -c -c -S -n -U -B -w -B -k -I -S -c -c -c -"} -(8,1,1) = {" -j -j -c -t -t -N -B -B -B -P -t -t -c -j -j -"} -(9,1,1) = {" -j -j -c -c -S -S -H -q -r -S -S -c -c -j -j -"} -(10,1,1) = {" -j -j -j -c -c -e -S -m -S -e -c -c -j -j -j -"} -(11,1,1) = {" -j -j -j -j -c -c -S -t -S -c -c -j -j -j -j -"} -(12,1,1) = {" -j -j -j -j -j -c -c -c -c -c -j -j -j -j -j -"} -(13,1,1) = {" -j -j -j -j -j -j -c -c -c -j -j -j -j -j -j -"} -(14,1,1) = {" -j -j -j -j -j -j -j -c -j -j -j -j -j -j -j -"} -(15,1,1) = {" -j -j -j -j -j -j -j -c -j -j -j -j -j -j -j -"} diff --git a/yogstation/code/datums/ruins/station.dm b/yogstation/code/datums/ruins/station.dm index cdc2c1ea4841..694cfdea0d7e 100644 --- a/yogstation/code/datums/ruins/station.dm +++ b/yogstation/code/datums/ruins/station.dm @@ -90,24 +90,19 @@ suffix = "maint_detective.dmm" name = "Detective Room" -/datum/map_template/ruin/station/box/testingsite +/datum/map_template/ruin/station/box/testingsite/bunker id = "testing_site_1" suffix = "testingsite_range1.dmm" - name = "Bomb Range" - -/datum/map_template/ruin/station/box/testingsite/bunker - id = "testing_site_2" - suffix = "testingsite_range2.dmm" name = "Bunker Bomb Range" /datum/map_template/ruin/station/box/testingsite/syndicate - id = "testing_site_3" - suffix = "testingsite_range3.dmm" + id = "testing_site_2" + suffix = "testingsite_range2.dmm" name = "Syndicate Bomb Range" /datum/map_template/ruin/station/box/testingsite/clown - id = "testing_site_4" - suffix = "testingsite_range4.dmm" + id = "testing_site_3" + suffix = "testingsite_range3.dmm" name = "Clown Bomb Range" /datum/map_template/ruin/station/box/dorms_edoor diff --git a/yogstation/code/game/objects/effects/landmarks.dm b/yogstation/code/game/objects/effects/landmarks.dm index 0b645cc18fa2..fc954de6f163 100644 --- a/yogstation/code/game/objects/effects/landmarks.dm +++ b/yogstation/code/game/objects/effects/landmarks.dm @@ -92,7 +92,7 @@ template_names = list("Roleplaying Room", "Detective Room") /obj/effect/landmark/stationroom/box/testingsite - template_names = list("Bomb Range", "Bunker Bomb Range","Syndicate Bomb Range","Clown Bomb Range") + template_names = list("Bunker Bomb Range","Syndicate Bomb Range","Clown Bomb Range") /obj/effect/landmark/stationroom/box/dorm_edoor template_names = list("Dorm east door 1", "Dorm east door 2", "Dorm east door 3", "Dorm east door 4", "Dorm east door 5", "Dorm east door 6", "Dorm east door 7", "Dorm east door 8", "Dorm east door 9") From a393dca4312bd39cb2f0174269867e480caa11a7 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sat, 21 Mar 2020 20:44:01 -0500 Subject: [PATCH 4/4] Area passthrough and Corner pieces --- _maps/map_files/YogStation/YogStation.dmm | 461 +++++++++--------- .../BoxStation/testingsite_range1.dmm | 44 +- .../BoxStation/testingsite_range2.dmm | 30 +- .../BoxStation/testingsite_range3.dmm | 30 +- 4 files changed, 310 insertions(+), 255 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index fda1b28920f1..fba2136161e4 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -55936,10 +55936,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) -"oRz" = ( -/obj/effect/landmark/stationroom/box/testingsite, -/turf/template_noop, -/area/space) "oSz" = ( /obj/machinery/door/airlock/maintenance{ id_tag = "commissarydoor"; @@ -57493,6 +57489,10 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"sER" = ( +/obj/effect/landmark/stationroom/box/testingsite, +/turf/template_noop, +/area/template_noop) "sGC" = ( /obj/machinery/button/door{ id = "Dorm2"; @@ -58244,9 +58244,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"udO" = ( -/turf/template_noop, -/area/space) "ueh" = ( /obj/machinery/computer/med_data{ dir = 1 @@ -118555,21 +118552,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -oRz +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +sER aaa aaa aaa @@ -118812,21 +118809,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -119069,21 +119066,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -119326,21 +119323,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -119583,21 +119580,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -119840,21 +119837,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -120097,21 +120094,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -120354,21 +120351,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -120611,21 +120608,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -120868,21 +120865,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -121125,21 +121122,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -121382,21 +121379,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -121639,21 +121636,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -121896,21 +121893,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa @@ -122153,21 +122150,21 @@ aaa aaa aaa aaa -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO -udO +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV +qQV aaa aaa aaa diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm index 34f2b5d315b0..459983bd9f01 100644 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range1.dmm @@ -26,11 +26,6 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"g" = ( -/obj/structure/table, -/obj/item/flashlight/lamp, -/turf/open/floor/plating/airless, -/area/science/test_area) "h" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -40,6 +35,12 @@ "j" = ( /turf/open/space/basic, /area/space) +"k" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) "l" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -97,6 +98,14 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) +"A" = ( +/obj/structure/table, +/obj/item/storage/box/mre, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) "B" = ( /turf/open/floor/plating/airless, /area/science/test_area) @@ -108,11 +117,6 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"G" = ( -/obj/structure/table, -/obj/item/storage/box/mre, -/turf/open/floor/plating/airless, -/area/science/test_area) "H" = ( /obj/structure/chair{ dir = 8 @@ -122,6 +126,12 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) +"I" = ( +/obj/structure/table, +/obj/item/flashlight/lamp, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating/airless, +/area/science/test_area) "J" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, @@ -154,6 +164,12 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) +"Y" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) (1,1,1) = {" j @@ -247,9 +263,9 @@ c t t l +Y B -B -B +k O t t @@ -281,9 +297,9 @@ c t t N -G +A B -g +I P t t diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm index 8ddc6322b987..666210e5256f 100644 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range2.dmm @@ -54,6 +54,11 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) +"i" = ( +/obj/item/target/syndicate, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating/airless, +/area/science/test_area) "j" = ( /turf/open/space/basic, /area/space) @@ -76,6 +81,12 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) +"r" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) "t" = ( /turf/closed/wall, /area/science/test_area) @@ -151,8 +162,17 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/science/test_area) -"U" = ( +"V" = ( /obj/item/target/syndicate, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) +"W" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating/airless, /area/science/test_area) @@ -248,9 +268,9 @@ c t t y +r B -B -B +W C t t @@ -282,9 +302,9 @@ c t t A -U +V I -U +i n t t diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm index 865ae18e7b51..3512c32d015f 100644 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/testingsite_range3.dmm @@ -101,6 +101,10 @@ /obj/item/beacon, /turf/open/floor/plating/airless, /area/science/test_area) +"x" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating/airless, +/area/science/test_area) "B" = ( /turf/open/floor/plating/airless, /area/science/test_area) @@ -132,6 +136,12 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) +"L" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) "N" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -158,12 +168,24 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/science/test_area) +"T" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) "U" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating/airless, /area/science/test_area) +"W" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/science/test_area) (1,1,1) = {" j @@ -257,9 +279,9 @@ c t t J -B +L G -B +W p t t @@ -291,9 +313,9 @@ c t t N +T B -B -B +x P t t