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

Holopads no longer log broadcasted speech and emotes in the chat (#34114)

Browse Source 
Initial commit
This commit is contained in:
chromiumboy
2024-12-31 04:52:08 -06:00
committed by GitHub
parent c1c4b1c9a4
commit 8545c3a70e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Holopad/HolopadSystem.cs
View File

@@ -381,7 +381,10 @@ public sealed class HolopadSystem : SharedHolopadSystem
if (TryComp<TelephoneComponent>(linkedHolopad, out var linkedHolopadTelephone) && linkedHolopadTelephone.Muted) if (TryComp<TelephoneComponent>(linkedHolopad, out var linkedHolopadTelephone) && linkedHolopadTelephone.Muted)
continue; continue;
foreach (var receiver in GetLinkedHolopads(linkedHolopad)) var receivingHolopads = GetLinkedHolopads(linkedHolopad);
var range = receivingHolopads.Count > 1 ? ChatTransmitRange.HideChat : ChatTransmitRange.GhostRangeLimit;
foreach (var receiver in receivingHolopads)
{ {
if (receiver.Comp.Hologram == null) if (receiver.Comp.Hologram == null)
continue; continue;
@@ -391,7 +394,7 @@ public sealed class HolopadSystem : SharedHolopadSystem
var name = Loc.GetString("holopad-hologram-name", ("name", ent)); var name = Loc.GetString("holopad-hologram-name", ("name", ent));
// Force the emote, because if the user can do it, the hologram can too // Force the emote, because if the user can do it, the hologram can too
_chatSystem.TryEmoteWithChat(receiver.Comp.Hologram.Value, args.Emote, ChatTransmitRange.Normal, false, name, true, true); _chatSystem.TryEmoteWithChat(receiver.Comp.Hologram.Value, args.Emote, range, false, name, true, true);
} }
} }
} }

4
Content.Server/Telephone/TelephoneSystem.cs
View File

@@ -109,8 +109,10 @@ public sealed class TelephoneSystem : SharedTelephoneSystem
("speaker", Name(entity)), ("speaker", Name(entity)),
("originalName", nameEv.VoiceName)); ("originalName", nameEv.VoiceName));
var range = args.TelephoneSource.Comp.LinkedTelephones.Count > 1 ? ChatTransmitRange.HideChat : ChatTransmitRange.GhostRangeLimit;
var volume = entity.Comp.SpeakerVolume == TelephoneVolume.Speak ? InGameICChatType.Speak : InGameICChatType.Whisper; var volume = entity.Comp.SpeakerVolume == TelephoneVolume.Speak ? InGameICChatType.Speak : InGameICChatType.Whisper;
_chat.TrySendInGameICMessage(entity, args.Message, volume, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false);
_chat.TrySendInGameICMessage(entity, args.Message, volume, range, nameOverride: name, checkRadioPrefix: false);
} }
#endregion #endregion