Merge branch 'space-wizards:master' into master

Content.Client/Access/UI/AccessLevelControl.xaml

@@ -0,0 +1,4 @@
+<GridContainer xmlns="https://spacestation14.io"
+               Columns="5"
+               HorizontalAlignment="Center">
+</GridContainer>

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

@@ -0,0 +1,52 @@
+using System.Linq;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Content.Shared.Access;
+using Content.Shared.Access.Systems;
+
+namespace Content.Client.Access.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class AccessLevelControl : GridContainer
+{
+    public readonly Dictionary<ProtoId<AccessLevelPrototype>, Button> ButtonsList = new();
+
+    public AccessLevelControl()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
+    {
+        foreach (var access in accessLevels)
+        {
+            if (!prototypeManager.TryIndex(access, out var accessLevel))
+            {
+                Logger.Error($"Unable to find accesslevel for {access}");
+                continue;
+            }
+
+            var newButton = new Button
+            {
+                Text = accessLevel.GetAccessLevelName(),
+                ToggleMode = true,
+            };
+            AddChild(newButton);
+            ButtonsList.Add(accessLevel.ID, newButton);
+        }
+    }
+
+    public void UpdateState(
+        List<ProtoId<AccessLevelPrototype>> pressedList,
+        List<ProtoId<AccessLevelPrototype>>? enabledList = null)
+    {
+        foreach (var (accessName, button) in ButtonsList)
+        {
+            button.Pressed = pressedList.Contains(accessName);
+            button.Disabled = !(enabledList?.Contains(accessName) ?? true);
+        }
+    }
+}

Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs

@@ -64,7 +64,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window?.UpdateState(castState);
         }
 
-        public void SubmitData(List<string> newAccessList)
+        public void SubmitData(List<ProtoId<AccessLevelPrototype>> newAccessList)
         {
             SendMessage(new WriteToTargetAccessReaderIdMessage(newAccessList));
         }

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

@@ -16,7 +16,6 @@ public sealed partial class AccessOverriderWindow : DefaultWindow
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-        private readonly ISawmill _logMill = default!;
         private readonly AccessOverriderBoundUserInterface _owner;
         private readonly Dictionary<string, Button> _accessButtons = new();
 
@@ -25,21 +24,21 @@ public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototype
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
-            _logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill);
+            var logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill);
 
             _owner = owner;
 
             foreach (var access in accessLevels)
             {
                 if (!prototypeManager.TryIndex(access, out var accessLevel))
                 {
-                    _logMill.Error($"Unable to find accesslevel for {access}");
+                    logMill.Error($"Unable to find accesslevel for {access}");
                     continue;
                 }
 
                 var newButton = new Button
                 {
-                    Text = GetAccessLevelName(accessLevel),
+                    Text = accessLevel.GetAccessLevelName(),
                     ToggleMode = true,
                 };
 
@@ -49,14 +48,6 @@ public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototype
             }
         }
 
-        private static string GetAccessLevelName(AccessLevelPrototype prototype)
-        {
-            if (prototype.Name is { } name)
-                return Loc.GetString(name);
-
-            return prototype.ID;
-        }
-
         public void UpdateState(AccessOverriderBoundUserInterfaceState state)
         {
             PrivilegedIdLabel.Text = state.PrivilegedIdName;
@@ -105,7 +96,7 @@ private void SubmitData()
             _owner.SubmitData(
 
                 // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
-                _accessButtons.Where(x => x.Value.Pressed).Select(x => x.Key).ToList());
+                _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId<AccessLevelPrototype>(x.Key)).ToList());
         }
     }
 }

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
+using Content.Shared.Access;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
@@ -28,7 +29,6 @@ protected override void Open()
             if (EntMan.TryGetComponent<IdCardConsoleComponent>(Owner, out var idCard))
             {
                 accessLevels = idCard.AccessLevels;
-                accessLevels.Sort();
             }
             else
             {
@@ -65,7 +65,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window?.UpdateState(castState);
         }
 
