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

Fix comms consoles not working (#8644)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Veritius
2022-06-04 19:09:04 +10:00
committed by GitHub
parent 68a58aa0d1
commit 33faf00112
10 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Communications/CommunicationsConsoleComponent.cs
View File

@@ -10,13 +10,12 @@ namespace Content.Server.Communications
/// <summary>
/// Remaining cooldown between making announcements.
/// </summary>
[ViewVariables]
[ViewVariables(VVAccess.ReadWrite)]
public float AnnouncementCooldownRemaining;
/// <summary>
/// Has the UI already been refreshed after the announcement
/// </summary>
[ViewVariables]
public bool AlreadyRefreshed = false;
/// <summary>

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

@@ -2,7 +2,6 @@ using System.Globalization;
using Content.Server.Access.Systems;
using Content.Server.AlertLevel;
using Content.Server.Chat;
using Content.Server.Chat.Managers;
using Content.Server.Popups;
using Content.Server.RoundEnd;
using Content.Server.Station.Systems;
@@ -199,11 +198,9 @@ namespace Content.Server.Communications
if (comp.AnnounceGlobal)
{
_chatSystem.DispatchGlobalStationAnnouncement(msg, title, colorOverride: comp.AnnouncementColor);
return;
}
else
{
_chatSystem.DispatchStationAnnouncement(uid, msg, title, colorOverride: comp.AnnouncementColor);
}
_chatSystem.DispatchStationAnnouncement(uid, msg, title, colorOverride: comp.AnnouncementColor);
}
private void OnCallShuttleMessage(EntityUid uid, CommunicationsConsoleComponent comp, CommunicationsConsoleCallEmergencyShuttleMessage message)