diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs index 332de34345c807..a36cc2fe54f5b3 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs +++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs @@ -58,6 +58,8 @@ public void UpdateReagentsList(List x.Value.Key.CompareTo(y.Value.Key)); foreach (KeyValuePair> entry in inventory) { diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs index 07492b310f3d70..1c94d32bf8d17d 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs @@ -16,6 +16,8 @@ public sealed class CommunicationsConsoleBoundUserInterface : BoundUserInterface [ViewVariables] public bool CanAnnounce { get; private set; } + [ViewVariables] + public bool CanBroadcast { get; private set; } [ViewVariables] public bool CanCall { get; private set; } @@ -71,6 +73,11 @@ public void AnnounceButtonPressed(string message) SendMessage(new CommunicationsConsoleAnnounceMessage(msg)); } + public void BroadcastButtonPressed(string message) + { + SendMessage(new CommunicationsConsoleBroadcastMessage(message)); + } + public void CallShuttle() { SendMessage(new CommunicationsConsoleCallEmergencyShuttleMessage()); @@ -89,6 +96,7 @@ protected override void UpdateState(BoundUserInterfaceState state) return; CanAnnounce = commsState.CanAnnounce; + CanBroadcast = commsState.CanBroadcast; CanCall = commsState.CanCall; _expectedCountdownTime = commsState.ExpectedCountdownEnd; CountdownStarted = commsState.CountdownStarted; @@ -102,6 +110,7 @@ protected override void UpdateState(BoundUserInterfaceState state) _menu.AlertLevelButton.Disabled = !AlertLevelSelectable; _menu.EmergencyShuttleButton.Disabled = !CanCall; _menu.AnnounceButton.Disabled = !CanAnnounce; + _menu.BroadcastButton.Disabled = !CanBroadcast; } } diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml index 86c0b4e2d5337b..ea2f77d457d781 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml @@ -5,6 +5,7 @@