ss14Starlight · walksanatora · Oct 4, 2025 · Aug 23, 2025 · Aug 23, 2025 · Aug 23, 2025
@@ -0,0 +1,3 @@
+// Global usings for Content.Benchmarks
+
+global using Robust.UnitTesting.Pool;
@@ -82,48 +82,70 @@ public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUser
             if (state.MissingPrivilegesList != null && state.MissingPrivilegesList.Any())
             {
                 var missingPrivileges = new List<string>();
+                var unknownCount = 0;
 
                 foreach (string tag in state.MissingPrivilegesList)
                 {
-                    var privilege = Loc.GetString(protoManager.Index<AccessLevelPrototype>(tag)?.Name ?? "generic-unknown");
-                    missingPrivileges.Add(privilege);
+                // Starlight edit Start
+                    var canDisplay = state.AccessGroups?.Any(group => 
+                        protoManager.TryIndex(group, out AccessGroupPrototype? groupProto) && 
+                        groupProto.Tags.Contains(tag)) ?? false;
+
+                    if (canDisplay && protoManager.TryIndex<AccessLevelPrototype>(tag, out var accessProto))
+                    {
+                        var privilege = Loc.GetString(accessProto.Name ?? "generic-unknown");
+                        missingPrivileges.Add(privilege);
+                    }
+                    else
+                    {
+                        unknownCount++;
+                    }
                 }
-
-                MissingPrivilegesLabel.Text = Loc.GetString("access-overrider-window-missing-privileges");
-                MissingPrivilegesText.Text = string.Join(", ", missingPrivileges);
+                if (unknownCount > 0)
+                {
+                    if (unknownCount == 1)
+                        missingPrivileges.Add("Unknown");
+                    else
+                        missingPrivileges.Add($"Unknown ({unknownCount})");
+                }
+                if (missingPrivileges.Any())
+                {
+                    MissingPrivilegesLabel.Text = Loc.GetString("access-overrider-window-missing-privileges");
+                    MissingPrivilegesText.Text = string.Join(", ", missingPrivileges);
+                }
+                // Starlight edit End
             }
 
             var interfaceEnabled = state.IsPrivilegedIdPresent && state.IsPrivilegedIdAuthorized;
 
-            // Starlight-edit: Start
-            var allowedAccess = interfaceEnabled && state.AllowedModifyAccessList != null
-                ? state.AllowedModifyAccessList.ToList()
-                : new List<ProtoId<AccessLevelPrototype>>();
+            // Starlight edit Start
+            var availableAccess = state.AvailableAccessLevels?.ToList() ?? new List<ProtoId<AccessLevelPrototype>>();
+            var pressedAccess = state.PressedAccessLevels?.ToList() ?? new List<ProtoId<AccessLevelPrototype>>();
 
             var groupsWithCoverage = new List<ProtoId<AccessGroupPrototype>>();
-            if (allowedAccess.Count > 0 && state.AccessGroups != null)
+            if (availableAccess.Count > 0 && state.AccessGroups != null)
             {
                 foreach (var g in state.AccessGroups)
                 {
                     if (!protoManager.TryIndex(g, out AccessGroupPrototype? gp))
                         continue;
-                    
-                    var groupTags = gp.Tags.Where(tag => 
-                        protoManager.TryIndex<AccessLevelPrototype>(tag, out var accessProto) && 
-                        accessProto.CanAddToIdCard).ToList();
-                    
+
+                    var groupTags = gp.Tags.Where(tag =>
+                        protoManager.TryIndex<AccessLevelPrototype>(tag, out var accessProto) &&
+                        accessProto.CanAddToIdCard && availableAccess.Contains(tag)).ToList();
+
                     if (groupTags.Count == 0)
                         continue;
-                        
-                    var matchingTags = groupTags.Count(tag => allowedAccess.Contains(tag));
+
+                    var matchingTags = groupTags.Count;
                     var threshold = Math.Max(1, Math.Min(3, groupTags.Count / 2));
-                    
+
                     if (matchingTags >= threshold)
                         groupsWithCoverage.Add(gp.ID);
                 }
             }
 
