diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index e8d555890ca9..735c244e7d76 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -8,7 +8,7 @@ #include "map_files\mining\Icemoon.dmm" #include "map_files\mining\IcemoonUnderground.dmm" #include "map_files\debug\runtimestation.dmm" - #include "map_files\YogsBox\Yogsbox.dmm" + #include "map_files\YogStation\Yogstation.dmm" #include "map_files\YogsMeta\YogsMeta.dmm" #include "map_files\YogsDelta\YogsDelta.dmm" #include "map_files\EclipseStation\EclipseStation.dmm" diff --git a/_maps/map_files/YogsBox/YogsBox.dmm b/_maps/map_files/YogStation/YogStation.dmm similarity index 100% rename from _maps/map_files/YogsBox/YogsBox.dmm rename to _maps/map_files/YogStation/YogStation.dmm diff --git a/_maps/yogsbox.dm b/_maps/yogsbox.dm deleted file mode 100644 index bfadc4075710..000000000000 --- a/_maps/yogsbox.dm +++ /dev/null @@ -1 +0,0 @@ -#define FORCE_MAP "_maps/yogsbox.json" diff --git a/_maps/yogstation.dm b/_maps/yogstation.dm new file mode 100644 index 000000000000..040cec03d858 --- /dev/null +++ b/_maps/yogstation.dm @@ -0,0 +1 @@ +#define FORCE_MAP "_maps/yogstation.json" \ No newline at end of file diff --git a/_maps/yogsbox.json b/_maps/yogstation.json similarity index 59% rename from _maps/yogsbox.json rename to _maps/yogstation.json index a2b3344b911e..c5e735881a9f 100644 --- a/_maps/yogsbox.json +++ b/_maps/yogstation.json @@ -1,7 +1,7 @@ { - "map_name": "YogsBox", - "map_path": "map_files/YogsBox", - "map_file": "YogsBox.dmm", + "map_name": "YogStation", + "map_path": "map_files/YogStation", + "map_file": "YogStation.dmm", "shuttles": { "cargo": "cargo_box", "ferry": "ferry_fancy", diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 91fa09a002cb..596ca1d035c5 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -5,7 +5,7 @@ /datum/map_config // Metadata - var/config_filename = "_maps/yogsbox.json" + var/config_filename = "_maps/yogstation.json" var/defaulted = TRUE // set to FALSE by LoadConfig() succeeding // Config from maps.txt var/config_max_users = 0 @@ -14,9 +14,9 @@ var/votable = FALSE // Config actually from the JSON - should default to Box - var/map_name = "YogsBox" - var/map_path = "map_files/YogsBox" - var/map_file = "YogsBox.dmm" + var/map_name = "YogStation" + var/map_path = "map_files/YogStation" + var/map_file = "YogStation.dmm" var/traits = null var/space_ruin_levels = 7 diff --git a/config/maps.txt b/config/maps.txt index 4ff921a30a43..5f72de78a949 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -12,7 +12,7 @@ Format: disabled (disables the map) votable (is this map votable) -map yogsbox +map yogstation voteweight 0.7 votable endmap