Merge dev into stable

Content.Client/Access/UI/AccessLevelControl.xaml.cs

@@ -48,8 +48,20 @@ public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototyp
 
     public void UpdateState(
         List<ProtoId<AccessLevelPrototype>> pressedList,
+        ProtoId<AccessGroupPrototype>? currentGroup, // Starlight-edit: access groups
+        IPrototypeManager? prototypeManager = null, // Starlight-edit: access groups
         List<ProtoId<AccessLevelPrototype>>? enabledList = null)
     {
+        // Starlight-start: Access groups
+        if (currentGroup != null && prototypeManager != null && prototypeManager.TryIndex(currentGroup.Value, out var group))
+        {
+            RemoveAllChildren();
+            ButtonsList.Clear();
+
+            Populate(group.Tags.ToList(), prototypeManager);
+        }
+        // Starlight-end
+
         foreach (var (accessName, button) in ButtonsList)
         {
             button.Pressed = pressedList.Contains(accessName);

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -4,6 +4,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
+using Content.Shared._Starlight.Access; // Starlight-edit
 using Content.Shared.Roles;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
@@ -34,23 +35,24 @@ public IdCardConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner
         protected override void Open()
         {
             base.Open();
-            List<ProtoId<AccessLevelPrototype>> accessLevels;
+            List<ProtoId<AccessGroupPrototype>> accessGroups; // Starlight-edit
 
             if (EntMan.TryGetComponent<IdCardConsoleComponent>(Owner, out var idCard))
             {
-                accessLevels = idCard.AccessLevels;
+                accessGroups = idCard.AccessGroups; // Starlight-edit
             }
             else
             {
-                accessLevels = new List<ProtoId<AccessLevelPrototype>>();
+                accessGroups = new List<ProtoId<AccessGroupPrototype>>(); // Starlight-edit
                 _idCardConsoleSystem.Log.Error($"No IdCardConsole component found for {EntMan.ToPrettyString(Owner)}!");
             }
 
-            _window = new IdCardConsoleWindow(this, _prototypeManager, accessLevels)
+            _window = new IdCardConsoleWindow(this, _prototypeManager, accessGroups) // Starlight-edit
             {
                 Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName
             };
 
+            _window.OnGroupSelected += group => SendMessage(new AccessGroupSelectedMessage(group)); // Starlight-edit
             _window.CrewManifestButton.OnPressed += _ => SendMessage(new CrewManifestOpenUiMessage());
             _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId));
             _window.TargetIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(TargetIdCardSlotId));

Content.Client/Access/UI/IdCardConsoleWindow.xaml

@@ -1,4 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
+            xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
             MinSize="650 290">
     <BoxContainer Orientation="Vertical">
         <GridContainer Columns="2">
@@ -30,6 +31,12 @@
             <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
             <OptionButton Name="JobPresetOptionButton" />
         </GridContainer>
-        <Control Name="AccessLevelControlContainer" />
+        <!-- Starlight-start: Access Groups -->
+        <BoxContainer Orientation="Horizontal">
+            <Control Name="AccessGroupControlContainer" /> <!-- Access Groups Buttons -->
+            <cc:VSeparator Color="#a88b5e" Margin="5 0 5 0" /> <!-- Separator -->
+            <Control Name="AccessLevelControlContainer" /> <!-- Access Level Buttons -->
+        </BoxContainer>
+        <!-- Starlight-end: Access Groups -->
     </BoxContainer>
 </DefaultWindow>

Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client._Starlight.Access.UI; // Starlight-edit
 using Content.Shared.Access;
 using Content.Shared.Access.Systems;
 using Content.Shared.CCVar;
@@ -28,6 +29,7 @@ public sealed partial class IdCardConsoleWindow : DefaultWindow
         private int _maxIdJobLength;
 
         private AccessLevelControl _accessButtons = new();
+        private AccessGroupControl _accessGroups = new(); // Starlight-edit: Access Groups
         private readonly List<string> _jobPrototypeIds = new();
 
         private string? _lastFullName;
@@ -37,8 +39,11 @@ public sealed partial class IdCardConsoleWindow : DefaultWindow
         // The job that will be picked if the ID doesn't have a job on the station.
         private static ProtoId<JobPrototype> _defaultJob = "Assistant";
 
+        private ProtoId<AccessGroupPrototype>? _selectedAccessGroup = null; // Starlight-edit
+        public Action<ProtoId<AccessGroupPrototype>>? OnGroupSelected; // Starlight-edit
+
         public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager,