-            var showGroups = groupsWithCoverage.Count > 1;
+            var showGroups = groupsWithCoverage.Count > 0;
 
             AccessGroupControlContainer.RemoveAllChildren();
             AccessLevelControlContainer.RemoveAllChildren();
@@ -151,10 +173,10 @@ public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUser
                 showGroups ? state.CurrentAccessGroup : null;
 
             _accessButtons.UpdateState(
-                state.TargetAccessReaderIdAccessList?.ToList() ?? new List<ProtoId<AccessLevelPrototype>>(),
+                pressedAccess,
                 effectiveGroup,
                 protoManager,
-                allowedAccess);
+                availableAccess);
             AccessLevelControlContainer.AddChild(_accessButtons);
 
             foreach (var (id, button) in _accessButtons.ButtonsList)

@@ -41,7 +41,7 @@ public AgentIDCardWindow()
 
         public void SetAllowedIcons(string currentJobIconId)
         {
-            IconGrid.RemoveAllChildren(); // Starlight-edit
+            IconGrid.RemoveAllChildren();
 
             var jobIconButtonGroup = new ButtonGroup();
             var i = 0;

@@ -99,10 +99,8 @@ private void ArrangeAccessControls()
 
     private bool TryRebuildAccessGroupControls()
     {
-        // Starlight-edit: Start
         AccessGroupList.RemoveAllChildren();
         AccessLevelChecklist.RemoveAllChildren();
-        // Starlight-edit: End
 
         // No access level prototypes were assigned to any of the access level groups.
         // Either the turret controller has no assigned access levels or their names were invalid.
@@ -167,7 +165,7 @@ private bool TryRebuildAccessGroupControls()
     /// </summary>
     public void RebuildAccessLevelsControls()
     {
-        AccessLevelChecklist.RemoveAllChildren(); // Starlight
+        AccessLevelChecklist.RemoveAllChildren();
         _accessLevelEntries.Clear();
 
         // No access level prototypes were assigned to any of the access level groups

@@ -33,6 +33,7 @@ public sealed class ActionsSystem : SharedActionsSystem
         [Dependency] private readonly IPrototypeManager _proto = default!;
         [Dependency] private readonly IResourceManager _resources = default!;
         [Dependency] private readonly MetaDataSystem _metaData = default!;
+        [Dependency] private readonly ISerializationManager _serialization = default!;
 
         public event Action<EntityUid>? OnActionAdded;
         public event Action<EntityUid>? OnActionRemoved;
@@ -286,8 +287,27 @@ public void LoadActionAssignments(string path, bool userData)
                     continue;
                 }
 
+                if (assignmentNode is SequenceDataNode sequenceAssignments)
+                {
+                    try
+                    {
+                        var nodeAssignments = _serialization.Read<List<(byte Hotbar, byte Slot)>>(sequenceAssignments, notNullableOverride: true);
+
+                        foreach (var index in nodeAssignments)
+                        {
+                            assignments.Add(new SlotAssignment(index.Hotbar, index.Slot, actionId));
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.Error($"Failed to parse action assignments: {ex}");
+                    }
+                }
+
                 AddActionDirect((user, actions), actionId);
             }
+
+            AssignSlot?.Invoke(assignments);
         }
 
         private void OnWorldTargetAttempt(Entity<WorldTargetActionComponent> ent, ref ActionTargetAttemptEvent args)
@@ -309,10 +329,10 @@ private void OnWorldTargetAttempt(Entity<WorldTargetActionComponent> ent, ref Ac
             // this is the actual entity-world targeting magic
             EntityUid? targetEnt = null;
             if (TryComp<EntityTargetActionComponent>(ent, out var entity) &&
-                args.Input.EntityUid != null &&
-                ValidateEntityTarget(user, args.Input.EntityUid, (uid, entity)))
+                args.Input.EntityUid is { Valid: true } entityUid &&
+                ValidateEntityTarget(user, entityUid, (uid, entity)))
             {
-                targetEnt = args.Input.EntityUid;
+                targetEnt = entityUid;
             }
 
             if (action.ClientExclusive)

@@ -1,6 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
     Title="{Loc admin-camera-window-title-placeholder}"
     SetSize="425 550"
-    MinSize="200 225"
-    Name="Window">
+    MinSize="200 225">
 </DefaultWindow>
@@ -67,7 +67,7 @@ public void SetTargetEntity(NetEntity target)
         /// </summary>
         public void UpdateReagents()
         {
-            ReagentList.DisposeAllChildren();
+            ReagentList.RemoveAllChildren();
 
             if (_selectedSolution == null || _solutions == null)
                 return;
@@ -92,7 +92,7 @@ public void UpdateReagents()
         /// <param name="solution">The selected solution.</param>
         private void UpdateVolumeBox(Solution solution)
         {
-            VolumeBox.DisposeAllChildren();
+            VolumeBox.RemoveAllChildren();
 
             var volumeLabel = new Label();
             volumeLabel.HorizontalExpand = true;
@@ -131,7 +131,7 @@ private void UpdateVolumeBox(Solution solution)
         /// <param name="solution">The selected solution.</param>
         private void UpdateThermalBox(Solution solution)
         {
-            ThermalBox.DisposeAllChildren();
+            ThermalBox.RemoveAllChildren();
             var heatCap = solution.GetHeatCapacity(null);
             var specificHeatLabel = new Label();
             specificHeatLabel.HorizontalExpand = true;

@@ -82,7 +82,11 @@ private void Refresh()
 
         if (Note.UnbannedTime is not null)
         {
-            ExtraLabel.Text = Loc.GetString("admin-notes-unbanned", ("admin", Note.UnbannedByName ?? "[error]"), ("date", Note.UnbannedTime));
+            ExtraLabel.Text = Loc.GetString(
+                "admin-notes-unbanned",
+                ("admin", Note.UnbannedByName ?? "[error]"),
+                ("date", Note.UnbannedTime.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss"))
+            );
             ExtraLabel.Visible = true;
         }
         else if (Note.ExpiryTime is not null)
@@ -139,7 +143,7 @@ private string FormatBanMessage()
 
     private string FormatRoleBanMessage()
     {
-        var banMessage = new StringBuilder($"{Loc.GetString("admin-notes-banned-from")} {string.Join(", ", Note.BannedRoles ?? new []{"unknown"})} ");
+        var banMessage = new StringBuilder($"{Loc.GetString("admin-notes-banned-from")} {string.Join(", ", Note.BannedRoles ?? new[] { "unknown" })} ");
         return FormatBanMessageCommon(banMessage);
     }
 

@@ -30,7 +30,10 @@ private float ScaledValue
     public void SetValue(float value)
     {
         _value = value;
-        CSpinner.Value = ScaledValue;
+        if (!CSpinner.HasKeyboardFocus())
+        {
+            CSpinner.Value = ScaledValue;
+        }
     }
 
     public void SetEnabled(bool enabled)

@@ -206,7 +206,7 @@ public void PopulateOrders(IEnumerable<CargoOrderData> orders)
             if (!_orderConsoleQuery.TryComp(_owner, out var orderConsole))
                 return;
 
-            Requests.DisposeAllChildren();
+            Requests.RemoveAllChildren();
 
             foreach (var order in orders)
             {

@@ -30,7 +30,7 @@ public void SetShuttleName(string name)
 
         public void SetOrders(SpriteSystem sprites, IPrototypeManager protoManager, List<CargoOrderData> orders)
         {
-            Orders.DisposeAllChildren();
+            Orders.RemoveAllChildren();
 
             foreach (var order in orders)
             {

@@ -1,4 +1,4 @@
-using Content.Client.CrewManifest.UI;
+using Content.Client.CrewManifest.UI;
 using Content.Shared.CrewManifest;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -21,7 +21,6 @@ public CrewManifestUiFragment()
 
     public void UpdateState(string stationName, CrewManifestEntries? entries)
     {
-        CrewManifestListing.DisposeAllChildren();
         CrewManifestListing.RemoveAllChildren();
 
         StationNameContainer.Visible = entries != null;

@@ -55,7 +55,7 @@ private async void PopulateChangelog()
             // Changelog is not kept in memory so load it again.
             var changelogs = await _changelog.LoadChangelog();
 
-            Tabs.DisposeAllChildren();
+            Tabs.RemoveAllChildren();
 
             var i = 0;
             foreach (var changelog in changelogs)

@@ -95,7 +95,7 @@ public void Shutdown()
         /// </summary>
         public void Close()
         {
-            RootMenu.MenuBody.DisposeAllChildren();
+            RootMenu.MenuBody.RemoveAllChildren();
             CancelOpen?.Cancel();
             CancelClose?.Cancel();
             OnContextClosed?.Invoke();

@@ -293,7 +293,7 @@ private void AddEntityToMenu(EntityUid entity, ContextMenuPopup menu)
             var element = new EntityMenuElement(entity);
             element.SubMenu = new ContextMenuPopup(_context, element);
             element.SubMenu.OnPopupOpen += () => _verb.OpenVerbMenu(entity, popup: element.SubMenu);
-            element.SubMenu.OnPopupHide += element.SubMenu.MenuBody.DisposeAllChildren;
+            element.SubMenu.OnPopupHide += element.SubMenu.MenuBody.RemoveAllChildren;
             _context.AddElement(menu, element);
             Elements.TryAdd(entity, element);
         }

@@ -123,7 +123,7 @@ private void TogglePreview(ButtonToggledEventArgs args)
         private void RefreshList()
         {
             // Clear
-            Grids.DisposeAllChildren();
+            Grids.RemoveAllChildren();
 
             if (_decals == null || _allDecals == null)
                 return;

@@ -18,7 +18,6 @@ public CrewManifestUi()
 
     public void Populate(string name, CrewManifestEntries? entries)
     {
-        CrewManifestListing.DisposeAllChildren();
         CrewManifestListing.RemoveAllChildren();
 
         StationNameContainer.Visible = entries != null;

@@ -21,7 +21,11 @@ protected override void Open()
         base.Open();
         _window = this.CreateWindow<DoorElectronicsConfigurationMenu>();
         _window.OnAccessChanged += UpdateConfiguration;
-        Reset();
+        // Starlight edit Start
+        if (EntMan.TryGetComponent<MetaDataComponent>(Owner, out var meta))
+            _window.Title = meta.EntityName;
+        // Reset();
+        // Starlight edit End
     }
 
     public override void OnProtoReload(PrototypesReloadedEventArgs args)
@@ -31,32 +35,20 @@ public override void OnProtoReload(PrototypesReloadedEventArgs args)
         if (!args.WasModified<AccessLevelPrototype>())
             return;
 
-        Reset();
-    }
-
-    private void Reset()
-    {
-        List<ProtoId<AccessLevelPrototype>> accessLevels = new();
-
-        foreach (var accessLevel in _prototypeManager.EnumeratePrototypes<AccessLevelPrototype>())
-        {
-            if (accessLevel.Name != null)
-            {
-                accessLevels.Add(accessLevel.ID);
-            }
-        }
-
-        accessLevels.Sort();
-        _window?.Reset(_prototypeManager, accessLevels);
+        // Starlight edit Start
+        if (State is DoorElectronicsConfigurationState cast)
+            _window?.UpdateState(cast.AccessList, cast.AccessGroups);
+        // Starlight edit End
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
     {
+        // Starlight Start
         base.UpdateState(state);
-
-        var castState = (DoorElectronicsConfigurationState) state;
-
-        _window?.UpdateState(castState);
+        if (state is not DoorElectronicsConfigurationState cast)
+            return;
+        // Starlight End
+        _window?.UpdateState(cast.AccessList, cast.AccessGroups, cast.PressedAccessList); // Starlight edit
     }
 
     public void UpdateConfiguration(List<ProtoId<AccessLevelPrototype>> newAccessList)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// Global usings for Content.Benchmarks

		global using Robust.UnitTesting.Pool;