Release (#5011)

Finally

Author: redmushie

Content.Client/Clothing/ClientClothingSystem.cs

@@ -225,7 +225,7 @@ protected override void OnGotEquipped(EntityUid uid, ClothingComponent component
     {
         base.OnGotEquipped(uid, component, args);
 
-        RenderEquipment(args.Equipee, uid, args.Slot, clothingComponent: component);
+        RenderEquipment(args.EquipTarget, uid, args.Slot, clothingComponent: component);
     }
 
     private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot,

Content.Client/Ghost/GhostSystem.cs

@@ -9,6 +9,7 @@
 using Robust.Shared.Configuration;
 using Content.Shared._Starlight.Administration.Events;
 using Content.Shared._Starlight.CCVar;
+using Content.Shared._Starlight.Ghost;
 #endregion
 
 namespace Content.Client.Ghost
@@ -77,6 +78,7 @@ public override void Initialize()
             SubscribeLocalEvent<EyeComponent, ToggleLightingActionEvent>(OnToggleLighting);
             SubscribeLocalEvent<EyeComponent, ToggleFoVActionEvent>(OnToggleFoV);
             SubscribeLocalEvent<GhostComponent, ToggleGhostsActionEvent>(OnToggleGhosts);
+            SubscribeNetworkEvent<GhostCorporealEvent>(OnCorporeal); // Starlight
             SubscribeNetworkEvent<AdminGhostEvent>(OnAdminGhost); // Starlight
         }
 
@@ -219,13 +221,24 @@ public void ToggleGhostVisibility(bool? visibility = null)
             GhostVisibility = visibility ?? !GhostVisibility;
         }
 
-        // Starlight begin
+        #region Starlight
+
+        private void OnCorporeal(GhostCorporealEvent ev)
+        {
+            var uid = GetEntity(ev.Uid);
+            if (!TryComp<SpriteComponent>(uid, out var comp))
+                return;
+
+            _sprite.SetVisible((uid, comp), ev.IsCorporeal || uid == _playerManager.LocalEntity || GhostVisibility);
+        }
+
         private void OnAdminGhost(AdminGhostEvent ev)
         {
             var value = _cfg.GetCVar(StarlightCCVars.AdminGhostScriptPath);
             if (value == string.Empty) return;
             _console.ExecuteCommand(null, $"exec /{value}");
         }
-        // Starlight end
+
+        #endregion
     }
 }

Content.Client/Inventory/ClientInventorySystem.cs

