Отображение даты в КПК

Content.Client/PDA/PdaMenu.xaml

@@ -43,6 +43,9 @@
             <ContainerButton Name="StationTimeButton">
                 <RichTextLabel Name="StationTimeLabel" Access="Public"/>
             </ContainerButton>
+            <ContainerButton Name="StationDateButton">
+                <RichTextLabel Name="StationDateLabel" Access="Public"/>
+            </ContainerButton>
             <ContainerButton Name="ShuttleTimeButton">
                 <RichTextLabel Name="ShuttleTimeLabel" Access="Public"/>
             </ContainerButton>

Content.Client/PDA/PdaMenu.xaml.cs

@@ -1,6 +1,6 @@
 using Content.Client.GameTicking.Managers;
 using Content.Shared.PDA;
-using Robust.Shared.Utility;
+using Content.Shared._Sunrise.Time;
 using Content.Shared.CartridgeLoader;
 using Content.Client.Message;
 using Robust.Client.UserInterface;
@@ -9,6 +9,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Client.PDA
 {
@@ -120,10 +121,14 @@ public PdaMenu()
 
             StationTimeButton.OnPressed += _ =>
             {
-                var stationTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);
-                _clipboard.SetText((stationTime.ToString("hh\\:mm\\:ss")));
+                var stationTime = _entitySystem.GetEntitySystem<TimeSystem>().GetStationTime();
+                _clipboard.SetText((stationTime.Time.ToString("hh\\:mm\\:ss")));
+            };
+			StationDateButton.OnPressed += _ =>
+            {
+                var stationDate = _entitySystem.GetEntitySystem<TimeSystem>().GetDate();
+                _clipboard.SetText((stationDate));
             };
-
             StationAlertLevelInstructionsButton.OnPressed += _ =>
             {
                 _clipboard.SetText(_instructions);
@@ -171,10 +176,14 @@ public void UpdateState(PdaUpdateState state)
                 ("station", _stationName)));
 
 
-            var stationTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);
+            var stationTime = _entitySystem.GetEntitySystem<TimeSystem>().GetStationTime();
+			var stationDate = _entitySystem.GetEntitySystem<TimeSystem>().GetDate();
 
             StationTimeLabel.SetMarkup(Loc.GetString("comp-pda-ui-station-time",
-                ("time", stationTime.ToString("hh\\:mm\\:ss"))));
+                ("time", stationTime.Time.ToString("hh\\:mm\\:ss"))));
+
+            StationDateLabel.SetMarkup(Loc.GetString("comp-pda-ui-station-date",
+				("date", stationDate)));
 
             // Sunrise-start
             var remaining = TimeSpan.Zero;
@@ -374,10 +383,14 @@ protected override void Draw(DrawingHandleScreen handle)
         {
             base.Draw(handle);
 
-            var stationTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);
+            var stationTime = _entitySystem.GetEntitySystem<TimeSystem>().GetStationTime();
+			var stationDate = _entitySystem.GetEntitySystem<TimeSystem>().GetDate();
 
             StationTimeLabel.SetMarkup(Loc.GetString("comp-pda-ui-station-time",
-                ("time", stationTime.ToString("hh\\:mm\\:ss"))));
+                ("time", stationTime.Time.ToString("hh\\:mm\\:ss"))));
+
+            StationDateLabel.SetMarkup(Loc.GetString("comp-pda-ui-station-date",
+                ("date", stationDate)));
 
             // Sunrise-start
             var remaining = TimeSpan.Zero;

Content.Shared/_Sunrise/Time/TimeSystem.cs

@@ -0,0 +1,44 @@
+using Content.Shared.Examine;
+using Content.Shared.GameTicking;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._Sunrise.Time
+{
+    public sealed class TimeSystem : EntitySystem
+    {
+        [Dependency] private readonly IGameTiming _timing = default!;
+
+        private TimeSpan _roundStart;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeNetworkEvent<TickerLobbyStatusEvent>(LobbyStatus);
+        }
+
+        private void LobbyStatus(TickerLobbyStatusEvent ev)
+        {
+            _roundStart = ev.RoundStartTimeSpan;
+        }
+
+        public (TimeSpan Time, int Date) GetStationTime()
+        {
+            var stationTime = _timing.CurTime.Subtract(_roundStart).Add(TimeSpan.FromHours(12));
+
+            var date = 13;
+            while (stationTime.TotalHours >= 24)
+            {
+                stationTime.Subtract(TimeSpan.FromHours(24));
+                date = date + 1;
+            }
+
+            return (stationTime, date);
+        }
+
+        public string GetDate()
+        {
+            // please tell me you guys aren't gonna have a 4 week round yet...
+            return DateTime.UtcNow.AddYears(1000).ToString("dd.MM.yyyy");
+        }
+    }
+}

Resources/Locale/en-US/_sunrise/time/time.ftl

@@ -0,0 +1 @@
+standard-date = 417/11/{$date}

Resources/Locale/en-US/pda/pda-component.ftl

@@ -32,7 +32,7 @@ comp-pda-ui-station-alert-level = Alert Level: [color={ $color }]{ $level }[/col
 
 comp-pda-ui-station-alert-level-instructions = Instructions: [color=white]{ $instructions }[/color]
 
-comp-pda-ui-station-time = Shift duration: [color=white]{ $time }[/color]
+comp-pda-ui-station-time = The current time since the start of the shift: [color=white]{ $time } { $date }[/color]
 
 comp-pda-ui-eject-id-button = Eject ID
 

Resources/Locale/ru-RU/_sunrise/time/time.ftl

@@ -0,0 +1 @@
+standard-date = 417/11/{$date}

Resources/Locale/ru-RU/pda/pda-component.ftl

@@ -17,7 +17,8 @@ comp-pda-ui-footer = Карманный Персональный Компьют
 comp-pda-ui-station = Станция: [color=white]{ $station }[/color]
 comp-pda-ui-station-alert-level = Уровень угрозы: [color={ $color }]{ $level }[/color]
 comp-pda-ui-station-alert-level-instructions = Инструкции: [color=white]{ $instructions }[/color]
-comp-pda-ui-station-time = Продолжительность смены: [color=white]{ $time }[/color]
+comp-pda-ui-station-time = Текущее время с начала смены: [color=white]{ $time }[/color]
+comp-pda-ui-station-date = Текущая дата: [color=white]{ $date }[/color]
 comp-pda-ui-eject-id-button = Извлечь ID
 comp-pda-ui-eject-pen-button = Извлечь ручку
 comp-pda-ui-ringtone-button-description = Измените рингтон вашего КПК