From 9d7f14842c9dca29767e898aa1bfe6437f6e9857 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:16:50 -0500 Subject: [PATCH] ladder and chasm fix --- _maps/map_files/Mining/Lavaland_Lower.dmm | 7 +++---- code/__DEFINES/maps.dm | 1 + code/controllers/subsystem/mapping.dm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm index 17bbdd748f..72814ecd8b 100644 --- a/_maps/map_files/Mining/Lavaland_Lower.dmm +++ b/_maps/map_files/Mining/Lavaland_Lower.dmm @@ -4759,10 +4759,9 @@ /turf/open/floor/plating, /area/xenoarch/gen) "kT" = ( -/obj/machinery/quantumpad/always_powered{ - name = "To mining"; - map_pad_id = "to_mining"; - map_pad_link_id = "from_mining" +/obj/structure/ladder/unbreakable{ + height = 1; + id = "xenoarch" }, /turf/open/floor/plasteel/dark, /area/xenoarch/gen) diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index a3ad0a8e68..bfe1433949 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -73,6 +73,7 @@ require only minor tweaks. #define ZTRAITS_STATION list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_STATION = TRUE) #define ZTRAITS_SPACE list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_SPACE_RUINS = TRUE) #define ZTRAITS_LAVALAND list(\ + ZTRAIT_DOWN = -1, \ ZTRAIT_MINING = TRUE, \ ZTRAIT_ASHSTORM = TRUE, \ ZTRAIT_LAVA_RUINS = TRUE, \ diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index d6bad2bfea..d16f7336f4 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -310,9 +310,9 @@ SUBSYSTEM_DEF(mapping) // load mining if(config.minetype == "lavaland") - LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND) LoadGroup(FailedZs, "Lavaland_Lower", "map_files/Mining", "Lavaland_Lower.dmm", default_traits = ZTRAITS_LAVALAND_UNDERRGOUND) LoadGroup(FailedZs, "Lavaland_Demone", "map_files/Mining", "Lavaland_Demone.dmm", default_traits = ZTRAITS_LAVALAND_UNDERRGOUND) + LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND) LoadGroup(FailedZs, "Fast_Food", "map_files/gs13", "Fast_Food.dmm", default_traits = ZTRAITS_FASTFOOD) //GS13 else if (!isnull(config.minetype) && config.minetype != "none") INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!")