diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs index 2cf8330d2a..6d6f8a972d 100644 --- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs +++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs @@ -32,6 +32,7 @@ namespace Content.Client.GameTicking.Managers [ViewVariables] public bool DisallowedLateJoin { get; private set; } [ViewVariables] public string? ServerInfoBlob { get; private set; } [ViewVariables] public TimeSpan StartTime { get; private set; } + [ViewVariables] public TimeSpan RoundStartTimeSpan { get; private set; } [ViewVariables] public new bool Paused { get; private set; } [ViewVariables] public Dictionary Status { get; private set; } = new(); [ViewVariables] public IReadOnlyDictionary> JobsAvailable => _jobsAvailable; @@ -87,6 +88,7 @@ namespace Content.Client.GameTicking.Managers private void LobbyStatus(TickerLobbyStatusEvent message) { StartTime = message.StartTime; + RoundStartTimeSpan = message.RoundStartTimeSpan; IsGameStarted = message.IsRoundStarted; AreWeReady = message.YouAreReady; LobbySong = message.LobbySong; diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index cf99e3c055..fa8fc3c355 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -136,6 +136,7 @@ namespace Content.Client.Lobby if (gameTicker.IsGameStarted) { _lobby.StartTime.Text = string.Empty; + _lobby.StationTime.Text = Loc.GetString("lobby-state-player-status-station-time", ("stationTime", _gameTiming.RealTime.Subtract(_gameTicker.RoundStartTimeSpan).ToString("hh\\:mm"))); return; } @@ -159,6 +160,7 @@ namespace Content.Client.Lobby } } + _lobby.StationTime.Text = Loc.GetString("lobby-state-player-status-station-time", ("stationTime", TimeSpan.Zero.ToString("hh\\:mm"))); _lobby.StartTime.Text = Loc.GetString("lobby-state-round-start-countdown-text", ("timeLeft", text)); } diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml index b1dcfb6f23..12a24bb472 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml +++ b/Content.Client/Lobby/UI/LobbyGui.xaml @@ -65,6 +65,7 @@ +