diff --git a/.gitignore b/.gitignore index 5d93bb91162..2bd093799f2 100644 --- a/.gitignore +++ b/.gitignore @@ -185,9 +185,8 @@ Temporary Items *.kate-swp # Extra map stuff -/_maps/**/backup/ -/_maps/templates.dm /maps/**/backup/ +/maps/templates.dm # Extra DMI stuff /icons/*.dme diff --git a/_maps/_basemap.dm b/_mapload/_basemap.dm similarity index 74% rename from _maps/_basemap.dm rename to _mapload/_basemap.dm index 4428a1f72e7..0a5b7ba9150 100644 --- a/_maps/_basemap.dm +++ b/_mapload/_basemap.dm @@ -1,16 +1,16 @@ /// Uncomment this to load centcom and runtime station and thats it. // #define LOWMEMORYMODE +#include "../maps/core/reservation_base_level.dmm" + /** * This map is 25x25x1. * The zlevel will expand as the world loads. */ -#include "map_files\generic\reservation_base_level.dmm" - #ifndef LOWMEMORYMODE #ifdef ALL_MAPS #ifdef CIBUILDING - #include "templates.dm" + #include "..\maps\templates.dm" #endif #endif #endif diff --git a/_maps/lavaland.json b/_mapload/lavaland.json similarity index 100% rename from _maps/lavaland.json rename to _mapload/lavaland.json diff --git a/_mapload/rift.dm b/_mapload/rift.dm new file mode 100644 index 00000000000..9f77578b474 --- /dev/null +++ b/_mapload/rift.dm @@ -0,0 +1 @@ +#define FORCE_MAP "_mapload/rift.json" diff --git a/_maps/rift.json b/_mapload/rift.json similarity index 100% rename from _maps/rift.json rename to _mapload/rift.json diff --git a/_mapload/tether.dm b/_mapload/tether.dm new file mode 100644 index 00000000000..916c5e6c821 --- /dev/null +++ b/_mapload/tether.dm @@ -0,0 +1 @@ +#define FORCE_MAP "_mapload/tether.json" diff --git a/_maps/tether.json b/_mapload/tether.json similarity index 100% rename from _maps/tether.json rename to _mapload/tether.json diff --git a/_mapload/triumph.dm b/_mapload/triumph.dm new file mode 100644 index 00000000000..c39a5885c38 --- /dev/null +++ b/_mapload/triumph.dm @@ -0,0 +1 @@ +#define FORCE_MAP "_mapload/triumph.json" diff --git a/_maps/triumph.json b/_mapload/triumph.json similarity index 100% rename from _maps/triumph.json rename to _mapload/triumph.json diff --git a/_maps/rift.dm b/_maps/rift.dm deleted file mode 100644 index 28c8522311b..00000000000 --- a/_maps/rift.dm +++ /dev/null @@ -1 +0,0 @@ -#define FORCE_MAP "_maps/rift.json" diff --git a/_maps/tether.dm b/_maps/tether.dm deleted file mode 100644 index a15389de246..00000000000 --- a/_maps/tether.dm +++ /dev/null @@ -1 +0,0 @@ -#define FORCE_MAP "_maps/tether.json" diff --git a/_maps/triumph.dm b/_maps/triumph.dm deleted file mode 100644 index 1e677d8f514..00000000000 --- a/_maps/triumph.dm +++ /dev/null @@ -1 +0,0 @@ -#define FORCE_MAP "_maps/triumph.json" diff --git a/citadel.dme b/citadel.dme index 2d825dbbb9a..ef53db7d61e 100644 --- a/citadel.dme +++ b/citadel.dme @@ -13,10 +13,8 @@ // END_PREFERENCES // BEGIN_INCLUDE -#include "_maps\_basemap.dm" -#include "_maps\rift.dm" -#include "_maps\map_files\generic\reservation_base_level.dmm" -#include "_maps\submaps\level_specific\debrisfield_vr\debrisfield_things.dm" +#include "_mapload\_basemap.dm" +#include "_mapload\rift.dm" #include "code\___compile_options.dm" #include "code\__byond_version_compat.dm" #include "code\__global_init.dm" @@ -4562,5 +4560,6 @@ #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\engine_submaps\engine.dm" +#include "maps\submaps\level_specific\debrisfield_vr\debrisfield_things.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 0c80e8dc553..e65516ee3d2 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -25,7 +25,7 @@ The /tg/ codebase allows mixing of hardcoded and dynamically-loaded z-levels. Z-levels can be reordered as desired and their properties are set by "traits". See map_config.dm for how a particular station's traits may be chosen. The list DEFAULT_MAP_TRAITS at the bottom of this file should correspond to -the maps that are hardcoded, as set in _maps/_basemap.dm. SSmapping is +the maps that are hardcoded, as set in _mapload/_basemap.dm. SSmapping is responsible for loading every non-hardcoded z-level. As of 2018-02-04, the typical z-levels for a single-level station are: diff --git a/code/___compile_options.dm b/code/___compile_options.dm index d196fe89da5..8b58a18071a 100644 --- a/code/___compile_options.dm +++ b/code/___compile_options.dm @@ -1,3 +1,6 @@ +//? This is here because the linter will explode if this isn't here. Don't believe me? Remove it. I dare you. +/datum/language_server_error_blocker + //## Core settings //! Fastboot flags - useful for debugging /// Disable automatic roundstart icon smoothing. @@ -126,7 +129,7 @@ #ifdef LOWMEMORYMODE - #define FORCE_MAP "_maps/rift.json" //TODO: A PROPER runtime or ministation map. @Zandario + #define FORCE_MAP "_mapload/rift.json" //TODO: A PROPER runtime or ministation map. @Zandario #endif diff --git a/code/_macros.dm b/code/_macros.dm index e5370b8b68e..ebc86db64a0 100644 --- a/code/_macros.dm +++ b/code/_macros.dm @@ -21,12 +21,4 @@ #define random_id(key,min_id,max_id) uniqueness_repository.Generate(/datum/uniqueness_generator/id_random, key, min_id, max_id) -#define ARGS_DEBUG log_debug("[__FILE__] - [__LINE__]") ; for(var/arg in args) { log_debug("\t[log_info_line(arg)]") } - #define JOINTEXT(X) jointext(X, null) - -#define BITSHIFT_LEFT(X, N) (X << (N)) - -#define BITSHIFT_RIGHT(X, N) (X >> (N)) - -#define BITFLAG(X) BITSHIFT_LEFT(1, X) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 68a176db01a..7154caf6422 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -313,7 +313,7 @@ switch (command) if ("map") - currentmap = load_map_config("_maps/[data].json") + currentmap = load_map_config("_mapload/[data].json") if(currentmap.defaulted) log_config("Failed to load map config for [data]!") currentmap = null diff --git a/code/controllers/subsystem/mapping/_mapping.dm b/code/controllers/subsystem/mapping/_mapping.dm index 7eda3a9bcb8..2cfc5b6b475 100644 --- a/code/controllers/subsystem/mapping/_mapping.dm +++ b/code/controllers/subsystem/mapping/_mapping.dm @@ -96,7 +96,7 @@ SUBSYSTEM_DEF(mapping) var/total_z = 0 var/list/parsed_maps = list() for (var/file in files) - var/full_path = "_maps/[path]/[file]" + var/full_path = "_mapload/[path]/[file]" var/datum/parsed_map/pm = new(file(full_path)) var/bounds = pm?.bounds if (!bounds) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 9cf1565fb58..d1c9d2d5229 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -299,6 +299,8 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( return UI_CLOSE return ..() +GLOBAL_DATUM_INIT(virtual_announcer_ai, /mob/living/silicon/ai/announcer, new(null, null, null, 1)) + /obj/item/radio/proc/autosay(var/message, var/from, var/channel, list/zlevels = list(0)) //BS12 EDIT var/datum/radio_frequency/connection = null if(channel && channels && channels.len > 0) @@ -312,7 +314,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( if (!istype(connection)) return - var/static/mob/living/silicon/ai/announcer/A = new /mob/living/silicon/ai/announcer(null, null, null, 1) + var/mob/living/silicon/ai/announcer/A = GLOB.virtual_announcer_ai A.SetName(from) Broadcast_Message(connection, A, 0, "*garbled automated announcement*", src, diff --git a/code/modules/mapping/map_config.dm b/code/modules/mapping/map_config.dm index 6cd79ea1471..279bcf59e39 100644 --- a/code/modules/mapping/map_config.dm +++ b/code/modules/mapping/map_config.dm @@ -5,7 +5,7 @@ /datum/map_config // Metadata - var/config_filename = "_maps/triumph.json" + var/config_filename = "_mapload/triumph.json" var/defaulted = TRUE // set to FALSE by LoadConfig() succeeding // Config from maps.txt var/config_max_users = 0 @@ -105,13 +105,13 @@ map_file = json["map_file"] // "map_file": "BoxStation.dmm" if (istext(map_file)) - if (!fexists("_maps/[map_path]/[map_file]")) + if (!fexists("maps/[map_path]/[map_file]")) log_world("Map file ([map_path]/[map_file]) does not exist!") return // "map_file": ["Lower.dmm", "Upper.dmm"] else if (islist(map_file)) for (var/file in map_file) - if (!fexists("_maps/[map_path]/[file]")) + if (!fexists("maps/[map_path]/[file]")) log_world("Map file ([map_path]/[file]) does not exist!") return else @@ -197,10 +197,10 @@ /datum/map_config/proc/GetFullMapPaths() if (istext(map_file)) - return list("_maps/[map_path]/[map_file]") + return list("maps/[map_path]/[map_file]") . = list() for (var/file in map_file) - . += "_maps/[map_path]/[file]" + . += "maps/[map_path]/[file]" /datum/map_config/proc/MakeNextMap() return config_filename == "data/next_map.json" || fcopy(config_filename, "data/next_map.json") diff --git a/code/modules/maps/lateload/generic/example.dm b/code/modules/maps/lateload/generic/example.dm index 9233df4eafc..ba19c096734 100644 --- a/code/modules/maps/lateload/generic/example.dm +++ b/code/modules/maps/lateload/generic/example.dm @@ -12,7 +12,7 @@ /// too verbose. For changing what people see in game when they scan it you will need to edit the overmap effect itself /// (overmap effect as of me writing this are in the overmap folder) - mappath = "_maps/map_levels/192x192/Class_G.dmm" + mappath = "maps/map_levels/192x192/Class_G.dmm" /// ^ The direct file path for your map. Is case sensitive and you need to use /'s not \'s /// Make sure your map file is in a sensible location please for organization sake diff --git a/code/modules/maps/lateload/generic/gateway_lateload.dm b/code/modules/maps/lateload/generic/gateway_lateload.dm index 74f9506fb1a..2beaaffe0f6 100644 --- a/code/modules/maps/lateload/generic/gateway_lateload.dm +++ b/code/modules/maps/lateload/generic/gateway_lateload.dm @@ -36,7 +36,7 @@ This overmap effect is a generic one that can be used if you do not have anythin /datum/map_template/lateload/gateway/snow_outpost name = "Snow Outpost" desc = "Big snowy area with various outposts." - mappath = '_maps/away_missions/140x140/snow_outpost.dmm' + mappath = 'maps/away_missions/140x140/snow_outpost.dmm' associated_map_datum = /datum/map_z_level/gateway/gateway_destination //////////// @@ -45,7 +45,7 @@ This overmap effect is a generic one that can be used if you do not have anythin /datum/map_template/lateload/gateway/zoo name = "Zoo" desc = "Gigantic space zoo" - mappath = '_maps/away_missions/140x140/zoo.dmm' + mappath = 'maps/away_missions/140x140/zoo.dmm' associated_map_datum = /datum/map_z_level/gateway/gateway_destination /////////////////// @@ -54,7 +54,7 @@ This overmap effect is a generic one that can be used if you do not have anythin /datum/map_template/lateload/gateway/carpfarm name = "Carp Farm" desc = "Asteroid base surrounded by carp" - mappath = '_maps/away_missions/140x140/carpfarm.dmm' + mappath = 'maps/away_missions/140x140/carpfarm.dmm' associated_map_datum = /datum/map_z_level/gateway/gateway_destination /////////////////// @@ -63,7 +63,7 @@ This overmap effect is a generic one that can be used if you do not have anythin /datum/map_template/lateload/gateway/snowfield name = "Snow Field" desc = "An old base in middle of snowy wasteland" - mappath = '_maps/away_missions/140x140/snowfield.dmm' + mappath = 'maps/away_missions/140x140/snowfield.dmm' associated_map_datum = /datum/map_z_level/gateway/gateway_destination ////////////////////// @@ -72,5 +72,5 @@ This overmap effect is a generic one that can be used if you do not have anythin /datum/map_template/lateload/gateway/listeningpost name = "Listening Post" desc = "Asteroid-bound mercenary listening post" - mappath = '_maps/away_missions/140x140/listeningpost.dmm' + mappath = 'maps/away_missions/140x140/listeningpost.dmm' associated_map_datum = /datum/map_z_level/gateway/gateway_destination diff --git a/code/modules/maps/lateload/generic/planets_lateload.dm b/code/modules/maps/lateload/generic/planets_lateload.dm index 0dad11a8aa2..78c3c3afe3a 100644 --- a/code/modules/maps/lateload/generic/planets_lateload.dm +++ b/code/modules/maps/lateload/generic/planets_lateload.dm @@ -11,7 +11,7 @@ /datum/map_template/lateload/planets/away_g_world name = "ExoPlanet - Z1 Planet" desc = "A mineral rich planet." - mappath = "_maps/map_levels/192x192/Class_G.dmm" + mappath = "maps/map_levels/192x192/Class_G.dmm" associated_map_datum = /datum/map_z_level/planets_lateload/away_g_world ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = TRUE) @@ -31,7 +31,7 @@ /datum/map_template/lateload/planets/away_d_world name = "ExoPlanet - Z2 Planet" desc = "The previously nuked planet Class D away mission" - mappath = "_maps/map_levels/192x192/Class_D.dmm" + mappath = "maps/map_levels/192x192/Class_D.dmm" associated_map_datum = /datum/map_z_level/planets_lateload/away_d_world ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = TRUE) @@ -53,7 +53,7 @@ /datum/map_template/lateload/planets/away_h_world name = "ExoPlanet - Z3 Planet" desc = "A random unknown planet." - mappath = "_maps/map_levels/192x192/Class_H.dmm" + mappath = "maps/map_levels/192x192/Class_H.dmm" associated_map_datum = /datum/map_z_level/planets_lateload/away_h_world ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = TRUE) @@ -75,7 +75,7 @@ /datum/map_template/lateload/planets/away_m_world name = "ExoPlanet - Z4 Planet" desc = "A lush Gaia Class Planet." - mappath = "_maps/map_levels/192x192/Class_M.dmm" + mappath = "maps/map_levels/192x192/Class_M.dmm" associated_map_datum = /datum/map_z_level/planets_lateload/away_m_world ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = TRUE) @@ -97,7 +97,7 @@ /datum/map_template/lateload/planets/away_p_world name = "ExoPlanet - Z5 Planet" desc = "A Cold Frozen Planet." - mappath = "_maps/map_levels/192x192/Class_P.dmm" + mappath = "maps/map_levels/192x192/Class_P.dmm" associated_map_datum = /datum/map_z_level/planets_lateload/away_p_world ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = TRUE) @@ -117,7 +117,7 @@ /datum/map_template/lateload/planets/away_beach name = "Desert Planet - Z1 Beach" desc = "The beach away mission." - mappath = "_maps/map_levels/192x192/miaphus_beach.dmm" + mappath = "maps/map_levels/192x192/miaphus_beach.dmm" associated_map_datum = /datum/map_z_level/planets_lateload/away_beach /datum/map_z_level/planets_lateload/away_beach @@ -127,7 +127,7 @@ /datum/map_template/lateload/planets/away_beach_cave name = "Desert Planet - Z2 Cave" desc = "The beach away mission's cave." - mappath = "_maps/map_levels/192x192/miaphus_cave.dmm" + mappath = "maps/map_levels/192x192/miaphus_cave.dmm" associated_map_datum = /datum/map_z_level/planets_lateload/away_beach_cave /datum/map_template/lateload/planets/away_beach_cave/on_map_loaded(z) @@ -146,7 +146,7 @@ /datum/map_template/lateload/planets/away_desert name = "Desert Planet - Z3 Desert" desc = "The inland desert of V-4." - mappath = "_maps/map_levels/192x192/miaphus_desert.dmm" + mappath = "maps/map_levels/192x192/miaphus_desert.dmm" associated_map_datum = /datum/map_template/submap/level_specific/class_h /datum/map_template/lateload/planets/away_desert/on_map_loaded(z) @@ -168,7 +168,7 @@ /datum/map_template/lateload/planets/away_aerostat name = "Remmi Aerostat - Z1 Aerostat" desc = "The Virgo 2 Aerostat away mission." - mappath = "_maps/map_levels/140x140/virgo2_aerostat.dmm" + mappath = "maps/map_levels/140x140/virgo2_aerostat.dmm" associated_map_datum = /datum/map_z_level/planets_lateload/away_aerostat /datum/map_z_level/planets_lateload/away_aerostat @@ -178,7 +178,7 @@ /datum/map_template/lateload/planets/away_aerostat_surface name = "Remmi Aerostat - Z2 Surface" desc = "The surface from the Virgo 2 Aerostat." - mappath = "_maps/map_levels/140x140/virgo2_surface.dmm" + mappath = "maps/map_levels/140x140/virgo2_surface.dmm" associated_map_datum = /datum/map_z_level/planets_lateload/away_aerostat_surface /datum/map_template/lateload/planets/away_aerostat_surface/on_map_loaded(z) diff --git a/code/modules/maps/lateload/generic/space_lateload.dm b/code/modules/maps/lateload/generic/space_lateload.dm index 0962626929e..9b8dae68714 100644 --- a/code/modules/maps/lateload/generic/space_lateload.dm +++ b/code/modules/maps/lateload/generic/space_lateload.dm @@ -10,7 +10,7 @@ /datum/map_template/lateload/space/away_tradeport name = "Away Mission - Trade Port" desc = "A space gas station! Stretch your legs!" - mappath = "_maps/map_levels/192x192/tradeport.dmm" + mappath = "maps/map_levels/192x192/tradeport.dmm" associated_map_datum = /datum/map_z_level/space_lateload/away_tradeport ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = FALSE) @@ -25,7 +25,7 @@ /datum/map_template/lateload/space/away_debrisfield name = "Debris Field - Z1 Space" desc = "A random debris field out in space." - mappath = "_maps/map_levels/192x192/debrisfield.dmm" + mappath = "maps/map_levels/192x192/debrisfield.dmm" associated_map_datum = /datum/map_z_level/space_lateload/away_debrisfield @@ -44,7 +44,7 @@ /datum/map_template/lateload/space/away_piratebase name = "Away Mission - Pirate Base" desc = "A Pirate Base, oh no!" - mappath = "_maps/map_levels/192x192/piratebase.dmm" + mappath = "maps/map_levels/192x192/piratebase.dmm" associated_map_datum = /datum/map_z_level/space_lateload/away_piratebase ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = FALSE) @@ -61,7 +61,7 @@ /datum/map_template/lateload/space/away_fueldepot name = "Fuel Depot - Z1 Space" desc = "An unmanned fuel depot floating in space." - mappath = '_maps/map_levels/140x140/fueldepot.dmm' + mappath = 'maps/map_levels/140x140/fueldepot.dmm' associated_map_datum = /datum/map_z_level/space_lateload/away_fueldepot /datum/map_z_level/space_lateload/away_fueldepot @@ -74,7 +74,7 @@ /datum/map_template/lateload/space/roguemines1 name = "Asteroid Belt 1" desc = "Mining, but rogue. Zone 1" - mappath = "_maps/map_levels/192x192/roguemining_192x192/rogue_mine1.dmm" + mappath = "maps/map_levels/192x192/roguemining_192x192/rogue_mine1.dmm" associated_map_datum = /datum/map_z_level/space_lateload/roguemines1 /datum/map_z_level/space_lateload/roguemines1 @@ -84,7 +84,7 @@ /datum/map_template/lateload/space/roguemines2 name = "Asteroid Belt 2" desc = "Mining, but rogue. Zone 2" - mappath = "_maps/map_levels/192x192/roguemining_192x192/rogue_mine2.dmm" + mappath = "maps/map_levels/192x192/roguemining_192x192/rogue_mine2.dmm" associated_map_datum = /datum/map_z_level/space_lateload/roguemines2 @@ -95,7 +95,7 @@ /datum/map_template/lateload/space/roguemines3 name = "Asteroid Belt 3" desc = "Mining, but rogue. Zone 3" - mappath = "_maps/map_levels/192x192/roguemining_192x192/rogue_mine3.dmm" + mappath = "maps/map_levels/192x192/roguemining_192x192/rogue_mine3.dmm" associated_map_datum = /datum/map_z_level/space_lateload/roguemines3 /datum/map_z_level/space_lateload/roguemines3 @@ -106,7 +106,7 @@ /datum/map_template/lateload/space/roguemines4 name = "Asteroid Belt 4" desc = "Mining, but rogue. Zone 4" - mappath = "_maps/map_levels/192x192/roguemining_192x192/rogue_mine4.dmm" + mappath = "maps/map_levels/192x192/roguemining_192x192/rogue_mine4.dmm" associated_map_datum = /datum/map_z_level/space_lateload/roguemines1 /datum/map_z_level/space_lateload/roguemines4 @@ -120,7 +120,7 @@ /datum/map_template/lateload/space/away_alienship name = "Alien Ship - Z1 Ship" desc = "The alien ship away mission." - mappath = "_maps/map_levels/140x140/alienship.dmm" + mappath = "maps/map_levels/140x140/alienship.dmm" associated_map_datum = /datum/map_z_level/space_lateload/away_alienship /datum/map_z_level/space_lateload/away_alienship @@ -137,13 +137,13 @@ Not sure if this will work properly but no reason to get rid of it right now /datum/map_template/lateload/space/offmap/talon1 name = "Offmap Ship - Talon Z1" desc = "Offmap spawn ship, the Talon." - mappath = "_maps/map_levels/140x140/talon/talon1.dmm" + mappath = "maps/map_levels/140x140/talon/talon1.dmm" associated_map_datum = /datum/map_z_level/space_lateload/talon1 /datum/map_template/lateload/space/offmap/talon2 name = "Offmap Ship - Talon Z2" desc = "Offmap spawn ship, the Talon." - mappath = "_maps/map_levels/140x140/talon/talon2.dmm" + mappath = "maps/map_levels/140x140/talon/talon2.dmm" associated_map_datum = /datum/map_z_level/space_lateload/talon2 /datum/map_z_level/space_lateload/talon1 @@ -168,7 +168,7 @@ To try and make the ERT shuttle work, and also to do stuff like custom off-site /datum/map_template/lateload/space/specialty name = "Away Mission - Specialty" desc = "An emergency response cruiser patrolling the local sector." - mappath = '_maps/map_levels/192x192/specialty_facilities.dmm' + mappath = 'maps/map_levels/192x192/specialty_facilities.dmm' associated_map_datum = /datum/map_z_level/space_lateload/specialty ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = FALSE) diff --git a/code/modules/maps/lateload/generic/unique_lateload.dm b/code/modules/maps/lateload/generic/unique_lateload.dm index 2924f1c78f2..aba909f25c2 100644 --- a/code/modules/maps/lateload/generic/unique_lateload.dm +++ b/code/modules/maps/lateload/generic/unique_lateload.dm @@ -11,7 +11,7 @@ /datum/map_template/lateload/unique/lavaland name = "Away Mission - Lava Land" desc = "The fabled." - mappath = "_maps/map_levels/192x192/lavaland.dmm" + mappath = "maps/map_levels/192x192/lavaland.dmm" associated_map_datum = /datum/map_z_level/unique_lateload/lavaland ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = TRUE) @@ -35,7 +35,7 @@ /datum/map_template/lateload/unique/lavaland_dungeon name = "Away Mission - Lava Land (Dungeon)" desc = "The flooded." - mappath = "_maps/map_levels/192x192/lavaland_dungeon.dmm" + mappath = "maps/map_levels/192x192/lavaland_dungeon.dmm" associated_map_datum = /datum/map_z_level/unique_lateload/lavaland_dungeon ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = TRUE) @@ -56,7 +56,7 @@ /datum/map_template/lateload/unique/lavaland_east name = "Away Mission - Lava Land (East)" desc = "The forgotten." - mappath = "_maps/map_levels/192x192/lavaland_east.dmm" + mappath = "maps/map_levels/192x192/lavaland_east.dmm" associated_map_datum = /datum/map_z_level/unique_lateload/lavaland_east ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = TRUE) diff --git a/code/modules/maps/lateload/station_specific/_tether_lateload.dm b/code/modules/maps/lateload/station_specific/_tether_lateload.dm index 217d8f9bc49..04487944ec0 100644 --- a/code/modules/maps/lateload/station_specific/_tether_lateload.dm +++ b/code/modules/maps/lateload/station_specific/_tether_lateload.dm @@ -1,7 +1,7 @@ /datum/map_template/lateload/tether/tether_misc name = "Tether - Misc" desc = "Misc areas, like some transit areas, holodecks, merc area." - mappath = "_maps/map_files/tether/tether_misc.dmm" + mappath = "maps/map_files/tether/tether_misc.dmm" associated_map_datum = /datum/map_z_level/tether_lateload/misc @@ -12,7 +12,7 @@ /datum/map_template/lateload/tether/tether_underdark name = "Tether - Underdark" desc = "Mining, but harder." - mappath = "_maps/map_files/tether/tether_underdark.dmm" + mappath = "maps/map_files/tether/tether_underdark.dmm" associated_map_datum = /datum/map_z_level/tether_lateload/underdark @@ -30,7 +30,7 @@ /datum/map_template/lateload/tether/tether_plains name = "Tether - Plains" desc = "The Virgo 3B away mission." - mappath = "_maps/map_files/tether/tether_plains.dmm" + mappath = "maps/map_files/tether/tether_plains.dmm" associated_map_datum = /datum/map_z_level/tether_lateload/tether_plains /datum/map_z_level/tether_lateload/tether_plains diff --git a/code/modules/maps/lateload/station_specific/_triumph_submaps.dm b/code/modules/maps/lateload/station_specific/_triumph_submaps.dm index 599328a9451..52d7e4588a5 100644 --- a/code/modules/maps/lateload/station_specific/_triumph_submaps.dm +++ b/code/modules/maps/lateload/station_specific/_triumph_submaps.dm @@ -1,7 +1,7 @@ /datum/map_template/lateload/triumph/triumph_misc name = "Triumph - Misc" desc = "Misc areas, like some transit areas, holodecks, merc area." - mappath = "_maps/map_files/triumph/triumph_misc.dmm" + mappath = "maps/map_files/triumph/triumph_misc.dmm" associated_map_datum = /datum/map_z_level/triumph_lateload/ships @@ -14,7 +14,7 @@ /datum/map_template/lateload/triumph/triumph_ships name = "Triumph - Ships" desc = "Ship transit map and whatnot." - mappath = "_maps/map_files/triumph/triumph_ships.dmm" + mappath = "maps/map_files/triumph/triumph_ships.dmm" associated_map_datum = /datum/map_z_level/triumph_lateload/ships diff --git a/code/modules/maps/overmap/space/talon/talon.dm b/code/modules/maps/overmap/space/talon/talon.dm index 8e6b6eb066c..915ae0a0faf 100644 --- a/code/modules/maps/overmap/space/talon/talon.dm +++ b/code/modules/maps/overmap/space/talon/talon.dm @@ -494,13 +494,13 @@ Once in open space, consider disabling nonessential power-consuming electronics /datum/map_template/triumph_lateload/offmap/talon1 name = "Offmap Ship - Talon Z1" desc = "Offmap spawn ship, the Talon." - mappath = "_maps/map_levels/140x140/talon/talon1.dmm" + mappath = "maps/map_levels/140x140/talon/talon1.dmm" associated_map_datum = /datum/map_z_level/triumph_lateload/talon1 /datum/map_template/triumph_lateload/offmap/talon2 name = "Offmap Ship - Talon Z2" desc = "Offmap spawn ship, the Talon." - mappath = "_maps/map_levels/140x140/talon/talon2.dmm" + mappath = "maps/map_levels/140x140/talon/talon2.dmm" associated_map_datum = /datum/map_z_level/triumph_lateload/talon2 /datum/map_z_level/triumph_lateload/talon1 diff --git a/code/modules/maps/templates/badmin_misc/fun.dm b/code/modules/maps/templates/badmin_misc/fun.dm index 70c90836b9a..90d2c6da485 100644 --- a/code/modules/maps/templates/badmin_misc/fun.dm +++ b/code/modules/maps/templates/badmin_misc/fun.dm @@ -259,4 +259,4 @@ /datum/map_template/admin_use/fun/spa name = "Space Spa" desc = "A pleasant spa located in a spaceship." - mappath = '_maps/templates/admin/spa.dmm' + mappath = 'maps/templates/admin/spa.dmm' diff --git a/code/modules/maps/templates/badmin_misc/templates.dm b/code/modules/maps/templates/badmin_misc/templates.dm index 0af022fe5be..1422cf34669 100644 --- a/code/modules/maps/templates/badmin_misc/templates.dm +++ b/code/modules/maps/templates/badmin_misc/templates.dm @@ -3,44 +3,44 @@ /datum/map_template/admin_use/ert name = "Special Area - ERT" desc = "It's the ERT ship! Lorge." - mappath = '_maps/templates/admin/ert.dmm' + mappath = 'maps/templates/admin/ert.dmm' /datum/map_template/admin_use/trader name = "Special Area - Trader" desc = "Big trader ship." - mappath = '_maps/templates/archive/tradeship.dmm' //Simply change this to a new path if this is updated + mappath = 'maps/templates/archive/tradeship.dmm' //Simply change this to a new path if this is updated /datum/map_template/admin_use/salamander_trader name = "Special Area - Salamander Trader" desc = "Modest trader ship." - mappath = "_maps/templates/shuttles/overmaps/generic/salamander.dmm" + mappath = "maps/templates/shuttles/overmaps/generic/salamander.dmm" /datum/map_template/admin_use/mercenary name = "Special Area - Merc Ship" desc = "Prepare tae be boarded, arr!" - mappath = '_maps/templates/admin/kk_mercship.dmm' + mappath = 'maps/templates/admin/kk_mercship.dmm' /datum/map_template/admin_use/old_mercenary name = "Special Area - Old Merc Base" desc = "So much red!" - mappath = '_maps/templates/admin/mercbase.dmm' + mappath = 'maps/templates/admin/mercbase.dmm' /datum/map_template/admin_use/skipjack name = "Special Area - Skipjack Base" desc = "Stinky!" - mappath = '_maps/templates/admin/skipjack.dmm' + mappath = 'maps/templates/admin/skipjack.dmm' /datum/map_template/admin_use/thunderdome name = "Special Area - Thunderdome" desc = "Thunderrrrdomeee" - mappath = '_maps/templates/admin/thunderdome.dmm' + mappath = 'maps/templates/admin/thunderdome.dmm' /datum/map_template/admin_use/wizardbase name = "Special Area - Wizard Base" desc = "Wingardium Levosia" - mappath = '_maps/templates/admin/wizard.dmm' + mappath = 'maps/templates/admin/wizard.dmm' /datum/map_template/admin_use/dojo name = "Special Area - Ninja Dojo" desc = "Sneaky" - mappath = '_maps/templates/admin/dojo.dmm' + mappath = 'maps/templates/admin/dojo.dmm' diff --git a/code/modules/maps/templates/shuttles/admin_spawn/_generic_shuttles.dm b/code/modules/maps/templates/shuttles/admin_spawn/_generic_shuttles.dm index 68f5bda8bb2..228a5b3d68e 100644 --- a/code/modules/maps/templates/shuttles/admin_spawn/_generic_shuttles.dm +++ b/code/modules/maps/templates/shuttles/admin_spawn/_generic_shuttles.dm @@ -1,2 +1,2 @@ /datum/map_template/shuttle/overmap/generic - prefix = "_maps/templates/shuttles/overmaps/generic/" + prefix = "maps/templates/shuttles/overmaps/generic/" diff --git a/code/modules/maps/templates/shuttles/admin_spawn/ert.dm b/code/modules/maps/templates/shuttles/admin_spawn/ert.dm index ac92234a883..dfc6e875099 100644 --- a/code/modules/maps/templates/shuttles/admin_spawn/ert.dm +++ b/code/modules/maps/templates/shuttles/admin_spawn/ert.dm @@ -4,7 +4,7 @@ /datum/map_template/shuttle/overmap/generic/ert_ship name = "OM Ship - ERT Ship (New Z)" desc = "NT Emergency Response Ship." - mappath = "_maps/templates/admin/ert.dmm" + mappath = "maps/templates/admin/ert.dmm" // The ship's area(s) /area/ship/ert diff --git a/code/modules/maps/templates/shuttles/admin_spawn/geckos.dm b/code/modules/maps/templates/shuttles/admin_spawn/geckos.dm index e3fecb644ba..3f024c74643 100644 --- a/code/modules/maps/templates/shuttles/admin_spawn/geckos.dm +++ b/code/modules/maps/templates/shuttles/admin_spawn/geckos.dm @@ -15,7 +15,7 @@ /datum/map_template/shuttle/overmap/generic/gecko_cargohauler_wreck name = "OM Ship - Wrecked Gecko Cargo Hauler (new Z)" desc = "A wrecked medium supply transport shuttle." - mappath = "_maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm" + mappath = "maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm" annihilate = TRUE // The shuttle's area(s) diff --git a/code/modules/maps/templates/shuttles/admin_spawn/mackerels.dm b/code/modules/maps/templates/shuttles/admin_spawn/mackerels.dm index 9a3e4293258..7970a2c0fed 100644 --- a/code/modules/maps/templates/shuttles/admin_spawn/mackerels.dm +++ b/code/modules/maps/templates/shuttles/admin_spawn/mackerels.dm @@ -28,7 +28,7 @@ /datum/map_template/shuttle/overmap/generic/mackerel_lightcargo_wreck name = "OM Ship - Mackerel Light Cargo Wreck (new Z)" desc = "A small light cargo transport shuttle, struck by... something. Ouch." - mappath = "_maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm" + mappath = "maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm" annihilate = TRUE // The shuttle's area(s) diff --git a/code/modules/maps/templates/shuttles/admin_spawn/manta_mercship.dm b/code/modules/maps/templates/shuttles/admin_spawn/manta_mercship.dm index 73740fadc73..05a42332e58 100644 --- a/code/modules/maps/templates/shuttles/admin_spawn/manta_mercship.dm +++ b/code/modules/maps/templates/shuttles/admin_spawn/manta_mercship.dm @@ -4,7 +4,7 @@ /datum/map_template/shuttle/overmap/generic/manta_ship name = "OM Ship - Mercenary Cruiser Manta Class (New Z)" desc = "Mercenary Manta Cruiser." - mappath = "_maps/templates/admin/kk_mercship.dmm" + mappath = "maps/templates/admin/kk_mercship.dmm" // The ship's area(s) /area/ship/manta diff --git a/code/modules/maps/templates/shuttles/admin_spawn/salamander.dm b/code/modules/maps/templates/shuttles/admin_spawn/salamander.dm index 0c7a1ce9d8a..a12fd2a3c58 100644 --- a/code/modules/maps/templates/shuttles/admin_spawn/salamander.dm +++ b/code/modules/maps/templates/shuttles/admin_spawn/salamander.dm @@ -11,7 +11,7 @@ /datum/map_template/shuttle/overmap/generic/salamander_wreck name = "OM Ship - Salamander Corvette Wreckage" desc = "A medium multirole spacecraft, or at least what's left of it." - mappath = "_maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm" + mappath = "maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm" annihilate = TRUE // The shuttle's area(s) diff --git a/code/modules/maps/templates/submaps/class_d/class_d.dm b/code/modules/maps/templates/submaps/class_d/class_d.dm index 649f2214eaa..c48aaba84b7 100644 --- a/code/modules/maps/templates/submaps/class_d/class_d.dm +++ b/code/modules/maps/templates/submaps/class_d/class_d.dm @@ -2,7 +2,7 @@ name = "Class D POIs" desc = "Submaps for Class D Worlds" allow_duplicates = FALSE - prefix = "_maps/submaps/level_specific/class_d/" + prefix = "maps/submaps/level_specific/class_d/" /datum/map_template/submap/level_specific/class_d/broken_reactor_D name = "Broken Reactor" diff --git a/code/modules/maps/templates/submaps/class_h/class_h.dm b/code/modules/maps/templates/submaps/class_h/class_h.dm index b9892819866..123ac0fda9b 100644 --- a/code/modules/maps/templates/submaps/class_h/class_h.dm +++ b/code/modules/maps/templates/submaps/class_h/class_h.dm @@ -2,7 +2,7 @@ name = "Class H POIs" desc = "Submaps for Class H Worlds" allow_duplicates = TRUE - prefix = "_maps/submaps/level_specific/class_h/" + prefix = "maps/submaps/level_specific/class_h/" /datum/map_template/submap/level_specific/class_h/landing_padH name = "Prefabricated Landing Pad" diff --git a/code/modules/maps/templates/submaps/class_p/class_p.dm b/code/modules/maps/templates/submaps/class_p/class_p.dm index 1704175158a..510ee4e0ba7 100644 --- a/code/modules/maps/templates/submaps/class_p/class_p.dm +++ b/code/modules/maps/templates/submaps/class_p/class_p.dm @@ -1,7 +1,7 @@ /datum/map_template/submap/level_specific/class_p name = "Class P POIs" desc = "Submaps for Class P Worlds" - prefix = "_maps/submaps/level_specific/class_p/" + prefix = "maps/submaps/level_specific/class_p/" /datum/map_template/submap/level_specific/class_p/ruins1 name = "Ruins 1" diff --git a/code/modules/maps/templates/submaps/debrisfield/debrisfield_old.dm b/code/modules/maps/templates/submaps/debrisfield/debrisfield_old.dm index c80b206f9e8..97fdf7a16cc 100644 --- a/code/modules/maps/templates/submaps/debrisfield/debrisfield_old.dm +++ b/code/modules/maps/templates/submaps/debrisfield/debrisfield_old.dm @@ -3,7 +3,7 @@ /datum/map_template/submap/level_specific/debrisfield name = "Debris Field Content" desc = "For seeding submaps in debris field" - prefix = "_maps/submaps/level_specific/debrisfield/" + prefix = "maps/submaps/level_specific/debrisfield/" /datum/map_template/submap/level_specific/debrisfield/asteroids1 name = "Asteroids 1" diff --git a/code/modules/maps/templates/submaps/debrisfield/debrisfield_submaptemplate.dm b/code/modules/maps/templates/submaps/debrisfield/debrisfield_submaptemplate.dm index 0a47a9cb4bb..839154cd56b 100644 --- a/code/modules/maps/templates/submaps/debrisfield/debrisfield_submaptemplate.dm +++ b/code/modules/maps/templates/submaps/debrisfield/debrisfield_submaptemplate.dm @@ -2,7 +2,7 @@ name = "Debris Field Content" desc = "For seeding submaps in debris field" allow_duplicates = TRUE - prefix = "_maps/submaps/level_specific/debrisfield_vr/" + prefix = "maps/submaps/level_specific/debrisfield_vr/" /datum/map_template/submap/level_specific/debrisfield_vr/asteroids1 name = "Asteroids 1" diff --git a/code/modules/maps/templates/submaps/lavaland/lavaland.dm b/code/modules/maps/templates/submaps/lavaland/lavaland.dm index ace8f014364..908a99b0b5f 100644 --- a/code/modules/maps/templates/submaps/lavaland/lavaland.dm +++ b/code/modules/maps/templates/submaps/lavaland/lavaland.dm @@ -3,7 +3,7 @@ desc = "Submaps for Lava Land" allow_duplicates = FALSE // TRUE means the same submap can spawn twice annihilate = TRUE - prefix = "_maps/submaps/level_specific/lavaland/" + prefix = "maps/submaps/level_specific/lavaland/" /datum/map_template/submap/level_specific/lavaland/horrors name = "Lava Land - Shrine" diff --git a/code/modules/maps/templates/submaps/lythios_rift/lyhtios.dm b/code/modules/maps/templates/submaps/lythios_rift/lyhtios.dm index 60d8a44470e..af1693df5e4 100644 --- a/code/modules/maps/templates/submaps/lythios_rift/lyhtios.dm +++ b/code/modules/maps/templates/submaps/lythios_rift/lyhtios.dm @@ -14,7 +14,7 @@ name = "Rift Content" desc = "Bring a coat!" allow_duplicates = FALSE - prefix = "_maps/submaps/lythios_rift/admin_spawn/" + prefix = "maps/submaps/lythios_rift/admin_spawn/" /datum/map_template/submap/level_specific/rift/admin_spawn_1 name = "Blank 5x5 building" @@ -23,7 +23,7 @@ // 'Normal' templates get used on the bottom half, and should be safer. /datum/map_template/submap/level_specific/rift/west_caves - prefix = "_maps/submaps/lythios_rift/caves/" + prefix = "maps/submaps/lythios_rift/caves/" /datum/map_template/submap/level_specific/rift/west_caves/west_caves_cavern1 name = "Cavern 1" @@ -93,7 +93,7 @@ // 'Deep' templates get used on the mid part, and should be mildly more dangerous and rewarding. /datum/map_template/submap/level_specific/rift/west_deep - prefix = "_maps/submaps/lythios_rift/deep_caves/" + prefix = "maps/submaps/lythios_rift/deep_caves/" /datum/map_template/submap/level_specific/rift/west_deep/deep_small_crystals_1 name = "Crystal 1" @@ -105,7 +105,7 @@ // 'Base' templates get used on the lowest most level, and should be more dangerous and rewarding. /datum/map_template/submap/level_specific/rift/west_base - prefix = "_maps/submaps/lythios_rift/base/" + prefix = "maps/submaps/lythios_rift/base/" /datum/map_template/submap/level_specific/rift/west_base/base_rock_1 name = "Rock 1" diff --git a/code/modules/maps/templates/submaps/virgo2/virgo2.dm b/code/modules/maps/templates/submaps/virgo2/virgo2.dm index 5caffe1f074..9616d749ece 100644 --- a/code/modules/maps/templates/submaps/virgo2/virgo2.dm +++ b/code/modules/maps/templates/submaps/virgo2/virgo2.dm @@ -2,7 +2,7 @@ name = "Surface Content - Virgo 2" desc = "For seeding submaps on Virgo 2" allow_duplicates = FALSE - prefix = "_maps/submaps/level_specific/virgo2/" + prefix = "maps/submaps/level_specific/virgo2/" /datum/map_template/submap/level_specific/virgo2/Flake name = "Forest Lake" diff --git a/code/modules/maps/templates/submaps/virgo3b/plains.dm b/code/modules/maps/templates/submaps/virgo3b/plains.dm index caf44be61b8..371c9df545a 100644 --- a/code/modules/maps/templates/submaps/virgo3b/plains.dm +++ b/code/modules/maps/templates/submaps/virgo3b/plains.dm @@ -8,7 +8,7 @@ /datum/map_template/submap/level_specific/plains name = "Surface Content - Plains" desc = "Used to make the surface outside the outpost be 16% less boring." - prefix = "_maps/submaps/plains/" + prefix = "maps/submaps/plains/" // To be added: Templates for surface exploration when they are made. diff --git a/code/modules/maps/templates/submaps/virgo3b/underdark.dm b/code/modules/maps/templates/submaps/virgo3b/underdark.dm index c8300280731..d92ece8ce99 100644 --- a/code/modules/maps/templates/submaps/virgo3b/underdark.dm +++ b/code/modules/maps/templates/submaps/virgo3b/underdark.dm @@ -3,7 +3,7 @@ desc = "For seeding submaps in Underdark" allow_duplicates = TRUE annihilate = TRUE - prefix = "_maps/submaps/level_specific/underdark/" + prefix = "maps/submaps/level_specific/underdark/" /datum/map_template/submap/level_specific/underdark/normal_mob name = "Underdark Normal Mob Spawn" diff --git a/code/modules/maps/templates/submaps/virgo4/mountains.dm b/code/modules/maps/templates/submaps/virgo4/mountains.dm index 8492602766b..ed09fce9bb6 100644 --- a/code/modules/maps/templates/submaps/virgo4/mountains.dm +++ b/code/modules/maps/templates/submaps/virgo4/mountains.dm @@ -10,7 +10,7 @@ /datum/map_template/submap/level_specific/mountains name = "Mountain Content" desc = "Don't dig too deep!" - prefix = "_maps/submaps/mountains/" + prefix = "maps/submaps/mountains/" // 'Normal' templates get used on the bottom half, and should be safer. /datum/map_template/submap/level_specific/mountains/normal diff --git a/code/modules/maps/templates/submaps/wilderness/wilderness.dm b/code/modules/maps/templates/submaps/wilderness/wilderness.dm index a33c134d889..f53bbda2a81 100644 --- a/code/modules/maps/templates/submaps/wilderness/wilderness.dm +++ b/code/modules/maps/templates/submaps/wilderness/wilderness.dm @@ -11,7 +11,7 @@ /datum/map_template/submap/level_specific/wilderness name = "Surface Content - Wildy" desc = "Used to make the surface's wilderness be 17% less boring." - prefix = "_maps/submaps/wilderness/" + prefix = "maps/submaps/wilderness/" // 'Normal' templates get used on the top half, and should be challenging. /datum/map_template/submap/level_specific/wilderness/normal diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index 52a0bcc449b..5c14016946f 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -57,7 +57,7 @@ built-in navigation, entertainment, medical facilities and a \ sleeping area! Order now, and we'll throw in a TINY FAN, \ absolutely free!" - mappath = "_maps/templates/shelters/shelter_1.dmm" + mappath = "maps/templates/shelters/shelter_1.dmm" /datum/map_template/shelter/beta name = "Shelter Beta" @@ -67,7 +67,7 @@ running water, a gourmet three course meal, cooking facilities, \ and a deluxe companion to keep you from getting lonely during \ an ash storm." - mappath = "_maps/templates/shelters/shelter_2.dmm" + mappath = "maps/templates/shelters/shelter_2.dmm" /datum/map_template/shelter/gamma name = "Shelter Gamma" @@ -77,7 +77,7 @@ also has a sink. This isn't a survival capsule and so you can \ expect that this won't save you if you're bleeding out to \ death." - mappath = "_maps/templates/shelters/shelter_3.dmm" + mappath = "maps/templates/shelters/shelter_3.dmm" /datum/map_template/shelter/delta name = "Shelter Delta" @@ -87,7 +87,7 @@ supplies allow it to hold out for an extended period of time\ and a built in medical facility allows field treatment to be \ possible." - mappath = "_maps/templates/shelters/shelter_4.dmm" + mappath = "maps/templates/shelters/shelter_4.dmm" /datum/map_template/shelter/phi name = "Shelter Phi" @@ -97,4 +97,4 @@ Originally designed for use by colonists on worlds with little to \ to no contact, the expense of these shelters have prevented them \ from seeing common use." - mappath = "_maps/templates/shelters/shelter_a.dmm" + mappath = "maps/templates/shelters/shelter_a.dmm" diff --git a/code/modules/mob/living/carbon/alien/diona/diona.dm b/code/modules/mob/living/carbon/alien/diona/diona.dm index 029c669f9cb..a6717877746 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona.dm @@ -25,13 +25,13 @@ species = SScharacters.resolve_species_path(/datum/species/diona) add_language(LANGUAGE_ROOTGLOBAL) add_language(LANGUAGE_GALCOM) - add_verb(src, /mob/living/carbon/alien/diona/proc/merge) + add_verb(src, /mob/living/carbon/alien/diona/proc/diona_merge) /mob/living/carbon/alien/diona/proc/wear_hat(var/obj/item/new_hat) if(hat) return hat = new_hat - new_hat.loc = src + new_hat.forceMove(src) update_icons() /mob/living/carbon/alien/diona/proc/handle_npc(var/mob/living/carbon/alien/diona/D) diff --git a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm index d65e2cfe864..2c18c9516bb 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm @@ -1,5 +1,5 @@ //Verbs after this point. -/mob/living/carbon/alien/diona/proc/merge() +/mob/living/carbon/alien/diona/proc/diona_merge() set category = "Abilities" set name = "Merge with gestalt" @@ -9,7 +9,7 @@ return if(istype(src.loc,/mob/living/carbon)) - remove_verb(src, /mob/living/carbon/alien/diona/proc/merge) + remove_verb(src, /mob/living/carbon/alien/diona/proc/diona_merge) return var/list/choices = list() @@ -35,11 +35,11 @@ to_chat(H, "You feel your being twine with that of \the [src] as it merges with your biomass.") to_chat(src, "You feel your being twine with that of \the [H] as you merge with its biomass.") loc = H - add_verb(src, /mob/living/carbon/alien/diona/proc/split) - remove_verb(src, /mob/living/carbon/alien/diona/proc/merge) + add_verb(src, /mob/living/carbon/alien/diona/proc/diona_split) + remove_verb(src, /mob/living/carbon/alien/diona/proc/diona_merge) return 1 -/mob/living/carbon/alien/diona/proc/split() +/mob/living/carbon/alien/diona/proc/diona_split() set category = "Abilities" set name = "Split from gestalt" @@ -49,7 +49,7 @@ return if(!(istype(src.loc,/mob/living/carbon))) - remove_verb(src, /mob/living/carbon/alien/diona/proc/split) + remove_verb(src, /mob/living/carbon/alien/diona/proc/diona_split) return to_chat(src.loc, "You feel a pang of loss as [src] splits away from your biomass.") @@ -58,8 +58,8 @@ var/mob/living/M = src.loc src.loc = get_turf(src) - remove_verb(src, /mob/living/carbon/alien/diona/proc/split) - add_verb(src, /mob/living/carbon/alien/diona/proc/merge) + remove_verb(src, /mob/living/carbon/alien/diona/proc/diona_split) + add_verb(src, /mob/living/carbon/alien/diona/proc/diona_merge) if(istype(M)) for(var/atom/A in M.contents) diff --git a/code/modules/mob/living/carbon/alien/diona/progression.dm b/code/modules/mob/living/carbon/alien/diona/progression.dm index 63414cbad9e..797c48d5d3c 100644 --- a/code/modules/mob/living/carbon/alien/diona/progression.dm +++ b/code/modules/mob/living/carbon/alien/diona/progression.dm @@ -7,7 +7,7 @@ to_chat(src, "You are not yet ready for your growth...") return - src.split() + src.diona_split() if(istype(loc,/obj/item/holder/diona)) var/obj/item/holder/diona/L = loc diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index 4c006af5c14..ca53ec723cf 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -213,4 +213,4 @@ GLOBAL_VAR_INIT(focused_test, focused_test()) /datum/map_template/unit_tests name = "Unit Tests Zone" - mappath = "_maps/templates/unit_tests.dmm" + mappath = "maps/templates/unit_tests.dmm" diff --git a/_maps/away_missions/140x140/carpfarm.dmm b/maps/away_missions/140x140/carpfarm.dmm similarity index 100% rename from _maps/away_missions/140x140/carpfarm.dmm rename to maps/away_missions/140x140/carpfarm.dmm diff --git a/_maps/away_missions/140x140/listeningpost.dmm b/maps/away_missions/140x140/listeningpost.dmm similarity index 100% rename from _maps/away_missions/140x140/listeningpost.dmm rename to maps/away_missions/140x140/listeningpost.dmm diff --git a/_maps/away_missions/140x140/snow_outpost.dmm b/maps/away_missions/140x140/snow_outpost.dmm similarity index 100% rename from _maps/away_missions/140x140/snow_outpost.dmm rename to maps/away_missions/140x140/snow_outpost.dmm diff --git a/_maps/away_missions/140x140/snowfield.dmm b/maps/away_missions/140x140/snowfield.dmm similarity index 100% rename from _maps/away_missions/140x140/snowfield.dmm rename to maps/away_missions/140x140/snowfield.dmm diff --git a/_maps/away_missions/140x140/zoo.dmm b/maps/away_missions/140x140/zoo.dmm similarity index 100% rename from _maps/away_missions/140x140/zoo.dmm rename to maps/away_missions/140x140/zoo.dmm diff --git a/_maps/away_missions/archive/Academy.dmm b/maps/away_missions/archive/Academy.dmm similarity index 100% rename from _maps/away_missions/archive/Academy.dmm rename to maps/away_missions/archive/Academy.dmm diff --git a/_maps/away_missions/archive/beach.dmm b/maps/away_missions/archive/beach.dmm similarity index 100% rename from _maps/away_missions/archive/beach.dmm rename to maps/away_missions/archive/beach.dmm diff --git a/_maps/away_missions/archive/blackmarketpackers.dmm b/maps/away_missions/archive/blackmarketpackers.dmm similarity index 100% rename from _maps/away_missions/archive/blackmarketpackers.dmm rename to maps/away_missions/archive/blackmarketpackers.dmm diff --git a/_maps/away_missions/archive/challenge.dmm b/maps/away_missions/archive/challenge.dmm similarity index 100% rename from _maps/away_missions/archive/challenge.dmm rename to maps/away_missions/archive/challenge.dmm diff --git a/_maps/away_missions/archive/desertbase.dmm b/maps/away_missions/archive/desertbase.dmm similarity index 100% rename from _maps/away_missions/archive/desertbase.dmm rename to maps/away_missions/archive/desertbase.dmm diff --git a/_maps/away_missions/archive/example.dmm b/maps/away_missions/archive/example.dmm similarity index 100% rename from _maps/away_missions/archive/example.dmm rename to maps/away_missions/archive/example.dmm diff --git a/_maps/away_missions/archive/fileList.txt b/maps/away_missions/archive/fileList.txt similarity index 100% rename from _maps/away_missions/archive/fileList.txt rename to maps/away_missions/archive/fileList.txt diff --git a/_maps/away_missions/archive/jungle.dmm b/maps/away_missions/archive/jungle.dmm similarity index 100% rename from _maps/away_missions/archive/jungle.dmm rename to maps/away_missions/archive/jungle.dmm diff --git a/_maps/away_missions/archive/labyrinth.dmm b/maps/away_missions/archive/labyrinth.dmm similarity index 100% rename from _maps/away_missions/archive/labyrinth.dmm rename to maps/away_missions/archive/labyrinth.dmm diff --git a/_maps/away_missions/archive/spacebattle.dmm b/maps/away_missions/archive/spacebattle.dmm similarity index 100% rename from _maps/away_missions/archive/spacebattle.dmm rename to maps/away_missions/archive/spacebattle.dmm diff --git a/_maps/away_missions/archive/stationCollision.dmm b/maps/away_missions/archive/stationCollision.dmm similarity index 100% rename from _maps/away_missions/archive/stationCollision.dmm rename to maps/away_missions/archive/stationCollision.dmm diff --git a/_maps/away_missions/archive/wildwest.dmm b/maps/away_missions/archive/wildwest.dmm similarity index 100% rename from _maps/away_missions/archive/wildwest.dmm rename to maps/away_missions/archive/wildwest.dmm diff --git a/_maps/away_missions/archive/zresearchlabs.dmm b/maps/away_missions/archive/zresearchlabs.dmm similarity index 100% rename from _maps/away_missions/archive/zresearchlabs.dmm rename to maps/away_missions/archive/zresearchlabs.dmm diff --git a/maps/citadel_minitest/citadel_minitest.dm b/maps/citadel_minitest/citadel_minitest.dm index faa152fff29..d4b9fb07593 100644 --- a/maps/citadel_minitest/citadel_minitest.dm +++ b/maps/citadel_minitest/citadel_minitest.dm @@ -9,9 +9,9 @@ #include "citadel_minitest_sectors.dm" - #include "../../_maps/map_files/mini_test/citadel_minitest-1.dmm" - #include "../../_maps/map_files/mini_test/citadel_minitest-sector-2.dmm" - #include "../../_maps/map_files/mini_test/citadel_minitest-sector-3.dmm" + #include "../../maps/map_files/mini_test/citadel_minitest-1.dmm" + #include "../../maps/map_files/mini_test/citadel_minitest-sector-2.dmm" + #include "../../maps/map_files/mini_test/citadel_minitest-sector-3.dmm" #define USING_MAP_DATUM /datum/map/citadel_minitest diff --git a/_maps/map_files/generic/reservation_base_level.dmm b/maps/core/reservation_base_level.dmm similarity index 100% rename from _maps/map_files/generic/reservation_base_level.dmm rename to maps/core/reservation_base_level.dmm diff --git a/_maps/map_files/mini_test/citadel_minitest-1.dmm b/maps/map_files/mini_test/citadel_minitest-1.dmm similarity index 100% rename from _maps/map_files/mini_test/citadel_minitest-1.dmm rename to maps/map_files/mini_test/citadel_minitest-1.dmm diff --git a/_maps/map_files/mini_test/citadel_minitest-sector-2.dmm b/maps/map_files/mini_test/citadel_minitest-sector-2.dmm similarity index 100% rename from _maps/map_files/mini_test/citadel_minitest-sector-2.dmm rename to maps/map_files/mini_test/citadel_minitest-sector-2.dmm diff --git a/_maps/map_files/mini_test/citadel_minitest-sector-3.dmm b/maps/map_files/mini_test/citadel_minitest-sector-3.dmm similarity index 100% rename from _maps/map_files/mini_test/citadel_minitest-sector-3.dmm rename to maps/map_files/mini_test/citadel_minitest-sector-3.dmm diff --git a/_maps/map_files/rift/rift-01-underground3.dmm b/maps/map_files/rift/rift-01-underground3.dmm similarity index 100% rename from _maps/map_files/rift/rift-01-underground3.dmm rename to maps/map_files/rift/rift-01-underground3.dmm diff --git a/_maps/map_files/rift/rift-02-underground2.dmm b/maps/map_files/rift/rift-02-underground2.dmm similarity index 100% rename from _maps/map_files/rift/rift-02-underground2.dmm rename to maps/map_files/rift/rift-02-underground2.dmm diff --git a/_maps/map_files/rift/rift-03-underground1.dmm b/maps/map_files/rift/rift-03-underground1.dmm similarity index 100% rename from _maps/map_files/rift/rift-03-underground1.dmm rename to maps/map_files/rift/rift-03-underground1.dmm diff --git a/_maps/map_files/rift/rift-04-surface1.dmm b/maps/map_files/rift/rift-04-surface1.dmm similarity index 100% rename from _maps/map_files/rift/rift-04-surface1.dmm rename to maps/map_files/rift/rift-04-surface1.dmm diff --git a/_maps/map_files/rift/rift-05-surface2.dmm b/maps/map_files/rift/rift-05-surface2.dmm similarity index 100% rename from _maps/map_files/rift/rift-05-surface2.dmm rename to maps/map_files/rift/rift-05-surface2.dmm diff --git a/_maps/map_files/rift/rift-06-surface3.dmm b/maps/map_files/rift/rift-06-surface3.dmm similarity index 100% rename from _maps/map_files/rift/rift-06-surface3.dmm rename to maps/map_files/rift/rift-06-surface3.dmm diff --git a/_maps/map_files/rift/rift-07-west_base.dmm b/maps/map_files/rift/rift-07-west_base.dmm similarity index 100% rename from _maps/map_files/rift/rift-07-west_base.dmm rename to maps/map_files/rift/rift-07-west_base.dmm diff --git a/_maps/map_files/rift/rift-08-west_deep.dmm b/maps/map_files/rift/rift-08-west_deep.dmm similarity index 100% rename from _maps/map_files/rift/rift-08-west_deep.dmm rename to maps/map_files/rift/rift-08-west_deep.dmm diff --git a/_maps/map_files/rift/rift-09-west_caves.dmm b/maps/map_files/rift/rift-09-west_caves.dmm similarity index 100% rename from _maps/map_files/rift/rift-09-west_caves.dmm rename to maps/map_files/rift/rift-09-west_caves.dmm diff --git a/_maps/map_files/rift/rift-10-west_plains.dmm b/maps/map_files/rift/rift-10-west_plains.dmm similarity index 100% rename from _maps/map_files/rift/rift-10-west_plains.dmm rename to maps/map_files/rift/rift-10-west_plains.dmm diff --git a/_maps/map_files/rift/rift-11-orbital.dmm b/maps/map_files/rift/rift-11-orbital.dmm similarity index 100% rename from _maps/map_files/rift/rift-11-orbital.dmm rename to maps/map_files/rift/rift-11-orbital.dmm diff --git a/_maps/map_files/tether/tether-01-surface1.dmm b/maps/map_files/tether/tether-01-surface1.dmm similarity index 100% rename from _maps/map_files/tether/tether-01-surface1.dmm rename to maps/map_files/tether/tether-01-surface1.dmm diff --git a/_maps/map_files/tether/tether-02-surface2.dmm b/maps/map_files/tether/tether-02-surface2.dmm similarity index 100% rename from _maps/map_files/tether/tether-02-surface2.dmm rename to maps/map_files/tether/tether-02-surface2.dmm diff --git a/_maps/map_files/tether/tether-03-surface3.dmm b/maps/map_files/tether/tether-03-surface3.dmm similarity index 100% rename from _maps/map_files/tether/tether-03-surface3.dmm rename to maps/map_files/tether/tether-03-surface3.dmm diff --git a/_maps/map_files/tether/tether-04-transit.dmm b/maps/map_files/tether/tether-04-transit.dmm similarity index 100% rename from _maps/map_files/tether/tether-04-transit.dmm rename to maps/map_files/tether/tether-04-transit.dmm diff --git a/_maps/map_files/tether/tether-05-station1.dmm b/maps/map_files/tether/tether-05-station1.dmm similarity index 100% rename from _maps/map_files/tether/tether-05-station1.dmm rename to maps/map_files/tether/tether-05-station1.dmm diff --git a/_maps/map_files/tether/tether-06-station2.dmm b/maps/map_files/tether/tether-06-station2.dmm similarity index 100% rename from _maps/map_files/tether/tether-06-station2.dmm rename to maps/map_files/tether/tether-06-station2.dmm diff --git a/_maps/map_files/tether/tether-08-mining.dmm b/maps/map_files/tether/tether-08-mining.dmm similarity index 100% rename from _maps/map_files/tether/tether-08-mining.dmm rename to maps/map_files/tether/tether-08-mining.dmm diff --git a/_maps/map_files/tether/tether-09-solars.dmm b/maps/map_files/tether/tether-09-solars.dmm similarity index 100% rename from _maps/map_files/tether/tether-09-solars.dmm rename to maps/map_files/tether/tether-09-solars.dmm diff --git a/_maps/map_files/tether/tether_misc.dmm b/maps/map_files/tether/tether_misc.dmm similarity index 100% rename from _maps/map_files/tether/tether_misc.dmm rename to maps/map_files/tether/tether_misc.dmm diff --git a/_maps/map_files/tether/tether_plains.dmm b/maps/map_files/tether/tether_plains.dmm similarity index 100% rename from _maps/map_files/tether/tether_plains.dmm rename to maps/map_files/tether/tether_plains.dmm diff --git a/_maps/map_files/tether/tether_underdark.dmm b/maps/map_files/tether/tether_underdark.dmm similarity index 100% rename from _maps/map_files/tether/tether_underdark.dmm rename to maps/map_files/tether/tether_underdark.dmm diff --git a/_maps/map_files/triumph/triumph-01-deck1.dmm b/maps/map_files/triumph/triumph-01-deck1.dmm similarity index 100% rename from _maps/map_files/triumph/triumph-01-deck1.dmm rename to maps/map_files/triumph/triumph-01-deck1.dmm diff --git a/_maps/map_files/triumph/triumph-02-deck2.dmm b/maps/map_files/triumph/triumph-02-deck2.dmm similarity index 100% rename from _maps/map_files/triumph/triumph-02-deck2.dmm rename to maps/map_files/triumph/triumph-02-deck2.dmm diff --git a/_maps/map_files/triumph/triumph-03-deck3.dmm b/maps/map_files/triumph/triumph-03-deck3.dmm similarity index 100% rename from _maps/map_files/triumph/triumph-03-deck3.dmm rename to maps/map_files/triumph/triumph-03-deck3.dmm diff --git a/_maps/map_files/triumph/triumph-04-deck4.dmm b/maps/map_files/triumph/triumph-04-deck4.dmm similarity index 100% rename from _maps/map_files/triumph/triumph-04-deck4.dmm rename to maps/map_files/triumph/triumph-04-deck4.dmm diff --git a/_maps/map_files/triumph/triumph-05-flagship.dmm b/maps/map_files/triumph/triumph-05-flagship.dmm similarity index 100% rename from _maps/map_files/triumph/triumph-05-flagship.dmm rename to maps/map_files/triumph/triumph-05-flagship.dmm diff --git a/_maps/map_files/triumph/triumph_misc.dmm b/maps/map_files/triumph/triumph_misc.dmm similarity index 100% rename from _maps/map_files/triumph/triumph_misc.dmm rename to maps/map_files/triumph/triumph_misc.dmm diff --git a/_maps/map_files/triumph/triumph_ships.dmm b/maps/map_files/triumph/triumph_ships.dmm similarity index 100% rename from _maps/map_files/triumph/triumph_ships.dmm rename to maps/map_files/triumph/triumph_ships.dmm diff --git a/_maps/map_levels/140x140/Class_D.dmm b/maps/map_levels/140x140/Class_D.dmm similarity index 100% rename from _maps/map_levels/140x140/Class_D.dmm rename to maps/map_levels/140x140/Class_D.dmm diff --git a/_maps/map_levels/140x140/Class_G.dmm b/maps/map_levels/140x140/Class_G.dmm similarity index 100% rename from _maps/map_levels/140x140/Class_G.dmm rename to maps/map_levels/140x140/Class_G.dmm diff --git a/_maps/map_levels/140x140/Class_H.dmm b/maps/map_levels/140x140/Class_H.dmm similarity index 100% rename from _maps/map_levels/140x140/Class_H.dmm rename to maps/map_levels/140x140/Class_H.dmm diff --git a/_maps/map_levels/140x140/Class_M.dmm b/maps/map_levels/140x140/Class_M.dmm similarity index 100% rename from _maps/map_levels/140x140/Class_M.dmm rename to maps/map_levels/140x140/Class_M.dmm diff --git a/_maps/map_levels/140x140/Class_P.dmm b/maps/map_levels/140x140/Class_P.dmm similarity index 100% rename from _maps/map_levels/140x140/Class_P.dmm rename to maps/map_levels/140x140/Class_P.dmm diff --git a/_maps/map_levels/140x140/alienship.dmm b/maps/map_levels/140x140/alienship.dmm similarity index 100% rename from _maps/map_levels/140x140/alienship.dmm rename to maps/map_levels/140x140/alienship.dmm diff --git a/_maps/map_levels/140x140/debrisfield.dmm b/maps/map_levels/140x140/debrisfield.dmm similarity index 100% rename from _maps/map_levels/140x140/debrisfield.dmm rename to maps/map_levels/140x140/debrisfield.dmm diff --git a/_maps/map_levels/140x140/debrisfield_vr.dmm b/maps/map_levels/140x140/debrisfield_vr.dmm similarity index 100% rename from _maps/map_levels/140x140/debrisfield_vr.dmm rename to maps/map_levels/140x140/debrisfield_vr.dmm diff --git a/_maps/map_levels/140x140/fueldepot.dmm b/maps/map_levels/140x140/fueldepot.dmm similarity index 100% rename from _maps/map_levels/140x140/fueldepot.dmm rename to maps/map_levels/140x140/fueldepot.dmm diff --git a/_maps/map_levels/140x140/lavaland.dmm b/maps/map_levels/140x140/lavaland.dmm similarity index 100% rename from _maps/map_levels/140x140/lavaland.dmm rename to maps/map_levels/140x140/lavaland.dmm diff --git a/_maps/map_levels/140x140/lavaland_dungeon.dmm b/maps/map_levels/140x140/lavaland_dungeon.dmm similarity index 100% rename from _maps/map_levels/140x140/lavaland_dungeon.dmm rename to maps/map_levels/140x140/lavaland_dungeon.dmm diff --git a/_maps/map_levels/140x140/lavaland_east.dmm b/maps/map_levels/140x140/lavaland_east.dmm similarity index 100% rename from _maps/map_levels/140x140/lavaland_east.dmm rename to maps/map_levels/140x140/lavaland_east.dmm diff --git a/_maps/map_levels/140x140/piratebase.dmm b/maps/map_levels/140x140/piratebase.dmm similarity index 100% rename from _maps/map_levels/140x140/piratebase.dmm rename to maps/map_levels/140x140/piratebase.dmm diff --git a/_maps/map_levels/140x140/roguemining/rogue_mine1.dmm b/maps/map_levels/140x140/roguemining/rogue_mine1.dmm similarity index 100% rename from _maps/map_levels/140x140/roguemining/rogue_mine1.dmm rename to maps/map_levels/140x140/roguemining/rogue_mine1.dmm diff --git a/_maps/map_levels/140x140/roguemining/rogue_mine2.dmm b/maps/map_levels/140x140/roguemining/rogue_mine2.dmm similarity index 100% rename from _maps/map_levels/140x140/roguemining/rogue_mine2.dmm rename to maps/map_levels/140x140/roguemining/rogue_mine2.dmm diff --git a/_maps/map_levels/140x140/roguemining/rogue_mine3.dmm b/maps/map_levels/140x140/roguemining/rogue_mine3.dmm similarity index 100% rename from _maps/map_levels/140x140/roguemining/rogue_mine3.dmm rename to maps/map_levels/140x140/roguemining/rogue_mine3.dmm diff --git a/_maps/map_levels/140x140/roguemining/rogue_mine4.dmm b/maps/map_levels/140x140/roguemining/rogue_mine4.dmm similarity index 100% rename from _maps/map_levels/140x140/roguemining/rogue_mine4.dmm rename to maps/map_levels/140x140/roguemining/rogue_mine4.dmm diff --git a/_maps/map_levels/140x140/talon/talon1.dmm b/maps/map_levels/140x140/talon/talon1.dmm similarity index 100% rename from _maps/map_levels/140x140/talon/talon1.dmm rename to maps/map_levels/140x140/talon/talon1.dmm diff --git a/_maps/map_levels/140x140/talon/talon2.dmm b/maps/map_levels/140x140/talon/talon2.dmm similarity index 100% rename from _maps/map_levels/140x140/talon/talon2.dmm rename to maps/map_levels/140x140/talon/talon2.dmm diff --git a/_maps/map_levels/140x140/tradeport.dmm b/maps/map_levels/140x140/tradeport.dmm similarity index 100% rename from _maps/map_levels/140x140/tradeport.dmm rename to maps/map_levels/140x140/tradeport.dmm diff --git a/_maps/map_levels/140x140/virgo2_aerostat.dmm b/maps/map_levels/140x140/virgo2_aerostat.dmm similarity index 100% rename from _maps/map_levels/140x140/virgo2_aerostat.dmm rename to maps/map_levels/140x140/virgo2_aerostat.dmm diff --git a/_maps/map_levels/140x140/virgo2_surface.dmm b/maps/map_levels/140x140/virgo2_surface.dmm similarity index 100% rename from _maps/map_levels/140x140/virgo2_surface.dmm rename to maps/map_levels/140x140/virgo2_surface.dmm diff --git a/_maps/map_levels/140x140/virgo4_beach.dmm b/maps/map_levels/140x140/virgo4_beach.dmm similarity index 100% rename from _maps/map_levels/140x140/virgo4_beach.dmm rename to maps/map_levels/140x140/virgo4_beach.dmm diff --git a/_maps/map_levels/140x140/virgo4_cave.dmm b/maps/map_levels/140x140/virgo4_cave.dmm similarity index 100% rename from _maps/map_levels/140x140/virgo4_cave.dmm rename to maps/map_levels/140x140/virgo4_cave.dmm diff --git a/_maps/map_levels/140x140/virgo4_desert.dmm b/maps/map_levels/140x140/virgo4_desert.dmm similarity index 100% rename from _maps/map_levels/140x140/virgo4_desert.dmm rename to maps/map_levels/140x140/virgo4_desert.dmm diff --git a/_maps/map_levels/192x192/Class_D.dmm b/maps/map_levels/192x192/Class_D.dmm similarity index 100% rename from _maps/map_levels/192x192/Class_D.dmm rename to maps/map_levels/192x192/Class_D.dmm diff --git a/_maps/map_levels/192x192/Class_G.dmm b/maps/map_levels/192x192/Class_G.dmm similarity index 100% rename from _maps/map_levels/192x192/Class_G.dmm rename to maps/map_levels/192x192/Class_G.dmm diff --git a/_maps/map_levels/192x192/Class_H.dmm b/maps/map_levels/192x192/Class_H.dmm similarity index 100% rename from _maps/map_levels/192x192/Class_H.dmm rename to maps/map_levels/192x192/Class_H.dmm diff --git a/_maps/map_levels/192x192/Class_M.dmm b/maps/map_levels/192x192/Class_M.dmm similarity index 100% rename from _maps/map_levels/192x192/Class_M.dmm rename to maps/map_levels/192x192/Class_M.dmm diff --git a/_maps/map_levels/192x192/Class_P.dmm b/maps/map_levels/192x192/Class_P.dmm similarity index 100% rename from _maps/map_levels/192x192/Class_P.dmm rename to maps/map_levels/192x192/Class_P.dmm diff --git a/_maps/map_levels/192x192/debrisfield.dmm b/maps/map_levels/192x192/debrisfield.dmm similarity index 100% rename from _maps/map_levels/192x192/debrisfield.dmm rename to maps/map_levels/192x192/debrisfield.dmm diff --git a/_maps/map_levels/192x192/fueldepot.dmm b/maps/map_levels/192x192/fueldepot.dmm similarity index 100% rename from _maps/map_levels/192x192/fueldepot.dmm rename to maps/map_levels/192x192/fueldepot.dmm diff --git a/_maps/map_levels/192x192/lavaland.dmm b/maps/map_levels/192x192/lavaland.dmm similarity index 100% rename from _maps/map_levels/192x192/lavaland.dmm rename to maps/map_levels/192x192/lavaland.dmm diff --git a/_maps/map_levels/192x192/lavaland_east.dmm b/maps/map_levels/192x192/lavaland_east.dmm similarity index 100% rename from _maps/map_levels/192x192/lavaland_east.dmm rename to maps/map_levels/192x192/lavaland_east.dmm diff --git a/_maps/map_levels/192x192/miaphus_beach.dmm b/maps/map_levels/192x192/miaphus_beach.dmm similarity index 100% rename from _maps/map_levels/192x192/miaphus_beach.dmm rename to maps/map_levels/192x192/miaphus_beach.dmm diff --git a/_maps/map_levels/192x192/miaphus_cave.dmm b/maps/map_levels/192x192/miaphus_cave.dmm similarity index 100% rename from _maps/map_levels/192x192/miaphus_cave.dmm rename to maps/map_levels/192x192/miaphus_cave.dmm diff --git a/_maps/map_levels/192x192/miaphus_desert.dmm b/maps/map_levels/192x192/miaphus_desert.dmm similarity index 100% rename from _maps/map_levels/192x192/miaphus_desert.dmm rename to maps/map_levels/192x192/miaphus_desert.dmm diff --git a/_maps/map_levels/192x192/piratebase.dmm b/maps/map_levels/192x192/piratebase.dmm similarity index 100% rename from _maps/map_levels/192x192/piratebase.dmm rename to maps/map_levels/192x192/piratebase.dmm diff --git a/_maps/map_levels/192x192/roguemining_192x192/rogue_mine1.dmm b/maps/map_levels/192x192/roguemining_192x192/rogue_mine1.dmm similarity index 100% rename from _maps/map_levels/192x192/roguemining_192x192/rogue_mine1.dmm rename to maps/map_levels/192x192/roguemining_192x192/rogue_mine1.dmm diff --git a/_maps/map_levels/192x192/roguemining_192x192/rogue_mine2.dmm b/maps/map_levels/192x192/roguemining_192x192/rogue_mine2.dmm similarity index 100% rename from _maps/map_levels/192x192/roguemining_192x192/rogue_mine2.dmm rename to maps/map_levels/192x192/roguemining_192x192/rogue_mine2.dmm diff --git a/_maps/map_levels/192x192/roguemining_192x192/rogue_mine3.dmm b/maps/map_levels/192x192/roguemining_192x192/rogue_mine3.dmm similarity index 100% rename from _maps/map_levels/192x192/roguemining_192x192/rogue_mine3.dmm rename to maps/map_levels/192x192/roguemining_192x192/rogue_mine3.dmm diff --git a/_maps/map_levels/192x192/roguemining_192x192/rogue_mine4.dmm b/maps/map_levels/192x192/roguemining_192x192/rogue_mine4.dmm similarity index 100% rename from _maps/map_levels/192x192/roguemining_192x192/rogue_mine4.dmm rename to maps/map_levels/192x192/roguemining_192x192/rogue_mine4.dmm diff --git a/_maps/map_levels/192x192/tradeport.dmm b/maps/map_levels/192x192/tradeport.dmm similarity index 100% rename from _maps/map_levels/192x192/tradeport.dmm rename to maps/map_levels/192x192/tradeport.dmm diff --git a/maps/nsv_triumph/triumph.dm b/maps/nsv_triumph/triumph.dm index e9395cd1e20..2cb7baf1b75 100644 --- a/maps/nsv_triumph/triumph.dm +++ b/maps/nsv_triumph/triumph.dm @@ -9,11 +9,11 @@ #define USING_MAP_DATUM /datum/map/triumph - #include "../../_maps/map_files/triumph/triumph-01-deck1.dmm" - #include "../../_maps/map_files/triumph/triumph-02-deck2.dmm" - #include "../../_maps/map_files/triumph/triumph-03-deck3.dmm" - #include "../../_maps/map_files/triumph/triumph-04-deck4.dmm" - #include "../../_maps/map_files/triumph/triumph-05-flagship.dmm" + #include "../../maps/map_files/triumph/triumph-01-deck1.dmm" + #include "../../maps/map_files/triumph/triumph-02-deck2.dmm" + #include "../../maps/map_files/triumph/triumph-03-deck3.dmm" + #include "../../maps/map_files/triumph/triumph-04-deck4.dmm" + #include "../../maps/map_files/triumph/triumph-05-flagship.dmm" #elif !defined(MAP_OVERRIDE) diff --git a/maps/rift/rift.dm b/maps/rift/rift.dm index 0882a04c681..a6221568c7d 100644 --- a/maps/rift/rift.dm +++ b/maps/rift/rift.dm @@ -8,17 +8,17 @@ #define USING_MAP_DATUM /datum/map/rift - #include "../../_maps/map_files/rift/rift-01-underground3.dmm" - #include "../../_maps/map_files/rift/rift-02-underground2.dmm" - #include "../../_maps/map_files/rift/rift-03-underground1.dmm" - #include "../../_maps/map_files/rift/rift-04-surface1.dmm" - #include "../../_maps/map_files/rift/rift-05-surface2.dmm" - #include "../../_maps/map_files/rift/rift-06-surface3.dmm" - #include "../../_maps/map_files/rift/rift-07-west_base.dmm" - #include "../../_maps/map_files/rift/rift-08-west_deep.dmm" - #include "../../_maps/map_files/rift/rift-09-west_caves.dmm" - #include "../../_maps/map_files/rift/rift-10-west_plains.dmm" - #include "../../_maps/map_files/rift/rift-11-orbital.dmm" + #include "../../maps/map_files/rift/rift-01-underground3.dmm" + #include "../../maps/map_files/rift/rift-02-underground2.dmm" + #include "../../maps/map_files/rift/rift-03-underground1.dmm" + #include "../../maps/map_files/rift/rift-04-surface1.dmm" + #include "../../maps/map_files/rift/rift-05-surface2.dmm" + #include "../../maps/map_files/rift/rift-06-surface3.dmm" + #include "../../maps/map_files/rift/rift-07-west_base.dmm" + #include "../../maps/map_files/rift/rift-08-west_deep.dmm" + #include "../../maps/map_files/rift/rift-09-west_caves.dmm" + #include "../../maps/map_files/rift/rift-10-west_plains.dmm" + #include "../../maps/map_files/rift/rift-11-orbital.dmm" #elif !defined(MAP_OVERRIDE) diff --git a/maps/submaps/engine_submaps/engine.dm b/maps/submaps/engine_submaps/engine.dm index 347eec2b957..65267565a52 100644 --- a/maps/submaps/engine_submaps/engine.dm +++ b/maps/submaps/engine_submaps/engine.dm @@ -18,39 +18,39 @@ /datum/map_template/engine/rust name = "EngineSubmap_RUST" desc = "R-UST Fusion Tokamak Engine" - mappath = "_maps/templates/engines/triumph/triumph_engine_rust.dmm" + mappath = "maps/templates/engines/triumph/triumph_engine_rust.dmm" display_name = "Budget Star" /* /datum/map_template/engine/singulo name = "Singularity Engine" desc = "Lord Singuloth" - mappath = '_maps/templates/engines/triumph/engine_singulo.dmm' + mappath = 'maps/templates/engines/triumph/engine_singulo.dmm' */ /datum/map_template/engine/supermatter name = "EngineSubmap_SM" desc = "Old Faithful Supermatter" - mappath = "_maps/templates/engines/triumph/triumph_engine_sme.dmm" + mappath = "maps/templates/engines/triumph/triumph_engine_sme.dmm" display_name = "Angry Rock" /* /datum/map_template/engine/tesla name = "Edison's Bane" desc = "The Telsa Engine" - mappath = '_maps/templates/engines/triumph/engine_tesla.dmm' + mappath = 'maps/templates/engines/triumph/engine_tesla.dmm' */ /datum/map_template/engine/burnchamber name = "EngineSubmap_Burn" desc = "Burn Chamber Engine" - mappath = "_maps/templates/engines/triumph/triumph_engine_burnchamber.dmm" + mappath = "maps/templates/engines/triumph/triumph_engine_burnchamber.dmm" display_name = "Toxins Lab" /datum/map_template/engine/fission name = "EngineSubmap_Fission" desc = "The Fission Reactor" - mappath = "_maps/templates/engines/triumph/triumph_engine_fission.dmm" + mappath = "maps/templates/engines/triumph/triumph_engine_fission.dmm" display_name = "Nuclear Bomb" // Landmark for where to load in the engine on permament map diff --git a/maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm b/maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm index edb8cdcd116..8c8b316971a 100644 --- a/maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm +++ b/maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm @@ -16,25 +16,25 @@ /datum/map_template/engine/rust name = "EngineSubmap_RUST" desc = "R-UST Fusion Tokamak Engine" - mappath = '_maps/templates/engines/tether/engine_rust.dmm' + mappath = 'maps/templates/engines/tether/engine_rust.dmm' display_name = list("Contained Star", "Synthetic Killer", "Glowy Field", "R-UST", "Fusion Reactor", "Miniature Star") /datum/map_template/engine/singulo name = "EngineSubmap_Singulo" desc = "Lord Singuloth" - mappath = '_maps/templates/engines/tether/engine_singulo.dmm' + mappath = 'maps/templates/engines/tether/engine_singulo.dmm' display_name = list("Hypnosis Swirls", "Lord Singuloth", "The Devourer of Stations", "Contained Black Hole", "The Forbidden Succ") /datum/map_template/engine/supermatter name = "EngineSubmap_SM" desc = "Old Faithful Supermatter" - mappath = '_maps/templates/engines/tether/engine_sme.dmm' + mappath = 'maps/templates/engines/tether/engine_sme.dmm' display_name = list("Angry Rock", "The Forbidden Rock Candy", "Supermatter", "Death Crystal", "Spicy Crystal") /datum/map_template/engine/tesla name = "EngineSubmap_Tesla" desc = "The Telsa Engine" - mappath = '_maps/templates/engines/tether/engine_tesla.dmm' + mappath = 'maps/templates/engines/tether/engine_tesla.dmm' display_name = list("Edison's Bane", "Lady Tesla", "Lightning Ball", "Overpowered Phone Charger", "Exploder of Machines") // Landmark for where to load in the engine on permament map diff --git a/_maps/submaps/level_specific/class_d/DecoupledEngineD.dmm b/maps/submaps/level_specific/class_d/DecoupledEngineD.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/DecoupledEngineD.dmm rename to maps/submaps/level_specific/class_d/DecoupledEngineD.dmm diff --git a/_maps/submaps/level_specific/class_d/EpodD.dmm b/maps/submaps/level_specific/class_d/EpodD.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/EpodD.dmm rename to maps/submaps/level_specific/class_d/EpodD.dmm diff --git a/_maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm b/maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm rename to maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm diff --git a/_maps/submaps/level_specific/class_d/SupplyDrop1D.dmm b/maps/submaps/level_specific/class_d/SupplyDrop1D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/SupplyDrop1D.dmm rename to maps/submaps/level_specific/class_d/SupplyDrop1D.dmm diff --git a/_maps/submaps/level_specific/class_d/SupplyDrop2D.dmm b/maps/submaps/level_specific/class_d/SupplyDrop2D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/SupplyDrop2D.dmm rename to maps/submaps/level_specific/class_d/SupplyDrop2D.dmm diff --git a/_maps/submaps/level_specific/class_d/broken_reactor_D.dmm b/maps/submaps/level_specific/class_d/broken_reactor_D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/broken_reactor_D.dmm rename to maps/submaps/level_specific/class_d/broken_reactor_D.dmm diff --git a/_maps/submaps/level_specific/class_d/cave1D.dmm b/maps/submaps/level_specific/class_d/cave1D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/cave1D.dmm rename to maps/submaps/level_specific/class_d/cave1D.dmm diff --git a/_maps/submaps/level_specific/class_d/cave2D.dmm b/maps/submaps/level_specific/class_d/cave2D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/cave2D.dmm rename to maps/submaps/level_specific/class_d/cave2D.dmm diff --git a/_maps/submaps/level_specific/class_d/cave3D.dmm b/maps/submaps/level_specific/class_d/cave3D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/cave3D.dmm rename to maps/submaps/level_specific/class_d/cave3D.dmm diff --git a/_maps/submaps/level_specific/class_d/drone_hive_D.dmm b/maps/submaps/level_specific/class_d/drone_hive_D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/drone_hive_D.dmm rename to maps/submaps/level_specific/class_d/drone_hive_D.dmm diff --git a/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm b/maps/submaps/level_specific/class_d/hiddenbunkerD.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/hiddenbunkerD.dmm rename to maps/submaps/level_specific/class_d/hiddenbunkerD.dmm diff --git a/_maps/submaps/level_specific/class_d/landing_padD.dmm b/maps/submaps/level_specific/class_d/landing_padD.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/landing_padD.dmm rename to maps/submaps/level_specific/class_d/landing_padD.dmm diff --git a/_maps/submaps/level_specific/class_d/matdropD.dmm b/maps/submaps/level_specific/class_d/matdropD.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/matdropD.dmm rename to maps/submaps/level_specific/class_d/matdropD.dmm diff --git a/_maps/submaps/level_specific/class_d/mechwreckD.dmm b/maps/submaps/level_specific/class_d/mechwreckD.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/mechwreckD.dmm rename to maps/submaps/level_specific/class_d/mechwreckD.dmm diff --git a/_maps/submaps/level_specific/class_d/meteor.dmm b/maps/submaps/level_specific/class_d/meteor.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/meteor.dmm rename to maps/submaps/level_specific/class_d/meteor.dmm diff --git a/_maps/submaps/level_specific/class_d/solar_farmD.dmm b/maps/submaps/level_specific/class_d/solar_farmD.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/solar_farmD.dmm rename to maps/submaps/level_specific/class_d/solar_farmD.dmm diff --git a/_maps/submaps/level_specific/class_d/vault1D.dmm b/maps/submaps/level_specific/class_d/vault1D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/vault1D.dmm rename to maps/submaps/level_specific/class_d/vault1D.dmm diff --git a/_maps/submaps/level_specific/class_d/vault2D.dmm b/maps/submaps/level_specific/class_d/vault2D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/vault2D.dmm rename to maps/submaps/level_specific/class_d/vault2D.dmm diff --git a/_maps/submaps/level_specific/class_d/vault3D.dmm b/maps/submaps/level_specific/class_d/vault3D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/vault3D.dmm rename to maps/submaps/level_specific/class_d/vault3D.dmm diff --git a/_maps/submaps/level_specific/class_d/vault4D.dmm b/maps/submaps/level_specific/class_d/vault4D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/vault4D.dmm rename to maps/submaps/level_specific/class_d/vault4D.dmm diff --git a/_maps/submaps/level_specific/class_d/vault5D.dmm b/maps/submaps/level_specific/class_d/vault5D.dmm similarity index 100% rename from _maps/submaps/level_specific/class_d/vault5D.dmm rename to maps/submaps/level_specific/class_d/vault5D.dmm diff --git a/_maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm b/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm rename to maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm diff --git a/_maps/submaps/level_specific/class_h/BoneyardH.dmm b/maps/submaps/level_specific/class_h/BoneyardH.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/BoneyardH.dmm rename to maps/submaps/level_specific/class_h/BoneyardH.dmm diff --git a/_maps/submaps/level_specific/class_h/BunkerH.dmm b/maps/submaps/level_specific/class_h/BunkerH.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/BunkerH.dmm rename to maps/submaps/level_specific/class_h/BunkerH.dmm diff --git a/_maps/submaps/level_specific/class_h/SupplyDrop1H.dmm b/maps/submaps/level_specific/class_h/SupplyDrop1H.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/SupplyDrop1H.dmm rename to maps/submaps/level_specific/class_h/SupplyDrop1H.dmm diff --git a/_maps/submaps/level_specific/class_h/SupplyDrop2H.dmm b/maps/submaps/level_specific/class_h/SupplyDrop2H.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/SupplyDrop2H.dmm rename to maps/submaps/level_specific/class_h/SupplyDrop2H.dmm diff --git a/_maps/submaps/level_specific/class_h/cave1H.dmm b/maps/submaps/level_specific/class_h/cave1H.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/cave1H.dmm rename to maps/submaps/level_specific/class_h/cave1H.dmm diff --git a/_maps/submaps/level_specific/class_h/cave3H.dmm b/maps/submaps/level_specific/class_h/cave3H.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/cave3H.dmm rename to maps/submaps/level_specific/class_h/cave3H.dmm diff --git a/_maps/submaps/level_specific/class_h/covert_post.dmm b/maps/submaps/level_specific/class_h/covert_post.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/covert_post.dmm rename to maps/submaps/level_specific/class_h/covert_post.dmm diff --git a/_maps/submaps/level_specific/class_h/desertruins1H.dmm b/maps/submaps/level_specific/class_h/desertruins1H.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/desertruins1H.dmm rename to maps/submaps/level_specific/class_h/desertruins1H.dmm diff --git a/_maps/submaps/level_specific/class_h/desertruins2H.dmm b/maps/submaps/level_specific/class_h/desertruins2H.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/desertruins2H.dmm rename to maps/submaps/level_specific/class_h/desertruins2H.dmm diff --git a/_maps/submaps/level_specific/class_h/desertruins3H.dmm b/maps/submaps/level_specific/class_h/desertruins3H.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/desertruins3H.dmm rename to maps/submaps/level_specific/class_h/desertruins3H.dmm diff --git a/_maps/submaps/level_specific/class_h/desertruins4H.dmm b/maps/submaps/level_specific/class_h/desertruins4H.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/desertruins4H.dmm rename to maps/submaps/level_specific/class_h/desertruins4H.dmm diff --git a/_maps/submaps/level_specific/class_h/desertsaloon.dmm b/maps/submaps/level_specific/class_h/desertsaloon.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/desertsaloon.dmm rename to maps/submaps/level_specific/class_h/desertsaloon.dmm diff --git a/_maps/submaps/level_specific/class_h/farmsH.dmm b/maps/submaps/level_specific/class_h/farmsH.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/farmsH.dmm rename to maps/submaps/level_specific/class_h/farmsH.dmm diff --git a/_maps/submaps/level_specific/class_h/highnoonH.dmm b/maps/submaps/level_specific/class_h/highnoonH.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/highnoonH.dmm rename to maps/submaps/level_specific/class_h/highnoonH.dmm diff --git a/_maps/submaps/level_specific/class_h/landing_padH.dmm b/maps/submaps/level_specific/class_h/landing_padH.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/landing_padH.dmm rename to maps/submaps/level_specific/class_h/landing_padH.dmm diff --git a/_maps/submaps/level_specific/class_h/minesH.dmm b/maps/submaps/level_specific/class_h/minesH.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/minesH.dmm rename to maps/submaps/level_specific/class_h/minesH.dmm diff --git a/_maps/submaps/level_specific/class_h/oasisH.dmm b/maps/submaps/level_specific/class_h/oasisH.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/oasisH.dmm rename to maps/submaps/level_specific/class_h/oasisH.dmm diff --git a/_maps/submaps/level_specific/class_h/ranchH.dmm b/maps/submaps/level_specific/class_h/ranchH.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/ranchH.dmm rename to maps/submaps/level_specific/class_h/ranchH.dmm diff --git a/_maps/submaps/level_specific/class_h/rocks1H.dmm b/maps/submaps/level_specific/class_h/rocks1H.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/rocks1H.dmm rename to maps/submaps/level_specific/class_h/rocks1H.dmm diff --git a/_maps/submaps/level_specific/class_h/rocks2H.dmm b/maps/submaps/level_specific/class_h/rocks2H.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/rocks2H.dmm rename to maps/submaps/level_specific/class_h/rocks2H.dmm diff --git a/_maps/submaps/level_specific/class_h/solar_farmH.dmm b/maps/submaps/level_specific/class_h/solar_farmH.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/solar_farmH.dmm rename to maps/submaps/level_specific/class_h/solar_farmH.dmm diff --git a/_maps/submaps/level_specific/class_h/springcaveH.dmm b/maps/submaps/level_specific/class_h/springcaveH.dmm similarity index 100% rename from _maps/submaps/level_specific/class_h/springcaveH.dmm rename to maps/submaps/level_specific/class_h/springcaveH.dmm diff --git a/_maps/submaps/level_specific/class_p/HeadscientistHQ.dmm b/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm similarity index 100% rename from _maps/submaps/level_specific/class_p/HeadscientistHQ.dmm rename to maps/submaps/level_specific/class_p/HeadscientistHQ.dmm diff --git a/_maps/submaps/level_specific/class_p/archaictemple.dmm b/maps/submaps/level_specific/class_p/archaictemple.dmm similarity index 100% rename from _maps/submaps/level_specific/class_p/archaictemple.dmm rename to maps/submaps/level_specific/class_p/archaictemple.dmm diff --git a/_maps/submaps/level_specific/class_p/ruins1.dmm b/maps/submaps/level_specific/class_p/ruins1.dmm similarity index 100% rename from _maps/submaps/level_specific/class_p/ruins1.dmm rename to maps/submaps/level_specific/class_p/ruins1.dmm diff --git a/_maps/submaps/level_specific/class_p/ruins2.dmm b/maps/submaps/level_specific/class_p/ruins2.dmm similarity index 100% rename from _maps/submaps/level_specific/class_p/ruins2.dmm rename to maps/submaps/level_specific/class_p/ruins2.dmm diff --git a/_maps/submaps/level_specific/class_p/ruins3.dmm b/maps/submaps/level_specific/class_p/ruins3.dmm similarity index 100% rename from _maps/submaps/level_specific/class_p/ruins3.dmm rename to maps/submaps/level_specific/class_p/ruins3.dmm diff --git a/_maps/submaps/level_specific/class_p/ruins4.dmm b/maps/submaps/level_specific/class_p/ruins4.dmm similarity index 100% rename from _maps/submaps/level_specific/class_p/ruins4.dmm rename to maps/submaps/level_specific/class_p/ruins4.dmm diff --git a/_maps/submaps/level_specific/class_p/ruins5.dmm b/maps/submaps/level_specific/class_p/ruins5.dmm similarity index 100% rename from _maps/submaps/level_specific/class_p/ruins5.dmm rename to maps/submaps/level_specific/class_p/ruins5.dmm diff --git a/_maps/submaps/level_specific/debrisfield/asteroids1.dmm b/maps/submaps/level_specific/debrisfield/asteroids1.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/asteroids1.dmm rename to maps/submaps/level_specific/debrisfield/asteroids1.dmm diff --git a/_maps/submaps/level_specific/debrisfield/asteroids2.dmm b/maps/submaps/level_specific/debrisfield/asteroids2.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/asteroids2.dmm rename to maps/submaps/level_specific/debrisfield/asteroids2.dmm diff --git a/_maps/submaps/level_specific/debrisfield/asteroids3.dmm b/maps/submaps/level_specific/debrisfield/asteroids3.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/asteroids3.dmm rename to maps/submaps/level_specific/debrisfield/asteroids3.dmm diff --git a/_maps/submaps/level_specific/debrisfield/carp_asteroids1.dmm b/maps/submaps/level_specific/debrisfield/carp_asteroids1.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/carp_asteroids1.dmm rename to maps/submaps/level_specific/debrisfield/carp_asteroids1.dmm diff --git a/_maps/submaps/level_specific/debrisfield/carp_asteroids2.dmm b/maps/submaps/level_specific/debrisfield/carp_asteroids2.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/carp_asteroids2.dmm rename to maps/submaps/level_specific/debrisfield/carp_asteroids2.dmm diff --git a/_maps/submaps/level_specific/debrisfield/carp_asteroids3.dmm b/maps/submaps/level_specific/debrisfield/carp_asteroids3.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/carp_asteroids3.dmm rename to maps/submaps/level_specific/debrisfield/carp_asteroids3.dmm diff --git a/_maps/submaps/level_specific/debrisfield/carp_asteroids4.dmm b/maps/submaps/level_specific/debrisfield/carp_asteroids4.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/carp_asteroids4.dmm rename to maps/submaps/level_specific/debrisfield/carp_asteroids4.dmm diff --git a/_maps/submaps/level_specific/debrisfield/clownship.dmm b/maps/submaps/level_specific/debrisfield/clownship.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/clownship.dmm rename to maps/submaps/level_specific/debrisfield/clownship.dmm diff --git a/_maps/submaps/level_specific/debrisfield/debris1.dmm b/maps/submaps/level_specific/debrisfield/debris1.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/debris1.dmm rename to maps/submaps/level_specific/debrisfield/debris1.dmm diff --git a/_maps/submaps/level_specific/debrisfield/debris2.dmm b/maps/submaps/level_specific/debrisfield/debris2.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/debris2.dmm rename to maps/submaps/level_specific/debrisfield/debris2.dmm diff --git a/_maps/submaps/level_specific/debrisfield/debris3.dmm b/maps/submaps/level_specific/debrisfield/debris3.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/debris3.dmm rename to maps/submaps/level_specific/debrisfield/debris3.dmm diff --git a/_maps/submaps/level_specific/debrisfield/debris4.dmm b/maps/submaps/level_specific/debrisfield/debris4.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/debris4.dmm rename to maps/submaps/level_specific/debrisfield/debris4.dmm diff --git a/_maps/submaps/level_specific/debrisfield/debris5.dmm b/maps/submaps/level_specific/debrisfield/debris5.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/debris5.dmm rename to maps/submaps/level_specific/debrisfield/debris5.dmm diff --git a/_maps/submaps/level_specific/debrisfield/debris6.dmm b/maps/submaps/level_specific/debrisfield/debris6.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/debris6.dmm rename to maps/submaps/level_specific/debrisfield/debris6.dmm diff --git a/_maps/submaps/level_specific/debrisfield/derelict.dmm b/maps/submaps/level_specific/debrisfield/derelict.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/derelict.dmm rename to maps/submaps/level_specific/debrisfield/derelict.dmm diff --git a/_maps/submaps/level_specific/debrisfield/foodstand.dmm b/maps/submaps/level_specific/debrisfield/foodstand.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/foodstand.dmm rename to maps/submaps/level_specific/debrisfield/foodstand.dmm diff --git a/_maps/submaps/level_specific/debrisfield/oldshuttle.dmm b/maps/submaps/level_specific/debrisfield/oldshuttle.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/oldshuttle.dmm rename to maps/submaps/level_specific/debrisfield/oldshuttle.dmm diff --git a/_maps/submaps/level_specific/debrisfield/ship_med_crashed.dmm b/maps/submaps/level_specific/debrisfield/ship_med_crashed.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/ship_med_crashed.dmm rename to maps/submaps/level_specific/debrisfield/ship_med_crashed.dmm diff --git a/_maps/submaps/level_specific/debrisfield/ship_sci_overrun.dmm b/maps/submaps/level_specific/debrisfield/ship_sci_overrun.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/ship_sci_overrun.dmm rename to maps/submaps/level_specific/debrisfield/ship_sci_overrun.dmm diff --git a/_maps/submaps/level_specific/debrisfield/ship_sup_exploded.dmm b/maps/submaps/level_specific/debrisfield/ship_sup_exploded.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield/ship_sup_exploded.dmm rename to maps/submaps/level_specific/debrisfield/ship_sup_exploded.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/asteroids1.dmm b/maps/submaps/level_specific/debrisfield_vr/asteroids1.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/asteroids1.dmm rename to maps/submaps/level_specific/debrisfield_vr/asteroids1.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/asteroids10.dmm b/maps/submaps/level_specific/debrisfield_vr/asteroids10.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/asteroids10.dmm rename to maps/submaps/level_specific/debrisfield_vr/asteroids10.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/asteroids2.dmm b/maps/submaps/level_specific/debrisfield_vr/asteroids2.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/asteroids2.dmm rename to maps/submaps/level_specific/debrisfield_vr/asteroids2.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/asteroids3.dmm b/maps/submaps/level_specific/debrisfield_vr/asteroids3.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/asteroids3.dmm rename to maps/submaps/level_specific/debrisfield_vr/asteroids3.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/asteroids4.dmm b/maps/submaps/level_specific/debrisfield_vr/asteroids4.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/asteroids4.dmm rename to maps/submaps/level_specific/debrisfield_vr/asteroids4.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/asteroids5.dmm b/maps/submaps/level_specific/debrisfield_vr/asteroids5.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/asteroids5.dmm rename to maps/submaps/level_specific/debrisfield_vr/asteroids5.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/asteroids6.dmm b/maps/submaps/level_specific/debrisfield_vr/asteroids6.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/asteroids6.dmm rename to maps/submaps/level_specific/debrisfield_vr/asteroids6.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/asteroids7.dmm b/maps/submaps/level_specific/debrisfield_vr/asteroids7.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/asteroids7.dmm rename to maps/submaps/level_specific/debrisfield_vr/asteroids7.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/asteroids8.dmm b/maps/submaps/level_specific/debrisfield_vr/asteroids8.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/asteroids8.dmm rename to maps/submaps/level_specific/debrisfield_vr/asteroids8.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/asteroids9.dmm b/maps/submaps/level_specific/debrisfield_vr/asteroids9.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/asteroids9.dmm rename to maps/submaps/level_specific/debrisfield_vr/asteroids9.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/carp_asteroids1.dmm b/maps/submaps/level_specific/debrisfield_vr/carp_asteroids1.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/carp_asteroids1.dmm rename to maps/submaps/level_specific/debrisfield_vr/carp_asteroids1.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/carp_asteroids2.dmm b/maps/submaps/level_specific/debrisfield_vr/carp_asteroids2.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/carp_asteroids2.dmm rename to maps/submaps/level_specific/debrisfield_vr/carp_asteroids2.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/carp_asteroids3.dmm b/maps/submaps/level_specific/debrisfield_vr/carp_asteroids3.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/carp_asteroids3.dmm rename to maps/submaps/level_specific/debrisfield_vr/carp_asteroids3.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/carp_asteroids4.dmm b/maps/submaps/level_specific/debrisfield_vr/carp_asteroids4.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/carp_asteroids4.dmm rename to maps/submaps/level_specific/debrisfield_vr/carp_asteroids4.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/carp_asteroids5.dmm b/maps/submaps/level_specific/debrisfield_vr/carp_asteroids5.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/carp_asteroids5.dmm rename to maps/submaps/level_specific/debrisfield_vr/carp_asteroids5.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/carp_asteroids6.dmm b/maps/submaps/level_specific/debrisfield_vr/carp_asteroids6.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/carp_asteroids6.dmm rename to maps/submaps/level_specific/debrisfield_vr/carp_asteroids6.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/carp_asteroids7.dmm b/maps/submaps/level_specific/debrisfield_vr/carp_asteroids7.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/carp_asteroids7.dmm rename to maps/submaps/level_specific/debrisfield_vr/carp_asteroids7.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris1.dmm b/maps/submaps/level_specific/debrisfield_vr/debris1.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris1.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris1.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris10.dmm b/maps/submaps/level_specific/debrisfield_vr/debris10.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris10.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris10.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris11.dmm b/maps/submaps/level_specific/debrisfield_vr/debris11.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris11.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris11.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris12.dmm b/maps/submaps/level_specific/debrisfield_vr/debris12.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris12.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris12.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris13.dmm b/maps/submaps/level_specific/debrisfield_vr/debris13.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris13.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris13.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris14.dmm b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris14.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris14.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris2.dmm b/maps/submaps/level_specific/debrisfield_vr/debris2.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris2.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris2.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris3.dmm b/maps/submaps/level_specific/debrisfield_vr/debris3.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris3.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris3.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris4.dmm b/maps/submaps/level_specific/debrisfield_vr/debris4.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris4.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris4.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris5.dmm b/maps/submaps/level_specific/debrisfield_vr/debris5.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris5.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris5.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris6.dmm b/maps/submaps/level_specific/debrisfield_vr/debris6.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris6.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris6.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris7.dmm b/maps/submaps/level_specific/debrisfield_vr/debris7.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris7.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris7.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris8.dmm b/maps/submaps/level_specific/debrisfield_vr/debris8.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris8.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris8.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debris9.dmm b/maps/submaps/level_specific/debrisfield_vr/debris9.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debris9.dmm rename to maps/submaps/level_specific/debrisfield_vr/debris9.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/debrisfield_things.dm b/maps/submaps/level_specific/debrisfield_vr/debrisfield_things.dm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/debrisfield_things.dm rename to maps/submaps/level_specific/debrisfield_vr/debrisfield_things.dm diff --git a/_maps/submaps/level_specific/debrisfield_vr/derelict.dmm b/maps/submaps/level_specific/debrisfield_vr/derelict.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/derelict.dmm rename to maps/submaps/level_specific/debrisfield_vr/derelict.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/escape_pod.dmm b/maps/submaps/level_specific/debrisfield_vr/escape_pod.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/escape_pod.dmm rename to maps/submaps/level_specific/debrisfield_vr/escape_pod.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/foodstand.dmm b/maps/submaps/level_specific/debrisfield_vr/foodstand.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/foodstand.dmm rename to maps/submaps/level_specific/debrisfield_vr/foodstand.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm rename to maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm rename to maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm b/maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm rename to maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/new_escapepod.dmm b/maps/submaps/level_specific/debrisfield_vr/new_escapepod.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/new_escapepod.dmm rename to maps/submaps/level_specific/debrisfield_vr/new_escapepod.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/new_escapepod_carp.dmm b/maps/submaps/level_specific/debrisfield_vr/new_escapepod_carp.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/new_escapepod_carp.dmm rename to maps/submaps/level_specific/debrisfield_vr/new_escapepod_carp.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/new_escapepod_robo.dmm b/maps/submaps/level_specific/debrisfield_vr/new_escapepod_robo.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/new_escapepod_robo.dmm rename to maps/submaps/level_specific/debrisfield_vr/new_escapepod_robo.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/new_escapepod_xeno.dmm b/maps/submaps/level_specific/debrisfield_vr/new_escapepod_xeno.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/new_escapepod_xeno.dmm rename to maps/submaps/level_specific/debrisfield_vr/new_escapepod_xeno.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm b/maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm rename to maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm b/maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm rename to maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/oldshuttle.dmm b/maps/submaps/level_specific/debrisfield_vr/oldshuttle.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/oldshuttle.dmm rename to maps/submaps/level_specific/debrisfield_vr/oldshuttle.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm rename to maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/ship_med_crashed.dmm b/maps/submaps/level_specific/debrisfield_vr/ship_med_crashed.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/ship_med_crashed.dmm rename to maps/submaps/level_specific/debrisfield_vr/ship_med_crashed.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/ship_mining_drone.dmm b/maps/submaps/level_specific/debrisfield_vr/ship_mining_drone.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/ship_mining_drone.dmm rename to maps/submaps/level_specific/debrisfield_vr/ship_mining_drone.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/ship_sci_overrun.dmm b/maps/submaps/level_specific/debrisfield_vr/ship_sci_overrun.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/ship_sci_overrun.dmm rename to maps/submaps/level_specific/debrisfield_vr/ship_sci_overrun.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/ship_sup_exploded.dmm b/maps/submaps/level_specific/debrisfield_vr/ship_sup_exploded.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/ship_sup_exploded.dmm rename to maps/submaps/level_specific/debrisfield_vr/ship_sup_exploded.dmm diff --git a/_maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm b/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm similarity index 100% rename from _maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm rename to maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm diff --git a/_maps/submaps/level_specific/lavaland/ashlandercamp.dmm b/maps/submaps/level_specific/lavaland/ashlandercamp.dmm similarity index 100% rename from _maps/submaps/level_specific/lavaland/ashlandercamp.dmm rename to maps/submaps/level_specific/lavaland/ashlandercamp.dmm diff --git a/_maps/submaps/level_specific/lavaland/boss1.dmm b/maps/submaps/level_specific/lavaland/boss1.dmm similarity index 100% rename from _maps/submaps/level_specific/lavaland/boss1.dmm rename to maps/submaps/level_specific/lavaland/boss1.dmm diff --git a/_maps/submaps/level_specific/lavaland/botany.dmm b/maps/submaps/level_specific/lavaland/botany.dmm similarity index 100% rename from _maps/submaps/level_specific/lavaland/botany.dmm rename to maps/submaps/level_specific/lavaland/botany.dmm diff --git a/_maps/submaps/level_specific/lavaland/dogs.dmm b/maps/submaps/level_specific/lavaland/dogs.dmm similarity index 100% rename from _maps/submaps/level_specific/lavaland/dogs.dmm rename to maps/submaps/level_specific/lavaland/dogs.dmm diff --git a/_maps/submaps/level_specific/lavaland/horrors.dmm b/maps/submaps/level_specific/lavaland/horrors.dmm similarity index 100% rename from _maps/submaps/level_specific/lavaland/horrors.dmm rename to maps/submaps/level_specific/lavaland/horrors.dmm diff --git a/_maps/submaps/level_specific/lavaland/idleruins1.dmm b/maps/submaps/level_specific/lavaland/idleruins1.dmm similarity index 100% rename from _maps/submaps/level_specific/lavaland/idleruins1.dmm rename to maps/submaps/level_specific/lavaland/idleruins1.dmm diff --git a/_maps/submaps/level_specific/lavaland/idleruins2.dmm b/maps/submaps/level_specific/lavaland/idleruins2.dmm similarity index 100% rename from _maps/submaps/level_specific/lavaland/idleruins2.dmm rename to maps/submaps/level_specific/lavaland/idleruins2.dmm diff --git a/_maps/submaps/level_specific/lavaland/shelter.dmm b/maps/submaps/level_specific/lavaland/shelter.dmm similarity index 100% rename from _maps/submaps/level_specific/lavaland/shelter.dmm rename to maps/submaps/level_specific/lavaland/shelter.dmm diff --git a/_maps/submaps/level_specific/underdark/Corridor.dmm b/maps/submaps/level_specific/underdark/Corridor.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/Corridor.dmm rename to maps/submaps/level_specific/underdark/Corridor.dmm diff --git a/_maps/submaps/level_specific/underdark/abandonded_outpost.dmm b/maps/submaps/level_specific/underdark/abandonded_outpost.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/abandonded_outpost.dmm rename to maps/submaps/level_specific/underdark/abandonded_outpost.dmm diff --git a/_maps/submaps/level_specific/underdark/abandonedshelter.dmm b/maps/submaps/level_specific/underdark/abandonedshelter.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/abandonedshelter.dmm rename to maps/submaps/level_specific/underdark/abandonedshelter.dmm diff --git a/_maps/submaps/level_specific/underdark/blaster.dmm b/maps/submaps/level_specific/underdark/blaster.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/blaster.dmm rename to maps/submaps/level_specific/underdark/blaster.dmm diff --git a/_maps/submaps/level_specific/underdark/boss_mob.dmm b/maps/submaps/level_specific/underdark/boss_mob.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/boss_mob.dmm rename to maps/submaps/level_specific/underdark/boss_mob.dmm diff --git a/_maps/submaps/level_specific/underdark/broken_engine.dmm b/maps/submaps/level_specific/underdark/broken_engine.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/broken_engine.dmm rename to maps/submaps/level_specific/underdark/broken_engine.dmm diff --git a/_maps/submaps/level_specific/underdark/deadminer.dmm b/maps/submaps/level_specific/underdark/deadminer.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/deadminer.dmm rename to maps/submaps/level_specific/underdark/deadminer.dmm diff --git a/_maps/submaps/level_specific/underdark/goldhall.dmm b/maps/submaps/level_specific/underdark/goldhall.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/goldhall.dmm rename to maps/submaps/level_specific/underdark/goldhall.dmm diff --git a/_maps/submaps/level_specific/underdark/guardedloot_hard.dmm b/maps/submaps/level_specific/underdark/guardedloot_hard.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/guardedloot_hard.dmm rename to maps/submaps/level_specific/underdark/guardedloot_hard.dmm diff --git a/_maps/submaps/level_specific/underdark/guardedloot_normal.dmm b/maps/submaps/level_specific/underdark/guardedloot_normal.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/guardedloot_normal.dmm rename to maps/submaps/level_specific/underdark/guardedloot_normal.dmm diff --git a/_maps/submaps/level_specific/underdark/hard_mob.dmm b/maps/submaps/level_specific/underdark/hard_mob.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/hard_mob.dmm rename to maps/submaps/level_specific/underdark/hard_mob.dmm diff --git a/_maps/submaps/level_specific/underdark/mechbay.dmm b/maps/submaps/level_specific/underdark/mechbay.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/mechbay.dmm rename to maps/submaps/level_specific/underdark/mechbay.dmm diff --git a/_maps/submaps/level_specific/underdark/mechwreck.dmm b/maps/submaps/level_specific/underdark/mechwreck.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/mechwreck.dmm rename to maps/submaps/level_specific/underdark/mechwreck.dmm diff --git a/_maps/submaps/level_specific/underdark/mimicry.dmm b/maps/submaps/level_specific/underdark/mimicry.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/mimicry.dmm rename to maps/submaps/level_specific/underdark/mimicry.dmm diff --git a/_maps/submaps/level_specific/underdark/normal_mob.dmm b/maps/submaps/level_specific/underdark/normal_mob.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/normal_mob.dmm rename to maps/submaps/level_specific/underdark/normal_mob.dmm diff --git a/_maps/submaps/level_specific/underdark/old_drone_hive.dmm b/maps/submaps/level_specific/underdark/old_drone_hive.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/old_drone_hive.dmm rename to maps/submaps/level_specific/underdark/old_drone_hive.dmm diff --git a/_maps/submaps/level_specific/underdark/phoron_rat_den.dmm b/maps/submaps/level_specific/underdark/phoron_rat_den.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/phoron_rat_den.dmm rename to maps/submaps/level_specific/underdark/phoron_rat_den.dmm diff --git a/_maps/submaps/level_specific/underdark/puzzle_corridor.dmm b/maps/submaps/level_specific/underdark/puzzle_corridor.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/puzzle_corridor.dmm rename to maps/submaps/level_specific/underdark/puzzle_corridor.dmm diff --git a/_maps/submaps/level_specific/underdark/rad_threat.dmm b/maps/submaps/level_specific/underdark/rad_threat.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/rad_threat.dmm rename to maps/submaps/level_specific/underdark/rad_threat.dmm diff --git a/_maps/submaps/level_specific/underdark/rykka_easter_egg.dmm b/maps/submaps/level_specific/underdark/rykka_easter_egg.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/rykka_easter_egg.dmm rename to maps/submaps/level_specific/underdark/rykka_easter_egg.dmm diff --git a/_maps/submaps/level_specific/underdark/spider_nest.dmm b/maps/submaps/level_specific/underdark/spider_nest.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/spider_nest.dmm rename to maps/submaps/level_specific/underdark/spider_nest.dmm diff --git a/_maps/submaps/level_specific/underdark/subterranean_lake.dmm b/maps/submaps/level_specific/underdark/subterranean_lake.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/subterranean_lake.dmm rename to maps/submaps/level_specific/underdark/subterranean_lake.dmm diff --git a/_maps/submaps/level_specific/underdark/testsite.dmm b/maps/submaps/level_specific/underdark/testsite.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/testsite.dmm rename to maps/submaps/level_specific/underdark/testsite.dmm diff --git a/_maps/submaps/level_specific/underdark/tree_shrine.dmm b/maps/submaps/level_specific/underdark/tree_shrine.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/tree_shrine.dmm rename to maps/submaps/level_specific/underdark/tree_shrine.dmm diff --git a/_maps/submaps/level_specific/underdark/vault1.dmm b/maps/submaps/level_specific/underdark/vault1.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/vault1.dmm rename to maps/submaps/level_specific/underdark/vault1.dmm diff --git a/_maps/submaps/level_specific/underdark/vault2.dmm b/maps/submaps/level_specific/underdark/vault2.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/vault2.dmm rename to maps/submaps/level_specific/underdark/vault2.dmm diff --git a/_maps/submaps/level_specific/underdark/vault3.dmm b/maps/submaps/level_specific/underdark/vault3.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/vault3.dmm rename to maps/submaps/level_specific/underdark/vault3.dmm diff --git a/_maps/submaps/level_specific/underdark/wolf_den.dmm b/maps/submaps/level_specific/underdark/wolf_den.dmm similarity index 100% rename from _maps/submaps/level_specific/underdark/wolf_den.dmm rename to maps/submaps/level_specific/underdark/wolf_den.dmm diff --git a/_maps/submaps/level_specific/virgo2/Blackshuttledown.dmm b/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Blackshuttledown.dmm rename to maps/submaps/level_specific/virgo2/Blackshuttledown.dmm diff --git a/_maps/submaps/level_specific/virgo2/Boombase.dmm b/maps/submaps/level_specific/virgo2/Boombase.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Boombase.dmm rename to maps/submaps/level_specific/virgo2/Boombase.dmm diff --git a/_maps/submaps/level_specific/virgo2/CaveS.dmm b/maps/submaps/level_specific/virgo2/CaveS.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/CaveS.dmm rename to maps/submaps/level_specific/virgo2/CaveS.dmm diff --git a/_maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm b/maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm rename to maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm diff --git a/_maps/submaps/level_specific/virgo2/DJOutpost1.dmm b/maps/submaps/level_specific/virgo2/DJOutpost1.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/DJOutpost1.dmm rename to maps/submaps/level_specific/virgo2/DJOutpost1.dmm diff --git a/_maps/submaps/level_specific/virgo2/DJOutpost2.dmm b/maps/submaps/level_specific/virgo2/DJOutpost2.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/DJOutpost2.dmm rename to maps/submaps/level_specific/virgo2/DJOutpost2.dmm diff --git a/_maps/submaps/level_specific/virgo2/DecoupledEngine.dmm b/maps/submaps/level_specific/virgo2/DecoupledEngine.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/DecoupledEngine.dmm rename to maps/submaps/level_specific/virgo2/DecoupledEngine.dmm diff --git a/_maps/submaps/level_specific/virgo2/DoomP.dmm b/maps/submaps/level_specific/virgo2/DoomP.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/DoomP.dmm rename to maps/submaps/level_specific/virgo2/DoomP.dmm diff --git a/_maps/submaps/level_specific/virgo2/Drugden.dmm b/maps/submaps/level_specific/virgo2/Drugden.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Drugden.dmm rename to maps/submaps/level_specific/virgo2/Drugden.dmm diff --git a/_maps/submaps/level_specific/virgo2/Epod3.dmm b/maps/submaps/level_specific/virgo2/Epod3.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Epod3.dmm rename to maps/submaps/level_specific/virgo2/Epod3.dmm diff --git a/_maps/submaps/level_specific/virgo2/Epod4.dmm b/maps/submaps/level_specific/virgo2/Epod4.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Epod4.dmm rename to maps/submaps/level_specific/virgo2/Epod4.dmm diff --git a/_maps/submaps/level_specific/virgo2/Flake.dmm b/maps/submaps/level_specific/virgo2/Flake.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Flake.dmm rename to maps/submaps/level_specific/virgo2/Flake.dmm diff --git a/_maps/submaps/level_specific/virgo2/GovPatrol.dmm b/maps/submaps/level_specific/virgo2/GovPatrol.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/GovPatrol.dmm rename to maps/submaps/level_specific/virgo2/GovPatrol.dmm diff --git a/_maps/submaps/level_specific/virgo2/Lab1.dmm b/maps/submaps/level_specific/virgo2/Lab1.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Lab1.dmm rename to maps/submaps/level_specific/virgo2/Lab1.dmm diff --git a/_maps/submaps/level_specific/virgo2/MCamp1.dmm b/maps/submaps/level_specific/virgo2/MCamp1.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/MCamp1.dmm rename to maps/submaps/level_specific/virgo2/MCamp1.dmm diff --git a/_maps/submaps/level_specific/virgo2/MHR.dmm b/maps/submaps/level_specific/virgo2/MHR.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/MHR.dmm rename to maps/submaps/level_specific/virgo2/MHR.dmm diff --git a/_maps/submaps/level_specific/virgo2/Manor1.dmm b/maps/submaps/level_specific/virgo2/Manor1.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Manor1.dmm rename to maps/submaps/level_specific/virgo2/Manor1.dmm diff --git a/_maps/submaps/level_specific/virgo2/Mudpit.dmm b/maps/submaps/level_specific/virgo2/Mudpit.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Mudpit.dmm rename to maps/submaps/level_specific/virgo2/Mudpit.dmm diff --git a/_maps/submaps/level_specific/virgo2/Musk.dmm b/maps/submaps/level_specific/virgo2/Musk.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Musk.dmm rename to maps/submaps/level_specific/virgo2/Musk.dmm diff --git a/_maps/submaps/level_specific/virgo2/Rocky1.dmm b/maps/submaps/level_specific/virgo2/Rocky1.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Rocky1.dmm rename to maps/submaps/level_specific/virgo2/Rocky1.dmm diff --git a/_maps/submaps/level_specific/virgo2/Rocky4.dmm b/maps/submaps/level_specific/virgo2/Rocky4.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Rocky4.dmm rename to maps/submaps/level_specific/virgo2/Rocky4.dmm diff --git a/_maps/submaps/level_specific/virgo2/Rockybase.dmm b/maps/submaps/level_specific/virgo2/Rockybase.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Rockybase.dmm rename to maps/submaps/level_specific/virgo2/Rockybase.dmm diff --git a/_maps/submaps/level_specific/virgo2/Shack1.dmm b/maps/submaps/level_specific/virgo2/Shack1.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Shack1.dmm rename to maps/submaps/level_specific/virgo2/Shack1.dmm diff --git a/_maps/submaps/level_specific/virgo2/Smol1.dmm b/maps/submaps/level_specific/virgo2/Smol1.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Smol1.dmm rename to maps/submaps/level_specific/virgo2/Smol1.dmm diff --git a/_maps/submaps/level_specific/virgo2/Snowrock1.dmm b/maps/submaps/level_specific/virgo2/Snowrock1.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/Snowrock1.dmm rename to maps/submaps/level_specific/virgo2/Snowrock1.dmm diff --git a/_maps/submaps/level_specific/virgo2/butchershack.dmm b/maps/submaps/level_specific/virgo2/butchershack.dmm similarity index 100% rename from _maps/submaps/level_specific/virgo2/butchershack.dmm rename to maps/submaps/level_specific/virgo2/butchershack.dmm diff --git a/_maps/submaps/lythios_rift/admin_spawn/blank_5by5.dmm b/maps/submaps/lythios_rift/admin_spawn/blank_5by5.dmm similarity index 100% rename from _maps/submaps/lythios_rift/admin_spawn/blank_5by5.dmm rename to maps/submaps/lythios_rift/admin_spawn/blank_5by5.dmm diff --git a/_maps/submaps/lythios_rift/base/base_small_rock_1.dmm b/maps/submaps/lythios_rift/base/base_small_rock_1.dmm similarity index 100% rename from _maps/submaps/lythios_rift/base/base_small_rock_1.dmm rename to maps/submaps/lythios_rift/base/base_small_rock_1.dmm diff --git a/_maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm similarity index 100% rename from _maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm rename to maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm diff --git a/_maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm similarity index 100% rename from _maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm rename to maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm diff --git a/_maps/submaps/lythios_rift/caves/west_caves_cavern1.dmm b/maps/submaps/lythios_rift/caves/west_caves_cavern1.dmm similarity index 100% rename from _maps/submaps/lythios_rift/caves/west_caves_cavern1.dmm rename to maps/submaps/lythios_rift/caves/west_caves_cavern1.dmm diff --git a/_maps/submaps/lythios_rift/caves/west_caves_cavern2.dmm b/maps/submaps/lythios_rift/caves/west_caves_cavern2.dmm similarity index 100% rename from _maps/submaps/lythios_rift/caves/west_caves_cavern2.dmm rename to maps/submaps/lythios_rift/caves/west_caves_cavern2.dmm diff --git a/_maps/submaps/lythios_rift/caves/west_caves_cavern3.dmm b/maps/submaps/lythios_rift/caves/west_caves_cavern3.dmm similarity index 100% rename from _maps/submaps/lythios_rift/caves/west_caves_cavern3.dmm rename to maps/submaps/lythios_rift/caves/west_caves_cavern3.dmm diff --git a/_maps/submaps/lythios_rift/caves/west_caves_cavern4.dmm b/maps/submaps/lythios_rift/caves/west_caves_cavern4.dmm similarity index 100% rename from _maps/submaps/lythios_rift/caves/west_caves_cavern4.dmm rename to maps/submaps/lythios_rift/caves/west_caves_cavern4.dmm diff --git a/_maps/submaps/lythios_rift/caves/west_caves_rock1.dmm b/maps/submaps/lythios_rift/caves/west_caves_rock1.dmm similarity index 100% rename from _maps/submaps/lythios_rift/caves/west_caves_rock1.dmm rename to maps/submaps/lythios_rift/caves/west_caves_rock1.dmm diff --git a/_maps/submaps/lythios_rift/caves/west_caves_small_crystal1.dmm b/maps/submaps/lythios_rift/caves/west_caves_small_crystal1.dmm similarity index 100% rename from _maps/submaps/lythios_rift/caves/west_caves_small_crystal1.dmm rename to maps/submaps/lythios_rift/caves/west_caves_small_crystal1.dmm diff --git a/_maps/submaps/lythios_rift/caves/west_caves_small_crystal2.dmm b/maps/submaps/lythios_rift/caves/west_caves_small_crystal2.dmm similarity index 100% rename from _maps/submaps/lythios_rift/caves/west_caves_small_crystal2.dmm rename to maps/submaps/lythios_rift/caves/west_caves_small_crystal2.dmm diff --git a/_maps/submaps/lythios_rift/caves/west_caves_survival_cave.dmm b/maps/submaps/lythios_rift/caves/west_caves_survival_cave.dmm similarity index 100% rename from _maps/submaps/lythios_rift/caves/west_caves_survival_cave.dmm rename to maps/submaps/lythios_rift/caves/west_caves_survival_cave.dmm diff --git a/_maps/submaps/lythios_rift/deep_caves/deep_small_crystals_1.dmm b/maps/submaps/lythios_rift/deep_caves/deep_small_crystals_1.dmm similarity index 100% rename from _maps/submaps/lythios_rift/deep_caves/deep_small_crystals_1.dmm rename to maps/submaps/lythios_rift/deep_caves/deep_small_crystals_1.dmm diff --git a/_maps/submaps/lythios_rift/geothermal_vent.dmm b/maps/submaps/lythios_rift/geothermal_vent.dmm similarity index 100% rename from _maps/submaps/lythios_rift/geothermal_vent.dmm rename to maps/submaps/lythios_rift/geothermal_vent.dmm diff --git a/_maps/submaps/lythios_rift/map_makers_pallet.dmm b/maps/submaps/lythios_rift/map_makers_pallet.dmm similarity index 100% rename from _maps/submaps/lythios_rift/map_makers_pallet.dmm rename to maps/submaps/lythios_rift/map_makers_pallet.dmm diff --git a/_maps/submaps/mountains/BlastMine1.dmm b/maps/submaps/mountains/BlastMine1.dmm similarity index 100% rename from _maps/submaps/mountains/BlastMine1.dmm rename to maps/submaps/mountains/BlastMine1.dmm diff --git a/_maps/submaps/mountains/CaveTrench.dmm b/maps/submaps/mountains/CaveTrench.dmm similarity index 100% rename from _maps/submaps/mountains/CaveTrench.dmm rename to maps/submaps/mountains/CaveTrench.dmm diff --git a/_maps/submaps/mountains/Cavelake.dmm b/maps/submaps/mountains/Cavelake.dmm similarity index 100% rename from _maps/submaps/mountains/Cavelake.dmm rename to maps/submaps/mountains/Cavelake.dmm diff --git a/_maps/submaps/mountains/Cliff1.dmm b/maps/submaps/mountains/Cliff1.dmm similarity index 100% rename from _maps/submaps/mountains/Cliff1.dmm rename to maps/submaps/mountains/Cliff1.dmm diff --git a/_maps/submaps/mountains/CrashedMedShuttle1.dmm b/maps/submaps/mountains/CrashedMedShuttle1.dmm similarity index 100% rename from _maps/submaps/mountains/CrashedMedShuttle1.dmm rename to maps/submaps/mountains/CrashedMedShuttle1.dmm diff --git a/_maps/submaps/mountains/CrashedMedShuttle1_vr.dmm b/maps/submaps/mountains/CrashedMedShuttle1_vr.dmm similarity index 100% rename from _maps/submaps/mountains/CrashedMedShuttle1_vr.dmm rename to maps/submaps/mountains/CrashedMedShuttle1_vr.dmm diff --git a/_maps/submaps/mountains/Geyser1.dmm b/maps/submaps/mountains/Geyser1.dmm similarity index 100% rename from _maps/submaps/mountains/Geyser1.dmm rename to maps/submaps/mountains/Geyser1.dmm diff --git a/_maps/submaps/mountains/Geyser2.dmm b/maps/submaps/mountains/Geyser2.dmm similarity index 100% rename from _maps/submaps/mountains/Geyser2.dmm rename to maps/submaps/mountains/Geyser2.dmm diff --git a/_maps/submaps/mountains/Geyser3.dmm b/maps/submaps/mountains/Geyser3.dmm similarity index 100% rename from _maps/submaps/mountains/Geyser3.dmm rename to maps/submaps/mountains/Geyser3.dmm diff --git a/_maps/submaps/mountains/IceCave1A.dmm b/maps/submaps/mountains/IceCave1A.dmm similarity index 100% rename from _maps/submaps/mountains/IceCave1A.dmm rename to maps/submaps/mountains/IceCave1A.dmm diff --git a/_maps/submaps/mountains/IceCave1B.dmm b/maps/submaps/mountains/IceCave1B.dmm similarity index 100% rename from _maps/submaps/mountains/IceCave1B.dmm rename to maps/submaps/mountains/IceCave1B.dmm diff --git a/_maps/submaps/mountains/IceCave1C.dmm b/maps/submaps/mountains/IceCave1C.dmm similarity index 100% rename from _maps/submaps/mountains/IceCave1C.dmm rename to maps/submaps/mountains/IceCave1C.dmm diff --git a/_maps/submaps/mountains/Mineshaft1.dmm b/maps/submaps/mountains/Mineshaft1.dmm similarity index 100% rename from _maps/submaps/mountains/Mineshaft1.dmm rename to maps/submaps/mountains/Mineshaft1.dmm diff --git a/_maps/submaps/mountains/Rockb1.dmm b/maps/submaps/mountains/Rockb1.dmm similarity index 100% rename from _maps/submaps/mountains/Rockb1.dmm rename to maps/submaps/mountains/Rockb1.dmm diff --git a/_maps/submaps/mountains/Scave1.dmm b/maps/submaps/mountains/Scave1.dmm similarity index 100% rename from _maps/submaps/mountains/Scave1.dmm rename to maps/submaps/mountains/Scave1.dmm diff --git a/_maps/submaps/mountains/SupplyDrop1.dmm b/maps/submaps/mountains/SupplyDrop1.dmm similarity index 100% rename from _maps/submaps/mountains/SupplyDrop1.dmm rename to maps/submaps/mountains/SupplyDrop1.dmm diff --git a/_maps/submaps/mountains/SwordCave.dmm b/maps/submaps/mountains/SwordCave.dmm similarity index 100% rename from _maps/submaps/mountains/SwordCave.dmm rename to maps/submaps/mountains/SwordCave.dmm diff --git a/_maps/submaps/mountains/crashed_ufo.dmm b/maps/submaps/mountains/crashed_ufo.dmm similarity index 100% rename from _maps/submaps/mountains/crashed_ufo.dmm rename to maps/submaps/mountains/crashed_ufo.dmm diff --git a/_maps/submaps/mountains/crashed_ufo_frigate.dmm b/maps/submaps/mountains/crashed_ufo_frigate.dmm similarity index 100% rename from _maps/submaps/mountains/crashed_ufo_frigate.dmm rename to maps/submaps/mountains/crashed_ufo_frigate.dmm diff --git a/_maps/submaps/mountains/crashedcontainmentshuttle.dmm b/maps/submaps/mountains/crashedcontainmentshuttle.dmm similarity index 100% rename from _maps/submaps/mountains/crashedcontainmentshuttle.dmm rename to maps/submaps/mountains/crashedcontainmentshuttle.dmm diff --git a/_maps/submaps/mountains/crashedcontainmentshuttle_vr.dmm b/maps/submaps/mountains/crashedcontainmentshuttle_vr.dmm similarity index 100% rename from _maps/submaps/mountains/crashedcontainmentshuttle_vr.dmm rename to maps/submaps/mountains/crashedcontainmentshuttle_vr.dmm diff --git a/_maps/submaps/mountains/crystal1.dmm b/maps/submaps/mountains/crystal1.dmm similarity index 100% rename from _maps/submaps/mountains/crystal1.dmm rename to maps/submaps/mountains/crystal1.dmm diff --git a/_maps/submaps/mountains/crystal2.dmm b/maps/submaps/mountains/crystal2.dmm similarity index 100% rename from _maps/submaps/mountains/crystal2.dmm rename to maps/submaps/mountains/crystal2.dmm diff --git a/_maps/submaps/mountains/crystal3.dmm b/maps/submaps/mountains/crystal3.dmm similarity index 100% rename from _maps/submaps/mountains/crystal3.dmm rename to maps/submaps/mountains/crystal3.dmm diff --git a/_maps/submaps/mountains/cultmine.dmm b/maps/submaps/mountains/cultmine.dmm similarity index 100% rename from _maps/submaps/mountains/cultmine.dmm rename to maps/submaps/mountains/cultmine.dmm diff --git a/_maps/submaps/mountains/deadBeacon.dmm b/maps/submaps/mountains/deadBeacon.dmm similarity index 100% rename from _maps/submaps/mountains/deadBeacon.dmm rename to maps/submaps/mountains/deadBeacon.dmm diff --git a/_maps/submaps/mountains/deadspy.dmm b/maps/submaps/mountains/deadspy.dmm similarity index 100% rename from _maps/submaps/mountains/deadspy.dmm rename to maps/submaps/mountains/deadspy.dmm diff --git a/_maps/submaps/mountains/digsite.dmm b/maps/submaps/mountains/digsite.dmm similarity index 100% rename from _maps/submaps/mountains/digsite.dmm rename to maps/submaps/mountains/digsite.dmm diff --git a/_maps/submaps/mountains/lava_trench.dmm b/maps/submaps/mountains/lava_trench.dmm similarity index 100% rename from _maps/submaps/mountains/lava_trench.dmm rename to maps/submaps/mountains/lava_trench.dmm diff --git a/_maps/submaps/mountains/lost_explorer.dmm b/maps/submaps/mountains/lost_explorer.dmm similarity index 100% rename from _maps/submaps/mountains/lost_explorer.dmm rename to maps/submaps/mountains/lost_explorer.dmm diff --git a/_maps/submaps/mountains/prepper1.dmm b/maps/submaps/mountains/prepper1.dmm similarity index 100% rename from _maps/submaps/mountains/prepper1.dmm rename to maps/submaps/mountains/prepper1.dmm diff --git a/_maps/submaps/mountains/quarantineshuttle.dmm b/maps/submaps/mountains/quarantineshuttle.dmm similarity index 100% rename from _maps/submaps/mountains/quarantineshuttle.dmm rename to maps/submaps/mountains/quarantineshuttle.dmm diff --git a/_maps/submaps/mountains/ritual.dmm b/maps/submaps/mountains/ritual.dmm similarity index 100% rename from _maps/submaps/mountains/ritual.dmm rename to maps/submaps/mountains/ritual.dmm diff --git a/_maps/submaps/mountains/temple.dmm b/maps/submaps/mountains/temple.dmm similarity index 100% rename from _maps/submaps/mountains/temple.dmm rename to maps/submaps/mountains/temple.dmm diff --git a/_maps/submaps/mountains/vault1.dmm b/maps/submaps/mountains/vault1.dmm similarity index 100% rename from _maps/submaps/mountains/vault1.dmm rename to maps/submaps/mountains/vault1.dmm diff --git a/_maps/submaps/mountains/vault2.dmm b/maps/submaps/mountains/vault2.dmm similarity index 100% rename from _maps/submaps/mountains/vault2.dmm rename to maps/submaps/mountains/vault2.dmm diff --git a/_maps/submaps/mountains/vault3.dmm b/maps/submaps/mountains/vault3.dmm similarity index 100% rename from _maps/submaps/mountains/vault3.dmm rename to maps/submaps/mountains/vault3.dmm diff --git a/_maps/submaps/mountains/vault4.dmm b/maps/submaps/mountains/vault4.dmm similarity index 100% rename from _maps/submaps/mountains/vault4.dmm rename to maps/submaps/mountains/vault4.dmm diff --git a/_maps/submaps/mountains/vault5.dmm b/maps/submaps/mountains/vault5.dmm similarity index 100% rename from _maps/submaps/mountains/vault5.dmm rename to maps/submaps/mountains/vault5.dmm diff --git a/_maps/submaps/mountains/vault6.dmm b/maps/submaps/mountains/vault6.dmm similarity index 100% rename from _maps/submaps/mountains/vault6.dmm rename to maps/submaps/mountains/vault6.dmm diff --git a/_maps/submaps/plains/Boathouse.dmm b/maps/submaps/plains/Boathouse.dmm similarity index 100% rename from _maps/submaps/plains/Boathouse.dmm rename to maps/submaps/plains/Boathouse.dmm diff --git a/_maps/submaps/plains/Boathouse_vr.dmm b/maps/submaps/plains/Boathouse_vr.dmm similarity index 100% rename from _maps/submaps/plains/Boathouse_vr.dmm rename to maps/submaps/plains/Boathouse_vr.dmm diff --git a/_maps/submaps/plains/Diner.dmm b/maps/submaps/plains/Diner.dmm similarity index 100% rename from _maps/submaps/plains/Diner.dmm rename to maps/submaps/plains/Diner.dmm diff --git a/_maps/submaps/plains/Diner_vr.dmm b/maps/submaps/plains/Diner_vr.dmm similarity index 100% rename from _maps/submaps/plains/Diner_vr.dmm rename to maps/submaps/plains/Diner_vr.dmm diff --git a/_maps/submaps/plains/Epod.dmm b/maps/submaps/plains/Epod.dmm similarity index 100% rename from _maps/submaps/plains/Epod.dmm rename to maps/submaps/plains/Epod.dmm diff --git a/_maps/submaps/plains/Epod2.dmm b/maps/submaps/plains/Epod2.dmm similarity index 100% rename from _maps/submaps/plains/Epod2.dmm rename to maps/submaps/plains/Epod2.dmm diff --git a/_maps/submaps/plains/Field1.dmm b/maps/submaps/plains/Field1.dmm similarity index 100% rename from _maps/submaps/plains/Field1.dmm rename to maps/submaps/plains/Field1.dmm diff --git a/_maps/submaps/plains/Mechpt.dmm b/maps/submaps/plains/Mechpt.dmm similarity index 100% rename from _maps/submaps/plains/Mechpt.dmm rename to maps/submaps/plains/Mechpt.dmm diff --git a/_maps/submaps/plains/Oldhouse.dmm b/maps/submaps/plains/Oldhouse.dmm similarity index 100% rename from _maps/submaps/plains/Oldhouse.dmm rename to maps/submaps/plains/Oldhouse.dmm diff --git a/_maps/submaps/plains/Oldhouse_vr.dmm b/maps/submaps/plains/Oldhouse_vr.dmm similarity index 100% rename from _maps/submaps/plains/Oldhouse_vr.dmm rename to maps/submaps/plains/Oldhouse_vr.dmm diff --git a/_maps/submaps/plains/PascalB.dmm b/maps/submaps/plains/PascalB.dmm similarity index 100% rename from _maps/submaps/plains/PascalB.dmm rename to maps/submaps/plains/PascalB.dmm diff --git a/_maps/submaps/plains/Peninsula.dmm b/maps/submaps/plains/Peninsula.dmm similarity index 100% rename from _maps/submaps/plains/Peninsula.dmm rename to maps/submaps/plains/Peninsula.dmm diff --git a/_maps/submaps/plains/PooledR.dmm b/maps/submaps/plains/PooledR.dmm similarity index 100% rename from _maps/submaps/plains/PooledR.dmm rename to maps/submaps/plains/PooledR.dmm diff --git a/_maps/submaps/plains/PooledR_vr.dmm b/maps/submaps/plains/PooledR_vr.dmm similarity index 100% rename from _maps/submaps/plains/PooledR_vr.dmm rename to maps/submaps/plains/PooledR_vr.dmm diff --git a/_maps/submaps/plains/RationCache.dmm b/maps/submaps/plains/RationCache.dmm similarity index 100% rename from _maps/submaps/plains/RationCache.dmm rename to maps/submaps/plains/RationCache.dmm diff --git a/_maps/submaps/plains/RationCache_vr.dmm b/maps/submaps/plains/RationCache_vr.dmm similarity index 100% rename from _maps/submaps/plains/RationCache_vr.dmm rename to maps/submaps/plains/RationCache_vr.dmm diff --git a/_maps/submaps/plains/Rocky2.dmm b/maps/submaps/plains/Rocky2.dmm similarity index 100% rename from _maps/submaps/plains/Rocky2.dmm rename to maps/submaps/plains/Rocky2.dmm diff --git a/_maps/submaps/plains/Rocky5.dmm b/maps/submaps/plains/Rocky5.dmm similarity index 100% rename from _maps/submaps/plains/Rocky5.dmm rename to maps/submaps/plains/Rocky5.dmm diff --git a/_maps/submaps/plains/Shakden.dmm b/maps/submaps/plains/Shakden.dmm similarity index 100% rename from _maps/submaps/plains/Shakden.dmm rename to maps/submaps/plains/Shakden.dmm diff --git a/_maps/submaps/plains/Shakden_vr.dmm b/maps/submaps/plains/Shakden_vr.dmm similarity index 100% rename from _maps/submaps/plains/Shakden_vr.dmm rename to maps/submaps/plains/Shakden_vr.dmm diff --git a/_maps/submaps/plains/Smol3.dmm b/maps/submaps/plains/Smol3.dmm similarity index 100% rename from _maps/submaps/plains/Smol3.dmm rename to maps/submaps/plains/Smol3.dmm diff --git a/_maps/submaps/plains/SupplyDrop2.dmm b/maps/submaps/plains/SupplyDrop2.dmm similarity index 100% rename from _maps/submaps/plains/SupplyDrop2.dmm rename to maps/submaps/plains/SupplyDrop2.dmm diff --git a/_maps/submaps/plains/Thiefc.dmm b/maps/submaps/plains/Thiefc.dmm similarity index 100% rename from _maps/submaps/plains/Thiefc.dmm rename to maps/submaps/plains/Thiefc.dmm diff --git a/_maps/submaps/plains/Thiefc_vr.dmm b/maps/submaps/plains/Thiefc_vr.dmm similarity index 100% rename from _maps/submaps/plains/Thiefc_vr.dmm rename to maps/submaps/plains/Thiefc_vr.dmm diff --git a/_maps/submaps/plains/beacons.dmm b/maps/submaps/plains/beacons.dmm similarity index 100% rename from _maps/submaps/plains/beacons.dmm rename to maps/submaps/plains/beacons.dmm diff --git a/_maps/submaps/plains/bonfire.dmm b/maps/submaps/plains/bonfire.dmm similarity index 100% rename from _maps/submaps/plains/bonfire.dmm rename to maps/submaps/plains/bonfire.dmm diff --git a/_maps/submaps/plains/camp1.dmm b/maps/submaps/plains/camp1.dmm similarity index 100% rename from _maps/submaps/plains/camp1.dmm rename to maps/submaps/plains/camp1.dmm diff --git a/_maps/submaps/plains/camp1_vr.dmm b/maps/submaps/plains/camp1_vr.dmm similarity index 100% rename from _maps/submaps/plains/camp1_vr.dmm rename to maps/submaps/plains/camp1_vr.dmm diff --git a/_maps/submaps/plains/construction1.dmm b/maps/submaps/plains/construction1.dmm similarity index 100% rename from _maps/submaps/plains/construction1.dmm rename to maps/submaps/plains/construction1.dmm diff --git a/_maps/submaps/plains/farm1.dmm b/maps/submaps/plains/farm1.dmm similarity index 100% rename from _maps/submaps/plains/farm1.dmm rename to maps/submaps/plains/farm1.dmm diff --git a/_maps/submaps/plains/farm1_vr.dmm b/maps/submaps/plains/farm1_vr.dmm similarity index 100% rename from _maps/submaps/plains/farm1_vr.dmm rename to maps/submaps/plains/farm1_vr.dmm diff --git a/_maps/submaps/plains/house1.dmm b/maps/submaps/plains/house1.dmm similarity index 100% rename from _maps/submaps/plains/house1.dmm rename to maps/submaps/plains/house1.dmm diff --git a/_maps/submaps/plains/house1_arealess.dmm b/maps/submaps/plains/house1_arealess.dmm similarity index 100% rename from _maps/submaps/plains/house1_arealess.dmm rename to maps/submaps/plains/house1_arealess.dmm diff --git a/_maps/submaps/plains/house1_arealess_vr.dmm b/maps/submaps/plains/house1_arealess_vr.dmm similarity index 100% rename from _maps/submaps/plains/house1_arealess_vr.dmm rename to maps/submaps/plains/house1_arealess_vr.dmm diff --git a/_maps/submaps/plains/house1_vr.dmm b/maps/submaps/plains/house1_vr.dmm similarity index 100% rename from _maps/submaps/plains/house1_vr.dmm rename to maps/submaps/plains/house1_vr.dmm diff --git a/_maps/submaps/plains/smol2.dmm b/maps/submaps/plains/smol2.dmm similarity index 100% rename from _maps/submaps/plains/smol2.dmm rename to maps/submaps/plains/smol2.dmm diff --git a/_maps/submaps/plains/snow1.dmm b/maps/submaps/plains/snow1.dmm similarity index 100% rename from _maps/submaps/plains/snow1.dmm rename to maps/submaps/plains/snow1.dmm diff --git a/_maps/submaps/plains/snow2.dmm b/maps/submaps/plains/snow2.dmm similarity index 100% rename from _maps/submaps/plains/snow2.dmm rename to maps/submaps/plains/snow2.dmm diff --git a/_maps/submaps/plains/snow3.dmm b/maps/submaps/plains/snow3.dmm similarity index 100% rename from _maps/submaps/plains/snow3.dmm rename to maps/submaps/plains/snow3.dmm diff --git a/_maps/submaps/plains/snow4.dmm b/maps/submaps/plains/snow4.dmm similarity index 100% rename from _maps/submaps/plains/snow4.dmm rename to maps/submaps/plains/snow4.dmm diff --git a/_maps/submaps/plains/snow5.dmm b/maps/submaps/plains/snow5.dmm similarity index 100% rename from _maps/submaps/plains/snow5.dmm rename to maps/submaps/plains/snow5.dmm diff --git a/_maps/submaps/wilderness/Blackshuttledown.dmm b/maps/submaps/wilderness/Blackshuttledown.dmm similarity index 100% rename from _maps/submaps/wilderness/Blackshuttledown.dmm rename to maps/submaps/wilderness/Blackshuttledown.dmm diff --git a/_maps/submaps/wilderness/Blueshuttledown.dmm b/maps/submaps/wilderness/Blueshuttledown.dmm similarity index 100% rename from _maps/submaps/wilderness/Blueshuttledown.dmm rename to maps/submaps/wilderness/Blueshuttledown.dmm diff --git a/_maps/submaps/wilderness/Boombase.dmm b/maps/submaps/wilderness/Boombase.dmm similarity index 100% rename from _maps/submaps/wilderness/Boombase.dmm rename to maps/submaps/wilderness/Boombase.dmm diff --git a/_maps/submaps/wilderness/CaveS.dmm b/maps/submaps/wilderness/CaveS.dmm similarity index 100% rename from _maps/submaps/wilderness/CaveS.dmm rename to maps/submaps/wilderness/CaveS.dmm diff --git a/_maps/submaps/wilderness/Chapel.dmm b/maps/submaps/wilderness/Chapel.dmm similarity index 100% rename from _maps/submaps/wilderness/Chapel.dmm rename to maps/submaps/wilderness/Chapel.dmm diff --git a/_maps/submaps/wilderness/Cragzone1.dmm b/maps/submaps/wilderness/Cragzone1.dmm similarity index 100% rename from _maps/submaps/wilderness/Cragzone1.dmm rename to maps/submaps/wilderness/Cragzone1.dmm diff --git a/_maps/submaps/wilderness/DJOutpost1.dmm b/maps/submaps/wilderness/DJOutpost1.dmm similarity index 100% rename from _maps/submaps/wilderness/DJOutpost1.dmm rename to maps/submaps/wilderness/DJOutpost1.dmm diff --git a/_maps/submaps/wilderness/DJOutpost2.dmm b/maps/submaps/wilderness/DJOutpost2.dmm similarity index 100% rename from _maps/submaps/wilderness/DJOutpost2.dmm rename to maps/submaps/wilderness/DJOutpost2.dmm diff --git a/_maps/submaps/wilderness/DJOutpost3.dmm b/maps/submaps/wilderness/DJOutpost3.dmm similarity index 100% rename from _maps/submaps/wilderness/DJOutpost3.dmm rename to maps/submaps/wilderness/DJOutpost3.dmm diff --git a/_maps/submaps/wilderness/DJOutpost4.dmm b/maps/submaps/wilderness/DJOutpost4.dmm similarity index 100% rename from _maps/submaps/wilderness/DJOutpost4.dmm rename to maps/submaps/wilderness/DJOutpost4.dmm diff --git a/_maps/submaps/wilderness/DecoupledEngine.dmm b/maps/submaps/wilderness/DecoupledEngine.dmm similarity index 100% rename from _maps/submaps/wilderness/DecoupledEngine.dmm rename to maps/submaps/wilderness/DecoupledEngine.dmm diff --git a/_maps/submaps/wilderness/DoomP.dmm b/maps/submaps/wilderness/DoomP.dmm similarity index 100% rename from _maps/submaps/wilderness/DoomP.dmm rename to maps/submaps/wilderness/DoomP.dmm diff --git a/_maps/submaps/wilderness/Drugden.dmm b/maps/submaps/wilderness/Drugden.dmm similarity index 100% rename from _maps/submaps/wilderness/Drugden.dmm rename to maps/submaps/wilderness/Drugden.dmm diff --git a/_maps/submaps/wilderness/Epod3.dmm b/maps/submaps/wilderness/Epod3.dmm similarity index 100% rename from _maps/submaps/wilderness/Epod3.dmm rename to maps/submaps/wilderness/Epod3.dmm diff --git a/_maps/submaps/wilderness/Epod4.dmm b/maps/submaps/wilderness/Epod4.dmm similarity index 100% rename from _maps/submaps/wilderness/Epod4.dmm rename to maps/submaps/wilderness/Epod4.dmm diff --git a/_maps/submaps/wilderness/Flake.dmm b/maps/submaps/wilderness/Flake.dmm similarity index 100% rename from _maps/submaps/wilderness/Flake.dmm rename to maps/submaps/wilderness/Flake.dmm diff --git a/_maps/submaps/wilderness/GovPatrol.dmm b/maps/submaps/wilderness/GovPatrol.dmm similarity index 100% rename from _maps/submaps/wilderness/GovPatrol.dmm rename to maps/submaps/wilderness/GovPatrol.dmm diff --git a/_maps/submaps/wilderness/Lab1.dmm b/maps/submaps/wilderness/Lab1.dmm similarity index 100% rename from _maps/submaps/wilderness/Lab1.dmm rename to maps/submaps/wilderness/Lab1.dmm diff --git a/_maps/submaps/wilderness/MCamp1.dmm b/maps/submaps/wilderness/MCamp1.dmm similarity index 100% rename from _maps/submaps/wilderness/MCamp1.dmm rename to maps/submaps/wilderness/MCamp1.dmm diff --git a/_maps/submaps/wilderness/MHR.dmm b/maps/submaps/wilderness/MHR.dmm similarity index 100% rename from _maps/submaps/wilderness/MHR.dmm rename to maps/submaps/wilderness/MHR.dmm diff --git a/_maps/submaps/wilderness/Manor1.dmm b/maps/submaps/wilderness/Manor1.dmm similarity index 100% rename from _maps/submaps/wilderness/Manor1.dmm rename to maps/submaps/wilderness/Manor1.dmm diff --git a/_maps/submaps/wilderness/Mudpit.dmm b/maps/submaps/wilderness/Mudpit.dmm similarity index 100% rename from _maps/submaps/wilderness/Mudpit.dmm rename to maps/submaps/wilderness/Mudpit.dmm diff --git a/_maps/submaps/wilderness/Musk.dmm b/maps/submaps/wilderness/Musk.dmm similarity index 100% rename from _maps/submaps/wilderness/Musk.dmm rename to maps/submaps/wilderness/Musk.dmm diff --git a/_maps/submaps/wilderness/Rocky1.dmm b/maps/submaps/wilderness/Rocky1.dmm similarity index 100% rename from _maps/submaps/wilderness/Rocky1.dmm rename to maps/submaps/wilderness/Rocky1.dmm diff --git a/_maps/submaps/wilderness/Rocky2.dmm b/maps/submaps/wilderness/Rocky2.dmm similarity index 100% rename from _maps/submaps/wilderness/Rocky2.dmm rename to maps/submaps/wilderness/Rocky2.dmm diff --git a/_maps/submaps/wilderness/Rocky3.dmm b/maps/submaps/wilderness/Rocky3.dmm similarity index 100% rename from _maps/submaps/wilderness/Rocky3.dmm rename to maps/submaps/wilderness/Rocky3.dmm diff --git a/_maps/submaps/wilderness/Rocky4.dmm b/maps/submaps/wilderness/Rocky4.dmm similarity index 100% rename from _maps/submaps/wilderness/Rocky4.dmm rename to maps/submaps/wilderness/Rocky4.dmm diff --git a/_maps/submaps/wilderness/Rockybase.dmm b/maps/submaps/wilderness/Rockybase.dmm similarity index 100% rename from _maps/submaps/wilderness/Rockybase.dmm rename to maps/submaps/wilderness/Rockybase.dmm diff --git a/_maps/submaps/wilderness/Shack1.dmm b/maps/submaps/wilderness/Shack1.dmm similarity index 100% rename from _maps/submaps/wilderness/Shack1.dmm rename to maps/submaps/wilderness/Shack1.dmm diff --git a/_maps/submaps/wilderness/Shelter.dmm b/maps/submaps/wilderness/Shelter.dmm similarity index 100% rename from _maps/submaps/wilderness/Shelter.dmm rename to maps/submaps/wilderness/Shelter.dmm diff --git a/_maps/submaps/wilderness/Smol1.dmm b/maps/submaps/wilderness/Smol1.dmm similarity index 100% rename from _maps/submaps/wilderness/Smol1.dmm rename to maps/submaps/wilderness/Smol1.dmm diff --git a/_maps/submaps/wilderness/Snowrock1.dmm b/maps/submaps/wilderness/Snowrock1.dmm similarity index 100% rename from _maps/submaps/wilderness/Snowrock1.dmm rename to maps/submaps/wilderness/Snowrock1.dmm diff --git a/_maps/submaps/wilderness/butchershack.dmm b/maps/submaps/wilderness/butchershack.dmm similarity index 100% rename from _maps/submaps/wilderness/butchershack.dmm rename to maps/submaps/wilderness/butchershack.dmm diff --git a/_maps/submaps/wilderness/spider1.dmm b/maps/submaps/wilderness/spider1.dmm similarity index 100% rename from _maps/submaps/wilderness/spider1.dmm rename to maps/submaps/wilderness/spider1.dmm diff --git a/_maps/templates/admin/dhael_centcom.dmm b/maps/templates/admin/dhael_centcom.dmm similarity index 100% rename from _maps/templates/admin/dhael_centcom.dmm rename to maps/templates/admin/dhael_centcom.dmm diff --git a/_maps/templates/admin/dojo.dmm b/maps/templates/admin/dojo.dmm similarity index 100% rename from _maps/templates/admin/dojo.dmm rename to maps/templates/admin/dojo.dmm diff --git a/_maps/templates/admin/ert.dmm b/maps/templates/admin/ert.dmm similarity index 100% rename from _maps/templates/admin/ert.dmm rename to maps/templates/admin/ert.dmm diff --git a/_maps/templates/admin/ert_base.dmm b/maps/templates/admin/ert_base.dmm similarity index 100% rename from _maps/templates/admin/ert_base.dmm rename to maps/templates/admin/ert_base.dmm diff --git a/_maps/templates/admin/kk_mercship.dmm b/maps/templates/admin/kk_mercship.dmm similarity index 100% rename from _maps/templates/admin/kk_mercship.dmm rename to maps/templates/admin/kk_mercship.dmm diff --git a/_maps/templates/admin/mercbase.dmm b/maps/templates/admin/mercbase.dmm similarity index 100% rename from _maps/templates/admin/mercbase.dmm rename to maps/templates/admin/mercbase.dmm diff --git a/_maps/templates/admin/skipjack.dmm b/maps/templates/admin/skipjack.dmm similarity index 100% rename from _maps/templates/admin/skipjack.dmm rename to maps/templates/admin/skipjack.dmm diff --git a/_maps/templates/admin/spa.dmm b/maps/templates/admin/spa.dmm similarity index 100% rename from _maps/templates/admin/spa.dmm rename to maps/templates/admin/spa.dmm diff --git a/_maps/templates/admin/thunderdome.dmm b/maps/templates/admin/thunderdome.dmm similarity index 100% rename from _maps/templates/admin/thunderdome.dmm rename to maps/templates/admin/thunderdome.dmm diff --git a/_maps/templates/admin/wizard.dmm b/maps/templates/admin/wizard.dmm similarity index 100% rename from _maps/templates/admin/wizard.dmm rename to maps/templates/admin/wizard.dmm diff --git a/_maps/templates/archive/old_bearcat/bearcat.dmi b/maps/templates/archive/old_bearcat/bearcat.dmi similarity index 100% rename from _maps/templates/archive/old_bearcat/bearcat.dmi rename to maps/templates/archive/old_bearcat/bearcat.dmi diff --git a/_maps/templates/archive/tradeship.dmm b/maps/templates/archive/tradeship.dmm similarity index 100% rename from _maps/templates/archive/tradeship.dmm rename to maps/templates/archive/tradeship.dmm diff --git a/_maps/templates/engines/tether/engine_rust.dmm b/maps/templates/engines/tether/engine_rust.dmm similarity index 100% rename from _maps/templates/engines/tether/engine_rust.dmm rename to maps/templates/engines/tether/engine_rust.dmm diff --git a/_maps/templates/engines/tether/engine_singulo.dmm b/maps/templates/engines/tether/engine_singulo.dmm similarity index 100% rename from _maps/templates/engines/tether/engine_singulo.dmm rename to maps/templates/engines/tether/engine_singulo.dmm diff --git a/_maps/templates/engines/tether/engine_sme.dmm b/maps/templates/engines/tether/engine_sme.dmm similarity index 100% rename from _maps/templates/engines/tether/engine_sme.dmm rename to maps/templates/engines/tether/engine_sme.dmm diff --git a/_maps/templates/engines/tether/engine_tesla.dmm b/maps/templates/engines/tether/engine_tesla.dmm similarity index 100% rename from _maps/templates/engines/tether/engine_tesla.dmm rename to maps/templates/engines/tether/engine_tesla.dmm diff --git a/_maps/templates/engines/triumph/triumph_engine_burnchamber.dmm b/maps/templates/engines/triumph/triumph_engine_burnchamber.dmm similarity index 100% rename from _maps/templates/engines/triumph/triumph_engine_burnchamber.dmm rename to maps/templates/engines/triumph/triumph_engine_burnchamber.dmm diff --git a/_maps/templates/engines/triumph/triumph_engine_fission.dmm b/maps/templates/engines/triumph/triumph_engine_fission.dmm similarity index 100% rename from _maps/templates/engines/triumph/triumph_engine_fission.dmm rename to maps/templates/engines/triumph/triumph_engine_fission.dmm diff --git a/_maps/templates/engines/triumph/triumph_engine_rust.dmm b/maps/templates/engines/triumph/triumph_engine_rust.dmm similarity index 100% rename from _maps/templates/engines/triumph/triumph_engine_rust.dmm rename to maps/templates/engines/triumph/triumph_engine_rust.dmm diff --git a/_maps/templates/engines/triumph/triumph_engine_sme.dmm b/maps/templates/engines/triumph/triumph_engine_sme.dmm similarity index 100% rename from _maps/templates/engines/triumph/triumph_engine_sme.dmm rename to maps/templates/engines/triumph/triumph_engine_sme.dmm diff --git a/_maps/templates/shelters/shelter_1.dmm b/maps/templates/shelters/shelter_1.dmm similarity index 100% rename from _maps/templates/shelters/shelter_1.dmm rename to maps/templates/shelters/shelter_1.dmm diff --git a/_maps/templates/shelters/shelter_1_roof.dmm b/maps/templates/shelters/shelter_1_roof.dmm similarity index 100% rename from _maps/templates/shelters/shelter_1_roof.dmm rename to maps/templates/shelters/shelter_1_roof.dmm diff --git a/_maps/templates/shelters/shelter_2.dmm b/maps/templates/shelters/shelter_2.dmm similarity index 100% rename from _maps/templates/shelters/shelter_2.dmm rename to maps/templates/shelters/shelter_2.dmm diff --git a/_maps/templates/shelters/shelter_2_roof.dmm b/maps/templates/shelters/shelter_2_roof.dmm similarity index 100% rename from _maps/templates/shelters/shelter_2_roof.dmm rename to maps/templates/shelters/shelter_2_roof.dmm diff --git a/_maps/templates/shelters/shelter_3.dmm b/maps/templates/shelters/shelter_3.dmm similarity index 100% rename from _maps/templates/shelters/shelter_3.dmm rename to maps/templates/shelters/shelter_3.dmm diff --git a/_maps/templates/shelters/shelter_4.dmm b/maps/templates/shelters/shelter_4.dmm similarity index 100% rename from _maps/templates/shelters/shelter_4.dmm rename to maps/templates/shelters/shelter_4.dmm diff --git a/_maps/templates/shelters/shelter_a.dmm b/maps/templates/shelters/shelter_a.dmm similarity index 100% rename from _maps/templates/shelters/shelter_a.dmm rename to maps/templates/shelters/shelter_a.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/abductor.dmm b/maps/templates/shuttles/overmaps/generic/abductor.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/abductor.dmm rename to maps/templates/shuttles/overmaps/generic/abductor.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/bearcat.dmm b/maps/templates/shuttles/overmaps/generic/bearcat.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/bearcat.dmm rename to maps/templates/shuttles/overmaps/generic/bearcat.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/cruise_ship.dmm b/maps/templates/shuttles/overmaps/generic/cruise_ship.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/cruise_ship.dmm rename to maps/templates/shuttles/overmaps/generic/cruise_ship.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/cruiser.dmi b/maps/templates/shuttles/overmaps/generic/cruiser.dmi similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/cruiser.dmi rename to maps/templates/shuttles/overmaps/generic/cruiser.dmi diff --git a/_maps/templates/shuttles/overmaps/generic/cruiser.dmm b/maps/templates/shuttles/overmaps/generic/cruiser.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/cruiser.dmm rename to maps/templates/shuttles/overmaps/generic/cruiser.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/curashuttle.dmm b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/curashuttle.dmm rename to maps/templates/shuttles/overmaps/generic/curashuttle.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/gecko_cr.dmm b/maps/templates/shuttles/overmaps/generic/gecko_cr.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/gecko_cr.dmm rename to maps/templates/shuttles/overmaps/generic/gecko_cr.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/gecko_sh.dmm b/maps/templates/shuttles/overmaps/generic/gecko_sh.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/gecko_sh.dmm rename to maps/templates/shuttles/overmaps/generic/gecko_sh.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm b/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm rename to maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm b/maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm rename to maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/itglight.dmi b/maps/templates/shuttles/overmaps/generic/itglight.dmi similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/itglight.dmi rename to maps/templates/shuttles/overmaps/generic/itglight.dmi diff --git a/_maps/templates/shuttles/overmaps/generic/itglight.dmm b/maps/templates/shuttles/overmaps/generic/itglight.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/itglight.dmm rename to maps/templates/shuttles/overmaps/generic/itglight.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm rename to maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm rename to maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm rename to maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm rename to maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/mercenarybase.dmm b/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/mercenarybase.dmm rename to maps/templates/shuttles/overmaps/generic/mercenarybase.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/mercship.dmm b/maps/templates/shuttles/overmaps/generic/mercship.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/mercship.dmm rename to maps/templates/shuttles/overmaps/generic/mercship.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/salamander.dmm b/maps/templates/shuttles/overmaps/generic/salamander.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/salamander.dmm rename to maps/templates/shuttles/overmaps/generic/salamander.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/screebarge.dmm b/maps/templates/shuttles/overmaps/generic/screebarge.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/screebarge.dmm rename to maps/templates/shuttles/overmaps/generic/screebarge.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/shelter_5.dmm b/maps/templates/shuttles/overmaps/generic/shelter_5.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/shelter_5.dmm rename to maps/templates/shuttles/overmaps/generic/shelter_5.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/shelter_6.dmm b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/shelter_6.dmm rename to maps/templates/shuttles/overmaps/generic/shelter_6.dmm diff --git a/_maps/templates/shuttles/overmaps/generic/vespa.dmm b/maps/templates/shuttles/overmaps/generic/vespa.dmm similarity index 100% rename from _maps/templates/shuttles/overmaps/generic/vespa.dmm rename to maps/templates/shuttles/overmaps/generic/vespa.dmm diff --git a/_maps/templates/unit_tests.dmm b/maps/templates/unit_tests.dmm similarity index 100% rename from _maps/templates/unit_tests.dmm rename to maps/templates/unit_tests.dmm diff --git a/maps/tether/tether.dm b/maps/tether/tether.dm index ea43fb95015..6a8b78450f3 100644 --- a/maps/tether/tether.dm +++ b/maps/tether/tether.dm @@ -6,14 +6,14 @@ #include "tether_telecomms.dm" #include "tether_weather.dm" - #include "../../_maps/map_files/tether/tether-01-surface1.dmm" - #include "../../_maps/map_files/tether/tether-02-surface2.dmm" - #include "../../_maps/map_files/tether/tether-03-surface3.dmm" - #include "../../_maps/map_files/tether/tether-04-transit.dmm" - #include "../../_maps/map_files/tether/tether-05-station1.dmm" - #include "../../_maps/map_files/tether/tether-06-station2.dmm" - #include "../../_maps/map_files/tether/tether-08-mining.dmm" - #include "../../_maps/map_files/tether/tether-09-solars.dmm" + #include "../../maps/map_files/tether/tether-01-surface1.dmm" + #include "../../maps/map_files/tether/tether-02-surface2.dmm" + #include "../../maps/map_files/tether/tether-03-surface3.dmm" + #include "../../maps/map_files/tether/tether-04-transit.dmm" + #include "../../maps/map_files/tether/tether-05-station1.dmm" + #include "../../maps/map_files/tether/tether-06-station2.dmm" + #include "../../maps/map_files/tether/tether-08-mining.dmm" + #include "../../maps/map_files/tether/tether-09-solars.dmm" #define USING_MAP_DATUM /datum/map/tether diff --git a/prototypes/example.yaml b/prototypes/example.yaml deleted file mode 100644 index 5dde332b2e5..00000000000 --- a/prototypes/example.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- type: Dud - content: ayy - num: 2 - fragments: - - trait: faction - ATC: NT - nul: ~ diff --git a/tools/UpdatePaths/__main__.py b/tools/UpdatePaths/__main__.py index 804f34c88c0..a8bf8263e9b 100644 --- a/tools/UpdatePaths/__main__.py +++ b/tools/UpdatePaths/__main__.py @@ -27,7 +27,7 @@ Old paths properties: property = @UNSET - will apply the rule only if the property is not mapedited """ -default_map_directory = "../../_maps" +default_map_directory = "../../maps" replacement_re = re.compile(r'\s*(?P[^{]*)\s*(\{(?P.*)\})?') #urgent todo: replace with actual parser, this is slow as janitor in crit @@ -192,7 +192,7 @@ if __name__ == "__main__": parser = argparse.ArgumentParser(prog=prog, description=desc, formatter_class=argparse.RawTextHelpFormatter) parser.add_argument("update_source", help="update file path / line of update notation") parser.add_argument("--map", "-m", help="path to update, defaults to all maps in maps directory") - parser.add_argument("--directory", "-d", help="path to maps directory, defaults to _maps/") + parser.add_argument("--directory", "-d", help="path to maps directory, defaults to maps/") parser.add_argument("--inline", "-i", help="treat update source as update string instead of path", action="store_true") parser.add_argument("--verbose", "-v", help="toggle detailed update information", action="store_true") main(parser.parse_args()) diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php index 4d70744a0c4..8674108c3a2 100644 --- a/tools/WebhookProcessor/github_webhook_processor.php +++ b/tools/WebhookProcessor/github_webhook_processor.php @@ -258,7 +258,7 @@ function tag_pr($payload, $opened) { else if ($mergeable === FALSE) $tags[] = 'Merge Conflict'; - $treetags = array('_maps' => 'Map Edit', 'tools' => 'Tools', 'SQL' => 'SQL', '.github' => 'GitHub'); + $treetags = array('maps' => 'Map Edit', 'tools' => 'Tools', 'SQL' => 'SQL', '.github' => 'GitHub'); $addonlytags = array('icons' => 'Sprites', 'sound' => 'Sound', 'config' => 'Config Update', 'code/controllers/configuration/entries' => 'Config Update', 'tgui' => 'UI'); foreach($treetags as $tree => $tag) if(has_tree_been_edited($payload, $tree)) @@ -624,8 +624,8 @@ function auto_update($payload){ function has_tree_been_edited($payload, $tree){ global $github_diff; get_diff($payload); - //find things in the _maps/map_files tree - //e.g. diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm + //find things in the maps/map_files tree + //e.g. diff --git a/maps/map_files/Cerestation/cerestation.dmm b/maps/map_files/Cerestation/cerestation.dmm return ($github_diff !== FALSE) && (preg_match('/^diff --git a\/' . preg_quote($tree, '/') . '/m', $github_diff) !== 0); } diff --git a/tools/build/build.js b/tools/build/build.js index c2cde566d85..0ca20d9f33a 100755 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -45,16 +45,16 @@ export const DmMapsIncludeTarget = new Juke.Target({ executes: async () => { const folders = [ // Everything but primary station map files. - ...Juke.glob('_maps/away_missions/**/*.dmm'), - // ...Juke.glob('_maps/map_levels/**/*.dmm'), - // ...Juke.glob('_maps/submaps/**/*.dmm'), - ...Juke.glob('_maps/templates/**/*.dmm'), + ...Juke.glob('maps/away_missions/**/*.dmm'), + // ...Juke.glob('maps/map_levels/**/*.dmm'), + // ...Juke.glob('maps/submaps/**/*.dmm'), + ...Juke.glob('maps/templates/**/*.dmm'), ]; const content = folders - .map((file) => file.replace('_maps/', '')) + .map((file) => file.replace('maps/', '')) .map((file) => `#include "${file}"`) .join('\n') + '\n'; - fs.writeFileSync('_maps/templates.dm', content); + fs.writeFileSync('maps/templates.dm', content); }, }); @@ -64,7 +64,7 @@ export const DmTarget = new Juke.Target({ get(DefineParameter).includes('ALL_MAPS') && DmMapsIncludeTarget, ], inputs: [ - '_maps/map_files/generic/**', + 'maps/map_files/generic/**', 'code/**', 'html/**', 'icons/**', @@ -272,7 +272,7 @@ export const CleanTarget = new Juke.Target({ Juke.rm('*.{dmb,rsc}'); Juke.rm('*.mdme*'); Juke.rm('*.m.*'); - Juke.rm('_maps/templates.dm'); + Juke.rm('maps/templates.dm'); }, }); diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index 4f0d570d8e8..4ce05dbaf85 100755 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -10,46 +10,46 @@ if git grep -P "\r\n"; then echo "ERROR: CRLF line endings detected. Please stop using the webeditor, and fix it using a desktop Git client." st = 1 fi; -if grep -El '^\".+\" = \(.+\)' _maps/**/*.dmm; then +if grep -El '^\".+\" = \(.+\)' maps/**/*.dmm; then echo "ERROR: Non-TGM formatted map detected. Please convert it using Map Merger!" st=1 fi; -if grep -P '^\ttag = \"icon' _maps/**/*.dmm; then +if grep -P '^\ttag = \"icon' maps/**/*.dmm; then echo "ERROR: tag vars from icon state generation detected in maps, please remove them." st=1 fi; -if grep -P 'step_[xy]' _maps/**/*.dmm; then +if grep -P 'step_[xy]' maps/**/*.dmm; then echo "ERROR: step_x/step_y variables detected in maps, please remove them." st=1 fi; -if grep -P 'pixel_[^xy]' _maps/**/*.dmm; then +if grep -P 'pixel_[^xy]' maps/**/*.dmm; then echo "ERROR: incorrect pixel offset variables detected in maps, please remove them." st=1 fi; # THE BELOW REQUIRES SMART WIRES # echo "Checking for cable varedits" -# if grep -P '/obj/structure/cable(/\w+)+\{' _maps/**/*.dmm; then +# if grep -P '/obj/structure/cable(/\w+)+\{' maps/**/*.dmm; then # echo "ERROR: vareditted cables detected, please remove them." # st=1 # fi; -if grep -P '\td[1-2] =' _maps/**/*.dmm; then +if grep -P '\td[1-2] =' maps/**/*.dmm; then echo "ERROR: d1/d2 cable variables detected in maps, please remove them." st=1 fi; echo "Checking for stacked cables" -if grep -P '"\w+" = \(\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/area/.+\)' _maps/**/*.dmm; then +if grep -P '"\w+" = \(\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/obj/structure/cable,\n([^)]+\n)*/area/.+\)' maps/**/*.dmm; then echo "found multiple cables on the same tile, please remove them." st=1 fi; -if grep -P '/turf[0-z/_]*,\n/turf' _maps/**/*.dmm; then +if grep -P '/turf[0-z/_]*,\n/turf' maps/**/*.dmm; then echo "FATAL: found multiple tiles on one tile, this will result in severe glitches." st=1 fi; -if grep -P '^/area/.+[\{]' _maps/**/*.dmm; then +if grep -P '^/area/.+[\{]' maps/**/*.dmm; then echo "ERROR: Vareditted /area path use detected in maps, please replace with proper paths." st=1 fi; -if grep -P '\W\/turf\s*[,\){]' _maps/**/*.dmm; then +if grep -P '\W\/turf\s*[,\){]' maps/**/*.dmm; then echo "ERROR: base /turf path use detected in maps, please replace with proper paths." st=1 fi; @@ -85,7 +85,7 @@ done < <(find . -type f -name '*.dm') # echo "ERROR: Misspelling(s) of CENTCOM detected in code, please remove the extra M(s)." # st=1 # fi; -# if grep -i 'centcomm' _maps/**/*.dmm; then +# if grep -i 'centcomm' maps/**/*.dmm; then # echo "ERROR: Misspelling(s) of CENTCOM detected in maps, please remove the extra M(s)." # st=1 # fi; @@ -93,29 +93,13 @@ if grep -ni 'nanotransen' code/**/*.dm; then echo "Misspelling(s) of nanotrasen detected in code, please remove the extra N(s)." st=1 fi; -if grep -ni 'nanotransen' _maps/**/*.dmm; then +if grep -ni 'nanotransen' maps/**/*.dmm; then echo "Misspelling(s) of nanotrasen detected in maps, please remove the extra N(s)." st=1 fi; -if ls _maps/*.json | grep -P "[A-Z]"; then - echo "Uppercase in a map json detected, these must be all lowercase." - st=1 -fi; -if grep -i '/obj/effect/mapping_helpers/custom_icon' _maps/**/*.dmm; then +if grep -i '/obj/effect/mapping_helpers/custom_icon' maps/**/*.dmm; then echo "Custom icon helper found. Please include dmis as standard assets instead for built-in maps." st=1 fi; -for json in _maps/*.json -do - map_path=$(jq -r '.map_path' $json) - while read map_file; do - filename="_maps/$map_path/$map_file" - if [ ! -f $filename ] - then - echo "found invalid file reference to $filename in _maps/$json" - st=1 - fi - done < <(jq -r '[.map_file] | flatten | .[]' $json) -done exit $st diff --git a/tools/ci/new_check_grep.sh b/tools/ci/new_check_grep.sh index bb63a071177..564a196ed8d 100644 --- a/tools/ci/new_check_grep.sh +++ b/tools/ci/new_check_grep.sh @@ -7,75 +7,75 @@ shopt -s globstar st=0 echo "Checking for map issues" -if grep -El '^\".+\" = \(.+\)' _maps/**/*.dmm; then +if grep -El '^\".+\" = \(.+\)' maps/**/*.dmm; then echo "ERROR: Non-TGM formatted map detected. Please convert it using Map Merger!" st=1 fi; -if grep -P '//' _maps/**/*.dmm | grep -v '//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE' | grep -Ev 'name|desc'; then +if grep -P '//' maps/**/*.dmm | grep -v '//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE' | grep -Ev 'name|desc'; then echo "ERROR: Unexpected commented out line detected in this map file. Please remove it." st=1 fi; -if grep -P 'Merge conflict marker' _maps/**/*.dmm; then +if grep -P 'Merge conflict marker' maps/**/*.dmm; then echo "ERROR: Merge conflict markers detected in map, please resolve all merge failures!" st=1 fi; -if grep -P '^\ttag = \"icon' _maps/**/*.dmm; then +if grep -P '^\ttag = \"icon' maps/**/*.dmm; then echo "ERROR: tag vars from icon state generation detected in maps, please remove them." st=1 fi; -if grep -P 'step_[xy]' _maps/**/*.dmm; then +if grep -P 'step_[xy]' maps/**/*.dmm; then echo "ERROR: step_x/step_y variables detected in maps, please remove them." st=1 fi; -if grep -P 'pixel_[^xy]' _maps/**/*.dmm; then +if grep -P 'pixel_[^xy]' maps/**/*.dmm; then echo "ERROR: incorrect pixel offset variables detected in maps, please remove them." st=1 fi; -if grep -P '/obj/structure/cable(/\w+)+\{' _maps/**/*.dmm; then +if grep -P '/obj/structure/cable(/\w+)+\{' maps/**/*.dmm; then echo "ERROR: vareditted cables detected, please remove them." st=1 fi; -if grep -P '\td[1-2] =' _maps/**/*.dmm; then +if grep -P '\td[1-2] =' maps/**/*.dmm; then echo "ERROR: d1/d2 cable variables detected in maps, please remove them." st=1 fi; -if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/cable,\n[^)]*?/obj/structure/cable,\n[^)]*?/area/.+?\)' _maps/**/*.dmm; then +if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/cable,\n[^)]*?/obj/structure/cable,\n[^)]*?/area/.+?\)' maps/**/*.dmm; then echo echo "ERROR: found multiple cables on the same tile, please remove them." st=1 fi; -if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/lattice[/\w]*?,\n[^)]*?/obj/structure/lattice[/\w]*?,\n[^)]*?/area/.+?\)' _maps/**/*.dmm; then +if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/lattice[/\w]*?,\n[^)]*?/obj/structure/lattice[/\w]*?,\n[^)]*?/area/.+?\)' maps/**/*.dmm; then echo echo "ERROR: found multiple lattices on the same tile, please remove them." st=1 fi; -if grep -Pzo '"\w+" = \(\n[^)]*?/obj/machinery/atmospherics/pipe/(?[/\w]*),\n[^)]*?/obj/machinery/atmospherics/pipe/\g{type},\n[^)]*?/area/.+\)' _maps/**/*.dmm; then +if grep -Pzo '"\w+" = \(\n[^)]*?/obj/machinery/atmospherics/pipe/(?[/\w]*),\n[^)]*?/obj/machinery/atmospherics/pipe/\g{type},\n[^)]*?/area/.+\)' maps/**/*.dmm; then echo echo "ERROR: found multiple identical pipes on the same tile, please remove them." st=1 fi; -if grep -Pzo '/obj/machinery/power/apc[/\w]*?\{\n[^}]*?pixel_[xy] = -?[013-9]\d*?[^\d]*?\s*?\},?\n' _maps/**/*.dmm || - grep -Pzo '/obj/machinery/power/apc[/\w]*?\{\n[^}]*?pixel_[xy] = -?\d+?[0-46-9][^\d]*?\s*?\},?\n' _maps/**/*.dmm || - grep -Pzo '/obj/machinery/power/apc[/\w]*?\{\n[^}]*?pixel_[xy] = -?\d{3,1000}[^\d]*?\s*?\},?\n' _maps/**/*.dmm ; then +if grep -Pzo '/obj/machinery/power/apc[/\w]*?\{\n[^}]*?pixel_[xy] = -?[013-9]\d*?[^\d]*?\s*?\},?\n' maps/**/*.dmm || + grep -Pzo '/obj/machinery/power/apc[/\w]*?\{\n[^}]*?pixel_[xy] = -?\d+?[0-46-9][^\d]*?\s*?\},?\n' maps/**/*.dmm || + grep -Pzo '/obj/machinery/power/apc[/\w]*?\{\n[^}]*?pixel_[xy] = -?\d{3,1000}[^\d]*?\s*?\},?\n' maps/**/*.dmm ; then echo echo "ERROR: found an APC with a manually set pixel_x or pixel_y that is not +-25." st=1 fi; -if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/lattice[/\w]*?,\n[^)]*?/turf/closed/wall[/\w]*?,\n[^)]*?/area/.+?\)' _maps/**/*.dmm; then +if grep -Pzo '"\w+" = \(\n[^)]*?/obj/structure/lattice[/\w]*?,\n[^)]*?/turf/closed/wall[/\w]*?,\n[^)]*?/area/.+?\)' maps/**/*.dmm; then echo echo "ERROR: found lattice stacked with a wall, please remove them." st=1 fi; -if grep -Pzo '/obj/machinery/conveyor/inverted[/\w]*?\{\n[^}]*?dir = [1248];[^}]*?\},?\n' _maps/**/*.dmm; then +if grep -Pzo '/obj/machinery/conveyor/inverted[/\w]*?\{\n[^}]*?dir = [1248];[^}]*?\},?\n' maps/**/*.dmm; then echo echo "ERROR: found an inverted conveyor belt with a cardinal dir. Please replace it with a normal conveyor belt." st=1 fi; -if grep -P '^/area/.+[\{]' _maps/**/*.dmm; then +if grep -P '^/area/.+[\{]' maps/**/*.dmm; then echo "ERROR: Vareditted /area path use detected in maps, please replace with proper paths." st=1 fi; -if grep -P '\W\/turf\s*[,\){]' _maps/**/*.dmm; then +if grep -P '\W\/turf\s*[,\){]' maps/**/*.dmm; then echo "ERROR: base /turf path use detected in maps, please replace with proper paths." st=1 fi; @@ -115,7 +115,7 @@ if grep -i 'centcomm' code/**/*.dm; then echo "ERROR: Misspelling(s) of CENTCOM detected in code, please remove the extra M(s)." st=1 fi; -if grep -i 'centcomm' _maps/**/*.dmm; then +if grep -i 'centcomm' maps/**/*.dmm; then echo "ERROR: Misspelling(s) of CENTCOM detected in maps, please remove the extra M(s)." st=1 fi; @@ -123,29 +123,13 @@ if grep -ni 'nanotransen' code/**/*.dm; then echo "Misspelling(s) of nanotrasen detected in code, please remove the extra N(s)." st=1 fi; -if grep -ni 'nanotransen' _maps/**/*.dmm; then +if grep -ni 'nanotransen' maps/**/*.dmm; then echo "Misspelling(s) of nanotrasen detected in maps, please remove the extra N(s)." st=1 fi; -if ls _maps/*.json | grep -P "[A-Z]"; then - echo "Uppercase in a map json detected, these must be all lowercase." - st=1 -fi; -if grep -i '/obj/effect/mapping_helpers/custom_icon' _maps/**/*.dmm; then +if grep -i '/obj/effect/mapping_helpers/custom_icon' maps/**/*.dmm; then echo "Custom icon helper found. Please include dmis as standard assets instead for built-in maps." st=1 fi; -for json in _maps/*.json -do - map_path=$(jq -r '.map_path' $json) - while read map_file; do - filename="_maps/$map_path/$map_file" - if [ ! -f $filename ] - then - echo "found invalid file reference to $filename in _maps/$json" - st=1 - fi - done < <(jq -r '[.map_file] | flatten | .[]' $json) -done exit $st diff --git a/tools/deploy.sh b/tools/deploy.sh index ff55684e2ab..9674e83f28d 100755 --- a/tools/deploy.sh +++ b/tools/deploy.sh @@ -10,9 +10,9 @@ if [[ $# -eq 2 ]] ; then fi mkdir -p \ - $1/_maps \ + $1/_mapload \ + $1/maps \ $1/icons/runtime \ - $1/prototypes \ $1/sound/runtime \ $1/strings \ $1/tgui/public \ @@ -24,18 +24,18 @@ if [ -d ".git" ]; then fi cp citadel.dmb citadel.rsc $1/ -cp -r _maps/* $1/_maps/ +# todo: remove _mapload after .jsons are removed. +cp -r _mapload/* $1/_mapload/ +# todo: filter out .dm files +cp -r maps/* $1/maps/ cp -r icons/runtime/* $1/icons/runtime/ -cp -r prototypes/* $1/prototypes/ cp -r sound/runtime/* $1/sound/runtime/ cp -r strings/* $1/strings/ cp -r tgui/public/* $1/tgui/public/ cp -r tgui/packages/tgfont/dist/* $1/tgui/packages/tgfont/dist/ -#remove .dm files from _maps - #this regrettably doesn't work with windows find -#find $1/_maps -name "*.dm" -type f -delete +#find $1/maps -name "*.dm" -type f -delete #dlls on windows if [ "$(uname -o)" = "Msys" ]; then diff --git a/tools/mapmerge2/frontend.py b/tools/mapmerge2/frontend.py index 4d44eab951e..452b171bec3 100644 --- a/tools/mapmerge2/frontend.py +++ b/tools/mapmerge2/frontend.py @@ -19,7 +19,7 @@ def read_settings(): try: map_folder = os.environ['MAPROOT'] except KeyError: - map_folder = '_maps/' + map_folder = 'maps/' for _ in range(8): if os.path.exists(map_folder): break @@ -40,7 +40,7 @@ def pretty_path(settings, path_str): def prompt_maps(settings, verb): if not settings.map_folder: - print("Could not autodetect the _maps folder, set MAPROOT") + print("Could not autodetect the maps folder, set MAPROOT") exit(1) list_of_files = list()