Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove broadcast cooldown (#26492)

Browse Source 
* 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
This commit is contained in:
superjj18
2024-03-28 01:41:20 -04:00
committed by GitHub
parent 7d90175983
commit 578f7e4f2c
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Communications/CommunicationsConsoleSystem.cs
View File

@@ -170,7 +170,6 @@ namespace Content.Server.Communications
_uiSystem.SetUiState(ui, new CommunicationsConsoleInterfaceState( _uiSystem.SetUiState(ui, new CommunicationsConsoleInterfaceState(
CanAnnounce(comp), CanAnnounce(comp),
CanBroadcast(comp),
CanCallOrRecall(comp), CanCallOrRecall(comp),
levels, levels,
currentLevel, currentLevel,
@@ -184,11 +183,6 @@ namespace Content.Server.Communications
return comp.AnnouncementCooldownRemaining <= 0f; return comp.AnnouncementCooldownRemaining <= 0f;
} }
private static bool CanBroadcast(CommunicationsConsoleComponent comp)
{
return comp.AnnouncementCooldownRemaining <= 0f;
}
private bool CanUse(EntityUid user, EntityUid console) private bool CanUse(EntityUid user, EntityUid console)
{ {
// This shouldn't technically be possible because of BUI but don't trust client. // This shouldn't technically be possible because of BUI but don't trust client.

3
Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
View File

@@ -19,10 +19,9 @@ namespace Content.Shared.Communications
public string CurrentAlert; public string CurrentAlert;
public float CurrentAlertDelay; 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; CanAnnounce = canAnnounce;
CanBroadcast = canBroadcast;
CanCall = canCall; CanCall = canCall;
ExpectedCountdownEnd = expectedCountdownEnd; ExpectedCountdownEnd = expectedCountdownEnd;
CountdownStarted = expectedCountdownEnd != null; CountdownStarted = expectedCountdownEnd != null;