From f5819356b53af55e3b7612901f8941e43d526422 Mon Sep 17 00:00:00 2001 From: immortalartisan <64680018+immortalartisan@users.noreply.github.com> Date: Mon, 25 Sep 2023 15:02:24 -0700 Subject: [PATCH] Requested changes made --- .../SandRuins/whitesands_surface_pubbyslopcrash.dmm | 4 ++-- _maps/map_catalogue.txt | 5 +++++ config/sandruinblacklist.txt | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm index adc515e2ee31..395cf7ec21a6 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm @@ -788,8 +788,8 @@ icon_state = "0-8" }, /obj/structure/frame/machine, -/obj/item/circuitboard/machine/shuttle/smes/micro, /obj/item/stack/cable_coil/cut/red, +/obj/item/circuitboard/machine/shuttle/smes, /turf/open/floor/plating, /area/ruin/whitesands/pubbycrash) "qN" = ( @@ -1890,8 +1890,8 @@ name = "Engine Access" }, /obj/structure/frame/machine, -/obj/item/circuitboard/machine/shuttle/smes/micro, /obj/item/stack/cable_coil/cut/red, +/obj/item/circuitboard/machine/shuttle/smes, /turf/open/floor/plating, /area/ruin/whitesands/pubbycrash) "Mr" = ( diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt index 94750d30b542..5cc0693de3c0 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -340,6 +340,11 @@ Find the key for using this catalogue in "map_catalogue_key.txt" Size = (x = 7)(y = 9)(z = 1) Tags = "No Combat", "Minor Loot", "Inhospitable" + File Name = "_maps\RandomRuins\Ruins\whitesands_surface_pubbyslopcrash.dmm" + Size = (x = 35)(y = 25)(z = 1) + Tags = "Minor Combat Challange", "Medium Loot", "Shelter" + + SpaceRuins: File Name = "_maps\RandomRuins\SpaceRuins\.dmm" diff --git a/config/sandruinblacklist.txt b/config/sandruinblacklist.txt index df4536f018a0..a03a559a9c5c 100644 --- a/config/sandruinblacklist.txt +++ b/config/sandruinblacklist.txt @@ -10,4 +10,4 @@ #_maps/RandomRuins/SandRuins/crash_bar.dmm #_maps/RandomRuins/SandRuins/crash_cargo.dmm #_maps/RandomRuins/SandRuins/crash_cult.dmm -#_maps/RandomRuins/SandRuins/pubbysloptcrash.dmm +#_maps/RandomRuins/SandRuins/pubbyslopcrash.dmm