From 2d76b2117f364691edf2d9d1ad4b07e1564c8bf9 Mon Sep 17 00:00:00 2001
From: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Sun, 1 Oct 2023 08:40:29 -0500
Subject: [PATCH] Moves the lobby panel to the status panel (#22596)

---
 code/modules/mob/new_player/new_player.dm | 34 +++++++++--------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 3ac302009ef..b81047defd8 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -89,39 +89,31 @@
 	return
 
 /mob/new_player/Stat()
-	statpanel("Status")
-
-	..()
-
-	statpanel("Lobby")
-	if(client.statpanel=="Lobby" && SSticker)
-		if(SSticker.hide_mode)
-			stat("Game Mode:", "Secret")
+	. = ..()
+	if(statpanel("Status") && SSticker)
+		if(!SSticker.hide_mode)
+			stat("Game Mode: [GLOB.master_mode]")
 		else
-			if(SSticker.hide_mode == 0)
-				stat("Game Mode:", "[GLOB.master_mode]") // Old setting for showing the game mode
-			else
-				stat("Game Mode: ", "Secret")
-
-		if((SSticker.current_state == GAME_STATE_PREGAME) && SSticker.ticker_going)
-			stat("Time To Start:", round(SSticker.pregame_timeleft/10))
-		if((SSticker.current_state == GAME_STATE_PREGAME) && !SSticker.ticker_going)
-			stat("Time To Start:", "DELAYED")
+			stat("Game Mode: Secret")
 
 		if(SSticker.current_state == GAME_STATE_PREGAME)
-			stat("Players:", "[totalPlayers]")
+			if(SSticker.ticker_going)
+				stat("Time To Start: [round(SSticker.pregame_timeleft/10)]")
+			else
+				stat("Time To Start:", "DELAYED")
+
+			stat("Players: [totalPlayers]")
 			if(check_rights(R_ADMIN, 0, src))
-				stat("Players Ready:", "[totalPlayersReady]")
+				stat("Players Ready: [totalPlayersReady]")
 			totalPlayers = 0
 			totalPlayersReady = 0
 			for(var/mob/new_player/player in GLOB.player_list)
 				if(check_rights(R_ADMIN, 0, src))
-					stat("[player.key]", (player.ready)?("(Playing)"):(null))
+					stat("[player.key] [(player.ready) ? ("(Playing)") : (null)]")
 				totalPlayers++
 				if(player.ready)
 					totalPlayersReady++
 
-
 /mob/new_player/Topic(href, href_list[])
 	if(!client)
 		return FALSE