Doctor-Cpu
diff --git a/‎.github/CODEOWNERS
+1-36 b/‎.github/CODEOWNERS
+1-36
diff --git a/‎Content.Client/Cargo/Systems/ClientPriceGunSystem.cs
+3-2 b/‎Content.Client/Cargo/Systems/ClientPriceGunSystem.cs
+3-2
diff --git a/‎Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
+10 b/‎Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
+10
diff --git a/‎Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
+26-2 b/‎Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
+26-2
diff --git a/‎Content.Client/Effects/ColorFlashEffectSystem.cs
+10 b/‎Content.Client/Effects/ColorFlashEffectSystem.cs
+10
diff --git a/‎Content.Client/Holopad/HolopadWindow.xaml
+23-12 b/‎Content.Client/Holopad/HolopadWindow.xaml
+23-12
diff --git a/‎Content.Client/Holopad/HolopadWindow.xaml.cs
+9-3 b/‎Content.Client/Holopad/HolopadWindow.xaml.cs
+9-3
diff --git a/‎Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs
+13-1 b/‎Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs
+13-1
diff --git a/‎Content.Client/PDA/PdaMenu.xaml.cs
+5 b/‎Content.Client/PDA/PdaMenu.xaml.cs
+5
diff --git a/‎Content.Client/PDA/PdaSystem.cs
-40 b/‎Content.Client/PDA/PdaSystem.cs
-40
diff --git a/‎Content.Client/PDA/PdaVisualizerSystem.cs
+30 b/‎Content.Client/PDA/PdaVisualizerSystem.cs
+30
diff --git a/‎Content.Client/PDA/PdaVisualsComponent.cs
+14 b/‎Content.Client/PDA/PdaVisualsComponent.cs
+14
@@ -1,38 +1,3 @@
 # Last match in file takes precedence.
 
-# Sorting by path instead of by who added it one day :(
-# this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
-
-/Resources/ConfigPresets/WizardsDen/  @nikthechampiongr
-/Content.*/Administration/ @DrSmugleaf @nikthechampiongr
-/Resources/ServerInfo/ @nikthechampiongr
-/Resources/ServerInfo/Guidebook/ServerRules/ @nikthechampiongr
-
-/Resources/Prototypes/Maps/** @Emisse
-
-/Resources/Prototypes/Body/ @DrSmugleaf # suffering
-/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
-/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
-/Resources/Prototypes/Guidebook/rules.yml @nikthechampiongr
-/Content.*/Body/ @DrSmugleaf
-/Content.YAMLLinter @DrSmugleaf
-/Content.Shared/Damage/ @DrSmugleaf
-
-/Content.*/Anomaly/ @TheShuEd
-/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @TheShuEd
-
-/Content.*/Forensics/ @ficcialfaint
-
-# SKREEEE
-/Content.*.Database/ @PJB3005 @DrSmugleaf
-/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @nikthechampiongr
-/Pow3r/ @PJB3005
-/Content.Server/Power/Pow3r/ @PJB3005
-
-# notafet
-/Content.*/Atmos/ @Partmedia
-/Content.*/Botany/ @Partmedia
-
-# Jezi
-/Content.*/Medical @Jezithyr
-/Content.*/Body @Jezithyr
+* @Doctor-Cpu
@@ -1,3 +1,4 @@
+using Content.Shared.Cargo.Components;
 using Content.Shared.Timing;
 using Content.Shared.Cargo.Systems;
 