-        public void SubmitData(string newFullName, string newJobTitle, List<string> newAccessList, string newJobPrototype)
+        public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<AccessLevelPrototype>> newAccessList, string newJobPrototype)
         {
             if (newFullName.Length > MaxFullNameLength)
                 newFullName = newFullName[..MaxFullNameLength];

Content.Client/Access/UI/IdCardConsoleWindow.xaml

@@ -30,10 +30,6 @@
             <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
             <OptionButton Name="JobPresetOptionButton" />
         </GridContainer>
-        <GridContainer Name="AccessLevelGrid" Columns="5" HorizontalAlignment="Center">
-
-            <!-- Access level buttons are added here by the C# code -->
-
-        </GridContainer>
+        <Control Name="AccessLevelControlContainer" />
     </BoxContainer>
 </DefaultWindow>

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

@@ -20,7 +20,7 @@ public sealed partial class IdCardConsoleWindow : DefaultWindow
 
         private readonly IdCardConsoleBoundUserInterface _owner;
 
-        private readonly Dictionary<string, Button> _accessButtons = new();
+        private AccessLevelControl _accessButtons = new();
         private readonly List<string> _jobPrototypeIds = new();
 
         private string? _lastFullName;
@@ -66,36 +66,18 @@ public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeMana
 
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
 
-            foreach (var access in accessLevels)
-            {
-                if (!prototypeManager.TryIndex<AccessLevelPrototype>(access, out var accessLevel))
-                {
-                    _logMill.Error($"Unable to find accesslevel for {access}");
-                    continue;
-                }
+            _accessButtons.Populate(accessLevels, prototypeManager);
+            AccessLevelControlContainer.AddChild(_accessButtons);
 
-                var newButton = new Button
-                {
-                    Text = GetAccessLevelName(accessLevel),
-                    ToggleMode = true,
-                };
-                AccessLevelGrid.AddChild(newButton);
-                _accessButtons.Add(accessLevel.ID, newButton);
-                newButton.OnPressed += _ => SubmitData();
+            foreach (var (id, button) in _accessButtons.ButtonsList)
+            {
+                button.OnPressed += _ => SubmitData();
             }
         }
 
-        private static string GetAccessLevelName(AccessLevelPrototype prototype)
-        {
-            if (prototype.Name is { } name)
-                return Loc.GetString(name);
-
-            return prototype.ID;
-        }
-
         private void ClearAllAccess()
         {
-            foreach (var button in _accessButtons.Values)
+            foreach (var button in _accessButtons.ButtonsList.Values)
             {
                 if (button.Pressed)
                 {
@@ -119,7 +101,7 @@ private void SelectJobPreset(OptionButton.ItemSelectedEventArgs args)
             // this is a sussy way to do this
             foreach (var access in job.Access)
             {
-                if (_accessButtons.TryGetValue(access, out var button) && !button.Disabled)
+                if (_accessButtons.ButtonsList.TryGetValue(access, out var button) && !button.Disabled)
                 {
                     button.Pressed = true;
                 }
@@ -134,7 +116,7 @@ private void SelectJobPreset(OptionButton.ItemSelectedEventArgs args)
 
                 foreach (var access in groupPrototype.Tags)
                 {
-                    if (_accessButtons.TryGetValue(access, out var button) && !button.Disabled)
+                    if (_accessButtons.ButtonsList.TryGetValue(access, out var button) && !button.Disabled)
                     {
                         button.Pressed = true;
                     }
@@ -184,15 +166,10 @@ public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
 
             JobPresetOptionButton.Disabled = !interfaceEnabled;
 
-            foreach (var (accessName, button) in _accessButtons)
-            {
-                button.Disabled = !interfaceEnabled;
-                if (interfaceEnabled)
-                {
-                    button.Pressed = state.TargetIdAccessList?.Contains(accessName) ?? false;
-                    button.Disabled = (!state.AllowedModifyAccessList?.Contains(accessName)) ?? true;
-                }
-            }
+            _accessButtons.UpdateState(state.TargetIdAccessList?.ToList() ??
+                                       new List<ProtoId<AccessLevelPrototype>>(),
+                                       state.AllowedModifyAccessList?.ToList() ??
+                                       new List<ProtoId<AccessLevelPrototype>>());
 
             var jobIndex = _jobPrototypeIds.IndexOf(state.TargetIdJobPrototype);
             if (jobIndex >= 0)
@@ -215,7 +192,7 @@ private void SubmitData()
                 FullNameLineEdit.Text,
                 JobTitleLineEdit.Text,
                 // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
-                _accessButtons.Where(x => x.Value.Pressed).Select(x => x.Key).ToList(),
+                _accessButtons.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList(),
                 jobProtoDirty ? _jobPrototypeIds[JobPresetOptionButton.SelectedId] : string.Empty);
         }
     }

Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml

@@ -1,9 +1,9 @@
-<controls:FancyWindow
+<controls:FancyWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Title="{Loc 'anomaly-scanner-ui-title'}"
-    MinSize="350 260"
-    SetSize="350 260">
+    MinSize="350 400"
+    SetSize="350 400">
     <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="10 0 10 10">
         <RichTextLabel Name="TextDisplay"></RichTextLabel>
     </BoxContainer>

Content.Client/Chemistry/UI/InjectorStatusControl.cs

@@ -17,6 +17,7 @@ public sealed class InjectorStatusControl : Control
 
     private FixedPoint2 PrevVolume;
     private FixedPoint2 PrevMaxVolume;
+    private FixedPoint2 PrevTransferAmount;
     private InjectorToggleMode PrevToggleState;
 
     public InjectorStatusControl(Entity<InjectorComponent> parent, SharedSolutionContainerSystem solutionContainers)
@@ -37,11 +38,13 @@ protected override void FrameUpdate(FrameEventArgs args)
         // only updates the UI if any of the details are different than they previously were
         if (PrevVolume == solution.Volume
             && PrevMaxVolume == solution.MaxVolume
+            && PrevTransferAmount == _parent.Comp.TransferAmount
             && PrevToggleState == _parent.Comp.ToggleState)
             return;
 
         PrevVolume = solution.Volume;
         PrevMaxVolume = solution.MaxVolume;
+        PrevTransferAmount = _parent.Comp.TransferAmount;
         PrevToggleState = _parent.Comp.ToggleState;
 
         // Update current volume and injector state

Content.Client/Disposal/Systems/DisposalUnitSystem.cs

@@ -96,24 +96,22 @@ private void OnAppearanceChange(EntityUid uid, SharedDisposalUnitComponent unit,
     private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, SpriteComponent sprite, AppearanceComponent appearance)
     {
         if (!_appearanceSystem.TryGetData<VisualState>(uid, Visuals.VisualState, out var state, appearance))
-        {
             return;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.Unanchored, state == VisualState.UnAnchored);
         sprite.LayerSetVisible(DisposalUnitVisualLayers.Base, state == VisualState.Anchored);
-        sprite.LayerSetVisible(DisposalUnitVisualLayers.BaseFlush, state is VisualState.Flushing or VisualState.Charging);
+        sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayFlush, state is VisualState.OverlayFlushing or VisualState.OverlayCharging);
 
         var chargingState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.BaseCharging, out var chargingLayer)
             ? sprite.LayerGetState(chargingLayer)
             : new RSI.StateId(DefaultChargeState);
 
         // This is a transient state so not too worried about replaying in range.
-        if (state == VisualState.Flushing)
+        if (state == VisualState.OverlayFlushing)
         {
             if (!_animationSystem.HasRunningAnimation(uid, AnimationKey))
             {
-                var flushState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.BaseFlush, out var flushLayer)
+                var flushState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.OverlayFlush, out var flushLayer)
                     ? sprite.LayerGetState(flushLayer)
                     : new RSI.StateId(DefaultFlushState);
 
@@ -125,7 +123,7 @@ private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, Sprite
                     {
                         new AnimationTrackSpriteFlick
                         {
-                            LayerKey = DisposalUnitVisualLayers.BaseFlush,
+                            LayerKey = DisposalUnitVisualLayers.OverlayFlush,
                             KeyFrames =
                             {
                                 // Play the flush animation
@@ -154,26 +152,18 @@ private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, Sprite
                 _animationSystem.Play(uid, anim, AnimationKey);
             }
         }
-        else if (state == VisualState.Charging)
-        {
-            sprite.LayerSetState(DisposalUnitVisualLayers.BaseFlush, chargingState);
-        }
+        else if (state == VisualState.OverlayCharging)
+            sprite.LayerSetState(DisposalUnitVisualLayers.OverlayFlush, new RSI.StateId("disposal-charging"));
         else
-        {
             _animationSystem.Stop(uid, AnimationKey);
-        }
 
         if (!_appearanceSystem.TryGetData<HandleState>(uid, Visuals.Handle, out var handleState, appearance))
-        {
             handleState = HandleState.Normal;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayEngaged, handleState != HandleState.Normal);
 
         if (!_appearanceSystem.TryGetData<LightStates>(uid, Visuals.Light, out var lightState, appearance))
-        {
             lightState = LightStates.Off;
-        }
 
         sprite.LayerSetVisible(DisposalUnitVisualLayers.OverlayCharging,
                 (lightState & LightStates.Charging) != 0);
@@ -189,7 +179,7 @@ public enum DisposalUnitVisualLayers : byte
     Unanchored,
     Base,
     BaseCharging,
-    BaseFlush,
+    OverlayFlush,
     OverlayCharging,
     OverlayReady,
     OverlayFull,