From: superjj18 <gagnonjake@gmail.com>
Date: Thu, 28 Mar 2024 05:41:20 +0000 (-0400)
Subject: Remove broadcast cooldown (#26492)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=578f7e4f2c1cde38e1c66fa2b5fbbb2903576dec;p=space-station-14.git

Remove broadcast cooldown (#26492)

* Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal.

* Revert "Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal."

This reverts commit c730d6499b6908f6ae7c52e21d5338fa3b7eb80e.

* Reapply "Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal."

This reverts commit 3c2d66af865a11ca55eb0e98db58a955c0d70c00.

* -Removed cooldown entirely
---

diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 6b745c8cd9..6475e1a6d7 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -170,7 +170,6 @@ namespace Content.Server.Communications
 
             _uiSystem.SetUiState(ui, new CommunicationsConsoleInterfaceState(
                 CanAnnounce(comp),
-                CanBroadcast(comp),
                 CanCallOrRecall(comp),
                 levels,
                 currentLevel,
@@ -184,11 +183,6 @@ namespace Content.Server.Communications
             return comp.AnnouncementCooldownRemaining <= 0f;
         }
 
-        private static bool CanBroadcast(CommunicationsConsoleComponent comp)
-        {
-            return comp.AnnouncementCooldownRemaining <= 0f;
-        }
-
         private bool CanUse(EntityUid user, EntityUid console)
         {
             // This shouldn't technically be possible because of BUI but don't trust client.
diff --git a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
index bf0f5195b7..d48b99837f 100644
--- a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
+++ b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
@@ -19,10 +19,9 @@ namespace Content.Shared.Communications
         public string CurrentAlert;
         public float CurrentAlertDelay;
 
-        public CommunicationsConsoleInterfaceState(bool canAnnounce, bool canBroadcast, bool canCall, List<string>? alertLevels, string currentAlert, float currentAlertDelay, TimeSpan? expectedCountdownEnd = null)
+        public CommunicationsConsoleInterfaceState(bool canAnnounce, bool canCall, List<string>? alertLevels, string currentAlert, float currentAlertDelay, TimeSpan? expectedCountdownEnd = null)
         {
             CanAnnounce = canAnnounce;
-            CanBroadcast = canBroadcast;
             CanCall = canCall;
             ExpectedCountdownEnd = expectedCountdownEnd;
             CountdownStarted = expectedCountdownEnd != null;