tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quickfix: Give color to some announcements (#7488)

Browse Source
This commit is contained in:
Chris V
2022-04-10 13:54:07 -07:00
committed by GitHub
parent 8d8b0e6376
commit ef6d147763
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Administration/UI/AdminAnnounceEui.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Server.Administration.UI
_chatManager.DispatchServerAnnouncement(doAnnounce.Announcement); _chatManager.DispatchServerAnnouncement(doAnnounce.Announcement);
break; break;
case AdminAnnounceType.Station: case AdminAnnounceType.Station:
_chatManager.DispatchStationAnnouncement(doAnnounce.Announcement, doAnnounce.Announcer); _chatManager.DispatchStationAnnouncement(doAnnounce.Announcement, doAnnounce.Announcer, colorOverride: Color.Gold);
break; break;
} }

4
Content.Server/Announcements/AnnounceCommand.cs
View File

@@ -26,12 +26,12 @@ namespace Content.Server.Announcements
if (args.Length == 1) if (args.Length == 1)
{ {
chat.DispatchStationAnnouncement(args[0]); chat.DispatchStationAnnouncement(args[0], colorOverride: Color.Gold);
} }
else else
{ {
var message = string.Join(' ', new ArraySegment<string>(args, 1, args.Length-1)); var message = string.Join(' ', new ArraySegment<string>(args, 1, args.Length-1));
chat.DispatchStationAnnouncement(message, args[0]); chat.DispatchStationAnnouncement(message, args[0], colorOverride: Color.Gold);
} }
shell.WriteLine("Sent!"); shell.WriteLine("Sent!");
} }

2
Content.Server/Nuke/NukeCodeSystem.cs
View File

@@ -76,7 +76,7 @@ namespace Content.Server.Nuke
if (wasSent) if (wasSent)
{ {
var msg = Loc.GetString("nuke-component-announcement-send-codes"); var msg = Loc.GetString("nuke-component-announcement-send-codes");
_chat.DispatchStationAnnouncement(msg); _chat.DispatchStationAnnouncement(msg, colorOverride: Color.Red);
} }
return wasSent; return wasSent;

3
Content.Server/RoundEnd/RoundEndSystem.cs
View File

@@ -113,7 +113,8 @@ namespace Content.Server.RoundEnd
_adminLog.Add(LogType.ShuttleRecalled, LogImpact.High, $"Shuttle recalled"); _adminLog.Add(LogType.ShuttleRecalled, LogImpact.High, $"Shuttle recalled");
} }
_chatManager.DispatchStationAnnouncement(Loc.GetString("round-end-system-shuttle-recalled-announcement"), Loc.GetString("Station"), false); _chatManager.DispatchStationAnnouncement(Loc.GetString("round-end-system-shuttle-recalled-announcement"),
Loc.GetString("Station"), false, colorOverride: Color.Gold);
SoundSystem.Play(Filter.Broadcast(), "/Audio/Announcements/shuttlerecalled.ogg"); SoundSystem.Play(Filter.Broadcast(), "/Audio/Announcements/shuttlerecalled.ogg");

3
Content.Server/StationEvents/Events/RandomSentience.cs
View File

@@ -53,7 +53,8 @@ public sealed class RandomSentience : StationEvent
Loc.GetString("station-event-random-sentience-announcement", Loc.GetString("station-event-random-sentience-announcement",
("kind1", kind1), ("kind2", kind2), ("kind3", kind3), ("amount", groupList.Count), ("kind1", kind1), ("kind2", kind2), ("kind3", kind3), ("amount", groupList.Count),
("data", Loc.GetString($"random-sentience-event-data-{_random.Next(1, 6)}")), ("data", Loc.GetString($"random-sentience-event-data-{_random.Next(1, 6)}")),
("strength", Loc.GetString($"random-sentience-event-strength-{_random.Next(1, 8)}"))) ("strength", Loc.GetString($"random-sentience-event-strength-{_random.Next(1, 8)}"))),
colorOverride: Color.Gold
); );
} }
} }