From 4b599e3e57084710116d6e5d78e50bc7de0243db Mon Sep 17 00:00:00 2001 From: Zevotech Date: Mon, 4 Sep 2023 17:01:20 -0400 Subject: [PATCH 01/14] fix a tile + medical lathe on dangresearch --- _maps/RandomRuins/SpaceRuins/dangerous_research.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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{ From 8c7d27b4f72c07d7164d866ee8f8ad5dd7b155e0 Mon Sep 17 00:00:00 2001 From: Zevotech Date: Mon, 4 Sep 2023 17:25:32 -0400 Subject: [PATCH 02/14] removes mech transport + gasthelizards cruft --- .../RandomRuins/SpaceRuins/mechtransport.dmm | 377 ------------------ _maps/map_catalogue.txt | 4 - code/datums/ruins/space.dm | 6 - code/game/area/areas/ruins/space.dm | 13 - config/spaceruinblacklist.txt | 2 - 5 files changed, 402 deletions(-) delete mode 100644 _maps/RandomRuins/SpaceRuins/mechtransport.dmm 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/map_catalogue.txt b/_maps/map_catalogue.txt index d766b2a849fd..a1114f150e30 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -402,10 +402,6 @@ 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" diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 5aba2df7d5ce..e394b810cfc7 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" diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 769c509734bd..4307164ac824 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 diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index f7116456ed5f..858ca441708a 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -17,12 +17,10 @@ #_maps/RandomRuins/SpaceRuins/djstation.dmm #_maps/RandomRuins/SpaceRuins/emptyshell.dmm #_maps/RandomRuins/SpaceRuins/Fast_Food.dmm -#_maps/RandomRuins/SpaceRuins/gasthelizards.dmm #_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm #_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm #_maps/RandomRuins/SpaceRuins/intactemptyship.dmm #_maps/RandomRuins/SpaceRuins/listeningstation.dmm -#_maps/RandomRuins/SpaceRuins/mechtransport.dmm #_maps/RandomRuins/SpaceRuins/mrow_thats_right #_maps/RandomRuins/SpaceRuins/oldAIsat.dmm #_maps/RandomRuins/SpaceRuins/oldstation.dmm From a6a6abb68e67963b2a146922fb421ab6e59adfbf Mon Sep 17 00:00:00 2001 From: Zevotech Date: Mon, 4 Sep 2023 17:38:26 -0400 Subject: [PATCH 03/14] removes nucleardump/gondolasteroid --- _maps/map_catalogue.txt | 8 -------- code/datums/ruins/space.dm | 12 ------------ code/game/area/areas/ruins/space.dm | 10 ---------- config/spaceruinblacklist.txt | 1 - 4 files changed, 31 deletions(-) diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt index a1114f150e30..265f15fb9eea 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -390,10 +390,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" @@ -406,10 +402,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt" 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/space.dm b/code/datums/ruins/space.dm index e394b810cfc7..58bcbf8522f6 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -60,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" @@ -133,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/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 4307164ac824..6bda9781b500 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -353,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/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index 858ca441708a..a9ad450e38cd 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -17,7 +17,6 @@ #_maps/RandomRuins/SpaceRuins/djstation.dmm #_maps/RandomRuins/SpaceRuins/emptyshell.dmm #_maps/RandomRuins/SpaceRuins/Fast_Food.dmm -#_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm #_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm #_maps/RandomRuins/SpaceRuins/intactemptyship.dmm #_maps/RandomRuins/SpaceRuins/listeningstation.dmm From 891d60f929c5b2fec30ad3e2809b21b1a41e4a74 Mon Sep 17 00:00:00 2001 From: Zevotech Date: Mon, 4 Sep 2023 17:53:56 -0400 Subject: [PATCH 04/14] makes saloon able to spawn again after its remap --- code/datums/ruins/whitesands.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/ruins/whitesands.dm b/code/datums/ruins/whitesands.dm index 062a64db559a..4e4865457dff 100644 --- a/code/datums/ruins/whitesands.dm +++ b/code/datums/ruins/whitesands.dm @@ -71,6 +71,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" From 57465aa5573b7df8a74a5f847826845a5dec3c0b Mon Sep 17 00:00:00 2001 From: Zevotech Date: Mon, 4 Sep 2023 18:16:05 -0400 Subject: [PATCH 05/14] wompwomp --- _maps/RandomRuins/SpaceRuins/nuclear_dump.dmm | 1719 ----------------- 1 file changed, 1719 deletions(-) delete mode 100644 _maps/RandomRuins/SpaceRuins/nuclear_dump.dmm 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 -"} From 08d44ee4c9cdf770117a044ea48b125b4869587a Mon Sep 17 00:00:00 2001 From: Zevotech Date: Tue, 5 Sep 2023 18:16:46 -0400 Subject: [PATCH 06/14] fixes harmfactory and provinggrounds magical SMES --- .../RockRuins/rockplanet_harmfactory.dmm | 479 ++++++++---------- .../RandomRuins/SpaceRuins/provinggrounds.dmm | 8 +- code/datums/ruins/rockplanet.dm | 2 +- 3 files changed, 221 insertions(+), 268 deletions(-) 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/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm index 521b2beac456..7453b4b564d8 100644 --- a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm +++ b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm @@ -796,6 +796,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 @@ -3365,7 +3371,7 @@ AV Dm Bj IY -ap +vT ap OE am diff --git a/code/datums/ruins/rockplanet.dm b/code/datums/ruins/rockplanet.dm index 5d8e74000564..38cb0d4949d2 100644 --- a/code/datums/ruins/rockplanet.dm +++ b/code/datums/ruins/rockplanet.dm @@ -83,7 +83,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" From cae5bd58c256fb6df06c86ed13434c429ba650f0 Mon Sep 17 00:00:00 2001 From: Zevotech Date: Wed, 6 Sep 2023 00:21:05 -0400 Subject: [PATCH 07/14] Adds departmental RND lootdrops --- .../game/objects/effects/spawners/lootdrop.dm | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 41003679c894..a8bdd02ec387 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -1250,3 +1250,38 @@ 4 )) 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 + ) From 0b735ec8e5a4df5bf258c202a824828e0820c73e Mon Sep 17 00:00:00 2001 From: Zevotech Date: Thu, 14 Sep 2023 03:10:01 -0400 Subject: [PATCH 08/14] removes jungle_spider --- .../RandomRuins/JungleRuins/jungle_spider.dmm | 266 ------------------ _maps/map_catalogue.txt | 4 - code/datums/ruins/jungle.dm | 6 - config/jungleruinblacklist.txt | 1 - 4 files changed, 277 deletions(-) delete mode 100644 _maps/RandomRuins/JungleRuins/jungle_spider.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/map_catalogue.txt b/_maps/map_catalogue.txt index fea547b957f5..68ba89a6a94c 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" diff --git a/code/datums/ruins/jungle.dm b/code/datums/ruins/jungle.dm index 4c80d0618f50..ab25b6484d7e 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/config/jungleruinblacklist.txt b/config/jungleruinblacklist.txt index faf518fde632..a77747871ac1 100644 --- a/config/jungleruinblacklist.txt +++ b/config/jungleruinblacklist.txt @@ -10,7 +10,6 @@ #_maps/RandomRuins/JungleRuins/jungle_pirate.dmm #_maps/RandomRuins/JungleRuins/jungle_pizzawave.dmm #_maps/RandomRuins/JungleRuins/jungle_seedling.dmm -#_maps/RandomRuins/JungleRuins/jungle_spider.dmm #_maps/RandomRuins/JungleRuins/jungle_surface_abandonedsolgov.dmm #_maps/RandomRuins/JungleRuins/jungle_surface_coffinpirate.dmm #_maps/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm From 771fbf5dfa03fed8057516766fbdd8d4f24d0c34 Mon Sep 17 00:00:00 2001 From: Zevotech Date: Sat, 16 Sep 2023 23:35:18 -0400 Subject: [PATCH 09/14] sdfsdgsgsdergry --- code/game/objects/effects/spawners/lootdrop.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index e072f5d340c6..a6fca649401a 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -1262,7 +1262,7 @@ /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" @@ -1273,7 +1273,7 @@ /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" @@ -1285,8 +1285,8 @@ /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 4913c66aa4ff8f0093c34e4e88440e3d06e8f99e Mon Sep 17 00:00:00 2001 From: Zevotech Date: Sun, 17 Sep 2023 17:43:53 -0400 Subject: [PATCH 10/14] fixes singularitylab extinguishers door dirs --- .../SpaceRuins/singularity_lab.dmm | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) 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" = ( From 070c4d8ea193aa465c6b0fea352845cc66c316e9 Mon Sep 17 00:00:00 2001 From: Zevotech Date: Thu, 21 Sep 2023 16:22:52 -0400 Subject: [PATCH 11/14] removes golemhijack --- .../whitesands_surface_golemhijack.dmm | 1390 ----------------- _maps/map_catalogue.txt | 4 - code/datums/ruins/whitesands.dm | 6 - 3 files changed, 1400 deletions(-) delete mode 100644 _maps/RandomRuins/SandRuins/whitesands_surface_golemhijack.dmm 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/map_catalogue.txt b/_maps/map_catalogue.txt index 68ba89a6a94c..d66d9f858a20 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -308,10 +308,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" diff --git a/code/datums/ruins/whitesands.dm b/code/datums/ruins/whitesands.dm index 4e4865457dff..0a091b390018 100644 --- a/code/datums/ruins/whitesands.dm +++ b/code/datums/ruins/whitesands.dm @@ -18,12 +18,6 @@ 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" From 47ee865e3915ecb650e4bb794b76ff69eee4c38d Mon Sep 17 00:00:00 2001 From: Zevotech Date: Tue, 3 Oct 2023 15:54:57 -0400 Subject: [PATCH 12/14] removes rockplanet clock --- .../RockRuins/rockplanet_clock.dmm | 628 ------------------ _maps/map_catalogue.txt | 4 - code/datums/ruins/rockplanet.dm | 6 - config/rockruinblacklist.txt | 1 - 4 files changed, 639 deletions(-) delete mode 100644 _maps/RandomRuins/RockRuins/rockplanet_clock.dmm 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/map_catalogue.txt b/_maps/map_catalogue.txt index d66d9f858a20..b7c669111550 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -238,10 +238,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" diff --git a/code/datums/ruins/rockplanet.dm b/code/datums/ruins/rockplanet.dm index 38cb0d4949d2..cb924b3fe2be 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" diff --git a/config/rockruinblacklist.txt b/config/rockruinblacklist.txt index e38e248cd109..f3ea46327382 100644 --- a/config/rockruinblacklist.txt +++ b/config/rockruinblacklist.txt @@ -5,7 +5,6 @@ #_maps/RandomRuins/RockRuins/rockplanet_boxsci.dmm #_maps/RandomRuins/RockRuins/rockplanet_chaosmarine.dmm -#_maps/RandomRuins/RockRuins/rockplanet_clock.dmm #_maps/RandomRuins/RockRuins/rockplanet_clowncrash.dmm #_maps/RandomRuins/RockRuins/rockplanet_crash_cult.dmm #_maps/RandomRuins/RockRuins/rockplanet_crash_kitchen.dmm From ddbd27fc45c5b76a5e8d97c738fdbec205f3df98 Mon Sep 17 00:00:00 2001 From: Zevotech Date: Mon, 30 Oct 2023 17:10:50 -0400 Subject: [PATCH 13/14] removes whitesands_surface_youreinsane --- .../whitesands_surface_youreinsane.dmm | 320 ------------------ code/datums/ruins/whitesands.dm | 6 - 2 files changed, 326 deletions(-) delete mode 100644 _maps/RandomRuins/SandRuins/whitesands_surface_youreinsane.dmm 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/code/datums/ruins/whitesands.dm b/code/datums/ruins/whitesands.dm index 0a091b390018..09ca773c1421 100644 --- a/code/datums/ruins/whitesands.dm +++ b/code/datums/ruins/whitesands.dm @@ -24,12 +24,6 @@ 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" From 70d8216a7f49b419da70793fe11f9cdcc2b65b44 Mon Sep 17 00:00:00 2001 From: Zevotech Date: Mon, 30 Oct 2023 20:04:52 -0400 Subject: [PATCH 14/14] undoes blacklist changes for blacklist removal pr --- config/jungleruinblacklist.txt | 1 + config/rockruinblacklist.txt | 1 + config/spaceruinblacklist.txt | 3 +++ 3 files changed, 5 insertions(+) diff --git a/config/jungleruinblacklist.txt b/config/jungleruinblacklist.txt index a77747871ac1..faf518fde632 100644 --- a/config/jungleruinblacklist.txt +++ b/config/jungleruinblacklist.txt @@ -10,6 +10,7 @@ #_maps/RandomRuins/JungleRuins/jungle_pirate.dmm #_maps/RandomRuins/JungleRuins/jungle_pizzawave.dmm #_maps/RandomRuins/JungleRuins/jungle_seedling.dmm +#_maps/RandomRuins/JungleRuins/jungle_spider.dmm #_maps/RandomRuins/JungleRuins/jungle_surface_abandonedsolgov.dmm #_maps/RandomRuins/JungleRuins/jungle_surface_coffinpirate.dmm #_maps/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm diff --git a/config/rockruinblacklist.txt b/config/rockruinblacklist.txt index f3ea46327382..e38e248cd109 100644 --- a/config/rockruinblacklist.txt +++ b/config/rockruinblacklist.txt @@ -5,6 +5,7 @@ #_maps/RandomRuins/RockRuins/rockplanet_boxsci.dmm #_maps/RandomRuins/RockRuins/rockplanet_chaosmarine.dmm +#_maps/RandomRuins/RockRuins/rockplanet_clock.dmm #_maps/RandomRuins/RockRuins/rockplanet_clowncrash.dmm #_maps/RandomRuins/RockRuins/rockplanet_crash_cult.dmm #_maps/RandomRuins/RockRuins/rockplanet_crash_kitchen.dmm diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index a9ad450e38cd..f7116456ed5f 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -17,9 +17,12 @@ #_maps/RandomRuins/SpaceRuins/djstation.dmm #_maps/RandomRuins/SpaceRuins/emptyshell.dmm #_maps/RandomRuins/SpaceRuins/Fast_Food.dmm +#_maps/RandomRuins/SpaceRuins/gasthelizards.dmm +#_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm #_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm #_maps/RandomRuins/SpaceRuins/intactemptyship.dmm #_maps/RandomRuins/SpaceRuins/listeningstation.dmm +#_maps/RandomRuins/SpaceRuins/mechtransport.dmm #_maps/RandomRuins/SpaceRuins/mrow_thats_right #_maps/RandomRuins/SpaceRuins/oldAIsat.dmm #_maps/RandomRuins/SpaceRuins/oldstation.dmm