August Upstream Merge

.github/CODEOWNERS

@@ -9,9 +9,9 @@
 /Content.*/Administration/ @moonheart08 @PaulRitter @DrSmugleaf @Chief-Engineer
 /Content.*/Station/ @moonheart08
 /Content.*/Maps/ @moonheart08
-/Content.*/GameTicking/ @moonheart08
+/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
 /Resources/ServerInfo/ @moonheart08 @Chief-Engineer
-/Resources/ServerInfo/Guidebook/ @moonheart08
+/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
 /Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
 /Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
 /Resources/Prototypes/species.yml @moonheart08
@@ -39,6 +39,19 @@
 /Content.*/Actions/ @ElectroJr
 /Content.*/Explosion/ @ElectroJr
 
+/Content.*/Anomaly/ @EmoGarbage404
+/Content.*/Lathe/ @EmoGarbage404
+/Content.*/Materials/ @EmoGarbage404
+/Content.*/Mech/ @EmoGarbage404
+/Content.*/Research/ @EmoGarbage404
+/Content.*/Stack/ @EmoGarbage404
+/Content.*/Xenoarchaeology/ @EmoGarbage404
+/Content.*/Zombies/ @EmoGarbage404
+/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404
+/Resources/Prototypes/Research/ @EmoGarbage404
+
+/Content.*/Forensics/ @ficcialfaint
+
 /Content.YAMLLinter @PaulRitter @DrSmugleaf
 /Content.*/Inventory @PaulRitter
 /Content.*/Arcade @PaulRitter

Content.Benchmarks/DeviceNetworkingBenchmark.cs

@@ -26,10 +26,12 @@ public class DeviceNetworkingBenchmark
 
 
     private NetworkPayload _payload = default!;
+
+    [TestPrototypes]
     private const string Prototypes = @"
 - type: entity
-  name: DummyNetworkDevice
-  id: DummyNetworkDevice
+  name: DummyNetworkDevicePrivate
+  id: DummyNetworkDevicePrivate
   components:
     - type: DeviceNetwork
       transmitFrequency: 100
@@ -56,7 +58,7 @@ public class DeviceNetworkingBenchmark
     public async Task SetupAsync()
     {
         ProgramShared.PathOffset = "../../../../";
-        _pair = await PoolManager.GetServerClient(new PoolSettings { NoClient = true, ExtraPrototypes = Prototypes });
+        _pair = await PoolManager.GetServerClient();
         var server = _pair.Pair.Server;
 
         await server.WaitPost(() =>
@@ -73,17 +75,23 @@ await server.WaitPost(() =>
                 ["testbool"] = true
             };
 
-            _sourceEntity = entityManager.SpawnEntity("DummyNetworkDevice", MapCoordinates.Nullspace);
+            _sourceEntity = entityManager.SpawnEntity("DummyNetworkDevicePrivate", MapCoordinates.Nullspace);
             _sourceWirelessEntity = entityManager.SpawnEntity("DummyWirelessNetworkDevice", MapCoordinates.Nullspace);
 
             for (var i = 0; i < EntityCount; i++)
             {
-                _targetEntities.Add(entityManager.SpawnEntity("DummyNetworkDevice", MapCoordinates.Nullspace));
+                _targetEntities.Add(entityManager.SpawnEntity("DummyNetworkDevicePrivate", MapCoordinates.Nullspace));
                 _targetWirelessEntities.Add(entityManager.SpawnEntity("DummyWirelessNetworkDevice", MapCoordinates.Nullspace));
             }
         });
     }
 
