From 77b2d9354c152385687c0075099f678dfe030a7d Mon Sep 17 00:00:00 2001
From: pointer-to-null <91910481+pointer-to-null@users.noreply.github.com>
Date: Tue, 21 Dec 2021 20:18:08 +0300
Subject: [PATCH] Display the name of the map in the lobby. (#5849)

---
 Content.Server/GameTicking/GameTicker.Lobby.cs      | 4 +++-
 Resources/Locale/en-US/game-ticking/game-ticker.ftl | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs
index 6ce931db3f..7d65e6cb37 100644
--- a/Content.Server/GameTicking/GameTicker.Lobby.cs
+++ b/Content.Server/GameTicking/GameTicker.Lobby.cs
@@ -42,9 +42,11 @@ namespace Content.Server.GameTicking
                 return string.Empty;
             }
 
+            var map = _gameMapManager.GetSelectedMap();
+            var mapName = map?.MapName ?? Loc.GetString("game-ticker-no-map-selected");
             var gmTitle = Preset.ModeTitle;
             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)
diff --git a/Resources/Locale/en-US/game-ticking/game-ticker.ftl b/Resources/Locale/en-US/game-ticking/game-ticker.ftl
index 75d4eed384..a950acc4e3 100644
--- a/Resources/Locale/en-US/game-ticking/game-ticker.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-ticker.ftl
@@ -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-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]
+                            The current map is: [color=white]{$mapName}[/color]
                             The current game mode is: [color=white]{$gmTitle}[/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.
 
 # Displayed in chat to admins when a player joins