From e60f74ab12fd934b9b439e1f69556d9e5d146d1c Mon Sep 17 00:00:00 2001 From: chromiumboy Date: Sat, 28 Dec 2024 23:28:32 -0600 Subject: [PATCH] Initial commit --- Content.Server/Holopad/HolopadSystem.cs | 7 +++++-- Content.Server/Telephone/TelephoneSystem.cs | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs index fce71a2cd159..4cf0bf4bfdbd 100644 --- a/Content.Server/Holopad/HolopadSystem.cs +++ b/Content.Server/Holopad/HolopadSystem.cs @@ -381,7 +381,10 @@ private void OnEmote(Entity entity, ref EmoteEvent args) if (TryComp(linkedHolopad, out var linkedHolopadTelephone) && linkedHolopadTelephone.Muted) 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) continue; @@ -391,7 +394,7 @@ private void OnEmote(Entity entity, ref EmoteEvent args) var name = Loc.GetString("holopad-hologram-name", ("name", ent)); // 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); } } } diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs index cb0c72939aaa..ec6f1c38c6fb 100644 --- a/Content.Server/Telephone/TelephoneSystem.cs +++ b/Content.Server/Telephone/TelephoneSystem.cs @@ -108,8 +108,10 @@ private void OnTelephoneMessageReceived(Entity entity, ref T ("speaker", Name(entity)), ("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; - _chat.TrySendInGameICMessage(entity, args.Message, volume, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false); + + _chat.TrySendInGameICMessage(entity, args.Message, volume, range, nameOverride: name, checkRadioPrefix: false); } #endregion