diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9b7814ea469..7e8d19f1939 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -175,7 +175,7 @@ # NamelessFairy /code/modules/capture_the_flag/ @NamelessFairy -/_maps/map_files/CTF/ @NamelessFairy +/_maps/minigame/CTF/ @NamelessFairy # Pickle-Coding diff --git a/_maps/map_files/CTF/classic.dmm b/_maps/minigame/CTF/classic.dmm similarity index 100% rename from _maps/map_files/CTF/classic.dmm rename to _maps/minigame/CTF/classic.dmm diff --git a/_maps/map_files/CTF/cruiser.dmm b/_maps/minigame/CTF/cruiser.dmm similarity index 100% rename from _maps/map_files/CTF/cruiser.dmm rename to _maps/minigame/CTF/cruiser.dmm diff --git a/_maps/map_files/CTF/downtown.dmm b/_maps/minigame/CTF/downtown.dmm similarity index 100% rename from _maps/map_files/CTF/downtown.dmm rename to _maps/minigame/CTF/downtown.dmm diff --git a/_maps/map_files/CTF/fourSide.dmm b/_maps/minigame/CTF/fourSide.dmm similarity index 100% rename from _maps/map_files/CTF/fourSide.dmm rename to _maps/minigame/CTF/fourSide.dmm diff --git a/_maps/map_files/CTF/limbo.dmm b/_maps/minigame/CTF/limbo.dmm similarity index 100% rename from _maps/map_files/CTF/limbo.dmm rename to _maps/minigame/CTF/limbo.dmm diff --git a/_maps/map_files/CTF/turbine.dmm b/_maps/minigame/CTF/turbine.dmm similarity index 100% rename from _maps/map_files/CTF/turbine.dmm rename to _maps/minigame/CTF/turbine.dmm diff --git a/_maps/deathmatch/OSHA_Violator.dmm b/_maps/minigame/deathmatch/OSHA_Violator.dmm similarity index 100% rename from _maps/deathmatch/OSHA_Violator.dmm rename to _maps/minigame/deathmatch/OSHA_Violator.dmm diff --git a/_maps/deathmatch/arena_station.dmm b/_maps/minigame/deathmatch/arena_station.dmm similarity index 100% rename from _maps/deathmatch/arena_station.dmm rename to _maps/minigame/deathmatch/arena_station.dmm diff --git a/_maps/deathmatch/backalley.dmm b/_maps/minigame/deathmatch/backalley.dmm similarity index 100% rename from _maps/deathmatch/backalley.dmm rename to _maps/minigame/deathmatch/backalley.dmm diff --git a/_maps/deathmatch/finaldestination.dmm b/_maps/minigame/deathmatch/finaldestination.dmm similarity index 100% rename from _maps/deathmatch/finaldestination.dmm rename to _maps/minigame/deathmatch/finaldestination.dmm diff --git a/_maps/deathmatch/instagib.dmm b/_maps/minigame/deathmatch/instagib.dmm similarity index 100% rename from _maps/deathmatch/instagib.dmm rename to _maps/minigame/deathmatch/instagib.dmm diff --git a/_maps/deathmatch/lattice_battles.dmm b/_maps/minigame/deathmatch/lattice_battles.dmm similarity index 100% rename from _maps/deathmatch/lattice_battles.dmm rename to _maps/minigame/deathmatch/lattice_battles.dmm diff --git a/_maps/deathmatch/maint_mania.dmm b/_maps/minigame/deathmatch/maint_mania.dmm similarity index 100% rename from _maps/deathmatch/maint_mania.dmm rename to _maps/minigame/deathmatch/maint_mania.dmm diff --git a/_maps/deathmatch/meat_tower.dmm b/_maps/minigame/deathmatch/meat_tower.dmm similarity index 100% rename from _maps/deathmatch/meat_tower.dmm rename to _maps/minigame/deathmatch/meat_tower.dmm diff --git a/_maps/deathmatch/mech_madness.dmm b/_maps/minigame/deathmatch/mech_madness.dmm similarity index 100% rename from _maps/deathmatch/mech_madness.dmm rename to _maps/minigame/deathmatch/mech_madness.dmm diff --git a/_maps/deathmatch/meta_brig.dmm b/_maps/minigame/deathmatch/meta_brig.dmm similarity index 100% rename from _maps/deathmatch/meta_brig.dmm rename to _maps/minigame/deathmatch/meta_brig.dmm diff --git a/_maps/deathmatch/ragecage.dmm b/_maps/minigame/deathmatch/ragecage.dmm similarity index 100% rename from _maps/deathmatch/ragecage.dmm rename to _maps/minigame/deathmatch/ragecage.dmm diff --git a/_maps/deathmatch/ragin_mages.dmm b/_maps/minigame/deathmatch/ragin_mages.dmm similarity index 100% rename from _maps/deathmatch/ragin_mages.dmm rename to _maps/minigame/deathmatch/ragin_mages.dmm diff --git a/_maps/deathmatch/ragnarok.dmm b/_maps/minigame/deathmatch/ragnarok.dmm similarity index 100% rename from _maps/deathmatch/ragnarok.dmm rename to _maps/minigame/deathmatch/ragnarok.dmm diff --git a/_maps/deathmatch/secu_ring.dmm b/_maps/minigame/deathmatch/secu_ring.dmm similarity index 100% rename from _maps/deathmatch/secu_ring.dmm rename to _maps/minigame/deathmatch/secu_ring.dmm diff --git a/_maps/deathmatch/shooting_range.dmm b/_maps/minigame/deathmatch/shooting_range.dmm similarity index 100% rename from _maps/deathmatch/shooting_range.dmm rename to _maps/minigame/deathmatch/shooting_range.dmm diff --git a/_maps/deathmatch/sniper_elite.dmm b/_maps/minigame/deathmatch/sniper_elite.dmm similarity index 100% rename from _maps/deathmatch/sniper_elite.dmm rename to _maps/minigame/deathmatch/sniper_elite.dmm diff --git a/_maps/deathmatch/species_warfare.dmm b/_maps/minigame/deathmatch/species_warfare.dmm similarity index 100% rename from _maps/deathmatch/species_warfare.dmm rename to _maps/minigame/deathmatch/species_warfare.dmm diff --git a/_maps/deathmatch/sunrise.dmm b/_maps/minigame/deathmatch/sunrise.dmm similarity index 100% rename from _maps/deathmatch/sunrise.dmm rename to _maps/minigame/deathmatch/sunrise.dmm diff --git a/_maps/deathmatch/train.dmm b/_maps/minigame/deathmatch/train.dmm similarity index 100% rename from _maps/deathmatch/train.dmm rename to _maps/minigame/deathmatch/train.dmm diff --git a/_maps/deathmatch/underground_arena.dmm b/_maps/minigame/deathmatch/underground_arena.dmm similarity index 100% rename from _maps/deathmatch/underground_arena.dmm rename to _maps/minigame/deathmatch/underground_arena.dmm diff --git a/_maps/map_files/Mafia/mafia_ayylmao.dmm b/_maps/minigame/mafia/mafia_ayylmao.dmm similarity index 100% rename from _maps/map_files/Mafia/mafia_ayylmao.dmm rename to _maps/minigame/mafia/mafia_ayylmao.dmm diff --git a/_maps/map_files/Mafia/mafia_ball.dmm b/_maps/minigame/mafia/mafia_ball.dmm similarity index 100% rename from _maps/map_files/Mafia/mafia_ball.dmm rename to _maps/minigame/mafia/mafia_ball.dmm diff --git a/_maps/map_files/Mafia/mafia_gothic.dmm b/_maps/minigame/mafia/mafia_gothic.dmm similarity index 100% rename from _maps/map_files/Mafia/mafia_gothic.dmm rename to _maps/minigame/mafia/mafia_gothic.dmm diff --git a/_maps/map_files/Mafia/mafia_lavaland.dmm b/_maps/minigame/mafia/mafia_lavaland.dmm similarity index 100% rename from _maps/map_files/Mafia/mafia_lavaland.dmm rename to _maps/minigame/mafia/mafia_lavaland.dmm diff --git a/_maps/map_files/Mafia/mafia_snow.dmm b/_maps/minigame/mafia/mafia_snow.dmm similarity index 100% rename from _maps/map_files/Mafia/mafia_snow.dmm rename to _maps/minigame/mafia/mafia_snow.dmm diff --git a/_maps/map_files/Mafia/mafia_spiderclan.dmm b/_maps/minigame/mafia/mafia_spiderclan.dmm similarity index 100% rename from _maps/map_files/Mafia/mafia_spiderclan.dmm rename to _maps/minigame/mafia/mafia_spiderclan.dmm diff --git a/_maps/map_files/Mafia/mafia_syndie.dmm b/_maps/minigame/mafia/mafia_syndie.dmm similarity index 100% rename from _maps/map_files/Mafia/mafia_syndie.dmm rename to _maps/minigame/mafia/mafia_syndie.dmm diff --git a/_maps/map_files/Mafia/mafia_unit_test.dmm b/_maps/minigame/mafia/mafia_unit_test.dmm similarity index 100% rename from _maps/map_files/Mafia/mafia_unit_test.dmm rename to _maps/minigame/mafia/mafia_unit_test.dmm diff --git a/code/modules/capture_the_flag/ctf_map_loading.dm b/code/modules/capture_the_flag/ctf_map_loading.dm index 9e23d617473..502e8cfe3bd 100644 --- a/code/modules/capture_the_flag/ctf_map_loading.dm +++ b/code/modules/capture_the_flag/ctf_map_loading.dm @@ -67,30 +67,30 @@ GLOBAL_DATUM(ctf_spawner, /obj/effect/landmark/ctf) /datum/map_template/ctf/classic name = "Classic" description = "The original CTF map." - mappath = "_maps/map_files/CTF/classic.dmm" + mappath = "_maps/minigame/CTF/classic.dmm" /datum/map_template/ctf/four_side name = "Four Side" description = "A CTF map created to demonstrate 4 team CTF, features a single centred flag rather than one per team." - mappath = "_maps/map_files/CTF/fourSide.dmm" + mappath = "_maps/minigame/CTF/fourSide.dmm" /datum/map_template/ctf/downtown name = "Downtown" description = "A CTF map that takes place in a terrestrial city." - mappath = "_maps/map_files/CTF/downtown.dmm" + mappath = "_maps/minigame/CTF/downtown.dmm" /datum/map_template/ctf/limbo name = "Limbo" description = "A KOTH map that takes place in a wizard den with looping hallways" - mappath = "_maps/map_files/CTF/limbo.dmm" + mappath = "_maps/minigame/CTF/limbo.dmm" points_to_win = 180 /datum/map_template/ctf/cruiser name = "Crusier" description = "A CTF map that takes place across multiple space ships, one carrying a powerful device that can accelerate those who obtain it" - mappath = "_maps/map_files/CTF/cruiser.dmm" + mappath = "_maps/minigame/CTF/cruiser.dmm" /datum/map_template/ctf/turbine name = "Turbine" description = "A CTF map that takes place in a familiar facility. Don't try to hold out mid- There's no sentries in this version." - mappath = "_maps/map_files/CTF/turbine.dmm" + mappath = "_maps/minigame/CTF/turbine.dmm" diff --git a/code/modules/deathmatch/deathmatch_maps.dm b/code/modules/deathmatch/deathmatch_maps.dm index e0f86ccc923..f2822cf331a 100644 --- a/code/modules/deathmatch/deathmatch_maps.dm +++ b/code/modules/deathmatch/deathmatch_maps.dm @@ -1,5 +1,5 @@ /datum/lazy_template/deathmatch - map_dir = "_maps/deathmatch" + map_dir = "_maps/minigame/deathmatch" place_on_top = TRUE turf_reservation_type = /datum/turf_reservation/turf_not_baseturf /// Map UI Name diff --git a/code/modules/mafia/map_pieces.dm b/code/modules/mafia/map_pieces.dm index 2d62126466a..78b2b284061 100644 --- a/code/modules/mafia/map_pieces.dm +++ b/code/modules/mafia/map_pieces.dm @@ -36,7 +36,7 @@ var/custom_outfit /datum/map_template/mafia/New(path = null, rename = null, cache = FALSE) - path = "_maps/map_files/Mafia/" + map_suffix + path = "_maps/minigame/mafia/" + map_suffix return ..() //we only have one map in unit tests for consistency.