-            List<ProtoId<AccessLevelPrototype>> accessLevels)
+            List<ProtoId<AccessGroupPrototype>> accessGroups) // Starlight-edit
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
@@ -80,9 +85,30 @@ public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeMana
             }
 
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
-            _accessButtons.Populate(accessLevels, prototypeManager);
+            // Starlight-start: Access Groups
+            var currentAccessGroup = _selectedAccessGroup ?? accessGroups.FirstOrDefault();
+            _accessGroups.Populate(accessGroups, currentAccessGroup, prototypeManager);
+
+            List<ProtoId<AccessLevelPrototype>> accessLevels = new();
+            if (prototypeManager.TryIndex(currentAccessGroup, out var accessGroup))
+            {
+                accessLevels.AddRange(accessGroup.Tags);
+                _accessButtons.Populate(accessLevels, prototypeManager);
+            }
+            else
+                _logMill.Error($"Unable to find accessgroup for {accessGroup}");
+
+            AccessGroupControlContainer.AddChild(_accessGroups);
+
+            // Starlight-end
+
             AccessLevelControlContainer.AddChild(_accessButtons);
 
+            // Starlight-start: Access Groups
+            foreach (var (id, button) in _accessGroups.ButtonsList)
+                button.OnPressed += _ => OnGroupSelected?.Invoke(id);
+            // Starlight-end
+
             foreach (var (id, button) in _accessButtons.ButtonsList)
             {
                 button.OnPressed += _ => SubmitData();
@@ -180,11 +206,26 @@ public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
 
             JobPresetOptionButton.Disabled = !interfaceEnabled;
 
+            // Starlight-start: Access Groups
+
+            _selectedAccessGroup = state.CurrentAccessGroup;
+
+            _accessGroups.UpdateState(state.CurrentAccessGroup);
+
+            // Starlight-end
+
             _accessButtons.UpdateState(state.TargetIdAccessList?.ToList() ??
                                        new List<ProtoId<AccessLevelPrototype>>(),
+                                       state.CurrentAccessGroup, // Starlight-edit
+                                       _prototypeManager, // Starlight-edit
                                        state.AllowedModifyAccessList?.ToList() ??
                                        new List<ProtoId<AccessLevelPrototype>>());
 
+            // Starlight-start: Access Groups
+            foreach (var (id, button) in _accessButtons.ButtonsList)
+                button.OnPressed += _ => SubmitData();
+            // Starlight-end
+
             var jobIndex = _jobPrototypeIds.IndexOf(state.TargetIdJobPrototype);
             // If the job index is < 0 that means they don't have a job registered in the station records
             // or the IdCardComponent's JobPrototype field.

Content.Client/Administration/UI/CustomControls/HSeparator.cs

@@ -28,9 +28,9 @@ public HSeparator(Color color)
             ContentMarginBottomOverride = 2,
             ContentMarginLeftOverride = 2
         };
-
-        AddChild(new PanelContainer { PanelOverride = _styleBox });
         // Starlight-end
+
+        AddChild(new PanelContainer { PanelOverride = _styleBox }); // Starlight-edit
     }
 
     public HSeparator() : this(SeparatorColor) { }

Content.Client/Administration/UI/CustomControls/VSeparator.cs

@@ -9,17 +9,28 @@ public sealed class VSeparator : PanelContainer
 {
     private static readonly Color SeparatorColor = Color.FromHex("#3D4059");
 
+    // Starlight-start
+    private readonly StyleBoxFlat _styleBox;
+
+    public Color Color
+    {
+        get => _styleBox.BackgroundColor;
+        set => _styleBox.BackgroundColor = value;
+    }
+    // Starlight-end
+
     public VSeparator(Color color)
     {
         MinSize = new Vector2(2, 5);
 
-        AddChild(new PanelContainer
+        // Starlight-start
+        _styleBox = new StyleBoxFlat
         {
-            PanelOverride = new StyleBoxFlat
-            {
-                BackgroundColor = color
-            }
-        });
+            BackgroundColor = color,
+        };
+
+        AddChild(new PanelContainer { PanelOverride = _styleBox });
+        // Starlight-end
     }
 
     public VSeparator() : this(SeparatorColor) { }

Content.Client/Content.Client.csproj

@@ -22,6 +22,7 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
     <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
+    <ProjectReference Include="..\Content.Starlight.Codegen\Content.Starlight.Codegen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="_Starlight\Achievement\" />

Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs

@@ -37,6 +37,6 @@ public void Reset(IPrototypeManager protoManager, List<ProtoId<AccessLevelProtot
 
     public void UpdateState(DoorElectronicsConfigurationState state)
     {
-        _buttonsList.UpdateState(state.AccessList);
+        _buttonsList.UpdateState(state.AccessList, null); // Starlight-edit
     }
 }

