From 63554ed392829dfc7a0713ae140e196302392053 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Wed, 4 Oct 2017 10:22:28 -0400 Subject: [PATCH 1/2] Fixes lobby timer showing as delayed when its not --- code/modules/mob/dead/new_player/new_player.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index ae5a96f8c5d..a087810222d 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -79,9 +79,13 @@ if(SSticker.current_state == GAME_STATE_PREGAME) var/time_remaining = SSticker.GetTimeLeft() - if(time_remaining >= 0) + if(time_remaining > 0) time_remaining /= 10 - stat("Time To Start:", (time_remaining >= 0) ? "[round(time_remaining)]s" : "DELAYED") + stat("Time To Start:", "[round(time_remaining)]s") + else if(time_remaining == -10) + stat("Time To Start:", "DELAYED") + else + stat("Time To Start:", "SOON") stat("Players:", "[SSticker.totalPlayers]") if(client.holder) From 93dba1164820eed67da7d604e6c3306684e61377 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Wed, 4 Oct 2017 10:37:51 -0400 Subject: [PATCH 2/2] Simplified further --- code/modules/mob/dead/new_player/new_player.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index a087810222d..202158f6f67 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -80,8 +80,7 @@ if(SSticker.current_state == GAME_STATE_PREGAME) var/time_remaining = SSticker.GetTimeLeft() if(time_remaining > 0) - time_remaining /= 10 - stat("Time To Start:", "[round(time_remaining)]s") + stat("Time To Start:", "[round(time_remaining/10)]s") else if(time_remaining == -10) stat("Time To Start:", "DELAYED") else