From 1ff2b1d675c41d97dfe40733e4806009f7521c4a Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 17 Nov 2023 00:49:58 +0000 Subject: [PATCH 1/8] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-2442.yml | 9 --------- html/changelogs/AutoChangeLog-pr-2471.yml | 5 ----- html/changelogs/archive/2023-11.yml | 11 +++++++++++ 3 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-2442.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2471.yml diff --git a/html/changelogs/AutoChangeLog-pr-2442.yml b/html/changelogs/AutoChangeLog-pr-2442.yml deleted file mode 100644 index 10fcf3f561c7..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2442.yml +++ /dev/null @@ -1,9 +0,0 @@ -author: Erika Fox -changes: - - {rscadd: "Outpost 1 has been remapped into something fathomably less ass. It's - a bit smaller, probably, but I'm going to call that a good thing."} - - {rscadd: random number spawner. It's good for hull numbers that shouldn't be static.} - - {imageadd: a really bad sprite for a service directions sign.} - - {rscadd: Another elevator template (coincidentally demonstrating how that system - works in code)} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2471.yml b/html/changelogs/AutoChangeLog-pr-2471.yml deleted file mode 100644 index 8a583ac9d43f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2471.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Bjarl -changes: - - {balance: passive plasmasoul gas making is gone} - - {bugfix: plasmasouls no longer make infinite free lag} -delete-after: true diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml index ecede2ee4dae..0f42d6a053ca 100644 --- a/html/changelogs/archive/2023-11.yml +++ b/html/changelogs/archive/2023-11.yml @@ -79,3 +79,14 @@ - bugfix: Cybersun outfits have been adjusted to be less syndicate-generalist and more Cybersun. - imageadd: Cybersun has received a full visual overhaul, as well as new goodies! +2023-11-17: + Bjarl: + - balance: passive plasmasoul gas making is gone + - bugfix: plasmasouls no longer make infinite free lag + Erika Fox: + - rscadd: Outpost 1 has been remapped into something fathomably less ass. It's a + bit smaller, probably, but I'm going to call that a good thing. + - rscadd: random number spawner. It's good for hull numbers that shouldn't be static. + - imageadd: a really bad sprite for a service directions sign. + - rscadd: Another elevator template (coincidentally demonstrating how that system + works in code) From 62252fcd4dcf4741c651db427f6b6aa4dd1500b0 Mon Sep 17 00:00:00 2001 From: Hibou Date: Fri, 17 Nov 2023 08:43:05 -0600 Subject: [PATCH 2/8] Adds a sprite for strange plant fruit (#2491) ## About The Pull Request Fixes #2408 by giving strange plant fruit a sprite. Found /tg/'s strange fruit plant and brought it over here. Wish I could credit the original artist, but this sprite's older than /tg/'s commit history for their botany sprites file. ## Why It's Good For The Game Makes invisible strange plants visible. ## Changelog :cl: fix: added a sprite for strange plant fruit /:cl: --- icons/obj/hydroponics/harvest.dmi | Bin 112707 -> 113298 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index aeae4b17a44e6df9986c88319ac52a55f7c8abad..b07ae679471db3c1eb5969476c83073978a9b678 100644 GIT binary patch delta 21702 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 Uao14)W&k>lnOT{Z8M{UN2Myp4OaK4? delta 21086 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%0A)RqenhtGH1b?g8eE@5-VvXNOH` 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 OUp;AVYgT%k81)~4W1Iy5 From 241ff2de374fae0be9284153cefd91aef9d8641b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 17 Nov 2023 08:45:59 -0600 Subject: [PATCH 3/8] Automatic changelog generation for PR #2491 [ci skip] --- html/changelogs/AutoChangeLog-pr-2491.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2491.yml diff --git a/html/changelogs/AutoChangeLog-pr-2491.yml b/html/changelogs/AutoChangeLog-pr-2491.yml new file mode 100644 index 000000000000..147acd9226b7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2491.yml @@ -0,0 +1,4 @@ +author: Hibou48888 +changes: + - {bugfix: added a sprite for strange plant fruit} +delete-after: true From 9aab60b18de1b487eed44e7c2e2d0998dd02150c Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Fri, 17 Nov 2023 11:06:16 -0500 Subject: [PATCH 4/8] Bubble docking adjustment (#2415) Adjust mobile docking port to ensure east facing, added stationary docking port. ## About The Pull Request The Bubble lacked a docking port for shuttles, and would rotate in flight. Expanded map height (Y) by one to fit stationary dock. Added stationary dock to south airlock for shuttle use: ![Weaver Lambda AB 2023-10-19 055811](https://github.com/shiptest-ss13/Shiptest/assets/14267245/0d8da4b2-a9f3-4de1-baf5-155ad3829a70) Moved mobile dock to north pad and corrected `preferred_direction` (was north!) and `port_direction`. This ensured east-facing during transit. With the expanded map height (Y), Bubble map was now a square and would land facing north. Expanded map length (X) to make it rectangular again, and now it correctly lands facing east. ## Why It's Good For The Game Shuttle docking adds options. Consistent ship facing prevents issues. ## Changelog :cl: tweak: Bubble now consistently faces east add: added Bubble subshuttle dock /:cl: --- .../independent/independent_bubble.dmm | 65 +++++++++++++++++-- 1 file changed, 58 insertions(+), 7 deletions(-) diff --git a/_maps/shuttles/independent/independent_bubble.dmm b/_maps/shuttles/independent/independent_bubble.dmm index 6e37d1b244e8..32efe563c0bb 100644 --- a/_maps/shuttles/independent/independent_bubble.dmm +++ b/_maps/shuttles/independent/independent_bubble.dmm @@ -650,13 +650,14 @@ /turf/open/floor/plasteel/mono, /area/ship/hallway/central) "AR" = ( -/obj/machinery/door/airlock/external, -/obj/docking_port/mobile{ - launch_status = 0; - port_direction = 4 +/obj/docking_port/stationary{ + width = 30; + height = 15; + dwidth = 15; + dir = 2 }, -/turf/open/floor/plating, -/area/ship/engineering) +/turf/template_noop, +/area/space) "AU" = ( /obj/machinery/cryopod{ dir = 4 @@ -955,6 +956,18 @@ }, /turf/open/floor/plating/rust, /area/ship/maintenance/aft) +"Nf" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 1 + }, +/obj/docking_port/mobile{ + launch_status = 0; + port_direction = 8; + preferred_direction = 4; + dir = 2 + }, +/turf/open/floor/plating, +/area/ship/external) "NN" = ( /obj/structure/frame/computer{ dir = 4 @@ -1278,6 +1291,7 @@ VB VB VB VB +VB "} (2,1,1) = {" VB @@ -1297,6 +1311,7 @@ VB VB VB VB +VB "} (3,1,1) = {" VB @@ -1316,6 +1331,7 @@ VB VB VB VB +VB "} (4,1,1) = {" VB @@ -1335,6 +1351,7 @@ Ob VB VB VB +VB "} (5,1,1) = {" VB @@ -1354,6 +1371,7 @@ Ob VB VB VB +VB "} (6,1,1) = {" VB @@ -1373,6 +1391,7 @@ nH nH VB VB +VB "} (7,1,1) = {" VB @@ -1392,6 +1411,7 @@ KG nH VB VB +VB "} (8,1,1) = {" VB @@ -1411,6 +1431,7 @@ eT nH VB VB +VB "} (9,1,1) = {" VB @@ -1430,6 +1451,7 @@ fs vR xX VB +VB "} (10,1,1) = {" VB @@ -1449,6 +1471,7 @@ kW nH NX VB +VB "} (11,1,1) = {" Xn @@ -1468,9 +1491,10 @@ IL Vt Rk MJ +VB "} (12,1,1) = {" -gl +Nf Gl ec nS @@ -1486,6 +1510,7 @@ cH Ls ZQ cG +ZQ AR "} (13,1,1) = {" @@ -1506,6 +1531,7 @@ UC Vt mY MJ +VB "} (14,1,1) = {" VB @@ -1525,6 +1551,7 @@ MJ MJ VB VB +VB "} (15,1,1) = {" VB @@ -1544,6 +1571,7 @@ zy VB VB VB +VB "} (16,1,1) = {" VB @@ -1563,6 +1591,7 @@ zy VB VB VB +VB "} (17,1,1) = {" VB @@ -1582,6 +1611,7 @@ VB VB VB VB +VB "} (18,1,1) = {" VB @@ -1601,4 +1631,25 @@ VB VB VB VB +VB +"} +(19,1,1) = {" +VB +VB +VB +VB +VB +VB +VB +VB +VB +VB +VB +VB +VB +VB +VB +VB +VB +VB "} From 0b2d00f09169146ae962feba29bfd9912374af3f Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 17 Nov 2023 10:09:14 -0600 Subject: [PATCH 5/8] Automatic changelog generation for PR #2415 [ci skip] --- html/changelogs/AutoChangeLog-pr-2415.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2415.yml diff --git a/html/changelogs/AutoChangeLog-pr-2415.yml b/html/changelogs/AutoChangeLog-pr-2415.yml new file mode 100644 index 000000000000..8a04cb8c6af1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2415.yml @@ -0,0 +1,5 @@ +author: Doubleumc +changes: + - {tweak: Bubble now consistently faces east} + - {rscadd: added Bubble subshuttle dock} +delete-after: true From 88e683cec669624228d5204d7e3da06e6075d158 Mon Sep 17 00:00:00 2001 From: zevo <95449138+Zevotech@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:24:32 -0500 Subject: [PATCH 6/8] Massive Ruin Fixes + Removals PR (#2334) ## About The Pull Request This PR is made so I can stop getting angry at the ruins beyond saving that are still ingame. My criteria for a ruin being removed is if another ruin already does its niche better, if the ruin is outdated and/or the ruin is excessively small or unbalanced. For ruins that dont meet this criteria but are still outdated, they will be getting balance fixes and touch ups or a total remap. This PR is a draft for now because I will need to update the PR changelog and description as I make changes and communicate with the maptainers on what stays and what goes. Adds departmental RND lootdrop spawners for circuit imprinters, protolathes and techfabs. Excludes omnisci and basic boards from the drops. Fixed a space tile under a door and replaced the omnilathe with a medical lathe on dangerousresearch Fixed the whitesands saloon not spawning which may have caused some sandplanets to spawn without a ruin Fixed harmfactory's nonfunctional traps to now be as lethal as intended. Also changed the loot in the vault to better reflect the ruin's theme and difficulty (cargo techfab board instead of omnilathe, adv plasma cutter instead of combat medkit, less gold more cash, kept the cyberarm implant). Fixed provinggrounds magical SMES FINALLY by adding a terminal on the back. The map should finally function as intended. Fixed a few dirs on fire extinguisher cabinets and blast door assemblies in singularity_lab Removed mechtransport.dmm for being small and bad Removed some leftover gasthelizards.dmm cruft (VILE) Removed nucleardump for being an utter mess of an oldcode ruin Removed gondolaasteroid for being large and empty besides gondolas. better suited for a jungle planet IMO. Removed Jungle_Spider. Literally just a box with spiders and cloning equipment. Small, bad, hard to find, unjustified loot. Removed Golem_Hijack. Like jungle spider but it was free rnd, an AI core, a full BSRPED and three golem corpses. With no enemies or obstacles. Removed rockplanet_clock for being a tiny lootbox that doesnt fit with the lore. Also had a quantumn pad. Removed whitesands_surface_youreinsane. Its a silly little reference to an old event that unfortunately resulted in a subpar ruin. Could return as a wasteplanet greeble ruin, but it has to go for now. ## Why It's Good For The Game Normally I'm all for remapping instead of removing ruins, but some ruins are very much beyond saving. Clearing out space for better ruins to take the spotlight is always nice. Some older ruins are fine but are missing certain things or have loot that worked fine in the past, but doesn't reflect the balance we want for ruins in the present. I will be PR'ing ruins to replace the ones I remove. ## Changelog :cl: add: departmental RND lootdrop spawners for imprinters, protolathes and techfabs fix: dangerous_research.dmm now no longer has a space tile under a door and a medical lathe instead of an omnilathe fix: whitesands_surface_camp_saloon can now spawn again after its remap into a functional ruin fix: harmfactory.dmm's traps now work and loot has been adjusted to fit the ruin better fix: provinggrounds.dmm now has a working SMES and power fix: singularity_lab fire extinguishers and a few poddoors now have correct dirs del: mechtransport.dmm and associated code del: gasthelizards areas del: nucleardump.dmm and associated code del: gondolaasteroid.dmm and associated code del: jungle_spider.dmm and associated code del: whitesands_golem_hijack.dmm and associated code del: rockplanet_clock.dmm and associated code del: whitesands_surface_youreinsane.dmm and associated code /:cl: --------- Signed-off-by: zevo <95449138+Zevotech@users.noreply.github.com> --- .../RandomRuins/JungleRuins/jungle_spider.dmm | 266 --- .../RockRuins/rockplanet_clock.dmm | 628 ------ .../RockRuins/rockplanet_harmfactory.dmm | 479 ++--- .../whitesands_surface_golemhijack.dmm | 1390 ------------- .../whitesands_surface_youreinsane.dmm | 320 --- .../SpaceRuins/dangerous_research.dmm | 4 +- .../RandomRuins/SpaceRuins/mechtransport.dmm | 377 ---- _maps/RandomRuins/SpaceRuins/nuclear_dump.dmm | 1719 ----------------- .../RandomRuins/SpaceRuins/provinggrounds.dmm | 8 +- .../SpaceRuins/singularity_lab.dmm | 34 +- _maps/map_catalogue.txt | 24 - code/datums/ruins/jungle.dm | 6 - code/datums/ruins/rockplanet.dm | 8 +- code/datums/ruins/space.dm | 18 - code/datums/ruins/whitesands.dm | 13 +- code/game/area/areas/ruins/space.dm | 23 - .../game/objects/effects/spawners/lootdrop.dm | 36 + 17 files changed, 283 insertions(+), 5070 deletions(-) delete mode 100644 _maps/RandomRuins/JungleRuins/jungle_spider.dmm delete mode 100644 _maps/RandomRuins/RockRuins/rockplanet_clock.dmm delete mode 100644 _maps/RandomRuins/SandRuins/whitesands_surface_golemhijack.dmm delete mode 100644 _maps/RandomRuins/SandRuins/whitesands_surface_youreinsane.dmm delete mode 100644 _maps/RandomRuins/SpaceRuins/mechtransport.dmm delete mode 100644 _maps/RandomRuins/SpaceRuins/nuclear_dump.dmm diff --git a/_maps/RandomRuins/JungleRuins/jungle_spider.dmm b/_maps/RandomRuins/JungleRuins/jungle_spider.dmm deleted file mode 100644 index 14c11868d3af..000000000000 --- a/_maps/RandomRuins/JungleRuins/jungle_spider.dmm +++ /dev/null @@ -1,266 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"c" = ( -/obj/structure/flora/tree/jungle, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"e" = ( -/obj/structure/spider/stickyweb, -/obj/item/reagent_containers/food/snacks/spidereggs, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"f" = ( -/obj/structure/spider/stickyweb, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"g" = ( -/obj/structure/spider/stickyweb, -/obj/machinery/door/airlock/research, -/turf/open/floor/plating/dirt/jungle/dark/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"i" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"j" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/barricade/wooden, -/obj/structure/grille/broken, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"k" = ( -/obj/effect/decal/remains/human, -/obj/item/clothing/head/helmet/swat/nanotrasen, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"l" = ( -/obj/structure/spider/spiderling, -/turf/open/floor/plating/dirt/jungle/dark/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"m" = ( -/mob/living/simple_animal/hostile/poison/giant_spider/nurse, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"o" = ( -/obj/structure/spider/stickyweb, -/turf/open/floor/plating/dirt/jungle/dark/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"q" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/barricade/wooden, -/obj/structure/grille/broken, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"r" = ( -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"s" = ( -/obj/item/paper/guides/jobs/medical/cloning, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"t" = ( -/obj/structure/spider/spiderling, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"u" = ( -/obj/structure/spider/stickyweb, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"v" = ( -/obj/structure/spider/spiderling, -/obj/structure/spider/cocoon, -/obj/item/pda/geneticist, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/circuitboard/machine/dnascanner, -/obj/item/circuitboard/computer/cloning, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"w" = ( -/obj/machinery/clonepod, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"x" = ( -/obj/effect/decal/cleanable/insectguts, -/obj/machinery/door/airlock/research, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"y" = ( -/turf/open/floor/plating/dirt/jungle/dark/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"A" = ( -/obj/structure/closet/wardrobe/genetics_white, -/obj/item/storage/firstaid/toxin, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"C" = ( -/obj/item/storage/belt/security/webbing, -/turf/open/floor/plating/dirt/jungle/dark/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"D" = ( -/obj/effect/decal/cleanable/ash/large, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"G" = ( -/obj/structure/spider/spiderling, -/obj/structure/spider/cocoon, -/obj/item/research_notes/loot/medium, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"I" = ( -/obj/structure/spider/stickyweb, -/obj/item/organ/heart/gland/spiderman, -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/spiderlollipop, -/obj/item/reagent_containers/food/snacks/spiderlollipop, -/obj/item/reagent_containers/food/snacks/spiderlollipop, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"K" = ( -/turf/closed/wall/rust, -/area/overmap_encounter/planetoid/jungle/explored) -"L" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/barricade/wooden, -/obj/structure/grille/broken, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"M" = ( -/obj/structure/spider/spiderling, -/obj/effect/decal/cleanable/insectguts, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"N" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/mob/living/simple_animal/hostile/poison/giant_spider/nurse, -/turf/open/floor/plating/dirt/jungle/dark/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"O" = ( -/obj/item/melee/flyswatter, -/obj/item/reagent_containers/spray/pestspray, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"P" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/barricade/wooden, -/obj/structure/grille/broken, -/obj/structure/spider/stickyweb, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"Q" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/barricade/wooden, -/obj/structure/grille/broken, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"T" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) -"U" = ( -/obj/structure/spider/stickyweb, -/obj/effect/decal/cleanable/insectguts, -/turf/open/floor/plating/dirt/jungle/dark/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"V" = ( -/obj/effect/decal/cleanable/insectguts, -/turf/open/floor/plating/dirt/jungle/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"W" = ( -/obj/item/flamethrower, -/obj/item/tank/internals/plasma/full, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/dirt/jungle/dark/lit, -/area/overmap_encounter/planetoid/jungle/explored) -"X" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/spider/stickyweb, -/mob/living/simple_animal/hostile/poison/giant_spider, -/obj/item/reagent_containers/food/snacks/spidereggs, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/jungle/explored) - -(1,1,1) = {" -K -K -K -P -K -K -M -r -a -"} -(2,1,1) = {" -K -X -e -f -v -L -o -i -c -"} -(3,1,1) = {" -K -I -u -m -A -K -f -o -f -"} -(4,1,1) = {" -K -U -l -W -w -g -o -f -t -"} -(5,1,1) = {" -P -f -C -k -s -x -O -y -V -"} -(6,1,1) = {" -q -N -T -D -G -j -i -r -a -"} -(7,1,1) = {" -K -K -Q -K -K -K -f -a -a -"} diff --git a/_maps/RandomRuins/RockRuins/rockplanet_clock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_clock.dmm deleted file mode 100644 index 3a8da9995006..000000000000 --- a/_maps/RandomRuins/RockRuins/rockplanet_clock.dmm +++ /dev/null @@ -1,628 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"br" = ( -/obj/structure/table/bronze, -/obj/item/toy/clockwork_watch, -/turf/open/floor/bronze, -/area/ruin/powered) -"bw" = ( -/obj/structure/girder/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"by" = ( -/obj/structure/fluff/clockwork/clockgolem_remains, -/turf/open/floor/bronze, -/area/ruin/powered) -"cn" = ( -/obj/item/clothing/shoes/sandal/magic, -/obj/structure/table/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"ct" = ( -/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit, -/turf/open/floor/bronze, -/area/ruin/powered) -"fy" = ( -/obj/item/golem_shell/servant, -/turf/open/floor/bronze, -/area/ruin/powered) -"fK" = ( -/obj/machinery/computer/monitor{ - dir = 4 - }, -/turf/open/floor/bronze, -/area/ruin/powered) -"gA" = ( -/obj/machinery/computer/message_monitor{ - dir = 8 - }, -/turf/open/floor/bronze, -/area/ruin/powered) -"hb" = ( -/mob/living/simple_animal/hostile/jungle/mook, -/turf/open/floor/bronze, -/area/ruin/powered) -"hm" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/bronze, -/area/ruin/powered) -"hn" = ( -/obj/effect/decal/cleanable/garbage, -/turf/open/floor/bronze, -/area/ruin/powered) -"hU" = ( -/obj/machinery/computer/teleporter, -/turf/open/floor/bronze, -/area/ruin/powered) -"iX" = ( -/obj/structure/girder/bronze, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/bronze, -/area/ruin/powered) -"iY" = ( -/obj/machinery/door/airlock/bronze/seethru, -/obj/structure/trap/chill, -/turf/open/floor/bronze, -/area/ruin/powered) -"jG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/jungle/mook, -/turf/open/floor/bronze, -/area/ruin/powered) -"jK" = ( -/obj/effect/decal/cleanable/robot_debris/limb, -/turf/open/floor/bronze, -/area/ruin/powered) -"kd" = ( -/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit, -/obj/structure/chair/comfy/shuttle/bronze{ - dir = 4 - }, -/turf/open/floor/bronze, -/area/ruin/powered) -"ks" = ( -/obj/structure/girder/bronze, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/bronze, -/area/ruin/powered) -"lm" = ( -/obj/structure/fluff/clockwork/alloy_shards, -/turf/open/floor/bronze, -/area/ruin/powered) -"mG" = ( -/obj/structure/chair/comfy/shuttle/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"nM" = ( -/obj/machinery/door/airlock/bronze, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/bronze, -/area/ruin/powered) -"oj" = ( -/obj/structure/fluff/clockwork/alloy_shards, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"oW" = ( -/mob/living/simple_animal/hostile/jungle/mook, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"pi" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/trap/fire, -/turf/open/floor/bronze, -/area/ruin/powered) -"pt" = ( -/obj/item/gun/magic/wand/nothing, -/obj/structure/table/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"pV" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/bronze, -/area/ruin/powered) -"rM" = ( -/obj/structure/table/bronze, -/obj/item/stack/tile/bronze/thirty, -/turf/open/floor/bronze, -/area/ruin/powered) -"sS" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/trap/stun, -/turf/open/floor/bronze, -/area/ruin/powered) -"tg" = ( -/obj/structure/fluff/clockwork/alloy_shards, -/obj/machinery/quantumpad, -/turf/open/floor/bronze, -/area/ruin/powered) -"tI" = ( -/obj/effect/decal/cleanable/greenglow, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/bronze, -/area/ruin/powered) -"uk" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/bronze, -/area/ruin/powered) -"ur" = ( -/obj/machinery/quantumpad, -/obj/structure/trap/damage, -/turf/open/floor/bronze, -/area/ruin/powered) -"uM" = ( -/obj/item/clothing/under/color/black, -/obj/structure/table/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"uS" = ( -/obj/structure/fluff/clockwork/clockgolem_remains, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/bronze, -/area/ruin/powered) -"wq" = ( -/obj/machinery/power/smes, -/turf/open/floor/bronze, -/area/ruin/powered) -"wv" = ( -/obj/effect/decal/cleanable/robot_debris, -/turf/open/floor/bronze, -/area/ruin/powered) -"xb" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/mineral/bronze, -/area/ruin/powered) -"xt" = ( -/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit, -/obj/structure/closet/crate/grave/loot, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"xV" = ( -/obj/structure/chair/comfy/shuttle/bronze{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/bronze, -/area/ruin/powered) -"zj" = ( -/obj/effect/decal/cleanable/robot_debris/old, -/turf/open/floor/bronze, -/area/ruin/powered) -"zz" = ( -/obj/structure/chair/comfy/shuttle/bronze, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/bronze, -/area/ruin/powered) -"Bh" = ( -/obj/machinery/door/airlock/bronze/seethru, -/turf/open/floor/bronze, -/area/ruin/powered) -"BX" = ( -/obj/structure/lattice, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"Ci" = ( -/obj/structure/table/bronze, -/obj/item/clothing/suit/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"DL" = ( -/obj/structure/table/bronze, -/obj/item/stack/sheet/glass/fifty, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/bronze, -/area/ruin/powered) -"EB" = ( -/obj/structure/closet/crate/grave/loot, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"FE" = ( -/obj/structure/table/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"Gk" = ( -/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"GD" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"GT" = ( -/obj/item/toy/plush/plushvar, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"HK" = ( -/obj/effect/mine/stun, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/bronze, -/area/ruin/powered) -"Id" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/remains/human, -/turf/open/floor/bronze, -/area/ruin/powered) -"Iu" = ( -/obj/structure/fluff/clockwork/clockgolem_remains, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/trap/stun, -/turf/open/floor/bronze, -/area/ruin/powered) -"Ji" = ( -/obj/item/flashlight/lantern, -/turf/open/floor/bronze, -/area/ruin/powered) -"Jl" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/remains/human, -/turf/open/floor/bronze, -/area/ruin/powered) -"Ju" = ( -/obj/effect/decal/cleanable/robot_debris/old, -/mob/living/simple_animal/hostile/jungle/mook, -/turf/open/floor/bronze, -/area/ruin/powered) -"Nr" = ( -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"NP" = ( -/turf/open/floor/bronze, -/area/ruin/powered) -"Oa" = ( -/obj/structure/fluff/clockwork/alloy_shards/medium_gearbit, -/obj/effect/mine/stun, -/turf/open/floor/bronze, -/area/ruin/powered) -"Os" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/structure/trap/chill, -/turf/open/floor/bronze, -/area/ruin/powered) -"OB" = ( -/turf/template_noop, -/area/template_noop) -"OC" = ( -/obj/structure/table/bronze, -/obj/item/clothing/head/bronze, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/bronze, -/area/ruin/powered) -"PA" = ( -/obj/structure/fluff/clockwork/blind_eye, -/obj/structure/table/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"Qs" = ( -/turf/closed/wall/mineral/bronze, -/area/ruin/powered) -"Rt" = ( -/obj/structure/chair/comfy/shuttle/bronze{ - dir = 4 - }, -/turf/open/floor/bronze, -/area/ruin/powered) -"TL" = ( -/obj/structure/statue/bronze/marx, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"TV" = ( -/obj/item/reagent_containers/food/drinks/trophy/bronze_cup, -/obj/structure/table/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"VV" = ( -/obj/structure/girder/bronze, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/bronze, -/area/ruin/powered) -"Wm" = ( -/obj/effect/mine/stun, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"Wx" = ( -/obj/effect/decal/cleanable/greenglow, -/obj/effect/decal/cleanable/robot_debris/limb, -/turf/open/floor/bronze, -/area/ruin/powered) -"WK" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/bronze, -/area/ruin/powered) -"WT" = ( -/obj/structure/table/bronze, -/obj/item/clothing/shoes/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"Xi" = ( -/obj/structure/table/bronze, -/obj/item/nullrod/spear, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/bronze, -/area/ruin/powered) -"XY" = ( -/obj/structure/window/bronze/fulltile, -/obj/structure/grille, -/turf/open/floor/bronze, -/area/ruin/powered) -"Ye" = ( -/obj/structure/fluff/clockwork/alloy_shards, -/obj/structure/lattice, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"Ys" = ( -/obj/machinery/door/airlock/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"YQ" = ( -/obj/item/book/granter/spell/smoke, -/obj/structure/table/bronze, -/turf/open/floor/bronze, -/area/ruin/powered) -"Zs" = ( -/obj/structure/lattice, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating/asteroid/rockplanet/lit, -/area/overmap_encounter/planetoid/rockplanet/explored) -"ZY" = ( -/obj/structure/chair/comfy/shuttle/bronze{ - dir = 8 - }, -/turf/open/floor/bronze, -/area/ruin/powered) - -(1,1,1) = {" -Qs -Ys -Ys -Qs -Qs -Qs -Qs -Qs -Qs -Qs -Qs -Qs -OB -OB -OB -"} -(2,1,1) = {" -Qs -hm -NP -hn -bw -Qs -VV -pV -NP -NP -cn -XY -OB -OB -OB -"} -(3,1,1) = {" -Qs -kd -Iu -wv -NP -Bh -HK -WK -hm -NP -uM -XY -xt -Wm -OB -"} -(4,1,1) = {" -XY -gA -Ji -lm -hb -Bh -WK -tI -lm -by -NP -Qs -oW -GD -OB -"} -(5,1,1) = {" -Qs -fK -uk -NP -TV -Qs -DL -Jl -Ji -sS -NP -Ys -BX -oj -OB -"} -(6,1,1) = {" -Qs -ZY -NP -NP -PA -Qs -rM -NP -NP -zj -NP -Ys -BX -Gk -Nr -"} -(7,1,1) = {" -Qs -ks -WK -WK -bw -Qs -ks -br -Xi -FE -bw -Qs -EB -Nr -Nr -"} -(8,1,1) = {" -Qs -Qs -Bh -iY -xb -Qs -Qs -xb -Qs -Qs -Qs -Qs -Nr -GT -TL -"} -(9,1,1) = {" -Qs -VV -NP -NP -iX -Qs -VV -xV -Rt -NP -bw -Qs -Zs -oW -Nr -"} -(10,1,1) = {" -Qs -hU -NP -Oa -wq -Qs -mG -Ci -WT -NP -pi -nM -BX -Nr -Nr -"} -(11,1,1) = {" -Qs -tg -Id -Ji -NP -Qs -zz -OC -fy -uk -WK -nM -Wm -Nr -Nr -"} -(12,1,1) = {" -XY -ur -uS -NP -NP -Bh -WK -NP -Wx -ct -WK -xb -oW -GD -OB -"} -(13,1,1) = {" -Qs -NP -NP -jK -jG -Bh -WK -Os -NP -Ju -YQ -XY -EB -OB -OB -"} -(14,1,1) = {" -Qs -NP -NP -NP -bw -Qs -ks -Ji -by -by -pt -XY -Ye -BX -OB -"} -(15,1,1) = {" -Qs -Ys -Ys -Qs -Qs -Qs -Qs -Qs -Qs -Qs -Qs -Qs -OB -OB -OB -"} diff --git a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm index 5ba299eb454c..9b5adb277fa8 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm @@ -61,8 +61,9 @@ "bU" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/stack/sheet/mineral/gold/fifty, /obj/machinery/light/dim/directional/north, +/obj/item/spacecash/bundle/c1000, +/obj/item/spacecash/bundle/loadsamoney, /turf/open/floor/plasteel/patterned/brushed, /area/ruin/powered) "cb" = ( @@ -86,10 +87,6 @@ "cg" = ( /obj/structure/rack, /obj/item/stack/sheet/mineral/gold/twenty, -/obj/item/circuitboard/machine/protolathe{ - pixel_x = -7; - pixel_y = 4 - }, /obj/item/circuitboard/computer/rdconsole, /turf/open/floor/plasteel/patterned, /area/ruin/powered) @@ -141,7 +138,8 @@ /area/ruin/powered) "dJ" = ( /obj/structure/rack, -/obj/item/storage/firstaid/tactical, +/obj/item/circuitboard/machine/techfab/department/cargo, +/obj/item/stack/sheet/mineral/diamond/five, /turf/open/floor/plating/rust, /area/ruin/powered) "dN" = ( @@ -432,14 +430,18 @@ /turf/open/floor/plating/rust, /area/ruin/powered) "kC" = ( -/obj/machinery/door/keycard, +/obj/machinery/door/keycard{ + puzzle_id = "factory4" + }, /turf/open/floor/plasteel/patterned/brushed, /area/ruin/powered) "kI" = ( -/obj/machinery/door/keycard, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/keycard{ + puzzle_id = "factory4" + }, /turf/open/floor/plating/rust, /area/ruin/powered) "kM" = ( @@ -449,11 +451,11 @@ /area/ruin/powered) "kN" = ( /obj/structure/rack, -/obj/item/melee/greykingsword, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable{ icon_state = "0-8" }, +/obj/item/gun/energy/plasmacutter/adv, /turf/open/floor/plating/rust, /area/ruin/powered) "kU" = ( @@ -599,10 +601,8 @@ /turf/open/floor/plasteel/patterned, /area/ruin/powered) "of" = ( -/obj/machinery/conveyor/auto{ - dir = 8 - }, -/obj/machinery/light/dim/directional/north, +/obj/structure/disposalpipe/segment, +/obj/machinery/conveyor/auto, /turf/open/floor/engine, /area/ruin/powered) "oh" = ( @@ -681,8 +681,8 @@ /area/ruin/powered) "pi" = ( /obj/structure/rack, -/obj/item/construction/rcd/loaded, /obj/machinery/light/dim/directional/north, +/obj/item/stack/sheet/mineral/diamond/five, /turf/open/floor/plating/rust, /area/ruin/powered) "pk" = ( @@ -734,29 +734,29 @@ /turf/open/floor/engine, /area/ruin/powered) "pP" = ( -/obj/effect/turf_decal/industrial/warning/dust{ - dir = 1 - }, -/obj/structure/railing/corner, +/obj/item/toy/plush/moth, +/obj/structure/table/greyscale, /turf/open/floor/engine, /area/ruin/powered) "pU" = ( /obj/effect/turf_decal/industrial/warning/dust{ dir = 1 }, -/obj/structure/railing, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/engine, /area/ruin/powered) "qb" = ( -/obj/structure/railing{ - dir = 10 - }, /obj/structure/table/greyscale, /obj/item/laser_pointer/blue{ pixel_x = 10; pixel_y = 9 }, /obj/item/megaphone, +/obj/structure/railing{ + dir = 10 + }, /turf/open/floor/plasteel/patterned/brushed, /area/ruin/powered) "qd" = ( @@ -767,19 +767,10 @@ /turf/open/floor/engine, /area/ruin/powered) "qm" = ( -/obj/structure/railing, /obj/structure/chair/plastic, +/obj/structure/railing, /turf/open/floor/plasteel/patterned, /area/ruin/powered) -"qt" = ( -/obj/effect/turf_decal/industrial/warning/dust{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/engine, -/area/ruin/powered) "qv" = ( /obj/structure/railing{ dir = 10 @@ -837,6 +828,9 @@ /area/ruin/powered) "rv" = ( /obj/machinery/recycler/deathtrap, +/obj/machinery/conveyor/auto{ + dir = 4 + }, /turf/open/floor/engine, /area/ruin/powered) "rO" = ( @@ -880,11 +874,6 @@ }, /turf/open/floor/engine, /area/ruin/powered) -"sH" = ( -/obj/structure/railing/corner, -/mob/living/simple_animal/hostile/jungle/mook, -/turf/open/floor/engine, -/area/ruin/powered) "sK" = ( /obj/structure/closet/secure/loot, /obj/machinery/light/dim/directional/east, @@ -893,25 +882,37 @@ /turf/open/floor/plasteel/patterned, /area/ruin/powered) "sN" = ( -/obj/machinery/conveyor/inverted, -/obj/structure/grille, /obj/structure/cable, /obj/machinery/light/dim/directional/north, -/turf/open/floor/engine, +/obj/structure/grille, +/turf/open/floor/plating, /area/ruin/powered) "sV" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/railing{ - dir = 6 +/obj/machinery/disposal/deliveryChute{ + dir = 4 }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/conveyor/auto, /turf/open/floor/engine, /area/ruin/powered) "td" = ( -/obj/machinery/disposal/deliveryChute{ - dir = 4 +/obj/machinery/power/emitter/welded{ + active = 1 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable, +/obj/machinery/light/dim/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 6 }, +/obj/machinery/conveyor/auto, /turf/open/floor/engine, /area/ruin/powered) "te" = ( @@ -920,29 +921,21 @@ }, /turf/open/floor/engine, /area/ruin/powered) -"tu" = ( -/obj/machinery/conveyor/auto{ - dir = 4 - }, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, -/turf/open/floor/engine, -/area/ruin/powered) "tw" = ( -/obj/machinery/disposal/deliveryChute{ +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/conveyor/auto{ dir = 8 }, /turf/open/floor/engine, /area/ruin/powered) "tC" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/railing{ - dir = 10 +/obj/machinery/conveyor/auto{ + dir = 8 }, /turf/open/floor/engine, /area/ruin/powered) @@ -1018,19 +1011,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/ruin/powered) -"vz" = ( -/obj/machinery/disposal/deliveryChute, -/turf/open/floor/engine, -/area/ruin/powered) "vJ" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/railing{ dir = 6 }, -/turf/open/floor/engine, +/turf/open/floor/plating, /area/ruin/powered) "vK" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/conveyor/auto{ + dir = 1 }, /turf/open/floor/engine, /area/ruin/powered) @@ -1110,26 +1103,23 @@ /turf/open/floor/engine, /area/ruin/powered) "yw" = ( -/obj/machinery/power/emitter/ctf{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/engine, +/turf/closed/wall/r_wall, /area/ruin/powered) "za" = ( -/obj/machinery/power/emitter/ctf{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/engine, -/area/ruin/powered) -"zg" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/conveyor/auto{ dir = 1 }, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, +/turf/open/floor/engine, +/area/ruin/powered) +"zg" = ( +/obj/effect/turf_decal/industrial/warning/dust/corner, /turf/open/floor/engine, /area/ruin/powered) "zh" = ( @@ -1205,10 +1195,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/ruin/powered) -"Br" = ( -/obj/machinery/conveyor/inverted, -/turf/open/floor/engine, -/area/ruin/powered) "Bz" = ( /obj/effect/turf_decal/industrial/warning/dust{ dir = 4 @@ -1223,27 +1209,16 @@ /turf/open/floor/engine, /area/ruin/powered) "BE" = ( -/obj/machinery/conveyor/auto{ - dir = 1 +/obj/machinery/power/terminal{ + dir = 4 }, -/obj/item/shard/plasma, -/obj/item/shard/plasma, -/obj/item/shard/plasma, -/obj/item/shard/plasma, -/obj/item/shard/plasma, -/turf/open/floor/engine, +/turf/closed/indestructible/reinforced, /area/ruin/powered) "BQ" = ( /obj/structure/table/greyscale, -/obj/item/keycard, -/turf/open/floor/engine, -/area/ruin/powered) -"BR" = ( -/obj/effect/turf_decal/industrial/warning/dust{ - dir = 8 +/obj/item/keycard{ + puzzle_id = "factory4" }, -/obj/effect/turf_decal/number/zero, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/ruin/powered) "BW" = ( @@ -1343,30 +1318,18 @@ /obj/effect/turf_decal/industrial/warning/dust, /turf/open/floor/engine, /area/ruin/powered) -"EB" = ( -/obj/machinery/conveyor/inverted, -/mob/living/simple_animal/hostile/jungle/mook, -/turf/open/floor/engine, -/area/ruin/powered) "EE" = ( /obj/effect/turf_decal/industrial/warning/dust{ dir = 4 }, /obj/structure/sign/number/four, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/ruin/powered) "EG" = ( /obj/structure/table/greyscale, -/turf/open/floor/engine, -/area/ruin/powered) -"Fa" = ( -/obj/machinery/conveyor/auto, -/obj/item/shard/plasma, -/obj/item/shard/plasma, -/obj/item/shard/plasma, -/obj/item/shard/plasma, -/obj/item/shard/plasma, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/engine, /area/ruin/powered) "Fb" = ( @@ -1458,6 +1421,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/jungle/mook, /turf/open/floor/engine, /area/ruin/powered) "Gu" = ( @@ -1467,18 +1431,13 @@ /turf/open/floor/engine, /area/ruin/powered) "Gv" = ( -/obj/machinery/disposal/deliveryChute{ - dir = 1 - }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/ruin/powered) "Gz" = ( -/obj/machinery/conveyor/auto, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, +/obj/effect/turf_decal/industrial/warning/dust/corner{ + dir = 1 + }, /turf/open/floor/engine, /area/ruin/powered) "GE" = ( @@ -1492,10 +1451,6 @@ /obj/machinery/conveyor/auto, /turf/open/floor/engine, /area/ruin/powered) -"GN" = ( -/obj/structure/plasticflaps, -/turf/open/floor/engine, -/area/ruin/powered) "GO" = ( /obj/structure/table/greyscale, /obj/item/keycard/stockroom, @@ -1540,16 +1495,19 @@ /obj/machinery/light/broken/directional/east, /turf/open/floor/plating/asteroid/rockplanet, /area/overmap_encounter/planetoid/rockplanet/explored) -"HL" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/engine, -/area/ruin/powered) "HT" = ( +/obj/machinery/power/emitter/welded{ + dir = 1; + active = 1 + }, +/obj/structure/cable, +/obj/machinery/light/dim/directional/south, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/conveyor/auto{ + dir = 1 + }, /turf/open/floor/engine, /area/ruin/powered) "HU" = ( @@ -1574,32 +1532,29 @@ /turf/open/floor/engine, /area/ruin/powered) "It" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/machinery/disposal/deliveryChute{ + dir = 8 }, -/obj/structure/railing{ - dir = 5 +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/conveyor/auto{ + dir = 1 }, /turf/open/floor/engine, /area/ruin/powered) "IA" = ( -/obj/machinery/conveyor/auto{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, -/obj/item/shard, +/obj/machinery/conveyor/auto, /turf/open/floor/engine, /area/ruin/powered) "IF" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/railing{ - dir = 9 +/obj/effect/turf_decal/industrial/warning/dust{ + dir = 8 }, +/obj/effect/turf_decal/number/zero, /turf/open/floor/engine, /area/ruin/powered) "IM" = ( @@ -1701,37 +1656,22 @@ }, /turf/open/floor/engine, /area/ruin/powered) -"KC" = ( -/obj/effect/turf_decal/industrial/warning/dust, -/obj/structure/railing/corner{ +"KL" = ( +/obj/structure/chair/plastic{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, -/area/ruin/powered) -"KJ" = ( -/obj/effect/turf_decal/industrial/warning/dust, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/engine, -/area/ruin/powered) -"KL" = ( /obj/structure/railing{ dir = 9 }, -/obj/structure/chair/plastic{ - dir = 4 - }, -/turf/open/floor/plasteel/patterned/brushed, +/turf/open/floor/plasteel/patterned, /area/ruin/powered) "Lb" = ( -/obj/structure/railing{ - dir = 5 - }, /obj/structure/chair/plastic{ dir = 8 }, +/obj/structure/railing{ + dir = 5 + }, /turf/open/floor/plasteel/patterned, /area/ruin/powered) "Lp" = ( @@ -1793,6 +1733,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plating/rust, /area/ruin/powered) "Mr" = ( @@ -1923,12 +1866,11 @@ /turf/open/floor/plasteel/patterned, /area/ruin/powered) "QK" = ( -/obj/machinery/conveyor/inverted, -/obj/structure/grille, /obj/structure/cable, /obj/item/keycard/entry, /obj/machinery/light/dim/directional/north, -/turf/open/floor/engine, +/obj/structure/grille, +/turf/open/floor/plating, /area/ruin/powered) "Rd" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -2040,9 +1982,6 @@ /turf/open/floor/plasteel/patterned, /area/ruin/powered) "TE" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/structure/table/greyscale, /obj/item/spacecash/bundle/c1000{ pixel_y = 10 @@ -2052,6 +1991,9 @@ pixel_y = 2 }, /obj/item/toy/cards/deck/kotahi, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plating, /area/ruin/powered) "TM" = ( @@ -2154,10 +2096,15 @@ /turf/open/floor/plating, /area/ruin/powered) "XU" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /obj/machinery/conveyor/auto{ - dir = 4 + dir = 1 }, -/obj/machinery/light/dim/directional/south, /turf/open/floor/engine, /area/ruin/powered) "XX" = ( @@ -2774,7 +2721,7 @@ GV aB aB bf -bf +BE bf hj jL @@ -2824,12 +2771,12 @@ jO ln oG ro -uQ +hJ Op tR DI uW -GN +hJ ro JC Mp @@ -2867,7 +2814,7 @@ jR pk ol rv -uQ +pP hJ AY DO @@ -2910,12 +2857,12 @@ jR lC ol ro -uQ +hJ aQ xg Ep qd -uQ +hJ ro Jt LQ @@ -3083,8 +3030,8 @@ lQ oo sd uQ -yw -yw +uQ +uQ uQ Ga GS @@ -3127,9 +3074,9 @@ px st vi QK -Br -EB -Br +te +te +te GU tR Kj @@ -3170,9 +3117,9 @@ pC sx vi sN -Br -Br -Br +te +te +te Hs Ai Kn @@ -3212,8 +3159,8 @@ mu pE sd uQ -za -za +uQ +uQ uQ Go HG @@ -3296,14 +3243,14 @@ iS hJ mE pG -sH -vs -rh -Bz -EE -rh -rh -xg +tR +Ai +tR +tR +Ai +tR +tR +tR Ew LQ gv @@ -3338,16 +3285,16 @@ aB aB hJ my -pP -sV -vz +pG +tR +tR zg -BC -BC -te -Gv -It -KC +Bz +EE +GS +tR +tR +Lp Nn zC Pa @@ -3381,16 +3328,16 @@ aB bf hi mR -pU -td -vJ -vz -BE -BC +pG +tR +hJ Gv -HL -td -KJ +ro +ro +Gv +hJ +tR +Ew NK hi hi @@ -3425,15 +3372,15 @@ bf hj Mq pU -ro +yw td -hJ of -BC -hJ -td +of IA -KJ +ro +ro +hJ +Ew LT hi aB @@ -3468,14 +3415,14 @@ bf hj no qb -te -tR -te +Gv +sV +BC BQ EG -rO -rO -rO +ro +It +Gv KL NP hi @@ -3511,14 +3458,14 @@ je kC nq qm -tu -tw hJ -ro +tw +tC +vK XU +za +HT hJ -tw -BC TE GR hi @@ -3553,15 +3500,15 @@ hf jq kI nt -pE -tw -vK -vz -ro -Fa +vJ +tR +hJ Gv -HT -tw +BC +BC +Gv +hJ +tR Lb IO hi @@ -3596,16 +3543,16 @@ bf bf hi lC -qt -tC -vz -rO -ro -ro -Gz -Gv +pG +tR +tR +Ip IF -JV +Fb +Gz +tR +tR +Ew NK Ph hj @@ -3640,14 +3587,14 @@ bf hi ob pG -sC -rS -uT -BR -Fb -uT -uT -Gu +tR +Ai +tR +Ai +tR +tR +tR +tR Lp Mr Pt diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_golemhijack.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_golemhijack.dmm deleted file mode 100644 index 8953d652b99a..000000000000 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_golemhijack.dmm +++ /dev/null @@ -1,1390 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"at" = ( -/obj/item/mining_scanner, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/overmap_encounter/planetoid/sand/explored) -"aZ" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/ruin/unpowered) -"bb" = ( -/obj/item/shard{ - icon_state = "small" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"bW" = ( -/obj/structure/shuttle/engine/heater{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/open/floor/plating, -/area/ruin/unpowered) -"cj" = ( -/obj/effect/mob_spawn/human/corpse{ - mob_species = /datum/species/golem - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/titanium/white, -/area/ruin/unpowered) -"cs" = ( -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/white/line{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"cB" = ( -/obj/effect/turf_decal/trimline/opaque/white/corner{ - dir = 4 - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/machinery/mecha_part_fabricator/maint, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"cW" = ( -/obj/structure/door_assembly/door_assembly_min{ - dir = 4 - }, -/turf/open/floor/plating, -/area/ruin/unpowered) -"dz" = ( -/obj/structure/rack, -/obj/item/pickaxe, -/turf/open/floor/mineral/plastitanium, -/area/overmap_encounter/planetoid/sand/explored) -"eM" = ( -/obj/item/pickaxe{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/card/id/mining, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/yellow, -/area/overmap_encounter/planetoid/sand/explored) -"fb" = ( -/obj/item/crowbar, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/overmap_encounter/planetoid/sand/explored) -"fo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/titanium/purple, -/area/ruin/unpowered) -"fz" = ( -/turf/open/floor/plating/asteroid/whitesands, -/area/ruin/unpowered) -"ha" = ( -/obj/item/rack_parts, -/turf/open/floor/mineral/plastitanium, -/area/overmap_encounter/planetoid/sand/explored) -"hh" = ( -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/overmap_encounter/planetoid/sand/explored) -"hi" = ( -/obj/item/resonator, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"ht" = ( -/obj/structure/girder/displaced, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/overmap_encounter/planetoid/sand/explored) -"hJ" = ( -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/floor/plating/asteroid/whitesands, -/area/overmap_encounter/planetoid/sand/explored) -"hM" = ( -/obj/item/storage/box, -/obj/item/light/bulb/broken, -/obj/item/light/tube/broken, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/ruin/unpowered) -"iE" = ( -/obj/structure/AIcore/deactivated, -/turf/open/floor/mineral/titanium/white, -/area/ruin/unpowered) -"jp" = ( -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/opaque/white/line{ - dir = 8 - }, -/obj/structure/table, -/obj/item/storage/firstaid/brute, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"jw" = ( -/obj/item/bedsheet/rd/royal_cape, -/obj/item/toy/figure/rd{ - name = "the Liberator action figure"; - pixel_x = 7; - pixel_y = -5; - toysay = "Yeah, go do whatever." - }, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating, -/area/ruin/unpowered) -"jy" = ( -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/trimline/opaque/purple/line{ - dir = 8 - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"jO" = ( -/obj/item/storage/part_replacer/bluespace/tier2, -/turf/open/floor/mineral/titanium/white, -/area/ruin/unpowered) -"kJ" = ( -/obj/item/stack/sheet/mineral/wood, -/obj/item/stack/sheet/mineral/wood, -/obj/item/stack/sheet/mineral/wood, -/obj/item/stack/sheet/mineral/wood, -/obj/item/mining_scanner{ - pixel_x = -7; - pixel_y = 5 - }, -/turf/open/floor/mineral/plastitanium, -/area/overmap_encounter/planetoid/sand/explored) -"kT" = ( -/obj/structure/girder/displaced, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"lJ" = ( -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"mO" = ( -/obj/structure/window/reinforced, -/obj/structure/shuttle/engine/heater{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ruin/unpowered) -"mS" = ( -/obj/item/shard{ - icon_state = "tiny" - }, -/turf/open/floor/plating, -/area/ruin/unpowered) -"nL" = ( -/obj/item/light/bulb/broken{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/light/tube/broken{ - pixel_x = -10; - pixel_y = 6 - }, -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plasteel, -/area/ruin/unpowered) -"nX" = ( -/obj/machinery/door/airlock/titanium, -/turf/open/floor/plating, -/area/ruin/unpowered) -"nZ" = ( -/obj/item/storage/bag/ore, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 8 - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/item/rack_parts, -/obj/item/resonator{ - pixel_x = -6; - pixel_y = -6 - }, -/turf/open/floor/mineral/plastitanium, -/area/overmap_encounter/planetoid/sand/explored) -"od" = ( -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/ruin/unpowered) -"oP" = ( -/obj/item/toy/plush/lizardplushie{ - desc = "Awww! It looks like it will snuggle all of your internal organs!"; - name = "ashwalker plushie" - }, -/obj/effect/mob_spawn/human/corpse{ - mob_species = /datum/species/lizard/ashwalker - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/titanium/white, -/area/ruin/unpowered) -"pb" = ( -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/overmap_encounter/planetoid/sand/explored) -"pC" = ( -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"pQ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"qU" = ( -/obj/structure/table, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/ruin/unpowered) -"qY" = ( -/obj/structure/door_assembly/door_assembly_com, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"rm" = ( -/obj/structure/girder, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"rC" = ( -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/white/corner{ - dir = 1 - }, -/obj/structure/table, -/obj/item/areaeditor/blueprints{ - desc = "Use to build new structures in the wastes."; - name = "land claim" - }, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"sb" = ( -/obj/structure/frame/machine, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"sh" = ( -/obj/machinery/door/airlock/titanium, -/turf/open/floor/plating/asteroid/whitesands, -/area/ruin/unpowered) -"sm" = ( -/obj/structure/frame/machine, -/turf/open/floor/plating, -/area/ruin/unpowered) -"sF" = ( -/obj/item/rack_parts, -/obj/item/storage/bag/ore, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/sand/explored) -"sO" = ( -/obj/item/storage/box, -/obj/structure/table, -/obj/item/light/bulb/broken, -/obj/item/light/tube/broken{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/shard, -/obj/effect/mob_spawn/human/corpse{ - mob_species = /datum/species/lizard/ashwalker - }, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"tg" = ( -/obj/item/light/bulb/broken{ - pixel_x = -3; - pixel_y = -9 - }, -/obj/item/shard{ - icon_state = "medium" - }, -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/ruin/unpowered) -"tv" = ( -/obj/item/light/bulb/broken{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/ruin/unpowered) -"tw" = ( -/obj/item/mining_scanner{ - pixel_y = 7 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/yellow, -/area/overmap_encounter/planetoid/sand/explored) -"tH" = ( -/obj/item/pickaxe{ - pixel_x = -6; - pixel_y = 17 - }, -/obj/item/mining_scanner, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/overmap_encounter/planetoid/sand/explored) -"uA" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/overmap_encounter/planetoid/sand/explored) -"uY" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/ruin/unpowered) -"vc" = ( -/obj/item/pickaxe, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/titanium/white, -/area/ruin/unpowered) -"vd" = ( -/obj/item/rack_parts, -/turf/open/floor/plating/asteroid/whitesands, -/area/overmap_encounter/planetoid/sand/explored) -"vD" = ( -/obj/item/shard{ - icon_state = "tiny" - }, -/obj/item/shard{ - icon_state = "medium" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"vI" = ( -/obj/structure/rack, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 8 - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/item/clothing/head/hardhat/mining{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/clothing/head/hardhat/mining{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/head/hardhat/mining{ - pixel_x = 6; - pixel_y = 6 - }, -/turf/open/floor/mineral/plastitanium, -/area/overmap_encounter/planetoid/sand/explored) -"wd" = ( -/obj/effect/turf_decal/trimline/opaque/purple/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/opaque/purple/corner{ - dir = 8 - }, -/obj/item/shard{ - icon_state = "tiny" - }, -/obj/item/shard{ - icon_state = "small" - }, -/obj/effect/mob_spawn/human/corpse{ - mob_species = /datum/species/golem - }, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"wl" = ( -/obj/machinery/washing_machine, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"ww" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"wH" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/ruin/unpowered) -"xA" = ( -/obj/item/storage/box/rndboards, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/titanium/white, -/area/ruin/unpowered) -"xJ" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ruin/unpowered) -"xX" = ( -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/trimline/opaque/yellow/line{ - dir = 8 - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/turf/open/floor/mineral/plastitanium, -/area/overmap_encounter/planetoid/sand/explored) -"yc" = ( -/turf/open/floor/plating{ - icon_state = "platingdmg2" - }, -/area/overmap_encounter/planetoid/sand/explored) -"yI" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/overmap_encounter/planetoid/sand/explored) -"yX" = ( -/obj/item/light/bulb/broken{ - pixel_x = 3; - pixel_y = -1 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"zF" = ( -/turf/template_noop, -/area/template_noop) -"zP" = ( -/obj/effect/spawner/structure/window/shuttle, -/turf/open/floor/plating, -/area/ruin/unpowered) -"Al" = ( -/obj/item/shard{ - icon_state = "tiny" - }, -/obj/item/shard, -/obj/item/shard{ - icon_state = "small" - }, -/turf/open/floor/plating, -/area/ruin/unpowered) -"AG" = ( -/obj/machinery/mineral/ore_redemption{ - input_dir = 4; - output_dir = 8 - }, -/turf/open/floor/plating, -/area/ruin/unpowered) -"AW" = ( -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/trimline/opaque/white/line{ - dir = 9 - }, -/obj/structure/table, -/obj/structure/frame/machine, -/obj/item/stack/cable_coil/cut/green, -/obj/item/circuitboard/machine/reagentgrinder, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"CL" = ( -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/white/line{ - dir = 4 - }, -/obj/structure/frame/machine, -/obj/item/stack/cable_coil/cut/random, -/obj/item/surgicaldrill/advanced, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"EO" = ( -/obj/effect/turf_decal/trimline/opaque/purple/line{ - dir = 8 - }, -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"EZ" = ( -/obj/machinery/door/airlock/titanium, -/obj/effect/turf_decal/industrial/warning, -/obj/effect/turf_decal/industrial/warning{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"FK" = ( -/obj/item/resonator, -/obj/effect/mob_spawn/human/corpse{ - mob_species = /datum/species/golem - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/titanium/purple, -/area/ruin/unpowered) -"Gf" = ( -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/purple/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"Gm" = ( -/turf/open/floor/plating, -/area/ruin/unpowered) -"Gn" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/purple, -/area/ruin/unpowered) -"Gs" = ( -/obj/machinery/light/small/directional/west, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/freezer, -/area/overmap_encounter/planetoid/sand/explored) -"GZ" = ( -/obj/item/shard{ - icon_state = "tiny" - }, -/obj/item/shard{ - icon_state = "small" - }, -/turf/open/floor/plating, -/area/ruin/unpowered) -"Hm" = ( -/obj/item/card/id/mining, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/overmap_encounter/planetoid/sand/explored) -"HB" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/ruin/unpowered) -"HE" = ( -/obj/machinery/cell_charger, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/purple, -/area/ruin/unpowered) -"HK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"Ie" = ( -/obj/structure/girder/displaced, -/turf/open/floor/plating, -/area/ruin/unpowered) -"Il" = ( -/obj/machinery/shower, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/freezer, -/area/overmap_encounter/planetoid/sand/explored) -"IC" = ( -/turf/open/floor/mineral/titanium/purple, -/area/ruin/unpowered) -"JF" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"Ks" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/freezer, -/area/overmap_encounter/planetoid/sand/explored) -"Kt" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/decal/cleanable/oil/slippery, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"KT" = ( -/obj/structure/rack, -/obj/item/card/id/mining, -/obj/item/clothing/head/hardhat/mining, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/overmap_encounter/planetoid/sand/explored) -"Lz" = ( -/obj/structure/frame/machine, -/obj/effect/decal/cleanable/oil, -/obj/item/stack/cable_coil/cut/random, -/obj/item/clothing/suit/space/hardsuit/mining, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"Mx" = ( -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 1 - }, -/turf/open/floor/plating/asteroid/whitesands, -/area/ruin/unpowered) -"MT" = ( -/obj/structure/frame/machine, -/obj/item/shard, -/obj/item/book/manual/wiki/research_and_development{ - name = "Sacred Text of the Liberator"; - pixel_y = -5 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"Nm" = ( -/obj/machinery/door/airlock/titanium, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"Nz" = ( -/turf/open/floor/plating/asteroid/whitesands, -/area/overmap_encounter/planetoid/sand/explored) -"Pe" = ( -/obj/structure/ore_box, -/turf/open/floor/mineral/plastitanium, -/area/overmap_encounter/planetoid/sand/explored) -"PD" = ( -/obj/item/pickaxe, -/turf/open/floor/plating, -/area/ruin/unpowered) -"PN" = ( -/obj/structure/rack, -/obj/item/spear, -/obj/item/shard{ - icon_state = "medium" - }, -/obj/item/shard{ - icon_state = "tiny" - }, -/obj/item/shard{ - icon_state = "small" - }, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"Qi" = ( -/obj/item/light/bulb/broken{ - pixel_x = -13; - pixel_y = -12 - }, -/obj/item/light/tube/broken{ - pixel_x = -10; - pixel_y = -6 - }, -/obj/item/shard{ - icon_state = "small" - }, -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plasteel, -/area/ruin/unpowered) -"Qq" = ( -/turf/open/floor/plating{ - icon_state = "platingdmg2" - }, -/area/ruin/unpowered) -"Qr" = ( -/obj/item/shard, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/trimline/opaque/purple/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"QX" = ( -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/purple/line{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"Rb" = ( -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/opaque/white/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/opaque/white/corner, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"RJ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/white, -/area/ruin/unpowered) -"RX" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/electrical{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/toolbox/emergency{ - pixel_x = 3; - pixel_y = -3 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"SN" = ( -/obj/item/shard{ - icon_state = "tiny" - }, -/obj/item/shard{ - icon_state = "small" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"Tc" = ( -/obj/item/spear, -/obj/effect/mob_spawn/human/corpse{ - mob_species = /datum/species/lizard/ashwalker - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"Um" = ( -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/trimline/opaque/purple/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"Uz" = ( -/turf/closed/wall/mineral/plastitanium, -/area/ruin/unpowered) -"Wm" = ( -/obj/structure/frame/machine, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"Wt" = ( -/obj/effect/turf_decal/corner/transparent/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/corner/transparent/neutral, -/obj/effect/turf_decal/trimline/opaque/white/line{ - dir = 8 - }, -/obj/machinery/autolathe, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"WO" = ( -/obj/structure/door_assembly/door_assembly_com, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/ruin/unpowered) -"Xx" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating, -/area/ruin/unpowered) -"XQ" = ( -/obj/item/shard, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"YG" = ( -/obj/item/resonator/upgraded, -/obj/effect/mob_spawn/human/corpse{ - mob_species = /datum/species/golem - }, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/ruin/unpowered) -"YN" = ( -/obj/item/light/tube/broken{ - pixel_x = -10; - pixel_y = -7 - }, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/ruin/unpowered) -"YZ" = ( -/obj/effect/decal/cleanable/oil/streak, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/ruin/unpowered) -"ZD" = ( -/obj/structure/rack, -/obj/item/mop, -/obj/item/reagent_containers/glass/bucket, -/obj/item/storage/bag/trash{ - pixel_x = 6 - }, -/turf/open/floor/plating, -/area/ruin/unpowered) -"ZM" = ( -/obj/item/spear/bonespear, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/ruin/unpowered) -"ZP" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/ruin/unpowered) -"ZT" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/oil/slippery, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"ZY" = ( -/obj/item/light/bulb/broken{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/light/tube/broken{ - pixel_x = 12; - pixel_y = -7 - }, -/obj/effect/decal/cleanable/oil/streak, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/ruin/unpowered) - -(1,1,1) = {" -zF -zF -zF -zP -zP -aZ -aZ -rm -aZ -wH -Nz -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -"} -(2,1,1) = {" -Uz -Uz -aZ -zP -uY -ZD -RX -wH -Gs -pb -Nz -Nz -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -"} -(3,1,1) = {" -xJ -mO -aZ -wl -ZP -ZP -fz -aZ -Il -hh -pb -yI -Nz -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -"} -(4,1,1) = {" -xJ -mO -aZ -Xx -Tc -fz -fz -nX -Ks -Nz -hh -Nz -Nz -Nz -zF -zF -zF -zF -zF -zF -zF -zF -zF -"} -(5,1,1) = {" -Uz -Uz -kT -rm -Nm -kT -PD -rm -pb -hh -uA -ht -hJ -Nz -zF -zF -zF -zF -zF -zF -zF -zF -zF -"} -(6,1,1) = {" -xJ -mO -lJ -Gm -fz -aZ -aZ -aZ -aZ -aZ -aZ -aZ -aZ -mS -mS -aZ -nX -nX -aZ -aZ -Nz -zF -zF -"} -(7,1,1) = {" -xJ -mO -rm -fz -yX -od -kT -AW -jp -qU -Wt -lJ -Qr -jy -EO -lJ -ZP -Um -pQ -Ie -Nz -Nz -zF -"} -(8,1,1) = {" -aZ -aZ -aZ -sm -YG -HK -aZ -rC -hi -RJ -RJ -lJ -lJ -Gn -Gn -jw -pQ -XQ -pQ -WO -fb -hh -Nz -"} -(9,1,1) = {" -JF -pC -JF -HB -ZY -YN -EZ -ww -cj -lJ -iE -vc -IC -HE -sb -Gn -bb -SN -SN -Ie -yc -Nz -yc -"} -(10,1,1) = {" -JF -pC -JF -tv -hM -nL -EZ -RJ -RJ -oP -Gm -xA -lJ -Gn -Wm -fo -MT -wd -vD -wH -Nz -pb -pb -"} -(11,1,1) = {" -aZ -aZ -aZ -Lz -Qi -sO -aZ -cB -RJ -ZM -RJ -jO -Qq -FK -lJ -pQ -pQ -pQ -pQ -qY -pb -hh -Nz -"} -(12,1,1) = {" -xJ -bW -aZ -Kt -tg -PN -aZ -cs -lJ -Rb -CL -lJ -QX -Gf -Mx -pQ -Gf -pQ -lJ -pb -Nz -Nz -Nz -"} -(13,1,1) = {" -xJ -bW -aZ -ZT -YZ -aZ -aZ -aZ -aZ -cW -aZ -AG -Al -aZ -aZ -aZ -cW -GZ -Ie -Nz -zF -zF -zF -"} -(14,1,1) = {" -Uz -Uz -aZ -aZ -sh -aZ -vI -nZ -Hm -xX -Nz -Nz -Nz -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -"} -(15,1,1) = {" -xJ -mO -aZ -Pe -tw -pb -at -Nz -Nz -Nz -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -"} -(16,1,1) = {" -xJ -mO -aZ -kJ -eM -tH -pb -Hm -Nz -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -"} -(17,1,1) = {" -Uz -Uz -aZ -aZ -dz -sF -ha -KT -vd -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -"} -(18,1,1) = {" -zF -zF -zF -aZ -aZ -Nz -Nz -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -zF -"} diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_youreinsane.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_youreinsane.dmm deleted file mode 100644 index e8932e8b51ed..000000000000 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_youreinsane.dmm +++ /dev/null @@ -1,320 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"c" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating{ - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"f" = ( -/turf/open/floor/plating/asteroid/whitesands, -/area/ruin/unpowered) -"g" = ( -/obj/effect/turf_decal/industrial/outline/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"i" = ( -/obj/effect/decal/cleanable/greenglow, -/obj/item/disk/plantgene, -/turf/open/floor/plating{ - icon_state = "platingdmg2"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"j" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, -/turf/closed/wall/r_wall, -/area/ruin/unpowered) -"k" = ( -/obj/structure/window/plasma/reinforced, -/obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, -/turf/open/floor/plating/asteroid/whitesands, -/area/ruin/unpowered) -"n" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - icon_state = "panelscorched"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"r" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, -/area/ruin/unpowered) -"s" = ( -/obj/effect/turf_decal/industrial/outline/yellow{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"t" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/engine, -/area/ruin/unpowered) -"u" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/ruin/unpowered) -"w" = ( -/turf/closed/wall/r_wall, -/area/ruin/unpowered) -"x" = ( -/obj/effect/mob_spawn/human/engineer{ - gender = "female" - }, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation{ - pixel_x = -1; - pixel_y = 9 - }, -/obj/item/geiger_counter, -/turf/open/floor/engine, -/area/ruin/unpowered) -"y" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/turf/closed/wall/r_wall, -/area/ruin/unpowered) -"z" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"B" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, -/area/ruin/unpowered) -"C" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, -/area/ruin/unpowered) -"E" = ( -/obj/effect/decal/cleanable/greenglow, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating{ - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"G" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg2"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"H" = ( -/obj/structure/girder/displaced, -/turf/open/floor/plating{ - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"I" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/engine, -/area/ruin/unpowered) -"J" = ( -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/structure/frame/machine, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg2"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"L" = ( -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/turf/open/floor/plating{ - icon_state = "platingdmg1"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"Q" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, -/obj/structure/girder, -/turf/open/floor/plating{ - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"R" = ( -/obj/structure/window/plasma/reinforced, -/obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg2"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"S" = ( -/turf/open/floor/plating{ - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"T" = ( -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/structure/frame/machine, -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/turf/open/floor/engine, -/area/ruin/unpowered) -"V" = ( -/turf/open/floor/plating{ - icon_state = "platingdmg1"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"W" = ( -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10"; - dir = 4 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg2"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"X" = ( -/obj/structure/girder, -/turf/open/floor/plating{ - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) -"Y" = ( -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10"; - dir = 4 - }, -/turf/open/floor/engine, -/area/ruin/unpowered) -"Z" = ( -/obj/structure/window/plasma/reinforced, -/obj/structure/frame/machine, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg1"; - initial_gas_mix = "ws_atmos" - }, -/area/ruin/unpowered) - -(1,1,1) = {" -a -z -X -w -W -w -H -B -a -"} -(2,1,1) = {" -s -z -w -z -x -G -w -g -a -"} -(3,1,1) = {" -w -X -Q -u -Y -j -y -w -w -"} -(4,1,1) = {" -a -V -R -I -i -r -L -f -a -"} -(5,1,1) = {" -a -z -Z -I -E -r -T -n -b -"} -(6,1,1) = {" -S -S -k -I -C -t -J -C -a -"} -(7,1,1) = {" -X -w -w -w -c -w -w -X -w -"} diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index 73c7dd734c00..f477717d9b81 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -82,7 +82,7 @@ dir = 1 }, /obj/effect/turf_decal/corner/opaque/grey, -/obj/machinery/rnd/production/protolathe, +/obj/machinery/rnd/production/techfab/department/medical, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav) "cW" = ( @@ -1924,7 +1924,7 @@ /obj/effect/turf_decal/trimline/opaque/purple/line{ dir = 4 }, -/turf/open/space, +/turf/open/floor/plating, /area/ruin/space/has_grav) "XX" = ( /obj/structure/window/reinforced{ diff --git a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm deleted file mode 100644 index 43ec10644a73..000000000000 --- a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm +++ /dev/null @@ -1,377 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/closed/wall/mineral/titanium/overspace, -/area/ruin/space/has_grav/powered/mechtransport) -"c" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ruin/space/has_grav/powered/mechtransport) -"d" = ( -/turf/closed/wall/mineral/titanium, -/area/ruin/space/has_grav/powered/mechtransport) -"e" = ( -/obj/machinery/power/terminal, -/turf/closed/wall/mineral/titanium/overspace, -/area/ruin/space/has_grav/powered/mechtransport) -"f" = ( -/obj/structure/closet/crate/secure/loot, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/mineral/titanium/blue, -/area/ruin/space/has_grav/powered/mechtransport) -"g" = ( -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/mineral/titanium/blue, -/area/ruin/space/has_grav/powered/mechtransport) -"h" = ( -/obj/structure/table, -/obj/machinery/button/door{ - id = "mechaship1"; - name = "Mecha Cargo Ship Doors" - }, -/turf/open/floor/mineral/titanium/blue, -/area/ruin/space/has_grav/powered/mechtransport) -"i" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/blue, -/area/ruin/space/has_grav/powered/mechtransport) -"j" = ( -/obj/machinery/computer/helm{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/blue, -/area/ruin/space/has_grav/powered/mechtransport) -"k" = ( -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/mineral/titanium/blue, -/area/ruin/space/has_grav/powered/mechtransport) -"l" = ( -/obj/effect/decal/remains/human, -/turf/open/floor/mineral/titanium/blue, -/area/ruin/space/has_grav/powered/mechtransport) -"m" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/blue, -/area/ruin/space/has_grav/powered/mechtransport) -"n" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/turf/open/floor/mineral/titanium/blue, -/area/ruin/space/has_grav/powered/mechtransport) -"o" = ( -/obj/machinery/power/smes/shuttle/micro/precharged, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/closed/wall/mineral/titanium/overspace, -/area/ruin/space/has_grav/powered/mechtransport) -"p" = ( -/obj/machinery/door/airlock/hatch{ - name = "Cockpit"; - req_access_txt = "101" - }, -/turf/open/floor/mineral/titanium, -/area/ruin/space/has_grav/powered/mechtransport) -"r" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/mineral/titanium/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"s" = ( -/turf/open/floor/mineral/titanium/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"t" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"u" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/mineral/titanium/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"v" = ( -/obj/structure/mecha_wreckage/phazon, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"w" = ( -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"x" = ( -/obj/structure/mecha_wreckage/ripley/firefighter, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"y" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"z" = ( -/obj/structure/mecha_wreckage/ripley, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"A" = ( -/obj/mecha/working/ripley{ - ruin_mecha = 1 - }, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"B" = ( -/obj/effect/decal/cleanable/oil, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"C" = ( -/obj/effect/decal/cleanable/robot_debris/up, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"D" = ( -/obj/machinery/door/poddoor{ - id = "mechaship1"; - name = "Cargo Bay Door"; - dir = 4 - }, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"E" = ( -/obj/effect/decal/cleanable/robot_debris, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"F" = ( -/obj/structure/mecha_wreckage/durand, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"G" = ( -/obj/item/stack/tile/plasteel, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"H" = ( -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"I" = ( -/obj/structure/lattice, -/turf/open/space, -/area/ruin/space/has_grav/powered/mechtransport) -"J" = ( -/obj/machinery/computer/mecha{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/blue, -/area/ruin/space/has_grav/powered/mechtransport) -"K" = ( -/obj/effect/decal/cleanable/robot_debris/gib, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"L" = ( -/obj/effect/decal/cleanable/robot_debris, -/obj/item/stack/tile/plasteel, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"M" = ( -/turf/open/floor/plating/airless{ - icon_state = "platingdmg1" - }, -/area/ruin/space/has_grav/powered/mechtransport) -"N" = ( -/turf/open/floor/plating/airless{ - icon_state = "platingdmg2" - }, -/area/ruin/space/has_grav/powered/mechtransport) -"O" = ( -/obj/structure/mecha_wreckage/odysseus, -/turf/open/floor/mineral/titanium/yellow/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"P" = ( -/obj/item/stack/sheet/metal, -/turf/open/space, -/area/ruin/space/has_grav/powered/mechtransport) -"Q" = ( -/obj/structure/mecha_wreckage/gygax, -/turf/open/floor/mineral/titanium/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"R" = ( -/turf/open/floor/plating/airless{ - icon_state = "platingdmg3" - }, -/area/ruin/space/has_grav/powered/mechtransport) -"S" = ( -/obj/item/stack/rods, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"T" = ( -/turf/open/space, -/area/ruin/space/has_grav/powered/mechtransport) -"V" = ( -/obj/item/stack/rods, -/turf/open/space, -/area/ruin/space/has_grav/powered/mechtransport) -"W" = ( -/obj/machinery/power/smes/shuttle/micro/precharged, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/closed/wall/mineral/titanium, -/area/ruin/space/has_grav/powered/mechtransport) -"X" = ( -/obj/machinery/power/shuttle/engine/electric, -/obj/structure/cable, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/powered/mechtransport) -"Y" = ( -/obj/machinery/power/terminal, -/turf/closed/wall/mineral/titanium, -/area/ruin/space/has_grav/powered/mechtransport) - -(1,1,1) = {" -a -a -a -b -d -d -d -d -G -I -M -P -T -T -T -"} -(2,1,1) = {" -b -d -d -d -r -v -B -E -H -S -H -I -R -V -T -"} -(3,1,1) = {" -c -f -k -p -s -w -w -F -w -H -N -I -I -T -T -"} -(4,1,1) = {" -c -g -l -d -t -w -C -G -F -w -G -H -P -T -T -"} -(5,1,1) = {" -c -h -m -d -s -x -w -w -y -K -O -s -S -I -T -"} -(6,1,1) = {" -c -i -n -d -t -y -z -w -H -L -O -H -H -T -T -"} -(7,1,1) = {" -c -j -J -d -t -z -w -w -y -w -w -Q -Y -o -X -"} -(8,1,1) = {" -b -d -d -d -u -A -y -w -w -B -y -s -Y -W -X -"} -(9,1,1) = {" -a -a -a -b -d -d -D -D -D -D -D -d -e -o -X -"} diff --git a/_maps/RandomRuins/SpaceRuins/nuclear_dump.dmm b/_maps/RandomRuins/SpaceRuins/nuclear_dump.dmm deleted file mode 100644 index a953fc3f543c..000000000000 --- a/_maps/RandomRuins/SpaceRuins/nuclear_dump.dmm +++ /dev/null @@ -1,1719 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ac" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, -/turf/open/floor/plasteel/dark/airless, -/area/space/nearstation) -"ce" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, -/obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"cw" = ( -/obj/effect/turf_decal/syndicateemblem/top/right, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"cU" = ( -/obj/structure/radioactive/waste, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered) -"dl" = ( -/obj/machinery/power/emitter{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"eo" = ( -/obj/structure/radioactive, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"fi" = ( -/turf/closed/wall, -/area/ruin/space/has_grav/nucleardump) -"fu" = ( -/obj/structure/radioactive, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered) -"gs" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"gw" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"gO" = ( -/mob/living/simple_animal/hostile/hivebot/mechanic, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"he" = ( -/obj/effect/mob_spawn/human/corpse/charredskeleton, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump/supermatter) -"ht" = ( -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/nucleardump) -"hH" = ( -/obj/item/paper/crumpled, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"im" = ( -/obj/effect/decal/cleanable/blood/gibs/body, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"iN" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/space/nearstation) -"iZ" = ( -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"jm" = ( -/turf/closed/wall/r_wall/rust, -/area/ruin/space/has_grav/nucleardump) -"jD" = ( -/turf/closed/wall/r_wall, -/area/ruin/space/has_grav/nucleardump) -"jN" = ( -/turf/closed/wall/r_wall, -/area/ruin/space/has_grav/nucleardump/supermatter) -"kB" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"kN" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"kP" = ( -/obj/effect/turf_decal/radiation{ - pixel_y = 32 - }, -/turf/template_noop, -/area/space/nearstation) -"la" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/syndicateemblem/middle/right, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"ld" = ( -/obj/effect/decal/cleanable/blood/drip, -/obj/structure/radioactive, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"ls" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/nucleardump) -"lF" = ( -/obj/item/stack/sheet/plasmaglass, -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"lU" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/obj/structure/sign/warning/radiation{ - pixel_x = 32 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"ma" = ( -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered) -"mj" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/radioactive/stack, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"mX" = ( -/obj/structure/radioactive, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/nucleardump) -"nM" = ( -/obj/item/flashlight/flare, -/turf/open/floor/plasteel/dark/airless, -/area/ruin/space/has_grav/nucleardump) -"ov" = ( -/obj/machinery/atmospherics/components/unary/tank/air, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"oC" = ( -/turf/closed/wall/r_wall/rust, -/area/ruin/space/has_grav/nucleardump/supermatter) -"oP" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"oT" = ( -/turf/closed/mineral/random, -/area/ruin/unpowered) -"oU" = ( -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/airless, -/area/space/nearstation) -"oV" = ( -/obj/effect/turf_decal/radiation{ - dir = 4; - pixel_x = -32 - }, -/turf/template_noop, -/area/space/nearstation) -"pe" = ( -/obj/effect/turf_decal/industrial/fire, -/turf/open/floor/plasteel/dark/airless, -/area/space/nearstation) -"pf" = ( -/obj/machinery/door/airlock/grunge{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"pJ" = ( -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"qy" = ( -/obj/effect/decal/cleanable/blood/footprints, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"qA" = ( -/obj/item/geiger_counter, -/turf/open/floor/plasteel/dark/airless, -/area/space/nearstation) -"qF" = ( -/obj/item/pipe, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"qH" = ( -/obj/machinery/door/airlock/grunge, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"qK" = ( -/obj/structure/rack, -/obj/item/storage/box/lethalshot, -/obj/item/gun/ballistic/shotgun/automatic/combat, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/nucleardump) -"rg" = ( -/obj/item/stack/ore/uranium, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered) -"rp" = ( -/obj/structure/radioactive/stack, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"rM" = ( -/obj/item/pipe, -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"rS" = ( -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"sN" = ( -/obj/structure/grille, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"ua" = ( -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"un" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/eight, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/nucleardump) -"uo" = ( -/obj/machinery/door/airlock/hatch{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/airless, -/area/ruin/space/has_grav/nucleardump) -"ur" = ( -/obj/effect/turf_decal/syndicateemblem/top/left, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"uF" = ( -/obj/machinery/power/port_gen/pacman/super, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/nucleardump) -"vh" = ( -/obj/structure/sign/warning/radiation/rad_area{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/dark/airless, -/area/space/nearstation) -"vr" = ( -/obj/item/slimecross/chilling/green, -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"wc" = ( -/obj/structure/radioactive/supermatter, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"wr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon{ - dir = 4 - }, -/obj/machinery/light/small/broken/directional/south, -/turf/open/floor/plasteel/dark/airless, -/area/ruin/space/has_grav/nucleardump) -"xR" = ( -/turf/closed/wall, -/area/space/nearstation) -"yn" = ( -/obj/machinery/light/broken/directional/north, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/nucleardump) -"yw" = ( -/obj/structure/grille/broken, -/obj/item/stack/sheet/plasmarglass, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"zp" = ( -/obj/structure/cable{ - icon_state = "4-9" - }, -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"zx" = ( -/obj/effect/decal/cleanable/blood/tracks{ - dir = 8 - }, -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"zC" = ( -/obj/structure/catwalk, -/turf/template_noop, -/area/space/nearstation) -"zE" = ( -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"AO" = ( -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/nucleardump) -"Bl" = ( -/mob/living/simple_animal/hostile/hivebot/range, -/obj/machinery/light/broken/directional/north, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"BW" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"BX" = ( -/obj/structure/cable{ - icon_state = "4-6" - }, -/obj/machinery/atmospherics/pipe/manifold, -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"Dq" = ( -/obj/item/stack/sheet/mineral/plasma/five, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"DD" = ( -/obj/effect/decal/cleanable/blood/gibs/old, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"Ed" = ( -/mob/living/simple_animal/hostile/hivebot, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"EJ" = ( -/obj/structure/closet/secure/loot, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/nucleardump) -"EL" = ( -/obj/structure/barricade/wooden, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 4 - }, -/obj/effect/turf_decal/industrial/fire/fulltile, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"Fj" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"GN" = ( -/obj/effect/spawner/lootdrop/snowdin/dungeonmid, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/nucleardump) -"Hg" = ( -/obj/structure/closet/radiation, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"HH" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"Io" = ( -/obj/machinery/power/rad_collector, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"IJ" = ( -/obj/effect/spawner/structure/window/hollow/plasma/directional{ - dir = 4 - }, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"IM" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"Jb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/syndicateemblem/top/middle, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"Km" = ( -/obj/structure/window/plasma/reinforced/fulltile/unanchored, -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"KB" = ( -/turf/closed/wall, -/area/ruin/unpowered) -"KF" = ( -/turf/open/floor/plasteel/dark/airless, -/area/space/nearstation) -"KS" = ( -/mob/living/simple_animal/hostile/carp, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/syndicateemblem/bottom/middle, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"Ln" = ( -/obj/structure/radioactive/waste, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/nucleardump) -"LH" = ( -/obj/item/stack/ore/uranium, -/obj/item/stack/ore/uranium, -/obj/item/stack/ore/uranium, -/turf/open/floor/plating/asteroid/airless, -/area/ruin/unpowered) -"Mo" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"MP" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, -/obj/effect/decal/cleanable/blood/footprints{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"MX" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/nucleardump) -"Nk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/airless, -/area/ruin/space/has_grav/nucleardump) -"NV" = ( -/obj/structure/grille/broken, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"Oq" = ( -/obj/machinery/light/directional/north, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"OB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/syndicateemblem/bottom/right, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"OF" = ( -/obj/structure/radioactive/waste, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/nucleardump) -"OL" = ( -/obj/machinery/atmospherics/components/binary/valve/on, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"OP" = ( -/obj/item/stack/sheet/plasmarglass, -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"Py" = ( -/obj/structure/sign/warning/longtermwaste{ - pixel_y = 32 - }, -/obj/effect/mob_spawn/human/skeleton, -/turf/open/floor/plasteel/dark/airless, -/area/space/nearstation) -"Qa" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"Qd" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"QE" = ( -/obj/structure/radioactive/stack, -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/nucleardump) -"Ra" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"Ry" = ( -/obj/machinery/light/built/directional/south, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"RC" = ( -/mob/living/simple_animal/chicken, -/obj/item/melee/greykingsword, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/syndicateemblem/middle/middle, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"RD" = ( -/obj/effect/turf_decal/industrial/hatch/red, -/obj/effect/decal/cleanable/greenglow, -/obj/structure/closet/crate/radiation, -/obj/item/stack/sheet/mineral/uranium/twenty, -/obj/item/coin/uranium, -/obj/effect/spawner/lootdrop/maintenance/four, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"RZ" = ( -/obj/machinery/door/airlock/vault/derelict, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump/supermatter) -"SS" = ( -/obj/effect/decal/cleanable/blood/tracks{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"Tm" = ( -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"Tw" = ( -/obj/machinery/light/directional/east, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"Ud" = ( -/obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"UW" = ( -/turf/open/floor/plating/airless, -/area/space/nearstation) -"UY" = ( -/obj/structure/radioactive/waste, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"Vb" = ( -/obj/effect/radiation, -/turf/closed/wall, -/area/ruin/space/has_grav/nucleardump) -"VD" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/light/directional/east, -/turf/open/floor/engine/air, -/area/ruin/space/has_grav/nucleardump/supermatter) -"VE" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"VK" = ( -/obj/machinery/door/airlock/hatch{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/airless, -/area/ruin/space/has_grav/nucleardump) -"VL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/syndicateemblem/middle/left, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"VU" = ( -/turf/open/floor/mineral/plastitanium, -/area/ruin/space/has_grav/nucleardump) -"WH" = ( -/obj/effect/spawner/lootdrop/snowdin/dungeonlite, -/turf/open/floor/plasteel, -/area/ruin/space/has_grav/nucleardump) -"Yg" = ( -/obj/machinery/advanced_airlock_controller{ - pixel_y = -25 - }, -/obj/effect/mob_spawn/human/corpse/frontier, -/obj/item/tank/internals/emergency_oxygen/empty, -/turf/open/floor/plasteel/dark/airless, -/area/ruin/space/has_grav/nucleardump) -"Yj" = ( -/mob/living/simple_animal/hostile/hivebot/strong, -/turf/open/floor/plating/airless, -/area/ruin/space/has_grav/nucleardump) -"Yx" = ( -/turf/open/floor/vault, -/area/ruin/space/has_grav/nucleardump/supermatter) -"YZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/syndicateemblem/bottom/left, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) -"Zh" = ( -/obj/machinery/door/airlock/grunge, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"Zi" = ( -/obj/effect/turf_decal/industrial/fire{ - dir = 4 - }, -/obj/structure/radioactive/waste, -/obj/structure/sign/warning/radiation{ - pixel_x = 32 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/nucleardump) -"Zn" = ( -/turf/template_noop, -/area/template_noop) -"ZO" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/mineral/plastitanium/red, -/area/ruin/space/has_grav/nucleardump) - -(1,1,1) = {" -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -"} -(2,1,1) = {" -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -"} -(3,1,1) = {" -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -oT -oT -oT -oT -oT -oT -oT -oT -Zn -Zn -Zn -Zn -Zn -Zn -"} -(4,1,1) = {" -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -Zn -Zn -Zn -Zn -Zn -Zn -"} -(5,1,1) = {" -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -Zn -Zn -Zn -"} -(6,1,1) = {" -Zn -Zn -Zn -Zn -Zn -Zn -oT -oT -oT -oT -oT -oT -oT -oT -fi -fi -fi -fi -fi -fi -fi -oT -oT -oT -oT -oT -oT -oT -oT -Zn -Zn -Zn -"} -(7,1,1) = {" -Zn -Zn -Zn -Zn -Zn -Zn -oT -oT -oT -oT -oT -oT -oT -fi -fi -VU -iZ -iZ -ZO -mX -fi -fi -oT -oT -oT -oT -oT -oT -oT -Zn -Zn -Zn -"} -(8,1,1) = {" -Zn -Zn -Zn -Zn -Zn -Zn -oT -oT -oT -oT -oT -oT -oT -fi -Ln -pJ -ur -VL -YZ -iZ -VU -fi -oT -oT -oT -oT -oT -oT -oT -Zn -Zn -Zn -"} -(9,1,1) = {" -Zn -Zn -Zn -oT -oT -oT -oT -oT -oT -oT -oT -oT -fu -fi -VU -iZ -Jb -RC -KS -gs -VU -fi -fi -fi -fi -fi -oT -oT -oT -Zn -Zn -Zn -"} -(10,1,1) = {" -Zn -Zn -Zn -oT -oT -oT -oT -oT -oT -oT -ma -rg -LH -fi -QE -iZ -cw -la -OB -gs -MX -fi -rp -RD -eo -fi -oT -oT -oT -Zn -Zn -Zn -"} -(11,1,1) = {" -Zn -Zn -oT -oT -oT -oT -oT -oT -ma -rg -fu -ma -cU -fi -ls -VU -kN -gs -Tw -VU -mX -fi -Ud -eo -UY -fi -oT -oT -oT -Zn -Zn -Zn -"} -(12,1,1) = {" -Zn -Zn -oT -oT -fi -fi -fi -fi -fi -fi -fi -fi -fi -fi -Vb -fi -fi -pf -fi -fi -fi -fi -ua -ua -Ud -fi -oT -oT -oT -Zn -Zn -Zn -"} -(13,1,1) = {" -Zn -Zn -oT -oT -fi -AO -AO -qK -fi -mj -Tm -kB -Tm -ld -Tm -kB -Tm -Ed -Tm -Fj -Hg -fi -Oq -ua -im -fi -oT -oT -oT -Zn -Zn -Zn -"} -(14,1,1) = {" -Zn -Zn -oT -oT -fi -EJ -GN -ht -fi -Bl -DD -Tm -hH -Tm -Tm -ld -oP -qy -qy -qy -Ry -fi -zE -gO -WH -fi -oT -oT -oT -Zn -Zn -Zn -"} -(15,1,1) = {" -Zn -Zn -Zn -oT -fi -yn -Yj -ht -Zh -Tm -SS -Fj -fi -fi -fi -fi -fi -fi -fi -MP -gw -qH -VE -VE -ce -fi -oT -oT -oT -Zn -Zn -Zn -"} -(16,1,1) = {" -Zn -Zn -Zn -oT -fi -uF -OF -un -fi -lU -zx -Zi -fi -oT -oT -oT -oT -oT -jD -VK -jD -jD -ov -OL -Mo -fi -oT -oT -oT -Zn -Zn -Zn -"} -(17,1,1) = {" -Zn -Zn -oT -oT -fi -fi -fi -fi -fi -fi -EL -fi -fi -oT -oT -oT -oT -oT -jD -Nk -Yg -jD -fi -fi -fi -fi -oT -oT -Zn -Zn -Zn -Zn -"} -(18,1,1) = {" -Zn -Zn -oT -oT -oT -jN -jN -jN -jN -jN -RZ -oC -oC -jN -jN -oC -oT -oT -jm -nM -wr -jm -oT -oT -oT -oT -oT -Zn -Zn -Zn -Zn -Zn -"} -(19,1,1) = {" -Zn -oT -oT -oT -oT -oC -jN -oC -jN -jN -he -jN -jN -jN -oC -oC -oT -oT -jD -jD -uo -jm -oT -oT -Zn -iN -Zn -Zn -Zn -Zn -Zn -Zn -"} -(20,1,1) = {" -Zn -oT -oT -oT -oT -oC -jN -Yx -rM -Yx -Qa -Yx -BX -Yx -oC -jN -oT -oT -oT -vh -ac -Qd -zC -Zn -Zn -iN -Zn -Zn -Zn -Zn -Zn -Zn -"} -(21,1,1) = {" -Zn -oT -oT -oT -oT -oC -jN -Yx -Ra -Io -IM -Dq -VD -zp -oC -jN -oT -oT -oT -qA -UW -pe -zC -Zn -Zn -iN -Zn -Zn -Zn -Zn -Zn -Zn -"} -(22,1,1) = {" -Zn -Zn -oT -oT -oT -jN -jN -Yx -oC -HH -IJ -rS -oC -Qa -jN -jN -oT -oT -KB -Py -UW -UW -iN -iN -iN -xR -Zn -Zn -Zn -Zn -Zn -Zn -"} -(23,1,1) = {" -Zn -Zn -Zn -oT -oT -jN -oC -Yx -sN -rS -wc -qF -yw -dl -jN -jN -oT -oT -KB -KF -UW -pe -iN -Zn -Zn -xR -kP -Zn -Zn -Zn -Zn -Zn -"} -(24,1,1) = {" -Zn -Zn -Zn -oT -oT -jN -jN -lF -rS -rS -rS -rS -sN -OP -jN -jN -oT -oT -oT -KF -KF -UW -iN -Zn -Zn -iN -Zn -Zn -Zn -Zn -Zn -Zn -"} -(25,1,1) = {" -Zn -Zn -Zn -oT -oT -jN -jN -Yx -oC -NV -HH -rS -jN -Yx -oC -oC -oT -oT -oT -UW -oU -UW -zC -Zn -Zn -iN -Zn -Zn -Zn -Zn -Zn -Zn -"} -(26,1,1) = {" -Zn -Zn -Zn -oT -oT -oC -jN -Yx -Km -Yx -Yx -vr -BW -Yx -oC -oC -oT -oT -oT -iN -iN -zC -zC -Zn -Zn -xR -Zn -Zn -Zn -Zn -Zn -Zn -"} -(27,1,1) = {" -Zn -Zn -oT -oT -oT -oC -oC -oC -jN -oC -oC -oC -jN -oC -oC -oC -oT -oT -Zn -Zn -iN -Zn -Zn -Zn -Zn -xR -Zn -Zn -Zn -Zn -Zn -Zn -"} -(28,1,1) = {" -Zn -Zn -oT -oT -oT -jN -oC -oC -oC -jN -jN -jN -jN -jN -oC -oC -oT -oT -iN -xR -xR -xR -iN -iN -xR -xR -kP -Zn -Zn -Zn -Zn -Zn -"} -(29,1,1) = {" -Zn -Zn -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -Zn -Zn -oV -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -"} -(30,1,1) = {" -Zn -Zn -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -oT -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -"} -(31,1,1) = {" -Zn -Zn -oT -oT -oT -Zn -oT -oT -oT -oT -oT -oT -oT -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -"} -(32,1,1) = {" -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -Zn -"} diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm index 98a95198de5a..7b1e496384f5 100644 --- a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm +++ b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm @@ -795,6 +795,12 @@ /obj/machinery/light/directional/north, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/syndicircle/halls) +"vT" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/syndicircle/halls) "wa" = ( /obj/machinery/modular_computer/console/preset{ dir = 1 @@ -3364,7 +3370,7 @@ AV Dm Bj IY -ap +vT ap OE am diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm index 67fb3c35f127..12875d01ff1a 100644 --- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm +++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm @@ -1660,8 +1660,8 @@ /area/ruin/space/has_grav/singularitylab/civvie) "gP" = ( /obj/structure/table/reinforced, -/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/light/small/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/carpet/nanoweave/beige, /area/ruin/space/has_grav/singularitylab/cargo) "gR" = ( @@ -2017,7 +2017,9 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/structure/poddoor_assembly, +/obj/structure/poddoor_assembly{ + dir = 8 + }, /obj/structure/spacevine, /obj/machinery/power/shieldwallgen/atmos, /turf/open/floor/plating, @@ -2208,7 +2210,6 @@ /area/ruin/space/has_grav/singularitylab/civvie) "iZ" = ( /obj/structure/cable, -/obj/structure/poddoor_assembly, /obj/structure/spacevine, /obj/structure/spacevine/dense{ pixel_y = -32 @@ -2216,6 +2217,9 @@ /obj/machinery/power/shieldwallgen/atmos{ dir = 1 }, +/obj/structure/poddoor_assembly{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/singularitylab) "ja" = ( @@ -2660,8 +2664,8 @@ /area/ruin/space/has_grav/singularitylab/cargo) "kS" = ( /obj/effect/turf_decal/box, -/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/ore_box, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/plasteel/patterned/cargo_one, /area/ruin/space/has_grav/singularitylab/cargo) "kT" = ( @@ -4396,7 +4400,7 @@ pixel_x = -32; pixel_y = -4 }, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/singularitylab/cargo) "rp" = ( @@ -4788,7 +4792,7 @@ /area/ruin/space/has_grav/singularitylab/lab) "th" = ( /obj/structure/spacevine, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel, /area/ruin/space/has_grav/singularitylab) "tk" = ( @@ -8771,9 +8775,11 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/structure/poddoor_assembly, /obj/structure/spacevine, /obj/machinery/power/shieldwallgen/atmos, +/obj/structure/poddoor_assembly{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/singularitylab) "Iq" = ( @@ -8822,8 +8828,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/poddoor_assembly, /obj/structure/spacevine, +/obj/structure/poddoor_assembly{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/singularitylab) "IA" = ( @@ -8934,8 +8942,10 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/singularitylab/engineering) "Jb" = ( -/obj/structure/poddoor_assembly, /obj/structure/spacevine, +/obj/structure/poddoor_assembly{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/singularitylab) "Jc" = ( @@ -12169,7 +12179,7 @@ "Uo" = ( /obj/structure/table, /obj/structure/spacevine, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/singularitylab/engineering) "Up" = ( @@ -12932,11 +12942,13 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/structure/poddoor_assembly, /obj/structure/spacevine, /obj/machinery/power/shieldwallgen/atmos{ dir = 1 }, +/obj/structure/poddoor_assembly{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/singularitylab) "WJ" = ( diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt index defa6335817d..006f7f6328fd 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -69,10 +69,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt" Size = (x = 15)(y = 15)(z = 1) Tags = "Medium Combat Challenge", "Medium Loot", "Liveable" - File Name = "_maps\RandomRuins\JungleRuins\jungle_spider.dmm" - Size = (x = 7)(y = 9)(z = 1) - Tags = "Medium Combat Challenge", "Major Loot", "Liveable" - File Name = "_maps\RandomRuins\JungleRuins\jungle_surface_coffinepirate.dmm" Size = (x = 14)(y = 15)(z = 1) Tags = "No Combat", "Minor Loot", "Liveable" @@ -246,10 +242,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt" Size = (x = 15)(y = 23)(z = 1) Tags = "No Combat", "Medium Loot", "Shelter" - File Name = "_maps\RandomRuins\RockRuins\rockplanet_clock.dmm" - Size = (x = 15)(y = 15)(z = 1) - Tags = "Medium Combat Challenge", "Medium Loot", "Necropolis Loot", "Shelter" - File Name = "_maps\RandomRuins\RockRuins\rockplanet_crash_cult.dmm" Size = (x = 26)(y = 18)(z = 1) Tags = "Medium Combat Challenge", "Medium Loot", "Inhospitable" @@ -320,10 +312,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt" Size = (x = 13)(y = 13)(z = 1) Tags = "No Combat", "Minor Loot", "Shelter" - File Name = "_maps\RandomRuins\Ruins\whitesands_surface_golem_hijack.dmm" - Size = (x = 18)(y = 23)(z = 1) - Tags = "No Combat", "Medium Loot", "Inhospitable" - File Name = "_maps\RandomRuins\Ruins\whitesands_surface_medipen_plant.dmm" Size = (x = 23)(y = 29)(z = 1) Tags = "No Combat", "Major Loot", "Shelter" @@ -398,10 +386,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt" Size = (x = 50)(y = 50)(z = 1) Tags = "No Combat", "Minor Loot", "Inhospitable" - File Name = "_maps\RandomRuins\SpaceRuins\gondolaasteroid.dmm" - Size = (x = 35)(y = 35)(z = 1) - Tags = "No Combat", "Minor Loot", "Shelter" - File Name = "_maps\RandomRuins\SpaceRuins\hellfactory.dmm" Size = (x = 25)(y = 25)(z = 1) Tags = "No Combat", "Medium Loot", "Shelter" @@ -410,18 +394,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt" Size = (x = 73)(y = 36)(z = 1) Tags = "Medium Combat Challenge", "Major Loot", "Ghost Role", "Shelter", "Antag Gear" - File Name = "_maps\RandomRuins\SpaceRuins\mechtransport.dmm" - Size = (x = 9)(y = 15)(z = 1) - Tags = "No Combat", "Medium Loot", "Inhospitable" - File Name = "_maps\RandomRuins\SpaceRuins\ntfacility.dmm" Size = (x = 39)(y = 39)(z = 1) Tags = "Medium Combat Challenge", "Major Loot", "Shelter" - File Name = "_maps\RandomRuins\SpaceRuins\nuclear_dump.dmm" - Size = (x = 32)(y = 32)(z = 1) - Tags = "Minor Combat Challenge", "Medium Loot", "Shelter", "Hazardous" - File Name = "_maps\RandomRuins\SpaceRuins\oldcodeops.dmm" Size = (x = 17)(y = 22)(z = 1) Tags = "Boss Combat Challenge", "Major Loot", "Shelter", "Antag Gear" diff --git a/code/datums/ruins/jungle.dm b/code/datums/ruins/jungle.dm index b340bf2f9ac1..1f58dc96da67 100644 --- a/code/datums/ruins/jungle.dm +++ b/code/datums/ruins/jungle.dm @@ -66,12 +66,6 @@ description = "An abandoned hangar containing exosuits." suffix = "jungle_hangar.dmm" -/datum/map_template/ruin/jungle/spider - name = "Jungle Spiders" - id = "spiderjungle" - description = "A genetic experiment gone wrong." - suffix = "jungle_spider.dmm" - /datum/map_template/ruin/jungle/pirate name = "Jungle Pirates" id = "piratejungle" diff --git a/code/datums/ruins/rockplanet.dm b/code/datums/ruins/rockplanet.dm index 269198a16ed4..b3d9276b827e 100644 --- a/code/datums/ruins/rockplanet.dm +++ b/code/datums/ruins/rockplanet.dm @@ -12,12 +12,6 @@ description = "something dangerous" suffix = "rockplanet_heirophant.dmm" -/datum/map_template/ruin/rockplanet/clock - name = "Clockcult base" - id = "clockcultrock" - description = "the last remnants of a clockcult base on rockplanet." - suffix = "rockplanet_clock.dmm" - /datum/map_template/ruin/rockplanet/cult name = "Cult base" id = "rockcult" @@ -83,7 +77,7 @@ suffix = "rockplanet_saloon.dmm" /datum/map_template/ruin/rockplanet/harmfactory - name = "Harm factory" + name = "Harm Factory" description = "A factory made for HARM and AGONY." id = "rockplanet_harmfactory" suffix = "rockplanet_harmfactory.dmm" diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index f754aba26329..ea5a6d0aa775 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -25,12 +25,6 @@ description = "A once-bustling tradestation that handled imports and exports from nearby stations now lays eerily dormant. \ The last received message was a distress call from one of the on-board officers, but we had no success in making contact again." -/datum/map_template/ruin/space/mech_transport - id = "mech-transport" - suffix = "mechtransport.dmm" - name = "CF Corsair" - description = "Well, when is it getting here? I have bills to pay; very well-armed clients who want their shipments as soon as possible! I don't care, just find it!" - /datum/map_template/ruin/space/onehalf id = "onehalf" suffix = "onehalf.dmm" @@ -66,12 +60,6 @@ description = "Pause and remember-- You are unique.You are special. Every mistake, trial, and hardship has helped to sculpt your real beauty. \ Stop hating yourself and start appreciating and loving yourself!" -/datum/map_template/ruin/space/gondoland - id = "gondolaasteroid" - suffix = "gondolaasteroid.dmm" - name = "Gondoland" - description = "Just an ordinary rock- wait, what's that thing?" - /datum/map_template/ruin/space/clericden id = "clericden" suffix = "clericden.dmm" @@ -139,12 +127,6 @@ name = "Fuel Depot" description = "An orbital refueling station with the remains of a ship lodged among the debris." -/datum/map_template/ruin/space/nuclear_dump - id = "radioactivedump" - suffix = "nuclear_dump.dmm" - name = "Nuclear Waste Dump" - description = "An abandoned nuclear waste disposal zone, a relic of old-age spaceflight and a death sentence to any who dare enter..." - /datum/map_template/ruin/space/ntfacility id = "ntfacility" suffix = "ntfacility.dmm" diff --git a/code/datums/ruins/whitesands.dm b/code/datums/ruins/whitesands.dm index eaf742ce2a29..5615d5d72366 100644 --- a/code/datums/ruins/whitesands.dm +++ b/code/datums/ruins/whitesands.dm @@ -18,24 +18,12 @@ suffix = "whitesands_surface_starfurycrash.dmm" allow_duplicates = FALSE -/datum/map_template/ruin/whitesands/golem_hijack - name = "Crashed Golem Ship" - id = "golemcrash" - description = "The remains of a mysterious ship, inhabited by strange lizardpeople and golems of some sort. Who knows what happened here." - suffix = "whitesands_surface_golemhijack.dmm" - /datum/map_template/ruin/whitesands/medipen_plant name = "Abandoned Medipen Factory" id = "medipenplant" description = "A once prosperous autoinjector manufacturing plant." suffix = "whitesands_surface_medipen_plant.dmm" -/datum/map_template/ruin/whitesands/youreinsane - name = "Lost Engine" - id = "ws-youreinsane" - description = "Nanotrasen would like to remind all employees that the Pi\[REDACTED\]er is not real." - suffix = "whitesands_surface_youreinsane.dmm" - /datum/map_template/ruin/whitesands/assaultpodcrash name = "Crashed Syndicate Assault Drop Pod" id = "ws-assaultpodcrash" @@ -71,6 +59,7 @@ name = "Hermit Saloon" id = "ws-saloon" description = "A western style saloon, most popular spot for the hermits to gather planetside" + suffix = "whitesands_surface_camp_saloon.dmm" /datum/map_template/ruin/whitesands/survivors/combination //combined extra large ruin of several other whitesands survivor ruins (excludes the drugstore) name = "Wasteland Survivor Village" diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 769c509734bd..6bda9781b500 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -56,19 +56,6 @@ name = "Derelict Outpost Docked Ship" icon_state = "red" -//Ruin of mech transport - -/area/ruin/space/has_grav/powered/mechtransport - name = "Mech Transport" - icon_state = "green" - - -//Ruin of gas the lizard - -/area/ruin/space/has_grav/gasthelizard - name = "Gas the lizard" - - //Ruin of Deep Storage /area/ruin/space/has_grav/deepstorage @@ -366,16 +353,6 @@ name = "Mac Space Restaurant" icon_state = "yellow" -//NUCLEAR DUMP -- this ruin uses an area from power puzzle, for whatever reason. added new areas, for now. - -/area/ruin/space/has_grav/nucleardump - name = "Hallway" - icon_state = "hallC" - -/area/ruin/space/has_grav/nucleardump/supermatter - name = "Supermatter Chamber" - icon_state = "red" - //POWER PUZZLE /area/ruin/space/has_grav/powerpuzzle diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 1e349fd17abb..8d46f5bfa7d8 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -1250,6 +1250,42 @@ )) return ..() + +//random RND imprinter/protolathe board spawners. Do not use on maps without a good reason +/obj/effect/spawner/lootdrop/randomprotolathe + name = "random departmental protolathe" + loot = list( + /obj/item/circuitboard/machine/protolathe/department/cargo, + /obj/item/circuitboard/machine/protolathe/department/engineering, + /obj/item/circuitboard/machine/protolathe/department/service, + /obj/item/circuitboard/machine/protolathe/department/medical, + /obj/item/circuitboard/machine/protolathe/department/science, + /obj/item/circuitboard/machine/protolathe/department/security + ) + +/obj/effect/spawner/lootdrop/randomimprinter + name = "random departmental circuit imprinter" + loot = list( + /obj/item/circuitboard/machine/circuit_imprinter/department/cargo, + /obj/item/circuitboard/machine/circuit_imprinter/department/engi, + /obj/item/circuitboard/machine/circuit_imprinter/department/civ, + /obj/item/circuitboard/machine/circuit_imprinter/department/med, + /obj/item/circuitboard/machine/circuit_imprinter/department/science, + /obj/item/circuitboard/machine/circuit_imprinter/department/sec + ) + +/obj/effect/spawner/lootdrop/randomtechfab + name = "random departmental techfab" + loot = list( + /obj/item/circuitboard/machine/techfab/department/service, + /obj/item/circuitboard/machine/techfab/department/cargo, + /obj/item/circuitboard/machine/techfab/department/engineering, + /obj/item/circuitboard/machine/techfab/department/service, + /obj/item/circuitboard/machine/techfab/department/medical, + /obj/item/circuitboard/machine/techfab/department/science, + /obj/item/circuitboard/machine/techfab/department/security + ) + /obj/effect/spawner/lootdrop/ration loot = list ( /obj/item/storage/ration/vegan_chili = 5, From 4fab9ba1d898041dfb594334e59f8437541612e9 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 17 Nov 2023 10:27:20 -0600 Subject: [PATCH 7/8] Automatic changelog generation for PR #2334 [ci skip] --- html/changelogs/AutoChangeLog-pr-2334.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2334.yml diff --git a/html/changelogs/AutoChangeLog-pr-2334.yml b/html/changelogs/AutoChangeLog-pr-2334.yml new file mode 100644 index 000000000000..e3996c84b408 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2334.yml @@ -0,0 +1,21 @@ +author: Zevotech +changes: + - {rscadd: 'departmental RND lootdrop spawners for imprinters, protolathes and techfabs'} + - {bugfix: dangerous_research.dmm now no longer has a space tile under a door and + a medical lathe instead of an omnilathe} + - {bugfix: whitesands_surface_camp_saloon can now spawn again after its remap into + a functional ruin} + - {bugfix: harmfactory.dmm's traps now work and loot has been adjusted to fit the + ruin better} + - {bugfix: provinggrounds.dmm now has a working SMES and power} + - {bugfix: singularity_lab fire extinguishers and a few poddoors now have correct + dirs} + - {rscdel: mechtransport.dmm and associated code} + - {rscdel: gasthelizards areas} + - {rscdel: nucleardump.dmm and associated code} + - {rscdel: gondolaasteroid.dmm and associated code} + - {rscdel: jungle_spider.dmm and associated code} + - {rscdel: whitesands_golem_hijack.dmm and associated code} + - {rscdel: rockplanet_clock.dmm and associated code} + - {rscdel: whitesands_surface_youreinsane.dmm and associated code} +delete-after: true From 70b0fad46ba0af28f0a77c9e7eed46520d7cc4ba Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 18 Nov 2023 00:48:29 +0000 Subject: [PATCH 8/8] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-2334.yml | 21 ------------------- html/changelogs/AutoChangeLog-pr-2415.yml | 5 ----- html/changelogs/AutoChangeLog-pr-2491.yml | 4 ---- html/changelogs/archive/2023-11.yml | 25 +++++++++++++++++++++++ 4 files changed, 25 insertions(+), 30 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-2334.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2415.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2491.yml diff --git a/html/changelogs/AutoChangeLog-pr-2334.yml b/html/changelogs/AutoChangeLog-pr-2334.yml deleted file mode 100644 index e3996c84b408..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2334.yml +++ /dev/null @@ -1,21 +0,0 @@ -author: Zevotech -changes: - - {rscadd: 'departmental RND lootdrop spawners for imprinters, protolathes and techfabs'} - - {bugfix: dangerous_research.dmm now no longer has a space tile under a door and - a medical lathe instead of an omnilathe} - - {bugfix: whitesands_surface_camp_saloon can now spawn again after its remap into - a functional ruin} - - {bugfix: harmfactory.dmm's traps now work and loot has been adjusted to fit the - ruin better} - - {bugfix: provinggrounds.dmm now has a working SMES and power} - - {bugfix: singularity_lab fire extinguishers and a few poddoors now have correct - dirs} - - {rscdel: mechtransport.dmm and associated code} - - {rscdel: gasthelizards areas} - - {rscdel: nucleardump.dmm and associated code} - - {rscdel: gondolaasteroid.dmm and associated code} - - {rscdel: jungle_spider.dmm and associated code} - - {rscdel: whitesands_golem_hijack.dmm and associated code} - - {rscdel: rockplanet_clock.dmm and associated code} - - {rscdel: whitesands_surface_youreinsane.dmm and associated code} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2415.yml b/html/changelogs/AutoChangeLog-pr-2415.yml deleted file mode 100644 index 8a04cb8c6af1..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2415.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Doubleumc -changes: - - {tweak: Bubble now consistently faces east} - - {rscadd: added Bubble subshuttle dock} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2491.yml b/html/changelogs/AutoChangeLog-pr-2491.yml deleted file mode 100644 index 147acd9226b7..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2491.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Hibou48888 -changes: - - {bugfix: added a sprite for strange plant fruit} -delete-after: true diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml index 0f42d6a053ca..998f007a2499 100644 --- a/html/changelogs/archive/2023-11.yml +++ b/html/changelogs/archive/2023-11.yml @@ -90,3 +90,28 @@ - imageadd: a really bad sprite for a service directions sign. - rscadd: Another elevator template (coincidentally demonstrating how that system works in code) +2023-11-18: + Doubleumc: + - tweak: Bubble now consistently faces east + - rscadd: added Bubble subshuttle dock + Hibou48888: + - bugfix: added a sprite for strange plant fruit + Zevotech: + - rscadd: departmental RND lootdrop spawners for imprinters, protolathes and techfabs + - bugfix: dangerous_research.dmm now no longer has a space tile under a door and + a medical lathe instead of an omnilathe + - bugfix: whitesands_surface_camp_saloon can now spawn again after its remap into + a functional ruin + - bugfix: harmfactory.dmm's traps now work and loot has been adjusted to fit the + ruin better + - bugfix: provinggrounds.dmm now has a working SMES and power + - bugfix: singularity_lab fire extinguishers and a few poddoors now have correct + dirs + - rscdel: mechtransport.dmm and associated code + - rscdel: gasthelizards areas + - rscdel: nucleardump.dmm and associated code + - rscdel: gondolaasteroid.dmm and associated code + - rscdel: jungle_spider.dmm and associated code + - rscdel: whitesands_golem_hijack.dmm and associated code + - rscdel: rockplanet_clock.dmm and associated code + - rscdel: whitesands_surface_youreinsane.dmm and associated code