From 93e5d453237dc5603a16b4110357ca451f77e86e Mon Sep 17 00:00:00 2001
From: Ed <edwardxperia2000@gmail.com>
Date: Sun, 29 Jun 2025 16:58:36 +0300
Subject: [PATCH] Update CP14RoundEndSystem.CBT.cs

---
 .../_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs  | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs b/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs
index 4d6e41580a..bd286d8573 100644
--- a/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs
+++ b/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.CBT.cs
@@ -87,10 +87,13 @@ public sealed partial class CP14RoundEndSystem
 
     private void LimitPlaytimeRule(DateTime now)
     {
-        var allowedPlaytime = now.Hour is >= 18 and < 22;
+        var ruDays = now.DayOfWeek is DayOfWeek.Tuesday || now.DayOfWeek is DayOfWeek.Thursday || now.DayOfWeek is DayOfWeek.Saturday;
+
+        var allowedRuPlaytime = now.Hour is >= 18 and < 22;
+        var allowedEngPlaytime = now.Hour is >= 20 and < 24;
         var isMonday = now.DayOfWeek is DayOfWeek.Monday;
 
-        if (allowedPlaytime && !isMonday)
+        if (((ruDays && allowedRuPlaytime) || (!ruDays && allowedEngPlaytime)) && !isMonday)
         {
             if (_ticker.Paused)
                 _ticker.TogglePause();
@@ -107,10 +110,15 @@ public sealed partial class CP14RoundEndSystem
 
     private void ApplyAnnouncements(DateTime now)
     {
+        var ruDays = now.DayOfWeek is DayOfWeek.Tuesday || now.DayOfWeek is DayOfWeek.Thursday || now.DayOfWeek is DayOfWeek.Saturday;
+
         var timeMap = new (int Hour, int Minute, Action Action)[]
         {
             (21, 45, () =>
             {
+                if (!ruDays)
+                    return;
+
                 _chatSystem.DispatchGlobalAnnouncement(
                     Loc.GetString("cp14-cbt-close-15m"),
                     announcementSound: new SoundPathSpecifier("/Audio/Effects/beep1.ogg"),
@@ -119,6 +127,27 @@ public sealed partial class CP14RoundEndSystem
             }),
             (22, 2, () =>
             {
+                if (!ruDays)
+                    return;
+
+                _consoleHost.ExecuteCommand("golobby");
+            }),
+            (23, 44, () =>
+            {
+                if (ruDays)
+                    return;
+
+                _chatSystem.DispatchGlobalAnnouncement(
+                    Loc.GetString("cp14-cbt-close-15m"),
+                    announcementSound: new SoundPathSpecifier("/Audio/Effects/beep1.ogg"),
+                    sender: "Server"
+                );
+            }),
+            (23, 59, () =>
+            {
+                if (ruDays)
+                    return;
+
                 _consoleHost.ExecuteCommand("golobby");
             }),
         };