Skip to content

Commit

Permalink
Remove broadcast cooldown (#26492)
Browse files Browse the repository at this point in the history
* 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 c730d64.

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

This reverts commit 3c2d66a.

* -Removed cooldown entirely
  • Loading branch information
superjj18 authored Mar 28, 2024
1 parent 7d90175 commit 578f7e4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
6 changes: 0 additions & 6 deletions Content.Server/Communications/CommunicationsConsoleSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ public void UpdateCommsConsoleInterface(EntityUid uid, CommunicationsConsoleComp

_uiSystem.SetUiState(ui, new CommunicationsConsoleInterfaceState(
CanAnnounce(comp),
CanBroadcast(comp),
CanCallOrRecall(comp),
levels,
currentLevel,
Expand All @@ -184,11 +183,6 @@ private static bool CanAnnounce(CommunicationsConsoleComponent comp)
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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ public sealed class CommunicationsConsoleInterfaceState : BoundUserInterfaceStat
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;
Expand Down

0 comments on commit 578f7e4

Please sign in to comment.