From c84822871c14c2161801336c11f9026862cfd5e4 Mon Sep 17 00:00:00 2001 From: MortoSasye Date: Thu, 26 Sep 2024 01:30:32 -0300 Subject: [PATCH 1/2] Evil Iceland Ruins --- _maps/doppler/automapper/automapper_config.toml | 4 ++-- _maps/mining_configs/iceland.json | 1 - config/iceruinblacklist.txt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/_maps/doppler/automapper/automapper_config.toml b/_maps/doppler/automapper/automapper_config.toml index ed8211b9ddc25..7f4db0ffcdd68 100644 --- a/_maps/doppler/automapper/automapper_config.toml +++ b/_maps/doppler/automapper/automapper_config.toml @@ -58,7 +58,7 @@ trait_name = "Station" map_files = ["icemoon_underground_icewalker_lower.dmm"] directory = "_maps/RandomRuins/IceRuins/doppler/" required_map = "Iceland.dmm" -coordinates = [170, 16, 1] +coordinates = [121, 203, 1] trait_name = "Mining" # Icecats Camp Upper Level: ICELAND ADDITION @@ -66,7 +66,7 @@ trait_name = "Mining" map_files = ["icemoon_underground_icewalker_upper.dmm"] directory = "_maps/RandomRuins/IceRuins/doppler/" required_map = "Iceland.dmm" -coordinates = [170, 16, 2] +coordinates = [121, 203, 2] trait_name = "Mining" # TRAMSTATION MAP EDITS diff --git a/_maps/mining_configs/iceland.json b/_maps/mining_configs/iceland.json index f3eee637042f5..1726e53d63f85 100644 --- a/_maps/mining_configs/iceland.json +++ b/_maps/mining_configs/iceland.json @@ -22,7 +22,6 @@ "Down": true, "Mining": true, "No Parallax": true, - "Ice Ruins": true, "Ice Ruins Underground": true, "Baseturf": "/turf/open/openspace/icemoon/keep_below", "Gravity": true, diff --git a/config/iceruinblacklist.txt b/config/iceruinblacklist.txt index bad7f15f9793b..d99a99cbc1a98 100644 --- a/config/iceruinblacklist.txt +++ b/config/iceruinblacklist.txt @@ -13,7 +13,7 @@ ##MEGAFAUNA #_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm #_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm -#_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm +_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm #_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm ##MISC From 4367ba9e6b22af965053529c2f70fb1e9b8f6a20 Mon Sep 17 00:00:00 2001 From: MortoSasye Date: Thu, 26 Sep 2024 01:42:56 -0300 Subject: [PATCH 2/2] part-2 --- code/datums/ruins/icemoon.dm | 12 ++++++------ config/iceruinblacklist.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm index d6317b12ab15c..ec34f51bdedb4 100644 --- a/code/datums/ruins/icemoon.dm +++ b/code/datums/ruins/icemoon.dm @@ -73,6 +73,12 @@ description = "Here lies Charles Morlbaro. He died the way he lived." suffix = "icemoon_surface_smoking_room.dmm" +/datum/map_template/ruin/icemoon/lavaland // DOPPLER EDIT TO NOT BE UNDERGROUND + name = "Ice-Ruin Lavaland Incursion" + id = "lavalandsite" + description = "I guess we never really left you huh?" + suffix = "icemoon_underground_lavaland.dmm" + // above and below ground together /datum/map_template/ruin/icemoon/mining_site @@ -122,12 +128,6 @@ description = "A place of shelter for a lone hermit, scraping by to live another day." suffix = "icemoon_underground_hermit.dmm" -/datum/map_template/ruin/icemoon/underground/lavaland - name = "Ice-Ruin Lavaland Incursion" - id = "lavalandsite" - description = "I guess we never really left you huh?" - suffix = "icemoon_underground_lavaland.dmm" - /datum/map_template/ruin/icemoon/underground/puzzle name = "Ice-Ruin Ancient Puzzle" id = "puzzle" diff --git a/config/iceruinblacklist.txt b/config/iceruinblacklist.txt index d99a99cbc1a98..bad7f15f9793b 100644 --- a/config/iceruinblacklist.txt +++ b/config/iceruinblacklist.txt @@ -13,7 +13,7 @@ ##MEGAFAUNA #_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm #_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm -_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm +#_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm #_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm ##MISC