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/eclipsestation.json b/_maps/eclipsestation.json index 0c800f3d5d39..4522416758f5 100644 --- a/_maps/eclipsestation.json +++ b/_maps/eclipsestation.json @@ -2,6 +2,7 @@ "map_name": "EclipseStation", "map_path": "map_files/EclipseStation", "map_file": "EclipseStation.dmm", + "ui_name": "EclipseStation", "shuttles": { "emergency": "emergency_box", "ferry": "ferry_fancy", diff --git a/_maps/kilostation.json b/_maps/kilostation.json index 72403af2969b..861f5dde0527 100644 --- a/_maps/kilostation.json +++ b/_maps/kilostation.json @@ -2,6 +2,7 @@ "map_name": "Kilo Station", "map_path": "map_files/KiloStation", "map_file": "KiloStation.dmm", + "ui_name": "Kilo Station", "shuttles": { "emergency": "emergency_kilo", "ferry": "ferry_kilo", 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/omegastation.json b/_maps/omegastation.json index ba5745992ad4..d71f96e2d324 100644 --- a/_maps/omegastation.json +++ b/_maps/omegastation.json @@ -2,9 +2,10 @@ "map_name": "OmegaStation", "map_path": "map_files/Omegastation", "map_file": "omegastation.dmm", + "ui_name": "OmegaStation", "shuttles": { "emergency": "emergency_omega", "ferry": "ferry_fancy", "cargo": "cargo_delta" } -} \ No newline at end of file +} 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/yogsdelta.json b/_maps/yogsdelta.json index 6f7ad8504086..baf2de017103 100644 --- a/_maps/yogsdelta.json +++ b/_maps/yogsdelta.json @@ -2,6 +2,7 @@ "map_name": "Yogsdelta", "map_path": "map_files/YogsDelta", "map_file": "YogsDelta.dmm", + "ui_name": "Yogsdelta", "shuttles": { "emergency": "emergency_delta", "ferry": "ferry_fancy", diff --git a/_maps/yogsmeta.json b/_maps/yogsmeta.json index b2ac35eb157e..7ca5b7a3e4ab 100644 --- a/_maps/yogsmeta.json +++ b/_maps/yogsmeta.json @@ -2,6 +2,7 @@ "map_name": "Yogsmeta", "map_path": "map_files/Yogsmeta", "map_file": "Yogsmeta.dmm", + "ui_name": "Yogsmeta", "shuttles": { "cargo": "cargo_box", "ferry": "ferry_fancy", 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 53% rename from _maps/yogsbox.json rename to _maps/yogstation.json index a2b3344b911e..cefa80d49c05 100644 --- a/_maps/yogsbox.json +++ b/_maps/yogstation.json @@ -1,7 +1,8 @@ { - "map_name": "YogsBox", - "map_path": "map_files/YogsBox", - "map_file": "YogsBox.dmm", + "map_name": "YogStation", + "map_path": "map_files/YogStation", + "map_file": "YogStation.dmm", + "ui_name": "YogStation (Box)", "shuttles": { "cargo": "cargo_box", "ferry": "ferry_fancy", diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index fd9be0af713a..543fdf86c183 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -268,7 +268,7 @@ SUBSYSTEM_DEF(mapping) // load the station station_start = world.maxz + 1 - INIT_ANNOUNCE("Loading [config.map_name]...") + INIT_ANNOUNCE("Loading [config.ui_name]...") LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION) if(SSdbcore.Connect()) @@ -368,15 +368,15 @@ GLOBAL_LIST_EMPTY(the_station_areas) if (!pickedmap) return var/datum/map_config/VM = global.config.maplist[pickedmap] - message_admins("Randomly rotating map to [VM.map_name].") + message_admins("Randomly rotating map to [VM.ui_name].") . = changemap(VM) if (. && VM.map_name != config.map_name) - to_chat(world, span_boldannounce("Map rotation has chosen [VM.map_name] for next round!")) + to_chat(world, span_boldannounce("Map rotation has chosen [VM.ui_name] for next round!")) /datum/controller/subsystem/mapping/proc/changemap(var/datum/map_config/VM) if(!VM.MakeNextMap()) next_map_config = load_map_config(default_to_box = TRUE) - message_admins("Failed to set new map with next_map.json for [VM.map_name]! Using default as backup!") + message_admins("Failed to set new map with next_map.json for [VM.ui_name]! Using default as backup!") return next_map_config = VM diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 453ee65183c5..3fb3163050aa 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(statpanels) var/datum/map_config/cached = SSmapping.next_map_config var/round_time = world.time - SSticker.round_start_time var/list/global_data = list( - "Map: [SSmapping.config?.map_name || "Loading..."]", + "Map: [SSmapping.config?.ui_name || "Loading..."]", cached ? "Next Map: [cached.map_name]" : null, "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]", "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]", diff --git a/code/controllers/subsystem/statpanels.dm b/code/controllers/subsystem/statpanels.dm index 60842727ead9..8aa5e9e9a041 100644 --- a/code/controllers/subsystem/statpanels.dm +++ b/code/controllers/subsystem/statpanels.dm @@ -11,8 +11,8 @@ SUBSYSTEM_DEF(statpanels) if (!resumed) var/datum/map_config/cached = SSmapping.next_map_config var/list/global_data = list( - "Map: [html_encode(SSmapping.config?.map_name || "Loading...")]", - cached ? "Next Map: [html_encode(cached.map_name)]" : null, + "Map: [html_encode(SSmapping.config?.ui_name || "Loading...")]", + cached ? "Next Map: [html_encode(cached.ui_name)]" : null, "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]", "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]", "Round Time: [worldtime2text()]", diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 9d68caf9eee5..fdd98b65f16f 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -159,7 +159,7 @@ SUBSYSTEM_DEF(ticker) for(var/client/C in GLOB.clients) window_flash(C, ignorepref = TRUE) //let them know lobby has opened up. to_chat(world, span_boldnotice("Welcome to [station_name()]!")) - send2chat("New round starting on [SSmapping.config.map_name]!", CONFIG_GET(string/chat_announce_new_game)) + send2chat("New round starting on [SSmapping.config.ui_name]!", CONFIG_GET(string/chat_announce_new_game)) current_state = GAME_STATE_PREGAME //Everyone who wants to be an observer is now spawned create_observers() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index a319169159b3..de860dad70e7 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -73,8 +73,8 @@ SUBSYSTEM_DEF(vote) if(isnull(global.config.defaultmap)) continue if(!preferred_map) - if(global.config.defaultmap.map_name) - preferred_map = global.config.defaultmap.map_name + if(global.config.defaultmap.ui_name) + preferred_map = global.config.defaultmap.ui_name if(preferred_map) choices[preferred_map] += 1 greatest_votes = max(greatest_votes, choices[preferred_map]) @@ -203,7 +203,7 @@ SUBSYSTEM_DEF(vote) continue if(VM.config_max_users > 0 && GLOB.clients.len > VM.config_max_users) continue - maps += VM.map_name + maps += VM.ui_name shuffle_inplace(maps) for(var/valid_map in maps) choices.Add(valid_map) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 91fa09a002cb..e0afc335e9e0 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,10 @@ 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/ui_name = "YogStation (Box)" var/traits = null var/space_ruin_levels = 7 diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 11f314b02b2e..d8a40ceb0053 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -232,7 +232,7 @@ .["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho .["gamestate"] = SSticker.current_state - .["map_name"] = SSmapping.config?.map_name || "Loading..." + .["map_name"] = SSmapping.config?.ui_name || "Loading..." if(key_valid) .["active_players"] = get_active_player_count() diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm index ecb94b75c5fb..a85882f571e4 100644 --- a/code/modules/admin/chat_commands.dm +++ b/code/modules/admin/chat_commands.dm @@ -28,7 +28,7 @@ return last_irc_check = rtod var/server = CONFIG_GET(string/server) - return "[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.config.map_name], Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]" + return "[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.config.ui_name], Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]" /datum/tgs_chat_command/ahelp name = "ahelp" @@ -131,4 +131,4 @@ GLOBAL_LIST(round_end_notifiees) /datum/tgs_chat_command/reload_mentors/proc/ReloadAsync() set waitfor = FALSE - load_mentors() \ No newline at end of file + load_mentors() diff --git a/code/modules/admin/verbs/maprotation.dm b/code/modules/admin/verbs/maprotation.dm index ed9d23a84d92..e1cf3f3f44d4 100644 --- a/code/modules/admin/verbs/maprotation.dm +++ b/code/modules/admin/verbs/maprotation.dm @@ -38,7 +38,7 @@ return SSticker.maprotatechecked = 1 var/datum/map_config/VM = maprotatechoices[chosenmap] - message_admins("[key_name_admin(usr)] is changing the map to [VM.map_name]") - log_admin("[key_name(usr)] is changing the map to [VM.map_name]") + message_admins("[key_name_admin(usr)] is changing the map to [VM.ui_name]") + log_admin("[key_name(usr)] is changing the map to [VM.ui_name]") if (SSmapping.changemap(VM) == 0) - message_admins("[key_name_admin(usr)] has changed the map to [VM.map_name]") \ No newline at end of file + message_admins("[key_name_admin(usr)] has changed the map to [VM.ui_name]") diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 847c733f76c4..c34d1457f50d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1753,10 +1753,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/datum/map_config/VM = config.maplist[M] if(!VM.votable) continue - var/friendlyname = "[VM.map_name] " + var/friendlyname = "[VM.ui_name] " if (VM.voteweight <= 0) friendlyname += " (disabled)" - maplist[friendlyname] = VM.map_name + maplist[friendlyname] = VM.ui_name maplist[default] = null var/pickedmap = input(user, "Choose your preferred map. This will be used to help weight random map selection.", "Character Preference") as null|anything in maplist if (pickedmap) 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