+    [GlobalCleanup]
+    public async Task Cleanup()
+    {
+        await _pair.DisposeAsync();
+    }
+
     [Benchmark(Baseline = true, Description = "Entity Events")]
     public async Task EventSentBaseline()
     {

Content.Benchmarks/Program.cs

@@ -20,9 +20,11 @@ public static void Main(string[] args)
 
         public static async Task MainAsync(string[] args)
         {
+            PoolManager.Startup(typeof(Program).Assembly);
             var pair = await PoolManager.GetServerClient();
             var gameMaps = pair.Pair.Server.ResolveDependency<IPrototypeManager>().EnumeratePrototypes<GameMapPrototype>().ToList();
             MapLoadBenchmark.MapsSource = gameMaps.Select(x => x.ID);
+            await pair.CleanReturnAsync();
 
 #if DEBUG
             Console.ForegroundColor = ConsoleColor.Red;
@@ -33,6 +35,8 @@ public static async Task MainAsync(string[] args)
             var config = Environment.GetEnvironmentVariable("ROBUST_BENCHMARKS_ENABLE_SQL") != null ? DefaultSQLConfig.Instance : null;
             BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, config);
 #endif
+
+            PoolManager.Shutdown();
         }
     }
 }

Content.Client/Access/AccessOverriderSystem.cs

@@ -0,0 +1,11 @@
+using Content.Shared.Access.Systems;
+using JetBrains.Annotations;
+
+namespace Content.Client.Access
+{
+    [UsedImplicitly]
+    public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
+    {
+
+    }
+}

Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs

@@ -0,0 +1,72 @@
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.Containers.ItemSlots;
+using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
+using static Content.Shared.Access.Components.AccessOverriderComponent;
+
+namespace Content.Client.Access.UI
+{
+    public sealed class AccessOverriderBoundUserInterface : BoundUserInterface
+    {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        private readonly SharedAccessOverriderSystem _accessOverriderSystem = default!;
+
+        private AccessOverriderWindow? _window;
+
+        public AccessOverriderBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        {
+            _accessOverriderSystem = EntMan.System<SharedAccessOverriderSystem>();
+        }
+
+        protected override void Open()
+        {
+            base.Open();
+
+            List<string> accessLevels;
+
+            if (EntMan.TryGetComponent<AccessOverriderComponent>(Owner, out var accessOverrider))
+            {
+                accessLevels = accessOverrider.AccessLevels;
+                accessLevels.Sort();
+            }
+
+            else
+            {
+                accessLevels = new List<string>();
+                _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!");
+            }
+
+            _window = new AccessOverriderWindow(this, _prototypeManager, accessLevels)
+            {
+                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName
+            };
+
+            _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId));
+
+            _window.OnClose += Close;
+            _window.OpenCentered();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (!disposing)
+                return;
+
+            _window?.Dispose();
+        }
+
+        protected override void UpdateState(BoundUserInterfaceState state)
+        {
+            base.UpdateState(state);
+            var castState = (AccessOverriderBoundUserInterfaceState) state;
+            _window?.UpdateState(castState);
+        }
+
+        public void SubmitData(List<string> newAccessList)
+        {
+            SendMessage(new WriteToTargetAccessReaderIdMessage(newAccessList));
+        }
+    }
+}

Content.Client/Access/UI/AccessOverriderWindow.xaml

@@ -0,0 +1,23 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+            MinSize="650 290">
+    <BoxContainer Orientation="Vertical">
+        <GridContainer Columns="2">
+            <GridContainer Columns="3" HorizontalExpand="True">
+                <Label Text="{Loc 'access-overrider-window-privileged-id'}" />
+                <Button Name="PrivilegedIdButton" Access="Public"/>
+                <Label Name="PrivilegedIdLabel" />
+            </GridContainer>
+        </GridContainer>
+        <Label Name="TargetNameLabel" />
+        <Control MinSize="0 8"/>
+        <GridContainer Name="AccessLevelGrid" Columns="5" HorizontalAlignment="Center">
+
+            <!-- Access level buttons are added here by the C# code -->
+
+        </GridContainer>
+        <Control MinSize="0 8"/>
+        <Label Name="MissingPrivilegesLabel" />
+        <Control MinSize="0 4"/>
+        <Label Name="MissingPrivilegesText" />
+    </BoxContainer>
+</DefaultWindow>

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

