Merge remote-tracking branch 'refs/remotes/wizards/master'

Content.Client/Holopad/HolopadWindow.xaml

@@ -29,7 +29,7 @@
                     <Label Name="CallStatusText" Margin="10 5 10 0" ReservesSpace="False"/>
                     <BoxContainer Name="CallerIdContainer" Orientation="Vertical" ReservesSpace="False">
                         <RichTextLabel Name="CallerIdText" HorizontalAlignment="Center" Margin="0 0 0 0"/>
-                        <Label Text="{Loc 'holopad-window-relay-label'}" Margin="10 5 10 0" ReservesSpace="False"/>
+                        <Label Text="{Loc 'holopad-window-relay-label'}" Margin="10 10 10 0" ReservesSpace="False"/>
                         <RichTextLabel Name="HolopadIdText" HorizontalAlignment="Center" Margin="0 0 0 10"/>
                     </BoxContainer>
                 </BoxContainer>

Content.Server/Holopad/HolopadSystem.cs

@@ -381,7 +381,10 @@ private void OnEmote(Entity<HolopadUserComponent> entity, ref EmoteEvent args)
             if (TryComp<TelephoneComponent>(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<HolopadUserComponent> 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);
             }
         }
     }

Content.Server/Telephone/TelephoneSystem.cs

@@ -7,8 +7,11 @@
 using Content.Server.Speech.Components;
 using Content.Shared.Chat;
 using Content.Shared.Database;
+using Content.Shared.Labels.Components;
 using Content.Shared.Mind.Components;
 using Content.Shared.Power;
+using Content.Shared.Silicons.StationAi;
+using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Speech;
 using Content.Shared.Telephone;
 using Robust.Server.GameObjects;
@@ -19,8 +22,6 @@
 using Robust.Shared.Random;
 using Robust.Shared.Replays;
 using System.Linq;
-using Content.Shared.Silicons.StationAi;
-using Content.Shared.Silicons.Borgs.Components;
 
 namespace Content.Server.Telephone;
 
@@ -108,8 +109,10 @@ private void OnTelephoneMessageReceived(Entity<TelephoneComponent> 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
@@ -215,7 +218,14 @@ private bool TryCallTelephone(Entity<TelephoneComponent> source, Entity<Telephon
         source.Comp.Muted = options?.MuteSource == true;
 
         var callerInfo = GetNameAndJobOfCallingEntity(user);
-        receiver.Comp.LastCallerId = (callerInfo.Item1, callerInfo.Item2, Name(source)); // This will be networked when the state changes
+
+        // Base the name of the device on its label
+        string? deviceName = null;
+
+        if (TryComp<LabelComponent>(source, out var label))
+            deviceName = label.CurrentLabel;
+
+        receiver.Comp.LastCallerId = (callerInfo.Item1, callerInfo.Item2, deviceName); // This will be networked when the state changes
         receiver.Comp.LinkedTelephones.Add(source);
         receiver.Comp.Muted = options?.MuteReceiver == true;
 

Resources/Changelog/Changelog.yml

@@ -1,55 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Space Carp and Sharkminnows are a bit weaker overall.
-    type: Tweak
-  - message: The magnet now pulls in debris a bit closer.
-    type: Tweak
-  - message: Space debris now has slightly better loot.
-    type: Tweak
-  id: 7263
-  time: '2024-09-02T04:36:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31726
-- author: Errant
-  changes:
-  - message: Replacement Crew Monitor Servers, as well as the Crew Monitor Server
-      on the dev map, now work properly.
-    type: Fix
-  id: 7264
-  time: '2024-09-02T04:37:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31677
-- author: poeMota
-  changes:
-  - message: Now the time played on ERT roles and midround borgs will be saved to
-      the player's stats
-    type: Tweak
-  id: 7265
-  time: '2024-09-02T05:32:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31629
-- author: themias
-  changes:
-  - message: The Donk Co. microwave can cook baguette swords and throwing croissants.
-    type: Tweak
-  - message: The Combat Bakery Kit now has a Donk Co. microwave board and costs 6
-      TC.
-    type: Tweak
-  id: 7266
-  time: '2024-09-02T13:49:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31239
-- author: yuitop
-  changes:
-  - message: actions bar now resize dynamically
-    type: Tweak
-  id: 7267
-  time: '2024-09-02T19:12:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31759
-- author: yuitop
-  changes:
-  - message: space ninja throwing star ability now spawns a throwing star
-    type: Fix
-  id: 7268
-  time: '2024-09-03T00:50:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31684
 - author: Errant
   changes:
   - message: Vox sounds are now less unbearable.
@@ -3938,3 +3887,51 @@
   id: 7762
   time: '2024-12-29T03:25:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/34106
+- author: DreamlyJack
+  changes:
+  - message: Added Hair Pulato
+    type: Add
+  id: 7763
+  time: '2024-12-31T10:29:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34117
+- author: chromiumboy
+  changes:
+  - message: Chat messages from holopads during emergency broadcasts will no longer
+      be logged in the chat window to prevent message spam. This is a temporary change
+      until a proper fix can be made to the chat system
+    type: Tweak
+  id: 7764
+  time: '2024-12-31T10:52:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34114
+- author: PopGamer46
+  changes:
+  - message: Fixed borgs not being able to check their laws in crit
+    type: Fix
+  id: 7765
+  time: '2024-12-31T11:10:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34133
+- author: amatwiedle
+  changes:
+  - message: The A/V Communication technology now unlocks holopad circuit boards.
+    type: Add
+  id: 7766
+  time: '2024-12-31T13:20:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34150
+- author: justdie12
+  changes:
+  - message: Flipped signal disposal routers sprite
+    type: Fix
+  id: 7767
+  time: '2024-12-31T13:25:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34139
+- author: ArtisticRoomba
+  changes:
+  - message: Shotgun crate now comes with 4 lethal shell boxes.
+    type: Tweak
+  - message: Enforcer gun safe now comes with 4 lethal shell boxes.
+    type: Tweak
+  - message: Kammerer gun safe now comes with 2 lethal shell boxes.
+    type: Tweak
+  id: 7768
+  time: '2024-12-31T23:08:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34156

Resources/Locale/en-US/_strings/accessories/human-hair.ftl

@@ -146,6 +146,7 @@ marking-HumanHairSidetail3 = Ponytail (Side) 3
 marking-HumanHairSidetail4 = Ponytail (Side) 4
 marking-HumanHairSpikyponytail = Ponytail (Spiky)
 marking-HumanHairPoofy = Poofy
+marking-HumanHairPulato = Pulato
 marking-HumanHairQuiff = Quiff
 marking-HumanHairRonin = Ronin
 marking-HumanHairShaped = Shaped

Resources/Locale/en-US/telephone/telephone.ftl

@@ -6,5 +6,5 @@ chat-telephone-message-wrap-bold = [color={$color}][bold]{$name}[/bold] {$verb},
 chat-telephone-unknown-caller = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown caller[/bolditalic][/font][/color]
 chat-telephone-caller-id-with-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)} ({CAPITALIZE($callerJob)})[/bold][/font][/color]
 chat-telephone-caller-id-without-job = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($callerName)}[/bold][/font][/color]
-chat-telephone-unknown-device = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown device[/bolditalic][/font][/color]
+chat-telephone-unknown-device = [color={$color}][font={$fontType} size={$fontSize}][bolditalic]Unknown source[/bolditalic][/font][/color]
 chat-telephone-device-id = [color={$color}][font={$fontType} size={$fontSize}][bold]{CAPITALIZE($deviceName)}[/bold][/font][/color]