@@ -82,17 +82,17 @@ public override void Update(float frameTime)
 
         private void OnDidUnequip(InventorySlotsComponent component, DidUnequipEvent args)
         {
-            UpdateSlot(args.Equipee, component, args.Slot);
-            if (args.Equipee != _playerManager.LocalEntity)
+            UpdateSlot(args.EquipTarget, component, args.Slot);
+            if (args.EquipTarget != _playerManager.LocalEntity)
                 return;
             var update = new SlotSpriteUpdate(null, args.SlotGroup, args.Slot, false);
             OnSpriteUpdate?.Invoke(update);
         }
 
         private void OnDidEquip(InventorySlotsComponent component, DidEquipEvent args)
         {
-            UpdateSlot(args.Equipee, component, args.Slot);
-            if (args.Equipee != _playerManager.LocalEntity)
+            UpdateSlot(args.EquipTarget, component, args.Slot);
+            if (args.EquipTarget != _playerManager.LocalEntity)
                 return;
             var update = new SlotSpriteUpdate(args.Equipment, args.SlotGroup, args.Slot,
                 HasComp<StorageComponent>(args.Equipment));

Content.Client/SubFloor/TrayScannerSystem.cs

@@ -1,31 +1,49 @@
-using Content.Shared.Hands.EntitySystems;
+using Content.Client.Items;
+using Content.Client.Items.UI;
+using Content.Client.Message;
+using Content.Client.Power.Visualizers;
+using Content.Client.Stylesheets;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Disposal.Components;
+using Content.Shared.Input;
 using Content.Shared.Inventory;
 using Content.Shared.SubFloor;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
+using Robust.Client.Input;
 using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 
 namespace Content.Client.SubFloor;
 
-public sealed partial class TrayScannerSystem : SharedTrayScannerSystem
+public sealed class TrayScannerSystem : SharedTrayScannerSystem
 {
-    [Dependency] private IGameTiming _timing = default!;
-    [Dependency] private IPlayerManager _player = default!;
-    [Dependency] private AnimationPlayerSystem _animation = default!;
-    [Dependency] private EntityLookupSystem _lookup = default!;
-    [Dependency] private InventorySystem _inventory = default!;
-    [Dependency] private SharedAppearanceSystem _appearance = default!;
-    [Dependency] private SharedHandsSystem _hands = default!;
-    [Dependency] private SharedTransformSystem _transform = default!;
-    [Dependency] private SpriteSystem _sprite = default!;
-    [Dependency] private TrayScanRevealSystem _trayScanReveal = default!;
+    [Dependency] private IGameTiming _timing = default!; // starlight edit: removed readonly
+    [Dependency] private IPlayerManager _player = default!; // starlight edit: removed readonly
+    [Dependency] private AnimationPlayerSystem _animation = default!; // starlight edit: removed readonly
+    [Dependency] private EntityLookupSystem _lookup = default!; // starlight edit: removed readonly
+    [Dependency] private InventorySystem _inventory = default!; // starlight edit: removed readonly
+    [Dependency] private SharedAppearanceSystem _appearance = default!; // starlight edit: removed readonly
+    [Dependency] private SharedTransformSystem _transform = default!; // starlight edit: removed readonly
+    [Dependency] private SpriteSystem _sprite = default!; // starlight edit: removed readonly
+    [Dependency] private TrayScanRevealSystem _trayScanReveal = default!; // starlight edit: removed readonly
+    [Dependency] private IInputManager _inputManager = default!; // starlight edit: removed readonly
+    [Dependency] private EntityQuery<TrayScannerComponent> _trayScannerQuery = default!; // starlight edit: removed readonly
+    [Dependency] private EntityQuery<SubFloorHideComponent> _subFloorHideQuery = default!; // starlight edit: removed readonly
 
     private const string TRayAnimationKey = "trays";
     private const double AnimationLength = 0.3;
 
     public const LookupFlags Flags = LookupFlags.Static | LookupFlags.Sundries | LookupFlags.Approximate;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+        Subs.ItemStatus<TrayScannerComponent>(OnCollectItemStatus);
+    }
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -35,46 +53,27 @@ public override void Update(float frameTime)
 
         // TODO: Multiple viewports or w/e
         var player = _player.LocalEntity;
-        var xformQuery = GetEntityQuery<TransformComponent>();
 
-        if (!xformQuery.TryGetComponent(player, out var playerXform))
+        if (!TryComp(player, out TransformComponent? playerXform))
             return;
 
-        var playerPos = _transform.GetWorldPosition(playerXform, xformQuery);
+        var playerPos = _transform.GetWorldPosition(playerXform);
         var playerMap = playerXform.MapID;
         var range = 0f;
+        var mode = TrayScannerMode.All;
         HashSet<Entity<SubFloorHideComponent>> inRange;
-        var scannerQuery = GetEntityQuery<TrayScannerComponent>();
 
         // TODO: Should probably sub to player attached changes / inventory changes but inventory's
         // API is extremely skrungly. If this ever shows up on dottrace ping me and laugh.
         var canSee = false;
 
-        // TODO: Common iterator for both systems.
-        if (_inventory.TryGetContainerSlotEnumerator(player.Value, out var enumerator))
-        {
-            while (enumerator.MoveNext(out var slot))
-            {
-                foreach (var ent in slot.ContainedEntities)
-                {
-                    if (!scannerQuery.TryGetComponent(ent, out var sneakScanner) || !sneakScanner.Enabled)
-                        continue;
-
-                    canSee = true;
-                    range = MathF.Max(range, sneakScanner.Range);
-                }
-            }
-        }
-
-        foreach (var hand in _hands.EnumerateHands(player.Value))
+        foreach (var item in _inventory.GetHandOrInventoryEntities(player.Value, SlotFlags.POCKET))
         {
-            if (!_hands.TryGetHeldItem(player.Value, hand, out var heldEntity))
-                continue;
-
-            if (!scannerQuery.TryGetComponent(heldEntity, out var heldScanner) || !heldScanner.Enabled)
+            if (!_trayScannerQuery.TryGetComponent(item, out var scanner) || !scanner.Enabled)
                 continue;
 
-            range = MathF.Max(heldScanner.Range, range);
+            range = MathF.Max(scanner.Range, range);
+            mode = scanner.Mode;
             canSee = true;
             break;
         }
@@ -83,23 +82,28 @@ public override void Update(float frameTime)
 
         if (canSee)
         {
-            _lookup.GetEntitiesInRange(playerMap, playerPos, range, inRange, flags: Flags);
+            var entitiesInRange = new HashSet<Entity<SubFloorHideComponent>>();
+            _lookup.GetEntitiesInRange(playerMap, playerPos, range, entitiesInRange, flags: Flags);
 
-            foreach (var (uid, comp) in inRange)
+            foreach (var (uid, comp) in entitiesInRange)
             {
+                if (!MatchesMode(uid, mode))
+                    continue;
+
+                inRange.Add((uid, comp));
+
                 if (comp.IsUnderCover || _trayScanReveal.IsUnderRevealingEntity(uid))
                     EnsureComp<TrayRevealedComponent>(uid);
             }
         }
 
         var revealedQuery = AllEntityQuery<TrayRevealedComponent, SpriteComponent>();
-        var subfloorQuery = GetEntityQuery<SubFloorHideComponent>();
 
         while (revealedQuery.MoveNext(out var uid, out _, out var sprite))
         {
             // Revealing
             // Add buffer range to avoid flickers.
-            if (subfloorQuery.TryGetComponent(uid, out var subfloor) &&
+            if (_subFloorHideQuery.TryGetComponent(uid, out var subfloor) &&
                 inRange.Contains((uid, subfloor)))
             {
                 // Due to the fact client is predicting this server states will reset it constantly
@@ -174,4 +178,67 @@ private void SetRevealed(EntityUid uid, bool value)
     {
         _appearance.SetData(uid, SubFloorVisuals.ScannerRevealed, value);
     }
+
+    private bool MatchesMode(EntityUid uid, TrayScannerMode mode)
+    {
+        return mode switch
+        {
+            TrayScannerMode.All => true,
+            TrayScannerMode.Wiring => HasComp<CableVisualizerComponent>(uid),
+            // TODO: proper comp query after disposals refactor
+            TrayScannerMode.Piping => HasComp<AtmosPipeLayersComponent>(uid) || _appearance.TryGetData(uid, DisposalTubeVisuals.VisualState, out _),
+            _ => false,
+        };
+    }
+
+    #region UI
+    private Control OnCollectItemStatus(Entity<TrayScannerComponent> entity)
+    {
+        _inputManager.TryGetKeyBinding((ContentKeyFunctions.AltUseItemInHand), out var binding);
+        return new StatusControl(entity, binding?.GetKeyString() ?? "");
+    }
+
+    private sealed class StatusControl : PollingItemStatusControl<StatusControl.TRayData>
+    {
+        private readonly RichTextLabel _label;
+        private readonly TrayScannerComponent _scanner;
+        private readonly string _keyBindingName;
+
+        public StatusControl(TrayScannerComponent scanner, string keyBindingName)
+        {
+            _scanner = scanner;
+            _keyBindingName = keyBindingName;
+            _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
+            AddChild(_label);
+        }
+
+        protected override TRayData PollData()
+        {
+            return new TRayData(_scanner.Enabled, _scanner.Mode);
+        }
+
+        protected override void Update(in TRayData data)
+        {
+            if (!data.Enabled)
+            {
+                _label.SetMarkup(string.Empty);
+                return;
+            }
+
+            var modeLocString = data.Mode switch
+            {
+                TrayScannerMode.All => "tray-scanner-examine-mode-all",
+                TrayScannerMode.Wiring => "tray-scanner-examine-mode-wiring",
+                TrayScannerMode.Piping => "tray-scanner-examine-mode-piping",
+                _ => "",
+            };
+
+            _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("tray-scanner-item-status-label",
+                ("mode", Robust.Shared.Localization.Loc.GetString(modeLocString)),
+                ("keybinding", _keyBindingName)));
+        }
+
+        public readonly record struct TRayData(bool Enabled, TrayScannerMode Mode);
+    }
+    #endregion
 }

Content.Client/UserInterface/Systems/Chat/ChatUIController.cs

@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization; // Starlight: UTF-8 encode this file!
 using System.Linq;
 using System.Numerics;
 using Content.Client.Administration.Managers;
@@ -398,14 +398,31 @@ private void FocusChat()
 
     private void FocusChannel(ChatSelectChannel channel)
     {
+        // Starlight BEGIN
+        /*
+            We added the "MainChannel" property to fix the admin chat window not being prioritized
+            when the admin chat hotkey was pressed. This code was altered to prioritize a chat box
+            whose MainChannel == channel. If no such chat box is found, whichever chat box is
+            Main (the 'default' chat box) is used.
+
+            Note, I also tried to use the active chat filters to determine which box to select,
+            but it seems there's several boxes in the background that break this, so I opted
+            for this simpler approach of just having one "MainChannel".
+        */
+        ChatBox? fallback = null;
         foreach (var chat in _chats)
         {
-            if (!chat.Main)
-                continue;
+            if (chat.MainChannel == channel)
+            {
+                chat.Focus(channel);
+                return;
+            }
 
-            chat.Focus(channel);
-            break;
+            if (chat.Main)
+                fallback ??= chat;
         }
+        fallback?.Focus(channel);
+        // Starlight END
     }
 
     private void CycleChatChannel(bool forward)
@@ -793,7 +810,7 @@ public void UpdateSelectedChannel(ChatBox box)
 
         if (chatChannel == ChatSelectChannel.Local)
         {
-            if (_ghost?.IsGhost != true && _ghost?.Player?.BypassGhostChat != true) // Starlight edit
+            if (_ghost?.IsGhost != true || _ghost?.Player?.BypassGhostChat == true) // Starlight edit
                 return (chatChannel, text, null, null, language); //Starlight edit
             else
                 chatChannel = ChatSelectChannel.Dead;
@@ -876,8 +893,11 @@ private void OnDamageForceSay(DamageForceSayEvent ev, EntitySessionEventArgs _)
     }
 
     // Starlight begin: dumb event listener for updating channel permissions
-    private void OnCorporealChanged(GhostCorporealEvent ev, EntitySessionEventArgs _) =>
+    private void OnCorporealChanged(GhostCorporealEvent ev, EntitySessionEventArgs _)
+    {
+        if (EntityManager.GetEntity(ev.Uid) != _player.LocalEntity) return;
         UpdateChannelPermissions();
+    }
     // Starlight end
 
     private void OnChatMessage(MsgChatMessage message)

Content.Client/UserInterface/Systems/Chat/ChatWindow.xaml

@@ -1,7 +1,7 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<!-- Starlight --><chat:ChatWindow xmlns="https://spacestation14.io" xmlns:chat="clr-namespace:Content.Client.UserInterface.Systems.Chat"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Chat.Widgets"
                       Title="{Loc chat-window-title}"
                       MinSize="465 265">
     <widgets:ChatBox Name="Chatbox"/>
-</controls:FancyWindow>
+</chat:ChatWindow><!-- Starlight -->