@@ -10,9 +11,9 @@ public sealed class ClientPriceGunSystem : SharedPriceGunSystem
 {
     [Dependency] private readonly UseDelaySystem _useDelay = default!;
 
-    protected override bool GetPriceOrBounty(EntityUid priceGunUid, EntityUid target, EntityUid user)
+    protected override bool GetPriceOrBounty(Entity<PriceGunComponent> entity, EntityUid target, EntityUid user)
     {
-        if (!TryComp(priceGunUid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((priceGunUid, useDelay)))
+        if (!TryComp(entity, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((entity, useDelay)))
             return false;
 
         // It feels worse if the cooldown is predicted but the popup isn't! So only do the cooldown reset on the server.
 
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client.PDA;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.Inventory;
@@ -51,6 +52,15 @@ protected override void UpdateSprite(EntityUid uid, EntityPrototype proto)
         {
             sprite.CopyFrom(otherSprite);
         }
+
+        // Edgecase for PDAs to include visuals when UI is open
+        if (TryComp(uid, out PdaBorderColorComponent? borderColor)
+            && proto.TryGetComponent(out PdaBorderColorComponent? otherBorderColor, _factory))
+        {
+            borderColor.BorderColor = otherBorderColor.BorderColor;
+            borderColor.AccentHColor = otherBorderColor.AccentHColor;
+            borderColor.AccentVColor = otherBorderColor.AccentVColor;
+        }
     }
 
     /// <summary>
 
@@ -1,22 +1,29 @@
-using Content.Client.Clothing.Systems;
+using Content.Client.Clothing.Systems;
 using Content.Shared.Clothing.Components;
+using Content.Shared.Tag;
+using Content.Shared.Prototypes;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Clothing.UI;
 
 [UsedImplicitly]
 public sealed class ChameleonBoundUserInterface : BoundUserInterface
 {
+    [Dependency] private readonly IComponentFactory _factory = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
     private readonly ChameleonClothingSystem _chameleon;
+    private readonly TagSystem _tag;
 
     [ViewVariables]
     private ChameleonMenu? _menu;
 
     public ChameleonBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
         _chameleon = EntMan.System<ChameleonClothingSystem>();
+        _tag = EntMan.System<TagSystem>();
     }
 
     protected override void Open()
@@ -34,7 +41,24 @@ protected override void UpdateState(BoundUserInterfaceState state)
             return;
 
         var targets = _chameleon.GetValidTargets(st.Slot);
-        _menu?.UpdateState(targets, st.SelectedId);
+        if (st.RequiredTag != null)
+        {
+            var newTargets = new List<string>();
+            foreach (var target in targets)
+            {
+                if (string.IsNullOrEmpty(target) || !_proto.TryIndex(target, out EntityPrototype? proto))
+                    continue;
+
+                if (!proto.TryGetComponent(out TagComponent? tag, _factory) || !_tag.HasTag(tag, st.RequiredTag))
+                    continue;
+
+                newTargets.Add(target);
+            }
+            _menu?.UpdateState(newTargets, st.SelectedId);
+        } else
+        {
+            _menu?.UpdateState(targets, st.SelectedId);
+        }
     }
 
     private void OnIdSelected(string selectedId)
 
@@ -124,6 +124,10 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev)
                 continue;
             }
 
+            var targetEv = new GetFlashEffectTargetEvent(ent);
+            RaiseLocalEvent(ent, ref targetEv);
+            ent = targetEv.Target;
+
             EnsureComp<ColorFlashEffectComponent>(ent, out comp);
             comp.NetSyncEnabled = false;
             comp.Color = sprite.Color;
@@ -132,3 +136,9 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev)
         }
     }
 }
+
+/// <summary>
+/// Raised on an entity to change the target for a color flash effect.
+/// </summary>
+[ByRefEvent]
+public record struct GetFlashEffectTargetEvent(EntityUid Target);
@@ -13,21 +13,25 @@
                     <RichTextLabel Name="EmergencyBroadcastText" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="10 10 10 10" ReservesSpace="False"/>
                 </PanelContainer>
             </controls:StripeBack>
-            
+
             <Label Text="{Loc 'holopad-window-controls-locked-out'}" HorizontalAlignment="Center" Margin="10 5 10 0" ReservesSpace="False"/>
             <RichTextLabel Name="LockOutIdText" HorizontalAlignment="Center" Margin="10 5 10 0" ReservesSpace="False"/>
             <Label Name="LockOutCountDownText" Text="{Loc 'holopad-window-controls-unlock-countdown'}" HorizontalAlignment="Center" Margin="10 15 10 10" ReservesSpace="False"/>
         </BoxContainer>
 
         <BoxContainer Name="ControlsContainer" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" ReservesSpace="False">
-        
+
             <!-- Active call controls (either this or the call placement controls will be active) -->
             <BoxContainer Name="ActiveCallControlsContainer" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" ReservesSpace="False">
 
                 <!-- Header text -->
                 <BoxContainer MinHeight="60" Orientation="Vertical" VerticalAlignment="Center">
                     <Label Name="CallStatusText" Margin="10 5 10 0" ReservesSpace="False"/>
-                    <RichTextLabel Name="CallerIdText" HorizontalAlignment="Center" Margin="0 0 0 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 10 10 0" ReservesSpace="False"/>
+                        <RichTextLabel Name="HolopadIdText" HorizontalAlignment="Center" Margin="0 0 0 10"/>
+                    </BoxContainer>
                 </BoxContainer>
 
                 <!-- Controls (the answer call button is absent when the phone is not ringing) -->
