Skip to content

Commit

Permalink
Merge pull request #102 from MortoSasye/hearthkin-map-coordinate-swap
Browse files Browse the repository at this point in the history
Evil Iceland Ruins Mini-Fix
  • Loading branch information
SylvetteSylph authored Sep 26, 2024
2 parents 1c59189 + 4367ba9 commit 6d0a859
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions _maps/doppler/automapper/automapper_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ 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
[templates.icebox_icecats_upper_iceland]
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
Expand Down
1 change: 0 additions & 1 deletion _maps/mining_configs/iceland.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions code/datums/ruins/icemoon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 6d0a859

Please sign in to comment.