@@ -0,0 +1,111 @@
+using System.Linq;
+using Content.Shared.Access;
+using Content.Shared.Access.Systems;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using static Content.Shared.Access.Components.AccessOverriderComponent;
+
+namespace Content.Client.Access.UI
+{
+    [GenerateTypedNameReferences]
+    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();
+
+        public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototypeManager prototypeManager,
+            List<string> accessLevels)
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+            _logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill);
+
+            _owner = owner;
+
+            foreach (var access in accessLevels)
+            {
+                if (!prototypeManager.TryIndex<AccessLevelPrototype>(access, out var accessLevel))
+                {
+                    _logMill.Error($"Unable to find accesslevel for {access}");
+                    continue;
+                }
+
+                var newButton = new Button
+                {
+                    Text = GetAccessLevelName(accessLevel),
+                    ToggleMode = true,
+                };
+
+                AccessLevelGrid.AddChild(newButton);
+                _accessButtons.Add(accessLevel.ID, newButton);
+                newButton.OnPressed += _ => SubmitData();
+            }
+        }
+
+        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;
+            PrivilegedIdButton.Text = state.IsPrivilegedIdPresent
+                ? Loc.GetString("access-overrider-window-eject-button")
+                : Loc.GetString("access-overrider-window-insert-button");
+
+            TargetNameLabel.Text = state.TargetLabel;
+            TargetNameLabel.FontColorOverride = state.TargetLabelColor;
+
+            MissingPrivilegesLabel.Text = "";
+            MissingPrivilegesLabel.FontColorOverride = Color.Yellow;
+
+            MissingPrivilegesText.Text = "";
+            MissingPrivilegesText.FontColorOverride = Color.Yellow;
+
+            if (state.MissingPrivilegesList != null && state.MissingPrivilegesList.Any())
+            {
+                List<string> missingPrivileges = new List<string>();
+
+                foreach (string tag in state.MissingPrivilegesList)
+                {
+                    string privilege = Loc.GetString(_prototypeManager.Index<AccessLevelPrototype>(tag)?.Name ?? "generic-unknown");
+                    missingPrivileges.Add(privilege);
+                }
+
+                MissingPrivilegesLabel.Text = Loc.GetString("access-overrider-window-missing-privileges");
+                MissingPrivilegesText.Text = string.Join(", ", missingPrivileges);
+            }
+
+            var interfaceEnabled = state.IsPrivilegedIdPresent && state.IsPrivilegedIdAuthorized;
+
+            foreach (var (accessName, button) in _accessButtons)
+            {
+                button.Disabled = !interfaceEnabled;
+                if (interfaceEnabled)
+                {
+                    button.Pressed = state.TargetAccessReaderIdAccessList?.Contains(accessName) ?? false;
+                    button.Disabled = (!state.AllowedModifyAccessList?.Contains(accessName)) ?? true;
+                }
+            }
+        }
+
+        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());
+        }
+    }
+}

Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs

@@ -18,7 +18,8 @@ protected override void Open()
         {
             base.Open();
 
-            _window = new AgentIDCardWindow();
+            _window?.Dispose();
+            _window = new AgentIDCardWindow(this);
             if (State != null)
                 UpdateState(State);
 
@@ -39,6 +40,11 @@ private void OnJobChanged(string newJob)
             SendMessage(new AgentIDCardJobChangedMessage(newJob));
         }
 
+        public void OnJobIconChanged(string newJobIcon)
+        {
+            SendMessage(new AgentIDCardJobIconChangedMessage(newJobIcon));
+        }
+
         /// <summary>
         /// Update the UI state based on server-sent info
         /// </summary>
@@ -51,6 +57,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
 
             _window.SetCurrentName(cast.CurrentName);
             _window.SetCurrentJob(cast.CurrentJob);
+            _window.SetAllowedIcons(cast.Icons);
         }
 
         protected override void Dispose(bool disposing)

Content.Client/Access/UI/AgentIDCardWindow.xaml

@@ -6,5 +6,12 @@
         <LineEdit Name="NameLineEdit" />
         <Label Name="CurrentJob" Text="{Loc 'agent-id-card-current-job'}" />
         <LineEdit Name="JobLineEdit" />
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
+            <Control HorizontalExpand="True" MinSize="50 0"/>
+            <GridContainer Name="IconGrid" Columns="10">
+                <!-- Job icon buttons are generated in the code -->
+            </GridContainer>
+        </BoxContainer>
     </BoxContainer>
 </DefaultWindow>