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

remove "failed to send message" popup from radio (#19184)

Browse Source
This commit is contained in:
Nemanja
2023-08-15 16:56:42 -04:00
committed by GitHub
parent 2e86f4c556
commit f3b40197b9
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Radio/EntitySystems/RadioSystem.cs
View File

@@ -103,7 +103,6 @@ public sealed class RadioSystem : EntitySystem
var speakerQuery = GetEntityQuery<RadioSpeakerComponent>(); var speakerQuery = GetEntityQuery<RadioSpeakerComponent>();
var radioQuery = EntityQueryEnumerator<ActiveRadioComponent, TransformComponent>(); var radioQuery = EntityQueryEnumerator<ActiveRadioComponent, TransformComponent>();
var sentAtLeastOnce = false;
while (canSend && radioQuery.MoveNext(out var receiver, out var radio, out var transform)) while (canSend && radioQuery.MoveNext(out var receiver, out var radio, out var transform))
{ {
if (!radio.Channels.Contains(channel.ID) || (TryComp<IntercomComponent>(receiver, out var intercom) && !intercom.SupportedChannels.Contains(channel.ID))) if (!radio.Channels.Contains(channel.ID) || (TryComp<IntercomComponent>(receiver, out var intercom) && !intercom.SupportedChannels.Contains(channel.ID)))
@@ -126,10 +125,7 @@ public sealed class RadioSystem : EntitySystem
// send the message // send the message
RaiseLocalEvent(receiver, ref ev); RaiseLocalEvent(receiver, ref ev);
sentAtLeastOnce = true;
} }
if (!sentAtLeastOnce)
_popup.PopupEntity(Loc.GetString("failed-to-send-message"), messageSource, messageSource, PopupType.MediumCaution);
if (name != Name(messageSource)) if (name != Name(messageSource))
_adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(messageSource):user} as {name} on {channel.LocalizedName}: {message}"); _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(messageSource):user} as {name} on {channel.LocalizedName}: {message}");

1
Resources/Locale/en-US/radio/radio-event.ftl
View File

@@ -1 +0,0 @@
failed-to-send-message = Failed to send message!