Content.Client/_Starlight/Access/UI/AccessGroupControl.xaml

@@ -0,0 +1,6 @@
+<BoxContainer xmlns="https://spacestation14.io"
+                 VerticalExpand="True"
+                 HorizontalExpand="True"
+                 HorizontalAlignment="Center"
+                 Orientation="Vertical">
+</BoxContainer>

Content.Client/_Starlight/Access/UI/AccessGroupControl.xaml.cs

@@ -0,0 +1,54 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Content.Shared.Access;
+
+namespace Content.Client._Starlight.Access.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class AccessGroupControl : BoxContainer
+{
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private readonly ISawmill _sawmill = default!;
+
+    public readonly Dictionary<ProtoId<AccessGroupPrototype>, Button> ButtonsList = new();
+
+    public AccessGroupControl()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _sawmill = _logManager.GetSawmill("accessgroupcontrol");
+    }
+
+    public void Populate(List<ProtoId<AccessGroupPrototype>> accessGroups, ProtoId<AccessGroupPrototype> currentAccessGroup, IPrototypeManager prototypeManager)
+    {
+        foreach (var group in accessGroups)
+        {
+            if (!prototypeManager.TryIndex(group, out var accessGroup))
+            {
+                _sawmill.Error($"Unable to find accessgroup for {group}");
+                continue;
+            }
+
+            var newButton = new Button
+            {
+                Text = accessGroup.Name ?? accessGroup.ID
+            };
+
+            if (group == currentAccessGroup)
+                newButton.Disabled = true;
+
+            AddChild(newButton);
+            ButtonsList.Add(accessGroup.ID, newButton);
+        }
+    }
+
+    public void UpdateState(ProtoId<AccessGroupPrototype> pressed)
+    {
+        foreach (var (groupName, button) in ButtonsList)
+            button.Disabled = pressed == groupName;
+    }
+}

Content.Client/_Starlight/Actions/EntitySystems/JumpSystem.cs

@@ -0,0 +1,6 @@
+using Content.Shared._Starlight.Actions.EntitySystems;
+
+namespace Content.Client._Starlight.Actions.EntitySystems;
+public sealed class JumpSystem : SharedJumpSystem
+{
+}

Content.Client/_Starlight/Actions/Stasis/StasisFrozenSystem.cs → Content.Client/_Starlight/Actions/EntitySystems/StasisFrozenSystem.cs

@@ -1,6 +1,6 @@
-using Content.Shared._Starlight.Actions.Stasis;
+using Content.Shared._Starlight.Actions.EntitySystems;
 
-namespace Content.Client._Starlight.Actions.Stasis;
+namespace Content.Client._Starlight.Actions.EntitySystems;
 
 /// <summary>
 /// Client-side system that handles the freezing behavior of entities in stasis.

Content.Client/_Starlight/Actions/Stasis/StasisSystem.cs → Content.Client/_Starlight/Actions/EntitySystems/StasisSystem.cs

@@ -4,9 +4,11 @@
 using Robust.Shared.Timing;
 using Robust.Client.GameObjects;
 using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
-using Content.Shared._Starlight.Actions.Stasis;
+using Content.Shared._Starlight.Actions.EntitySystems;
+using Content.Shared._Starlight.Actions.Events;
+using Content.Shared._Starlight.Actions.Components;
 
-namespace Content.Client._Starlight.Actions.Stasis;
+namespace Content.Client._Starlight.Actions.EntitySystems;
 
 /// <summary>
 /// Client-side system that handles visual and audio effects for stasis.

Content.Client/_Starlight/IdClothingBlocker/IdClothingBlockerSystem.cs

@@ -0,0 +1,11 @@
+using Content.Shared._Starlight.IdClothingBlocker;
+
+namespace Content.Client._Starlight.IdClothingBlocker;
+
+/// <summary>
+/// Client-side implementation of SharedIdClothingBlockerSystem
+/// Defined for correct unequip predictions
+/// </summary>
+public sealed class IdClothingBlockerSystem : SharedIdClothingBlockerSystem
+{
+}

Content.Client/_Starlight/IdClothingBlocker/IdClothingFrozenSystem.cs

@@ -0,0 +1,11 @@
+using Content.Shared._Starlight.IdClothingBlocker;
+
+namespace Content.Client._Starlight.IdClothingBlocker;
+
+/// <summary>
+/// Client-side implementation of SharedIdClothingFrozenSystem
+/// Defined to block action and attack predictions
+/// </summary>
+public sealed class IdClothingFrozenSystem : SharedIdClothingFrozenSystem
+{
+}