From a96caa5f702ae2cdc57c3858993980b58596f7e9 Mon Sep 17 00:00:00 2001 From: Leshana Date: Sun, 5 Apr 2020 16:06:56 -0400 Subject: [PATCH] Update Lobby stat panel to show voting and server init status. --- code/modules/mob/new_player/new_player.dm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 209516ec882..cbef27dfa32 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -79,15 +79,17 @@ /mob/new_player/Stat() ..() - if(statpanel("Lobby") && ticker) - if(ticker.hide_mode) - stat("Game Mode:", "Secret") - else - if(ticker.hide_mode == 0) - stat("Game Mode:", "[config.mode_names[master_mode]]") // Old setting for showing the game mode + if(statpanel("Lobby") && SSticker) + stat("Game Mode:", SSticker.hide_mode ? "Secret" : "[config.mode_names[master_mode]]") - if(ticker.current_state == GAME_STATE_PREGAME) - stat("Time To Start:", "[ticker.pregame_timeleft][round_progressing ? "" : " (DELAYED)"]") + if(SSvote.mode) + stat("Vote: [capitalize(SSvote.mode)]", "Time Left: [SSvote.time_remaining] s") + + if(SSticker.current_state == GAME_STATE_INIT) + stat("Time To Start:", "Server Initializing") + + else if(SSticker.current_state == GAME_STATE_PREGAME) + stat("Time To Start:", "[round(SSticker.pregame_timeleft,1)][round_progressing ? "" : " (DELAYED)"]") stat("Players: [totalPlayers]", "Players Ready: [totalPlayersReady]") totalPlayers = 0 totalPlayersReady = 0