@@ -68,18 +72,25 @@
                     <PanelContainer Name="HolopadContactListHeaderPanel">
                         <Label Text="{Loc 'holopad-window-select-contact-from-list'}" HorizontalAlignment="Center" Margin="0 3 0 3"/>
                     </PanelContainer>
-                
+
                     <PanelContainer Name="HolopadContactListPanel">
-                        <ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="8, 8, 8, 8" MinHeight="256">
+                        <BoxContainer Orientation="Vertical">
 
-                            <!-- If there is no data yet, this will be displayed -->
-                            <BoxContainer Name="FetchingAvailableHolopadsContainer" HorizontalAlignment="Center" HorizontalExpand="True" VerticalExpand="True" ReservesSpace="False">
-                                <Label Text="{Loc 'holopad-window-fetching-contacts-list'}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            </BoxContainer>
+                            <!-- Contact filter -->
+                            <LineEdit Name="SearchLineEdit" HorizontalExpand="True" Margin="4, 4, 4, 0"
+                                      PlaceHolder="{Loc holopad-window-filter-line-placeholder}" />
 
-                            <!-- Container for the contacts -->
-                            <BoxContainer Name="ContactsList" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="10 0 10 0"/>
-                        </ScrollContainer>
+                            <ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="8, 8, 8, 8" MinHeight="256">
+
+                                <!-- If there is no data yet, this will be displayed -->
+                                <BoxContainer Name="FetchingAvailableHolopadsContainer" HorizontalAlignment="Center" HorizontalExpand="True" VerticalExpand="True" ReservesSpace="False">
+                                    <Label Text="{Loc 'holopad-window-fetching-contacts-list'}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                </BoxContainer>
+
+                                <!-- Container for the contacts -->
+                                <BoxContainer Name="ContactsList" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="10 0 10 0"/>
+                            </ScrollContainer>
+                        </BoxContainer>
                     </PanelContainer>
                 </BoxContainer>
 
 
@@ -171,8 +171,10 @@ public void UpdateState(Dictionary<NetEntity, string> holopads)
 
         // Caller ID text
         var callerId = _telephoneSystem.GetFormattedCallerIdForEntity(telephone.LastCallerId.Item1, telephone.LastCallerId.Item2, Color.LightGray, "Default", 11);
+        var holoapdId = _telephoneSystem.GetFormattedDeviceIdForEntity(telephone.LastCallerId.Item3, Color.LightGray, "Default", 11);
 
         CallerIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(callerId));
+        HolopadIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(holoapdId));
         LockOutIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(callerId));
 
         // Sort holopads alphabetically
@@ -236,10 +238,13 @@ private void UpdateAppearance()
         // Make / update required children
         foreach (var child in ContactsList.Children)
         {
-            if (child is not HolopadContactButton)
+            if (child is not HolopadContactButton contactButton)
                 continue;
 
-            var contactButton = (HolopadContactButton)child;
+            var passesFilter = string.IsNullOrEmpty(SearchLineEdit.Text) ||
+                               contactButton.Text?.Contains(SearchLineEdit.Text, StringComparison.CurrentCultureIgnoreCase) == true;
+
+            contactButton.Visible = passesFilter;
             contactButton.Disabled = (_currentState != TelephoneState.Idle || lockButtons);
         }
 
@@ -290,7 +295,7 @@ private void UpdateAppearance()
         FetchingAvailableHolopadsContainer.Visible = (ContactsList.ChildCount == 0);
         ActiveCallControlsContainer.Visible = (_currentState != TelephoneState.Idle || _currentUiKey == HolopadUiKey.AiRequestWindow);
         CallPlacementControlsContainer.Visible = !ActiveCallControlsContainer.Visible;
-        CallerIdText.Visible = (_currentState == TelephoneState.Ringing);
+        CallerIdContainer.Visible = (_currentState == TelephoneState.Ringing);
         AnswerCallButton.Visible = (_currentState == TelephoneState.Ringing);
     }
 
@@ -316,6 +321,7 @@ public HolopadContactButton()
             HorizontalExpand = true;
             SetHeight = 32;
             Margin = new Thickness(0f, 1f, 0f, 1f);
+            ReservesSpace = false;
         }
 
         public void UpdateValues(NetEntity netEntity, string label)
 
