Merge branch 'master' into fixes2-revival

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/Alerts/ClientAlertsSystem.cs

@@ -4,7 +4,6 @@
 using Robust.Client.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Client.Alerts;
 
@@ -13,7 +12,6 @@ public sealed class ClientAlertsSystem : AlertsSystem
 {
     public AlertOrderPrototype? AlertOrder { get; set; }
 
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 

Content.Client/Alerts/UpdateAlertSpriteEvent.cs

@@ -0,0 +1,21 @@
+using Content.Shared.Alert;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Alerts;
+
+/// <summary>
+/// Event raised on an entity with alerts in order to allow it to update visuals for the alert sprite entity.
+/// </summary>
+[ByRefEvent]
+public record struct UpdateAlertSpriteEvent
+{
+    public Entity<SpriteComponent> SpriteViewEnt;
+
+    public AlertPrototype Alert;
+
+    public UpdateAlertSpriteEvent(Entity<SpriteComponent> spriteViewEnt, AlertPrototype alert)
+    {
+        SpriteViewEnt = spriteViewEnt;
+        Alert = alert;
+    }
+}

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/Audio/AmbientSoundSystem.cs

@@ -50,7 +50,6 @@ protected override void QueueUpdate(EntityUid uid, AmbientSoundComponent ambienc
     private static AudioParams _params = AudioParams.Default
         .WithVariation(0.01f)
         .WithLoop(true)
-        .WithAttenuation(Attenuation.LinearDistance)
         .WithMaxDistance(7f);
 
     /// <summary>

Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs

@@ -23,8 +23,8 @@ public sealed partial class ContentAudioSystem
     [Dependency] private readonly IStateManager _stateManager = default!;
     [Dependency] private readonly IResourceCache _resourceCache = default!;
 
-    private readonly AudioParams _lobbySoundtrackParams = new(-5f, 1, "Master", 0, 0, 0, false, 0f);
-    private readonly AudioParams _roundEndSoundEffectParams = new(-5f, 1, "Master", 0, 0, 0, false, 0f);
+    private readonly AudioParams _lobbySoundtrackParams = new(-5f, 1, 0, 0, 0, false, 0f);
+    private readonly AudioParams _roundEndSoundEffectParams = new(-5f, 1, 0, 0, 0, false, 0f);
 
     /// <summary>
     /// EntityUid of lobby restart sound component.

Content.Client/Chemistry/EntitySystems/HypospraySystem.cs

@@ -0,0 +1,15 @@
+using Content.Client.Chemistry.UI;
+using Content.Client.Items;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+
+namespace Content.Client.Chemistry.EntitySystems;
+
+public sealed class HypospraySystem : SharedHypospraySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        Subs.ItemStatus<HyposprayComponent>(ent => new HyposprayStatusControl(ent, _solutionContainers));
+    }
+}

Content.Client/Chemistry/EntitySystems/InjectorSystem.cs

@@ -1,4 +1,3 @@
-using Content.Client.Chemistry.Components;
 using Content.Client.Chemistry.UI;
 using Content.Client.Items;
 using Content.Shared.Chemistry.Components;
@@ -13,17 +12,5 @@ public override void Initialize()
     {
         base.Initialize();
         Subs.ItemStatus<InjectorComponent>(ent => new InjectorStatusControl(ent, SolutionContainers));
-        SubscribeLocalEvent<HyposprayComponent, ComponentHandleState>(OnHandleHyposprayState);
-        Subs.ItemStatus<HyposprayComponent>(ent => new HyposprayStatusControl(ent));
-    }
-
-    private void OnHandleHyposprayState(EntityUid uid, HyposprayComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not HyposprayComponentState cState)
-            return;
-
-        component.CurrentVolume = cState.CurVolume;
-        component.TotalVolume = cState.MaxVolume;
-        component.UiUpdateNeeded = true;
     }
 }