Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Display the name of the map in the lobby. (#5849)

Browse Source
This commit is contained in:
pointer-to-null
2021-12-21 20:18:08 +03:00
committed by GitHub
parent 8ce94f0afa
commit 77b2d9354c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameTicking/GameTicker.Lobby.cs
View File

@@ -42,9 +42,11 @@ namespace Content.Server.GameTicking
return string.Empty; return string.Empty;
} }
var map = _gameMapManager.GetSelectedMap();
var mapName = map?.MapName ?? Loc.GetString("game-ticker-no-map-selected");
var gmTitle = Preset.ModeTitle; var gmTitle = Preset.ModeTitle;
var desc = Preset.Description; var desc = Preset.Description;
return Loc.GetString("game-ticker-get-info-text",("gmTitle", gmTitle),("desc", desc)); return Loc.GetString("game-ticker-get-info-text",("mapName", mapName),("gmTitle", gmTitle),("desc", desc));
} }
private TickerLobbyReadyEvent GetStatusSingle(ICommonSession player, LobbyPlayerStatus status) private TickerLobbyReadyEvent GetStatusSingle(ICommonSession player, LobbyPlayerStatus status)

2
Resources/Locale/en-US/game-ticking/game-ticker.ftl
View File

@@ -10,8 +10,10 @@ game-ticker-pause-start = Round start has been paused.
game-ticker-pause-start-resumed = Round start countdown is now resumed. game-ticker-pause-start-resumed = Round start countdown is now resumed.
game-ticker-player-join-game-message = Welcome to Space Station 14! If this is your first time playing, be sure to press F1 on your keyboard and read the game rules, and don't be afraid to ask for help in OOC. game-ticker-player-join-game-message = Welcome to Space Station 14! If this is your first time playing, be sure to press F1 on your keyboard and read the game rules, and don't be afraid to ask for help in OOC.
game-ticker-get-info-text = Hi and welcome to [color=white]Space Station 14![/color] game-ticker-get-info-text = Hi and welcome to [color=white]Space Station 14![/color]
The current map is: [color=white]{$mapName}[/color]
The current game mode is: [color=white]{$gmTitle}[/color]. The current game mode is: [color=white]{$gmTitle}[/color].
>[color=yellow]{$desc}[/color] >[color=yellow]{$desc}[/color]
game-ticker-no-map-selected = [color=red]No map selected![/color]
game-ticker-player-no-jobs-available-when-joining = When attempting to join to the game, no jobs were available. game-ticker-player-no-jobs-available-when-joining = When attempting to join to the game, no jobs were available.
# Displayed in chat to admins when a player joins # Displayed in chat to admins when a player joins