@@ -34,12 +34,24 @@ public LoadoutContainer(ProtoId<LoadoutPrototype> proto, bool disabled, Formatte
             SelectButton.TooltipSupplier = _ => tooltip;
         }
 
-        if (dummy != String.Empty)
+        if (dummy != null)
         {
             LoadoutSprite(dummy, _entity);
         }
         else if (_protoManager.TryIndex(proto, out var loadProto))
         {
+            var ent = loadProto.DummyEntity ?? _entManager.System<LoadoutSystem>().GetFirstOrNull(loadProto);
+
+            if (ent == null)
+                return;
+
+            _entity = _entManager.SpawnEntity(ent, MapCoordinates.Nullspace);
+            Sprite.SetEntity(_entity);
+
+            var spriteTooltip = new Tooltip();
+            spriteTooltip.SetMessage(FormattedMessage.FromUnformatted(_entManager.GetComponent<MetaDataComponent>(_entity.Value).EntityDescription));
+
+            TooltipSupplier = _ => spriteTooltip;
             LoadoutSprite(_entManager.System<LoadoutSystem>().GetFirstOrNull(loadProto), _entity);
         }
 
 
@@ -141,6 +141,11 @@ public void UpdateState(PdaUpdateState state)
                 _pdaOwner = state.PdaOwnerInfo.ActualOwnerName;
                 PdaOwnerLabel.SetMarkup(Loc.GetString("comp-pda-ui-owner",
                     ("actualOwnerName", _pdaOwner)));
+                PdaOwnerLabel.Visible = true;
+            }
+            else
+            {
+                PdaOwnerLabel.Visible = false;
             }
 
 
 
@@ -1,48 +1,8 @@
 using Content.Shared.PDA;
