[Tweak] Upstream sync

Content.Client/Cargo/Systems/ClientPriceGunSystem.cs

@@ -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.

Content.Client/Clothing/Systems/ChameleonClothingSystem.cs

@@ -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>

Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs

@@ -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)

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.Client/PDA/PdaMenu.xaml.cs

@@ -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;
             }
 
 

Content.Client/PDA/PdaSystem.cs

@@ -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
-    }
 }

Content.Client/PDA/PdaVisualizerSystem.cs

@@ -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
+    }
+}

Content.Client/PDA/PdaVisualsComponent.cs

@@ -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;
+}

Content.IntegrationTests/Tests/Backmen/Body/HandsTest.cs

@@ -0,0 +1,80 @@
+using System.Linq;
+using Content.Server.Body.Systems;
+using Content.Server.Hands.Systems;
+using Content.Shared.Body.Part;
+using Content.Shared.Humanoid.Prototypes;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Backmen.Body;
+
+[TestFixture]
+public sealed class HandsTest
+{
+    [Test]
+    public async Task AllSpeciesHaveLegs()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            Dirty = true,
+            Connected = true,
+            InLobby = false,
+        });
+
+        var server = pair.Server;
+        var bodySys = server.EntMan.System<BodySystem>();
+
+        foreach (var speciesPrototype in server.ProtoMan.EnumeratePrototypes<SpeciesPrototype>())
+        {
+            var dummy = EntityUid.Invalid;
+            await server.WaitAssertion(() =>
+            {
+                dummy = server.EntMan.Spawn(speciesPrototype.Prototype);
+            });
+            await server.WaitIdleAsync();
+            await server.WaitRunTicks(2);
+            await server.WaitAssertion(() =>
+            {
+                Assert.That(dummy, Is.Not.EqualTo(EntityUid.Invalid));
+                var handCount = bodySys.GetBodyPartCount(dummy, BodyPartType.Leg);
+                Assert.That(handCount, Is.GreaterThanOrEqualTo(2), $"legs {speciesPrototype.ID}({speciesPrototype.Prototype})");
+            });
+
+        }
+
+        await pair.CleanReturnAsync();
+    }
+    [Test]
+    public async Task AllSpeciesHaveHands()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            Dirty = true,
+            Connected = true,
+            InLobby = false,
+        });
+
+        var server = pair.Server;
+        var handsSys = server.EntMan.System<HandsSystem>();
+
+        foreach (var speciesPrototype in server.ProtoMan.EnumeratePrototypes<SpeciesPrototype>())
+        {
+            var dummy = EntityUid.Invalid;
+            await server.WaitAssertion(() =>
+            {
+                dummy = server.EntMan.Spawn(speciesPrototype.Prototype);
+            });
+            await server.WaitIdleAsync();
+            await server.WaitRunTicks(2);
+            await server.WaitAssertion(() =>
+            {
+                Assert.That(dummy, Is.Not.EqualTo(EntityUid.Invalid));
+                var handCount = handsSys.EnumerateHands(dummy).Count();
+                Assert.That(handCount, Is.GreaterThanOrEqualTo(2), $"hands {speciesPrototype.ID}({speciesPrototype.Prototype})");
+            });
+
+        }
+
+        await pair.CleanReturnAsync();
+    }
+}

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -98,7 +98,8 @@ public sealed class PostMapInitTest
             "Cog",
             "Gate",
             "Amber",
-            "Loop"
+            "Loop",
+            "Elkridge"
         };
 
         /// <summary>

Content.Server/Cargo/Systems/PriceGunSystem.cs

@@ -1,7 +1,9 @@
 using Content.Server.Popups;
+using Content.Shared.Cargo.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Timing;
 using Content.Shared.Cargo.Systems;
+using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Cargo.Systems;
 
@@ -11,12 +13,12 @@ public sealed class PriceGunSystem : SharedPriceGunSystem
     [Dependency] private readonly PricingSystem _pricingSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly CargoSystem _bountySystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = 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.Owner, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((entity.Owner, useDelay)))
             return false;
-
         // Check if we're scanning a bounty crate
         if (_bountySystem.IsBountyComplete(target, out _))
         {
@@ -25,10 +27,15 @@ protected override bool GetPriceOrBounty(EntityUid priceGunUid, EntityUid target
         else // Otherwise appraise the price
         {
             var price = _pricingSystem.GetPrice(target);
-            _popupSystem.PopupEntity(Loc.GetString("price-gun-pricing-result", ("object", Identity.Entity(target, EntityManager)), ("price", $"{price:F2}")), user, user);
+            _popupSystem.PopupEntity(Loc.GetString("price-gun-pricing-result",
+                    ("object", Identity.Entity(target, EntityManager)),
+                    ("price", $"{price:F2}")),
+                user,
+                user);
         }
 
-        _useDelay.TryResetDelay((priceGunUid, useDelay));
+        _audio.PlayPvs(entity.Comp.AppraisalSound, entity.Owner);
+        _useDelay.TryResetDelay((entity.Owner, useDelay));
         return true;
     }
 }

Content.Server/CartridgeLoader/Cartridges/NotekeeperCartridgeSystem.cs

@@ -1,11 +1,14 @@
+using Content.Server.Administration.Logs;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.Database;
 
 namespace Content.Server.CartridgeLoader.Cartridges;
 
 public sealed class NotekeeperCartridgeSystem : EntitySystem
 {
     [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
 
     public override void Initialize()
     {
@@ -36,16 +39,19 @@ private void OnUiMessage(EntityUid uid, NotekeeperCartridgeComponent component,
         if (message.Action == NotekeeperUiAction.Add)
         {
             component.Notes.Add(message.Note);
+            _adminLogger.Add(LogType.PdaInteract, LogImpact.Low,
+                $"{ToPrettyString(args.Actor)} added a note to PDA: '{message.Note}' contained on: {ToPrettyString(uid)}");
         }
         else
         {
             component.Notes.Remove(message.Note);
+            _adminLogger.Add(LogType.PdaInteract, LogImpact.Low,
+                $"{ToPrettyString(args.Actor)} removed a note from PDA: '{message.Note}' was contained on: {ToPrettyString(uid)}");
         }
 
         UpdateUiState(uid, GetEntity(args.LoaderUid), component);
     }
 
-
     private void UpdateUiState(EntityUid uid, EntityUid loaderUid, NotekeeperCartridgeComponent? component)
     {
         if (!Resolve(uid, ref component))