From 43fe113250c374a5698a21fc5f45ef160b5d5c9f Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Sun, 25 May 2025 12:45:52 -0400 Subject: [PATCH] rename some mapping-related files (#29422) --- .../map_template.dm | 0 code/datums/{ruins => mapping}/ruin_placer.dm | 0 .../mapping/station_maps.dm} | 0 .../templates/lavaland_map_templates.dm} | 22 +++++++++++++++++++ .../templates/space_map_templates.dm} | 0 .../mapping/themes}/caves_theme.dm | 0 .../mapping/themes}/lavaland_theme.dm | 0 .../spawners/dynamic_bridge_spawner.dm} | 20 ----------------- paradise.dme | 16 +++++++------- 9 files changed, 30 insertions(+), 28 deletions(-) rename code/datums/{helper_datums => mapping}/map_template.dm (100%) rename code/datums/{ruins => mapping}/ruin_placer.dm (100%) rename code/{modules/mapping/station_datums.dm => datums/mapping/station_maps.dm} (100%) rename code/datums/{ruins/lavaland.dm => mapping/templates/lavaland_map_templates.dm} (93%) rename code/datums/{ruins/space_ruins.dm => mapping/templates/space_map_templates.dm} (100%) rename code/{modules/lavaland => datums/mapping/themes}/caves_theme.dm (100%) rename code/{modules/lavaland => datums/mapping/themes}/lavaland_theme.dm (100%) rename code/{datums/ruins/bridges/bridges.dm => game/objects/effects/spawners/dynamic_bridge_spawner.dm} (92%) diff --git a/code/datums/helper_datums/map_template.dm b/code/datums/mapping/map_template.dm similarity index 100% rename from code/datums/helper_datums/map_template.dm rename to code/datums/mapping/map_template.dm diff --git a/code/datums/ruins/ruin_placer.dm b/code/datums/mapping/ruin_placer.dm similarity index 100% rename from code/datums/ruins/ruin_placer.dm rename to code/datums/mapping/ruin_placer.dm diff --git a/code/modules/mapping/station_datums.dm b/code/datums/mapping/station_maps.dm similarity index 100% rename from code/modules/mapping/station_datums.dm rename to code/datums/mapping/station_maps.dm diff --git a/code/datums/ruins/lavaland.dm b/code/datums/mapping/templates/lavaland_map_templates.dm similarity index 93% rename from code/datums/ruins/lavaland.dm rename to code/datums/mapping/templates/lavaland_map_templates.dm index 437b82690a2..98f940f3c70 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/mapping/templates/lavaland_map_templates.dm @@ -267,3 +267,25 @@ Sadly, in their mass production rush, they lack a RTG power source and rely on pacmans, with many of the pods being shipped with the wrong fuel inside." allow_duplicates = FALSE // Less space on lavaland. Ideally we would figure out a way to ban this from spawning the same level as the mining base always_place = TRUE // Since only one can spawn for now, might as well ensure it. + +// MARK: Bridges + +/datum/map_template/ruin/lavaland/zlvl_bridge + prefix = "_maps/map_files/RandomRuins/LavaRuins/zlvl_bridges/" + ci_exclude = /datum/map_template/ruin/lavaland/zlvl_bridge + +/datum/map_template/ruin/lavaland/zlvl_bridge/vertical + ci_exclude = /datum/map_template/ruin/lavaland/zlvl_bridge/vertical + +/datum/map_template/ruin/lavaland/zlvl_bridge/vertical/one + name = "Vertical Bridge One" + suffix = "lavaland_zlvl_bridge_vertical_1.dmm" + ci_exclude = /datum/map_template/ruin/lavaland/zlvl_bridge/vertical/one + +/datum/map_template/ruin/lavaland/zlvl_bridge/horizontal + ci_exclude = /datum/map_template/ruin/lavaland/zlvl_bridge/horizontal + +/datum/map_template/ruin/lavaland/zlvl_bridge/horizontal/one + name = "Horizontal Bridge One" + suffix = "lavaland_zlvl_bridge_horizontal_1.dmm" + ci_exclude = /datum/map_template/ruin/lavaland/zlvl_bridge/horizontal/one diff --git a/code/datums/ruins/space_ruins.dm b/code/datums/mapping/templates/space_map_templates.dm similarity index 100% rename from code/datums/ruins/space_ruins.dm rename to code/datums/mapping/templates/space_map_templates.dm diff --git a/code/modules/lavaland/caves_theme.dm b/code/datums/mapping/themes/caves_theme.dm similarity index 100% rename from code/modules/lavaland/caves_theme.dm rename to code/datums/mapping/themes/caves_theme.dm diff --git a/code/modules/lavaland/lavaland_theme.dm b/code/datums/mapping/themes/lavaland_theme.dm similarity index 100% rename from code/modules/lavaland/lavaland_theme.dm rename to code/datums/mapping/themes/lavaland_theme.dm diff --git a/code/datums/ruins/bridges/bridges.dm b/code/game/objects/effects/spawners/dynamic_bridge_spawner.dm similarity index 92% rename from code/datums/ruins/bridges/bridges.dm rename to code/game/objects/effects/spawners/dynamic_bridge_spawner.dm index 35155716682..281f0532e92 100644 --- a/code/datums/ruins/bridges/bridges.dm +++ b/code/game/objects/effects/spawners/dynamic_bridge_spawner.dm @@ -328,26 +328,6 @@ return INITIALIZE_HINT_NORMAL -/datum/map_template/ruin/lavaland/zlvl_bridge - prefix = "_maps/map_files/RandomRuins/LavaRuins/zlvl_bridges/" - ci_exclude = /datum/map_template/ruin/lavaland/zlvl_bridge - -/datum/map_template/ruin/lavaland/zlvl_bridge/vertical - ci_exclude = /datum/map_template/ruin/lavaland/zlvl_bridge/vertical - -/datum/map_template/ruin/lavaland/zlvl_bridge/vertical/one - name = "Vertical Bridge One" - suffix = "lavaland_zlvl_bridge_vertical_1.dmm" - ci_exclude = /datum/map_template/ruin/lavaland/zlvl_bridge/vertical/one - -/datum/map_template/ruin/lavaland/zlvl_bridge/horizontal - ci_exclude = /datum/map_template/ruin/lavaland/zlvl_bridge/horizontal - -/datum/map_template/ruin/lavaland/zlvl_bridge/horizontal/one - name = "Horizontal Bridge One" - suffix = "lavaland_zlvl_bridge_horizontal_1.dmm" - ci_exclude = /datum/map_template/ruin/lavaland/zlvl_bridge/horizontal/one - #undef LONG_BRIDGE_THEME_CULT #undef LONG_BRIDGE_THEME_HIERO #undef LONG_BRIDGE_THEME_CLOCKWORK diff --git a/paradise.dme b/paradise.dme index 56ce4bf53a3..e9b5b1934b5 100644 --- a/paradise.dme +++ b/paradise.dme @@ -616,7 +616,6 @@ #include "code\datums\helper_datums\async_input.dm" #include "code\datums\helper_datums\construction_datum.dm" #include "code\datums\helper_datums\icon_snapshot.dm" -#include "code\datums\helper_datums\map_template.dm" #include "code\datums\helper_datums\teleport.dm" #include "code\datums\helper_datums\topic_input.dm" #include "code\datums\job_selection\job_candidate.dm" @@ -639,6 +638,13 @@ #include "code\datums\looping_sounds\machinery_sounds.dm" #include "code\datums\looping_sounds\thermal_drill_sounds.dm" #include "code\datums\looping_sounds\weather_sounds.dm" +#include "code\datums\mapping\map_template.dm" +#include "code\datums\mapping\ruin_placer.dm" +#include "code\datums\mapping\station_maps.dm" +#include "code\datums\mapping\templates\lavaland_map_templates.dm" +#include "code\datums\mapping\templates\space_map_templates.dm" +#include "code\datums\mapping\themes\caves_theme.dm" +#include "code\datums\mapping\themes\lavaland_theme.dm" #include "code\datums\outfits\outfit.dm" #include "code\datums\outfits\outfit_admin.dm" #include "code\datums\outfits\outfit_debug.dm" @@ -648,10 +654,6 @@ #include "code\datums\proximity\ai_target_tracking.dm" #include "code\datums\proximity\proximity_monitor.dm" #include "code\datums\proximity\singulo_proximity_monitor.dm" -#include "code\datums\ruins\lavaland.dm" -#include "code\datums\ruins\ruin_placer.dm" -#include "code\datums\ruins\space_ruins.dm" -#include "code\datums\ruins\bridges\bridges.dm" #include "code\datums\spell_cooldown\spell_charges.dm" #include "code\datums\spell_cooldown\spell_cooldown.dm" #include "code\datums\spell_handler\alien_spell_handler.dm" @@ -1120,6 +1122,7 @@ #include "code\game\objects\effects\spawners\bombspawner.dm" #include "code\game\objects\effects\spawners\depot_spawners.dm" #include "code\game\objects\effects\spawners\detgun_spawner.dm" +#include "code\game\objects\effects\spawners\dynamic_bridge_spawner.dm" #include "code\game\objects\effects\spawners\gibspawner.dm" #include "code\game\objects\effects\spawners\grouped_spawner.dm" #include "code\game\objects\effects\spawners\mess_spawners.dm" @@ -2194,8 +2197,6 @@ #include "code\modules\instruments\songs\_song_ui.dm" #include "code\modules\instruments\songs\play_legacy.dm" #include "code\modules\instruments\songs\play_synthesized.dm" -#include "code\modules\lavaland\caves_theme.dm" -#include "code\modules\lavaland\lavaland_theme.dm" #include "code\modules\library\book.dm" #include "code\modules\library\library_admin.dm" #include "code\modules\library\library_catalog.dm" @@ -2218,7 +2219,6 @@ #include "code\modules\mapping\dynamic_airlocks.dm" #include "code\modules\mapping\mapping_helpers.dm" #include "code\modules\mapping\merge_conflicts.dm" -#include "code\modules\mapping\station_datums.dm" #include "code\modules\mapping\windoor_access_helpers.dm" #include "code\modules\maptext_alerts\location_blurbs.dm" #include "code\modules\maptext_alerts\text_blurbs.dm"