-using Content.Shared.Light;
-using Robust.Client.GameObjects;
 
 namespace Content.Client.PDA;
 
 public sealed class PdaSystem : SharedPdaSystem
 {
-    public override void Initialize()
-    {
-        base.Initialize();
 
-        SubscribeLocalEvent<PdaComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
-
-    private void OnAppearanceChange(EntityUid uid, PdaComponent component, ref AppearanceChangeEvent args)
-    {
-        if (args.Sprite == null)
-            return;
-
-        if (Appearance.TryGetData<bool>(uid, UnpoweredFlashlightVisuals.LightOn, out var isFlashlightOn, args.Component))
-            args.Sprite.LayerSetVisible(PdaVisualLayers.Flashlight, isFlashlightOn);
-
-        if (Appearance.TryGetData<bool>(uid, PdaVisuals.IdCardInserted, out var isCardInserted, args.Component))
-            args.Sprite.LayerSetVisible(PdaVisualLayers.IdLight, isCardInserted);
-    }
-
-    protected override void OnComponentInit(EntityUid uid, PdaComponent component, ComponentInit args)
-    {
-        base.OnComponentInit(uid, component, args);
-
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
-            return;
-
-        if (component.State != null)
-            sprite.LayerSetState(PdaVisualLayers.Base, component.State);
-
-        sprite.LayerSetVisible(PdaVisualLayers.Flashlight, component.FlashlightOn);
-        sprite.LayerSetVisible(PdaVisualLayers.IdLight, component.IdSlot.StartingItem != null);
-    }
-
-    public enum PdaVisualLayers : byte
-    {
-        Base,
-        Flashlight,
-        IdLight
-    }
 }
@@ -0,0 +1,30 @@
+using Content.Shared.Light;
+using Content.Shared.PDA;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.PDA;
+
+public sealed class PdaVisualizerSystem : VisualizerSystem<PdaVisualsComponent>
+{
+    protected override void OnAppearanceChange(EntityUid uid, PdaVisualsComponent comp, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite == null)
+            return;
+
+        if (AppearanceSystem.TryGetData<string>(uid, PdaVisuals.PdaType, out var pdaType, args.Component))
+            args.Sprite.LayerSetState(PdaVisualLayers.Base, pdaType);
+
+        if (AppearanceSystem.TryGetData<bool>(uid, UnpoweredFlashlightVisuals.LightOn, out var isFlashlightOn, args.Component))
+            args.Sprite.LayerSetVisible(PdaVisualLayers.Flashlight, isFlashlightOn);
+
+        if (AppearanceSystem.TryGetData<bool>(uid, PdaVisuals.IdCardInserted, out var isCardInserted, args.Component))
+            args.Sprite.LayerSetVisible(PdaVisualLayers.IdLight, isCardInserted);
+    }
+
+    public enum PdaVisualLayers : byte
+    {
+        Base,
+        Flashlight,
+        IdLight
+    }
+}
@@ -0,0 +1,14 @@
+namespace Content.Client.PDA;
+
+/// <summary>
+/// Used for visualizing PDA visuals.
+/// </summary>
+[RegisterComponent]
+public sealed partial class PdaVisualsComponent : Component
+{
+    public string? BorderColor;
+
+    public string? AccentHColor;
+
+    public string? AccentVColor;
+}
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using Content.Shared.Cargo.Components;`
`1`	`2`	`using Content.Shared.Timing;`
`2`	`3`	`using Content.Shared.Cargo.Systems;`
`3`	`4`
`@@ -10,9 +11,9 @@ public sealed class ClientPriceGunSystem : SharedPriceGunSystem`
`10`	`11`	`{`
`11`	`12`	`[Dependency] private readonly UseDelaySystem _useDelay = default!;`
`12`	`13`
`13`		`- protected override bool GetPriceOrBounty(EntityUid priceGunUid, EntityUid target, EntityUid user)`
	`14`	`+ protected override bool GetPriceOrBounty(Entity<PriceGunComponent> entity, EntityUid target, EntityUid user)`
`14`	`15`	`{`
`15`		`- if (!TryComp(priceGunUid, out UseDelayComponent? useDelay) \|\| _useDelay.IsDelayed((priceGunUid, useDelay)))`
	`16`	`+ if (!TryComp(entity, out UseDelayComponent? useDelay) \|\| _useDelay.IsDelayed((entity, useDelay)))`
`16`	`17`	`return false;`
`17`	`18`
`18`	`19`	`// It feels worse if the cooldown is predicted but the popup isn't! So only do the cooldown reset on the server.`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,10 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev)`
`124`	`124`	`continue;`
`125`	`125`	`}`
`126`	`126`
	`127`	`+ var targetEv = new GetFlashEffectTargetEvent(ent);`
	`128`	`+ RaiseLocalEvent(ent, ref targetEv);`
	`129`	`+ ent = targetEv.Target;`
	`130`	`+`
`127`	`131`	`EnsureComp<ColorFlashEffectComponent>(ent, out comp);`
`128`	`132`	`comp.NetSyncEnabled = false;`
`129`	`133`	`comp.Color = sprite.Color;`
`@@ -132,3 +136,9 @@ private void OnColorFlashEffect(ColorFlashEffectEvent ev)`
`132`	`136`	`}`
`133`	`137`	`}`
`134`	`138`	`}`
	`139`	`+`
	`140`	`+/// <summary>`
	`141`	`+/// Raised on an entity to change the target for a color flash effect.`
	`142`	`+/// </summary>`
	`143`	`+[ByRefEvent]`
	`144`	`+public record struct GetFlashEffectTargetEvent(EntityUid Target);`
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,24 @@ public LoadoutContainer(ProtoId<LoadoutPrototype> proto, bool disabled, Formatte`
`34`	`34`	`SelectButton.TooltipSupplier = _ => tooltip;`
`35`	`35`	`}`
`36`	`36`
`37`		`- if (dummy != String.Empty)`
	`37`	`+ if (dummy != null)`
`38`	`38`	`{`
`39`	`39`	`LoadoutSprite(dummy, _entity);`
`40`	`40`	`}`
`41`	`41`	`else if (_protoManager.TryIndex(proto, out var loadProto))`
`42`	`42`	`{`
	`43`	`+ var ent = loadProto.DummyEntity ?? _entManager.System<LoadoutSystem>().GetFirstOrNull(loadProto);`
	`44`	`+`
	`45`	`+ if (ent == null)`
	`46`	`+ return;`
	`47`	`+`
	`48`	`+ _entity = _entManager.SpawnEntity(ent, MapCoordinates.Nullspace);`
	`49`	`+ Sprite.SetEntity(_entity);`
	`50`	`+`
	`51`	`+ var spriteTooltip = new Tooltip();`
	`52`	`+ spriteTooltip.SetMessage(FormattedMessage.FromUnformatted(_entManager.GetComponent<MetaDataComponent>(_entity.Value).EntityDescription));`
	`53`	`+`
	`54`	`+ TooltipSupplier = _ => spriteTooltip;`
`43`	`55`	`LoadoutSprite(_entManager.System<LoadoutSystem>().GetFirstOrNull(loadProto), _entity);`
`44`	`56`	`}`
`45`	`57`