Smooth diagonal windows to walls (#1563)

Upstream sync

.editorconfig

@@ -196,7 +196,7 @@ csharp_preserve_single_line_blocks = true
 #dotnet_naming_style.begins_with_i.word_separator =
 #dotnet_naming_style.begins_with_i.capitalization = pascal_case
 
-dotnet_diagnostic.IDE0055.severity = warning
+dotnet_diagnostic.ide0055.severity = warning
 
 dotnet_naming_rule.constants_rule.severity = warning
 dotnet_naming_rule.constants_rule.style = upper_camel_case_style
@@ -336,6 +336,10 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
 
 # ReSharper properties
 resharper_braces_for_ifelse = required_for_multiline
+resharper_keep_existing_attribute_arrangement = true
 
-[*.{csproj,xml,yml,dll.config,msbuildproj,targets}]
+[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets}]
 indent_size = 2
+
+[{*.yaml,*.yml}]
+ij_yaml_indent_sequence_value = false

.github/workflows/build-map-renderer.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/build-test-debug.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.actor != 'IanComradeBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/build-test-release.yml

@@ -1,62 +0,0 @@
-name: Build & Test Release
-
-on:
-  push:
-    branches: [ master, staging, trying ]
-  merge_group:
-  pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
-    branches: [ master ]
-
-jobs:
-  build:
-    if: github.actor != 'IanComradeBot' && github.event.pull_request.draft == false
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-    - name: Checkout Master
-      uses: actions/checkout@v3.6.0
-
-    - name: Setup Submodule
-      run: |
-        git submodule update --init --recursive
-
-    - name: Pull engine updates
-      uses: space-wizards/submodule-dependency@v0.1.5
-
-    - name: Update Engine Submodules
-      run: |
-        cd RobustToolbox/
-        git submodule update --init --recursive
-
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3.2.0
-      with:
-        dotnet-version: 7.0.x
-
-    - name: Install dependencies
-      run: dotnet restore
-
-    - name: Build Project
-      run: dotnet build --configuration Tools --no-restore /p:WarningsAsErrors=nullable /m
-
-    - name: Run Content.Tests
-      run: dotnet test --configuration Tools --no-build Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
-
-    - name: Run Content.IntegrationTests
-      shell: pwsh
-      run: |
-        $env:DOTNET_gcServer=1
-        dotnet test --configuration Tools --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
-  ci-success:
-    name: Build & Test Release
-    needs:
-      - build
-    runs-on: ubuntu-latest
-    steps:
-      - name: CI succeeded
-        run: exit 0

.github/workflows/publish-publish.yml

@@ -0,0 +1,61 @@
+name: Publish Public
+
+#concurrency:
+#  group: publish
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 1 * * *'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check configuration
+      env:
+        PUBLIC_PATH: ${{ secrets.BUILDS_PUBLIC_PATH }}
+      if: ${{ env.PUBLIC_PATH == '' }}
+      uses: andymckay/cancel-action@0.3
+
+    - uses: actions/checkout@v3.6.0
+      with:
+        submodules: 'recursive'
+
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 7.0.x
+
+    - name: Get Engine Tag
+      run: |
+        cd RobustToolbox
+        git fetch --depth=1
+
+    - name: Package all
+      run: |
+        Tools/package_server_build.py --hybrid-acz -p win-x64 linux-x64 osx-x64 linux-arm64
+
+    - name: Shuffle files around
+      run: |
+        mkdir "release/${{ github.sha }}"
+        mv release/SS14.Server*.zip "release/${{ github.sha }}"
+
+    - name: Upload files to mothership
+      uses: burnett01/rsync-deployments@5.2
+      with:
+        switches: -avzr --ignore-existing
+        path: "release/${{ github.sha }}"
+        remote_path: ${{ secrets.BUILDS_PUBLIC_PATH }}
+        remote_host: ${{ secrets.BUILDS_HOST }}
+        remote_user: ${{ secrets.BUILDS_USERNAME }}
+        remote_key: ${{ secrets.BUILDS_SSH_KEY }}
+
+    - name: Generate public HTML
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.BUILDS_HOST }}
+        username: ${{ secrets.BUILDS_USERNAME }}
+        key: ${{ secrets.BUILDS_SSH_KEY }}
+        script: node ~/scripts/generate_html_page.js -fork ${{ vars.FORK_ID_PUBLIC }} -id ${{ github.sha }}

.github/workflows/publish.yml

@@ -6,7 +6,7 @@ concurrency:
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 1 * * *'
+    - cron: '0 6 * * *'
 
 jobs:
   build:
@@ -32,8 +32,10 @@ jobs:
         echo "HOST *" > ~/.ssh/config
         echo "StrictHostKeyChecking no" >> ~/.ssh/config
         git -c submodule.Secrets.update=checkout submodule update --init
-        cp -R Secrets/Prototypes Resources/Prototypes/CorvaxSecrets
-        cp -R Secrets/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer
+        cp -R Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets
+        cp -R Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer
+        cp -R Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets
+        cp -R Secrets/Resources/Textures Resources/Textures/CorvaxSecrets
     # Corvax-Secrets-End
 
     - name: Setup .NET Core
@@ -46,12 +48,21 @@ jobs:
         cd RobustToolbox
         git fetch --depth=1
 
-    - name: Package all
-      run: |
-        Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64
-        Tools/package_client_build.py
+    - name: Install dependencies
+      run: dotnet restore
+
+    - name: Build Packaging
+      run: dotnet build Content.Packaging --configuration Release --no-restore /m
+
+    - name: Package server
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+
+    - name: Package client
+      run: dotnet run --project Content.Packaging client --no-wipe-release
 
     - name: Update Build Info
+      env:
+        FORK_ID: ${{ vars.FORK_ID }}
       run: Tools/gen_build_info.py
 
     - name: Shuffle files around
@@ -75,7 +86,7 @@ jobs:
         host: ${{ secrets.BUILDS_HOST }}
         username: ${{ secrets.BUILDS_USERNAME }}
         key: ${{ secrets.BUILDS_SSH_KEY }}
-        script: node ~/scripts/push_to_manifest.js -fork syndicate -id ${{ github.sha }}
+        script: node ~/scripts/push_to_manifest.js -fork ${{ vars.FORK_ID }} -id ${{ github.sha }}
 
 #    - name: Publish changelog (Discord)
 #      run: Tools/actions_changelogs_since_last_run.py

.github/workflows/test-packaging.yml

@@ -47,7 +47,7 @@ jobs:
         run: |
           cd RobustToolbox/
           git submodule update --init --recursive
-          
+
       # Corvax-Secrets-Start
       - name: Setup secrets
         env:
@@ -70,12 +70,18 @@ jobs:
       - name: Install dependencies
         run: dotnet restore
 
-      - name: Package client
-        run: |
-          Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64
-          Tools/package_client_build.py
+      - name: Build Packaging
+        run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
+      - name: Package server
+        run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+
+      - name: Package client
+        run: dotnet run --project Content.Packaging client --no-wipe-release
+      
       - name: Update Build Info
+        env:
+          FORK_ID: ${{ vars.FORK_ID }}
         run: Tools/gen_build_info.py
 
       - name: Shuffle files around

.github/workflows/update-credits.yml

@@ -0,0 +1,32 @@
+name: Update Contrib and Patreons in credits
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: 0 0 * * 0
+    
+jobs:
+  get_credits:
+    runs-on: ubuntu-latest
+    # Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo
+    # Do this in dump_github_contributors.ps1 too into your own repo
+    if: github.repository == 'space-wizards/space-station-14'
+    
+    steps:
+      - uses: actions/checkout@v3.6.0
+        with:
+          ref: master
+        
+      - name: Get this week's Contributors
+        shell: pwsh
+        run: Tools/dump_github_contributors.ps1 > Resources/Credits/GitHub.txt
+
+      # TODO
+      #- name: Get this week's Patreons
+      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml        
+        
+      - name: Commit new credit files
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Update Credits
+          commit_author: PJBot <pieterjan.briers+bot@gmail.com>

.github/workflows/update-wiki.yml

@@ -70,3 +70,12 @@ jobs:
         username: ${{ secrets.WIKI_BOT_USER }}
         password: ${{ secrets.WIKI_BOT_PASS }}
 
+    - name: Upload entity_prototypes.json to wiki
+      uses: jtmullen/mediawiki-edit-action@v0.1.1
+      with:
+        wiki_text_file: ./bin/Content.Server/data/entity_prototypes.json
+        edit_summary: Update entity_prototypes.json via GitHub Actions
+        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/entity_prototypes.json"
+        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+        username: ${{ secrets.WIKI_BOT_USER }}
+        password: ${{ secrets.WIKI_BOT_PASS }}

.gitignore

@@ -13,6 +13,8 @@
 # Secret
 Resources/Prototypes/CorvaxSecrets
 Resources/Prototypes/CorvaxSecretsServer
+Resources/Textures/CorvaxSecrets
+Resources/Locale/ru-RU/corvax-secrets
 
 # Build results
 [Dd]ebug/
@@ -166,6 +168,7 @@ PublishScripts/
 # NuGet v3's project.json files produces more ignoreable files
 *.nuget.props
 *.nuget.targets
+.nuget/
 
 # Microsoft Azure Build Output
 csx/

.gitmodules

@@ -4,6 +4,6 @@
 	branch = master
 [submodule "Secrets"]
 	path = Secrets
-	url = git@gitlab.com:Morbo/corvax-secrets.git
+	url = git@github.com:corvax-project/secrets.git
 	branch = master
 	update = none

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "omnisharp.analyzeOpenDocumentsOnly": true
+    "omnisharp.analyzeOpenDocumentsOnly": true,
+    "dotnet.defaultSolution": "SpaceStation14.sln"
 }

Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs

@@ -1,7 +1,7 @@
+using Content.Shared.Access;
 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;
 
@@ -23,7 +23,7 @@ namespace Content.Client.Access.UI
         {
             base.Open();
 
-            List<string> accessLevels;
+            List<ProtoId<AccessLevelPrototype>> accessLevels;
 
             if (EntMan.TryGetComponent<AccessOverriderComponent>(Owner, out var accessOverrider))
             {
@@ -33,7 +33,7 @@ namespace Content.Client.Access.UI
 
             else
             {
-                accessLevels = new List<string>();
+                accessLevels = new List<ProtoId<AccessLevelPrototype>>();
                 _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!");
             }
 

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

@@ -21,7 +21,7 @@ namespace Content.Client.Access.UI
         private readonly Dictionary<string, Button> _accessButtons = new();
 
         public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototypeManager prototypeManager,
-            List<string> accessLevels)
+            List<ProtoId<AccessLevelPrototype>> accessLevels)
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
@@ -31,7 +31,7 @@ namespace Content.Client.Access.UI
 
             foreach (var access in accessLevels)
             {
-                if (!prototypeManager.TryIndex<AccessLevelPrototype>(access, out var accessLevel))
+                if (!prototypeManager.TryIndex(access, out var accessLevel))
                 {
                     _logMill.Error($"Unable to find accesslevel for {access}");
                     continue;

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -1,10 +1,11 @@
+using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
-using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
+
 namespace Content.Client.Access.UI
 {
     public sealed class IdCardConsoleBoundUserInterface : BoundUserInterface
@@ -22,7 +23,7 @@ namespace Content.Client.Access.UI
         protected override void Open()
         {
             base.Open();
-            List<string> accessLevels;
+            List<ProtoId<AccessLevelPrototype>> accessLevels;
 
             if (EntMan.TryGetComponent<IdCardConsoleComponent>(Owner, out var idCard))
             {
@@ -31,7 +32,7 @@ namespace Content.Client.Access.UI
             }
             else
             {
-                accessLevels = new List<string>();
+                accessLevels = new List<ProtoId<AccessLevelPrototype>>();
                 _idCardConsoleSystem.Log.Error($"No IdCardConsole component found for {EntMan.ToPrettyString(Owner)}!");
             }
 

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

@@ -28,7 +28,7 @@ namespace Content.Client.Access.UI
         private string? _lastJobProto;
 
         public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager,
-            List<string> accessLevels)
+            List<ProtoId<AccessLevelPrototype>> accessLevels)
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);

Content.Client/Actions/ActionEvents.cs

@@ -1,11 +1,9 @@
-using Content.Shared.Actions.ActionTypes;
-
 namespace Content.Client.Actions;
 
 /// <summary>
-///     This event is raised when a user clicks on an empty action slot. Enables other systems to fill this slow.
+///     This event is raised when a user clicks on an empty action slot. Enables other systems to fill this slot.
 /// </summary>
 public sealed class FillActionSlotEvent : EntityEventArgs
 {
-    public ActionType? Action;
+    public EntityUid? Action;
 }

Content.Client/Actions/ActionsSystem.cs

@@ -1,9 +1,7 @@
 using System.IO;
 using System.Linq;
 using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameStates;
@@ -12,6 +10,7 @@ using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Sequence;
+using Robust.Shared.Serialization.Markdown.Value;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
@@ -20,37 +19,98 @@ namespace Content.Client.Actions
     [UsedImplicitly]
     public sealed class ActionsSystem : SharedActionsSystem
     {
-        public delegate void OnActionReplaced(ActionType existing, ActionType action);
+        public delegate void OnActionReplaced(EntityUid actionId);
 
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IResourceManager _resources = default!;
         [Dependency] private readonly ISerializationManager _serialization = default!;
+        [Dependency] private readonly MetaDataSystem _metaData = default!;
 
-        public event Action<ActionType>? ActionAdded;
-        public event Action<ActionType>? ActionRemoved;
-        public event OnActionReplaced? ActionReplaced;
+        public event Action<EntityUid>? OnActionAdded;
+        public event Action<EntityUid>? OnActionRemoved;
         public event Action? ActionsUpdated;
         public event Action<ActionsComponent>? LinkActions;
         public event Action? UnlinkActions;
         public event Action? ClearAssignments;
         public event Action<List<SlotAssignment>>? AssignSlot;
 
-        public ActionsComponent? PlayerActions { get; private set; }
+        private readonly List<EntityUid> _removed = new();
+        private readonly List<(EntityUid, BaseActionComponent?)> _added = new();
 
         public override void Initialize()
         {
             base.Initialize();
-            SubscribeLocalEvent<ActionsComponent, PlayerAttachedEvent>(OnPlayerAttached);
-            SubscribeLocalEvent<ActionsComponent, PlayerDetachedEvent>(OnPlayerDetached);
+            SubscribeLocalEvent<ActionsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+            SubscribeLocalEvent<ActionsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
             SubscribeLocalEvent<ActionsComponent, ComponentHandleState>(HandleComponentState);
+
+            SubscribeLocalEvent<InstantActionComponent, ComponentHandleState>(OnInstantHandleState);
+            SubscribeLocalEvent<EntityTargetActionComponent, ComponentHandleState>(OnEntityTargetHandleState);
+            SubscribeLocalEvent<WorldTargetActionComponent, ComponentHandleState>(OnWorldTargetHandleState);
         }
 
-        public override void Dirty(ActionType action)
+        private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args)
         {
+            if (args.Current is not InstantActionComponentState state)
+                return;
+
+            BaseHandleState<InstantActionComponent>(uid, component, state);
+        }
+
+        private void OnEntityTargetHandleState(EntityUid uid, EntityTargetActionComponent component, ref ComponentHandleState args)
+        {
+            if (args.Current is not EntityTargetActionComponentState state)
+                return;
+
+            component.Whitelist = state.Whitelist;
+            component.CanTargetSelf = state.CanTargetSelf;
+            BaseHandleState<EntityTargetActionComponent>(uid, component, state);
+        }
+
+        private void OnWorldTargetHandleState(EntityUid uid, WorldTargetActionComponent component, ref ComponentHandleState args)
+        {
+            if (args.Current is not WorldTargetActionComponentState state)
+                return;
+
+            BaseHandleState<WorldTargetActionComponent>(uid, component, state);
+        }
+
+        private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, BaseActionComponentState state) where T : BaseActionComponent
+        {
+            component.Icon = state.Icon;
+            component.IconOn = state.IconOn;
+            component.IconColor = state.IconColor;
+            component.Keywords = new HashSet<string>(state.Keywords);
+            component.Enabled = state.Enabled;
+            component.Toggled = state.Toggled;
+            component.Cooldown = state.Cooldown;
+            component.UseDelay = state.UseDelay;
+            component.Charges = state.Charges;
+            component.Container = EnsureEntity<T>(state.Container, uid);
+            component.EntityIcon = EnsureEntity<T>(state.EntityIcon, uid);
+            component.CheckCanInteract = state.CheckCanInteract;
+            component.ClientExclusive = state.ClientExclusive;
+            component.Priority = state.Priority;
+            component.AttachedEntity = EnsureEntity<T>(state.AttachedEntity, uid);
+            component.RaiseOnUser = state.RaiseOnUser;
+            component.AutoPopulate = state.AutoPopulate;
+            component.Temporary = state.Temporary;
+            component.ItemIconStyle = state.ItemIconStyle;
+            component.Sound = state.Sound;
+
+            if (_playerManager.LocalPlayer?.ControlledEntity == component.AttachedEntity)
+                ActionsUpdated?.Invoke();
+        }
+
+        protected override void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null)
+        {
+            if (!ResolveActionData(actionId, ref action))
+                return;
+
+            base.UpdateAction(actionId, action);
             if (_playerManager.LocalPlayer?.ControlledEntity != action.AttachedEntity)
                 return;
 
-            base.Dirty(action);
             ActionsUpdated?.Invoke();
         }
 
@@ -59,124 +119,107 @@ namespace Content.Client.Actions
             if (args.Current is not ActionsComponentState state)
                 return;
 
-            state.SortedActions ??= new SortedSet<ActionType>(state.Actions);
-            var serverActions = state.SortedActions;
-            var removed = new List<ActionType>();
-
-            foreach (var act in component.Actions.ToList())
+            _added.Clear();
+            _removed.Clear();
+            var stateEnts = EnsureEntitySet<ActionsComponent>(state.Actions, uid);
+            foreach (var act in component.Actions)
             {
-                if (act.ClientExclusive)
-                    continue;
-
-                if (!serverActions.TryGetValue(act, out var serverAct))
-                {
-                    component.Actions.Remove(act);
-                    if (act.AutoRemove)
-                        removed.Add(act);
-
-                    continue;
-                }
-
-                act.CopyFrom(serverAct);
+                if (!stateEnts.Contains(act) && !IsClientSide(act))
+                    _removed.Add(act);
             }
+            component.Actions.ExceptWith(_removed);
 
-            var added = new List<ActionType>();
-
-            // Anything that remains is a new action
-            foreach (var newAct in serverActions)
+            foreach (var actionId in stateEnts)
             {
-                if (component.Actions.Contains(newAct))
+                if (!actionId.IsValid())
                     continue;
 
-                // We create a new action, not just sorting a reference to the state's action.
-                var action = (ActionType) newAct.Clone();
-                component.Actions.Add(action);
-                added.Add(action);
+                if (!component.Actions.Add(actionId))
+                    continue;
+
+                TryGetActionData(actionId, out var action);
+                _added.Add((actionId, action));
             }
 
             if (_playerManager.LocalPlayer?.ControlledEntity != uid)
                 return;
 
-            foreach (var action in removed)
+            foreach (var action in _removed)
             {
-                ActionRemoved?.Invoke(action);
+                OnActionRemoved?.Invoke(action);
             }
 
-            foreach (var action in added)
+            _added.Sort(ActionComparer);
+
+            foreach (var action in _added)
             {
-                ActionAdded?.Invoke(action);
+                OnActionAdded?.Invoke(action.Item1);
             }
 
             ActionsUpdated?.Invoke();
         }
 
-        protected override void AddActionInternal(ActionsComponent comp, ActionType action)
+        public static int ActionComparer((EntityUid, BaseActionComponent?) a, (EntityUid, BaseActionComponent?) b)
         {
-            // Sometimes the client receives actions from the server, before predicting that newly added components will add
-            // their own shared actions. Just in case those systems ever decided to directly access action properties (e.g.,
-            // action.Toggled), we will remove duplicates:
-            if (comp.Actions.TryGetValue(action, out var existing))
-            {
-                comp.Actions.Remove(existing);
-                ActionReplaced?.Invoke(existing, action);
-            }
+            var priorityA = a.Item2?.Priority ?? 0;
+            var priorityB = b.Item2?.Priority ?? 0;
+            if (priorityA != priorityB)
+                return priorityA - priorityB;
 
-            comp.Actions.Add(action);
+            priorityA = a.Item2?.Container?.Id ?? 0;
+            priorityB = b.Item2?.Container?.Id ?? 0;
+            return priorityA - priorityB;
         }
 
-        public override void AddAction(EntityUid uid, ActionType action, EntityUid? provider, ActionsComponent? comp = null, bool dirty = true)
+        protected override void ActionAdded(EntityUid performer, EntityUid actionId, ActionsComponent comp,
+            BaseActionComponent action)
         {
-            if (!Resolve(uid, ref comp, false))
+            if (_playerManager.LocalPlayer?.ControlledEntity != performer)
                 return;
 
-            dirty &= !action.ClientExclusive;
-            base.AddAction(uid, action, provider, comp, dirty);
-
-            if (uid == _playerManager.LocalPlayer?.ControlledEntity)
-                ActionAdded?.Invoke(action);
+            OnActionAdded?.Invoke(actionId);
         }
 
-        public override void RemoveAction(EntityUid uid, ActionType action, ActionsComponent? comp = null, bool dirty = true)
+        protected override void ActionRemoved(EntityUid performer, EntityUid actionId, ActionsComponent comp, BaseActionComponent action)
         {
-            if (GameTiming.ApplyingState && !action.ClientExclusive)
+            if (_playerManager.LocalPlayer?.ControlledEntity != performer)
                 return;
 
-            if (!Resolve(uid, ref comp, false))
-                return;
-
-            dirty &= !action.ClientExclusive;
-            base.RemoveAction(uid, action, comp, dirty);
-
-            if (action.AutoRemove && uid == _playerManager.LocalPlayer?.ControlledEntity)
-                ActionRemoved?.Invoke(action);
+            OnActionRemoved?.Invoke(actionId);
         }
 
-        private void OnPlayerAttached(EntityUid uid, ActionsComponent component, PlayerAttachedEvent args)
+        public IEnumerable<(EntityUid Id, BaseActionComponent Comp)> GetClientActions()
+        {
+            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user)
+                return Enumerable.Empty<(EntityUid, BaseActionComponent)>();
+
+            return GetActions(user);
+        }
+
+        private void OnPlayerAttached(EntityUid uid, ActionsComponent component, LocalPlayerAttachedEvent args)
         {
             LinkAllActions(component);
         }
 
-        private void OnPlayerDetached(EntityUid uid, ActionsComponent component, PlayerDetachedEvent? args = null)
+        private void OnPlayerDetached(EntityUid uid, ActionsComponent component, LocalPlayerDetachedEvent? args = null)
         {
             UnlinkAllActions();
         }
 
         public void UnlinkAllActions()
         {
-            PlayerActions = null;
             UnlinkActions?.Invoke();
         }
 
         public void LinkAllActions(ActionsComponent? actions = null)
         {
-             var player = _playerManager.LocalPlayer?.ControlledEntity;
-             if (player == null || !Resolve(player.Value, ref actions, false))
+             if (_playerManager.LocalPlayer?.ControlledEntity is not { } user ||
+                 !Resolve(user, ref actions, false))
              {
                  return;
              }
 
              LinkActions?.Invoke(actions);
-             PlayerActions = actions;
         }
 
         public override void Shutdown()
@@ -185,61 +228,37 @@ namespace Content.Client.Actions
             CommandBinds.Unregister<ActionsSystem>();
         }
 
-        public void TriggerAction(ActionType? action)
+        public void TriggerAction(EntityUid actionId, BaseActionComponent action)
         {
-            if (PlayerActions == null || action == null || _playerManager.LocalPlayer?.ControlledEntity is not { Valid: true } user)
-                return;
-
-            if (action.Provider != null && Deleted(action.Provider))
-                return;
-
-            if (action is not InstantAction instantAction)
+            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user ||
+                !TryComp(user, out ActionsComponent? actions))
             {
                 return;
             }
 
+            if (action is not InstantActionComponent instantAction)
+                return;
+
             if (action.ClientExclusive)
             {
                 if (instantAction.Event != null)
                     instantAction.Event.Performer = user;
 
-                PerformAction(user, PlayerActions, instantAction, instantAction.Event, GameTiming.CurTime);
+                PerformAction(user, actions, actionId, instantAction, instantAction.Event, GameTiming.CurTime);
             }
             else
             {
-                var request = new RequestPerformActionEvent(instantAction);
+                var request = new RequestPerformActionEvent(GetNetEntity(actionId));
                 EntityManager.RaisePredictiveEvent(request);
             }
         }
 
-        /*public void SaveActionAssignments(string path)
-        {
-
-            // Currently only tested with temporary innate actions (i.e., mapping actions). No guarantee it works with
-            // other actions. If its meant to be used for full game state saving/loading, the entity that provides
-            // actions needs to keep the same uid.
-
-            var sequence = new SequenceDataNode();
-
-            foreach (var (action, assigns) in Assignments.Assignments)
-            {
-                var slot = new MappingDataNode();
-                slot.Add("action", _serializationManager.WriteValue(action));
-                slot.Add("assignments", _serializationManager.WriteValue(assigns));
-                sequence.Add(slot);
-            }
-
-            using var writer = _resourceManager.UserData.OpenWriteText(new ResourcePath(path).ToRootedPath());
-            var stream = new YamlStream { new(sequence.ToSequenceNode()) };
-            stream.Save(new YamlMappingFix(new Emitter(writer)), false);
-        }*/
-
         /// <summary>
         ///     Load actions and their toolbar assignments from a file.
         /// </summary>
         public void LoadActionAssignments(string path, bool userData)
         {
-            if (PlayerActions == null)
+            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user)
                 return;
 
             var file = new ResPath(path).ToRootedPath();
@@ -265,17 +284,13 @@ namespace Content.Client.Actions
                 if (!map.TryGet("action", out var actionNode))
                     continue;
 
-                var action = _serialization.Read<ActionType>(actionNode, notNullableOverride: true);
+                var action = _serialization.Read<BaseActionComponent>(actionNode, notNullableOverride: true);
+                var actionId = Spawn(null);
+                AddComp(actionId, action);
+                AddActionDirect(user, actionId);
 
-                if (PlayerActions.Actions.TryGetValue(action, out var existingAction))
-                {
-                    existingAction.CopyFrom(action);
-                    action = existingAction;
-                }
-                else
-                {
-                    PlayerActions.Actions.Add(action);
-                }
+                if (map.TryGet<ValueDataNode>("name", out var nameNode))
+                    _metaData.SetEntityName(actionId, nameNode.Value);
 
                 if (!map.TryGet("assignments", out var assignmentNode))
                     continue;
@@ -284,7 +299,7 @@ namespace Content.Client.Actions
 
                 foreach (var index in nodeAssignments)
                 {
-                    var assignment = new SlotAssignment(index.Hotbar, index.Slot, action);
+                    var assignment = new SlotAssignment(index.Hotbar, index.Slot, actionId);
                     assignments.Add(assignment);
                 }
             }
@@ -292,6 +307,6 @@ namespace Content.Client.Actions
             AssignSlot?.Invoke(assignments);
         }
 
-        public record struct SlotAssignment(byte Hotbar, byte Slot, ActionType Action);
+        public record struct SlotAssignment(byte Hotbar, byte Slot, EntityUid ActionId);
     }
 }

Content.Client/Actions/UI/ActionAlertTooltip.cs

@@ -1,9 +1,5 @@
-using System;
-using Content.Client.Stylesheets;
-using Content.Shared.Actions;
-using Content.Shared.Actions.ActionTypes;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using static Robust.Client.UserInterface.Controls.BoxContainer;

Content.Client/Administration/AdminNameOverlay.cs

@@ -35,20 +35,21 @@ namespace Content.Client.Administration
 
             foreach (var playerInfo in _system.PlayerList)
             {
+                var entity = _entityManager.GetEntity(playerInfo.NetEntity);
+
                 // Otherwise the entity can not exist yet
-                if (!_entityManager.EntityExists(playerInfo.EntityUid))
+                if (entity == null || !_entityManager.EntityExists(entity))
                 {
                     continue;
                 }
-                var entity = playerInfo.EntityUid.Value;
 
                 // if not on the same map, continue
-                if (_entityManager.GetComponent<TransformComponent>(entity).MapID != _eyeManager.CurrentMap)
+                if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != _eyeManager.CurrentMap)
                 {
                     continue;
                 }
 
-                var aabb = _entityLookup.GetWorldAABB(entity);
+                var aabb = _entityLookup.GetWorldAABB(entity.Value);
 
                 // if not on screen, continue
                 if (!aabb.Intersects(in viewport))

Content.Client/Administration/Managers/ClientAdminManager.cs

@@ -4,7 +4,7 @@ using Robust.Client.Console;
 using Robust.Client.Player;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Network;
-using Robust.Shared.Players;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.Managers
@@ -130,5 +130,13 @@ namespace Content.Client.Administration.Managers
 
             return null;
         }
+
+        public AdminData? GetAdminData(bool includeDeAdmin = false)
+        {
+            if (_player.LocalPlayer is { Session: { } session })
+                return GetAdminData(session, includeDeAdmin);
+
+            return null;
+        }
     }
 }

Content.Client/Administration/Managers/IClientAdminManager.cs

@@ -1,5 +1,4 @@
-using System;
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 
 namespace Content.Client.Administration.Managers
 {
@@ -13,6 +12,15 @@ namespace Content.Client.Administration.Managers
         /// </summary>
         event Action AdminStatusUpdated;
 
+        /// <summary>
+        ///     Gets the admin data for the client, if they are an admin.
+        /// </summary>
+        /// <param name="includeDeAdmin">
+        ///     Whether to return admin data for admins that are current de-adminned.
+        /// </param>
+        /// <returns><see langword="null" /> if the player is not an admin.</returns>
+        AdminData? GetAdminData(bool includeDeAdmin = false);
+
         /// <summary>
         ///     Checks whether the local player is an admin.
         /// </summary>
@@ -52,5 +60,17 @@ namespace Content.Client.Administration.Managers
         bool CanAdminMenu();
 
         void Initialize();
+
+        /// <summary>
+        ///     Checks if the client is an admin.
+        /// </summary>
+        /// <param name="includeDeAdmin">
+        ///     Whether to return admin data for admins that are current de-adminned.
+        /// </param>
+        /// <returns>true if the player is an admin, false otherwise.</returns>
+        bool IsAdmin(bool includeDeAdmin = false)
+        {
+            return GetAdminData(includeDeAdmin) != null;
+        }
     }
 }

Content.Client/Administration/Systems/AdminVerbSystem.cs

@@ -24,12 +24,13 @@ namespace Content.Client.Administration.Systems
             // View variables verbs
             if (_clientConGroupController.CanViewVar())
             {
-                Verb verb = new();
-                verb.Category = VerbCategory.Debug;
-                verb.Text = "View Variables";
-                verb.Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/vv.svg.192dpi.png"));
-                verb.Act = () => _clientConsoleHost.ExecuteCommand($"vv {args.Target}");
-                verb.ClientExclusive = true; // opening VV window is client-side. Don't ask server to run this verb.
+                var verb = new VvVerb()
+                {
+                    Text = Loc.GetString("view-variables"),
+                    Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/vv.svg.192dpi.png")),
+                    Act = () => _clientConsoleHost.ExecuteCommand($"vv {GetNetEntity(args.Target)}"),
+                    ClientExclusive = true // opening VV window is client-side. Don't ask server to run this verb.
+                };
                 args.Verbs.Add(verb);
             }
         }

Content.Client/Administration/UI/AdminMenuWindow.xaml

@@ -5,13 +5,15 @@
     xmlns:atmosTab="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
     xmlns:tabs="clr-namespace:Content.Client.Administration.UI.Tabs"
     xmlns:playerTab="clr-namespace:Content.Client.Administration.UI.Tabs.PlayerTab"
-    xmlns:objectsTab="clr-namespace:Content.Client.Administration.UI.Tabs.ObjectsTab">
+    xmlns:objectsTab="clr-namespace:Content.Client.Administration.UI.Tabs.ObjectsTab"
+    xmlns:panic="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab">
     <TabContainer Name="MasterTabContainer">
         <adminTab:AdminTab />
         <adminbusTab:AdminbusTab />
         <atmosTab:AtmosTab />
         <tabs:RoundTab />
         <tabs:ServerTab />
+        <panic:PanicBunkerTab Name="PanicBunkerControl" Access="Public" />
         <playerTab:PlayerTab Name="PlayerTabControl" Access="Public" />
         <objectsTab:ObjectsTab Name="ObjectsTabControl" Access="Public" />
     </TabContainer>

Content.Client/Administration/UI/AdminMenuWindow.xaml.cs

@@ -12,7 +12,7 @@ namespace Content.Client.Administration.UI
 
         public AdminMenuWindow()
         {
-            MinSize = new Vector2(600, 250); // Corvax-Resize
+            MinSize = new Vector2(650, 250);
             Title = Loc.GetString("admin-menu-title");
             RobustXamlLoader.Load(this);
             MasterTabContainer.SetTabTitle(0, Loc.GetString("admin-menu-admin-tab"));
@@ -20,8 +20,9 @@ namespace Content.Client.Administration.UI
             MasterTabContainer.SetTabTitle(2, Loc.GetString("admin-menu-atmos-tab"));
             MasterTabContainer.SetTabTitle(3, Loc.GetString("admin-menu-round-tab"));
             MasterTabContainer.SetTabTitle(4, Loc.GetString("admin-menu-server-tab"));
-            MasterTabContainer.SetTabTitle(5, Loc.GetString("admin-menu-players-tab"));
-            MasterTabContainer.SetTabTitle(6, Loc.GetString("admin-menu-objects-tab"));
+            MasterTabContainer.SetTabTitle(5, Loc.GetString("admin-menu-panic-bunker-tab"));
+            MasterTabContainer.SetTabTitle(6, Loc.GetString("admin-menu-players-tab"));
+            MasterTabContainer.SetTabTitle(7, Loc.GetString("admin-menu-objects-tab"));
         }
 
         protected override void Dispose(bool disposing)

Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml

@@ -1,13 +1,9 @@
 <ui:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
-                xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                 VerticalExpand="True" HorizontalExpand="True"
                 Title="{Loc admin-notes-message-window-title}"
                 MinSize="600 170">
-    <PanelContainer VerticalExpand="True" HorizontalExpand="True">
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="#25252A" />
-        </PanelContainer.PanelOverride>
+    <PanelContainer VerticalExpand="True" HorizontalExpand="True" StyleClasses="BackgroundDark">
         <ScrollContainer HScrollEnabled="False" VerticalExpand="True" HorizontalExpand="True" Margin="4">
             <BoxContainer Orientation="Vertical" SeparationOverride="10" VerticalAlignment="Bottom">
                 <Label Name="AdminLabel" Text="Loading..." />

Content.Client/Administration/UI/AdminRemarks/AdminRemarksWindow.xaml

@@ -1,13 +1,9 @@
 <ui:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
-                xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                 VerticalExpand="True" HorizontalExpand="True"
                 Title="{Loc admin-remarks-title}"
                 SetSize="600 400">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="#25252A" />
-        </PanelContainer.PanelOverride>
+    <PanelContainer StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Vertical" Margin="4">
             <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
                 <BoxContainer Orientation="Vertical" Name="NotesContainer" Access="Public" VerticalExpand="True" />

Content.Client/Administration/UI/AdminUIHelpers.cs

@@ -0,0 +1,59 @@
+using System.Threading;
+using Content.Client.Stylesheets;
+using Robust.Client.UserInterface.Controls;
+using Timer = Robust.Shared.Timing.Timer;
+
+namespace Content.Client.Administration.UI;
+
+public static class AdminUIHelpers
+{
+    private static void ResetButton(Button button, ConfirmationData data)
+    {
+        data.Cancellation.Cancel();
+        button.ModulateSelfOverride = null;
+        button.Text = data.OriginalText;
+    }
+
+    public static bool RemoveConfirm(Button button, Dictionary<Button, ConfirmationData> confirmations)
+    {
+        if (confirmations.Remove(button, out var data))
+        {
+            ResetButton(button, data);
+            return true;
+        }
+
+        return false;
+    }
+
+    public static void RemoveAllConfirms(Dictionary<Button, ConfirmationData> confirmations)
+    {
+        foreach (var (button, confirmation) in confirmations)
+        {
+            ResetButton(button, confirmation);
+        }
+
+        confirmations.Clear();
+    }
+
+    public static bool TryConfirm(Button button, Dictionary<Button, ConfirmationData> confirmations)
+    {
+        if (RemoveConfirm(button, confirmations))
+            return true;
+
+        var data = new ConfirmationData(new CancellationTokenSource(), button.Text);
+        confirmations[button] = data;
+
+        Timer.Spawn(TimeSpan.FromSeconds(5), () =>
+        {
+            confirmations.Remove(button);
+            button.ModulateSelfOverride = null;
+            button.Text = data.OriginalText;
+        }, data.Cancellation.Token);
+
+        button.ModulateSelfOverride = StyleNano.ButtonColorCautionDefault;
+        button.Text = Loc.GetString("admin-player-actions-confirm");
+        return false;
+    }
+}
+
+public readonly record struct ConfirmationData(CancellationTokenSource Cancellation, string? OriginalText);

Content.Client/Administration/UI/BanList/BanListControl.xaml

@@ -1,15 +0,0 @@
-<controls:BanListControl
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client.Administration.UI.BanList"
-    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="#25252A"/>
-        </PanelContainer.PanelOverride>
-        <ScrollContainer>
-            <BoxContainer Name="Bans" Access="Public" Orientation="Vertical">
-                <controls:BanListHeader Name="BansHeader"/>
-            </BoxContainer>
-        </ScrollContainer>
-    </PanelContainer>
-</controls:BanListControl>

Content.Client/Administration/UI/BanList/BanListControl.xaml.cs

@@ -1,76 +0,0 @@
-using System.Linq;
-using System.Numerics;
-using Content.Client.Administration.UI.CustomControls;
-using Content.Shared.Administration.BanList;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client.Administration.UI.BanList;
-
-[GenerateTypedNameReferences]
-public sealed partial class BanListControl : Control
-{
-    private BanListIdsPopup? _popup;
-
-    public BanListControl()
-    {
-        RobustXamlLoader.Load(this);
-    }
-
-    public void SetBans(List<SharedServerBan> bans)
-    {
-        foreach (var control in Bans.Children.ToArray()[1..])
-        {
-            control.Orphan();
-        }
-
-        foreach (var ban in bans)
-        {
-            Bans.AddChild(new HSeparator());
-
-            var line = new BanListLine(ban);
-            line.OnIdsClicked += LineIdsClicked;
-
-            Bans.AddChild(line);
-        }
-    }
-
-    private void ClosePopup()
-    {
-        _popup?.Close();
-        _popup = null;
-    }
-
-    private bool LineIdsClicked(BanListLine line)
-    {
-        ClosePopup();
-
-        var ban = line.Ban;
-        var id = ban.Id == null ? string.Empty : Loc.GetString("ban-list-id", ("id", ban.Id.Value));
-        var ip = ban.Address == null
-            ? string.Empty
-            : Loc.GetString("ban-list-ip", ("ip", ban.Address.Value.address));
-        var hwid = ban.HWId == null ? string.Empty : Loc.GetString("ban-list-hwid", ("hwid", ban.HWId));
-        var guid = ban.UserId == null
-            ? string.Empty
-            : Loc.GetString("ban-list-guid", ("guid", ban.UserId.Value.ToString()));
-
-        _popup = new BanListIdsPopup(id, ip, hwid, guid);
-
-        var box = UIBox2.FromDimensions(UserInterfaceManager.MousePositionScaled.Position, new Vector2(1, 1));
-        _popup.Open(box);
-
-        return true;
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (_popup != null)
-        {
-            UserInterfaceManager.PopupRoot.RemoveChild(_popup);
-        }
-    }
-}

Content.Client/Administration/UI/BanList/BanListEui.cs

@@ -1,21 +1,47 @@
-using Content.Client.Eui;
+using System.Numerics;
+using Content.Client.Administration.UI.BanList.Bans;
+using Content.Client.Administration.UI.BanList.RoleBans;
+using Content.Client.Eui;
 using Content.Shared.Administration.BanList;
 using Content.Shared.Eui;
-using Content.Shared.Ghost.Roles;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Administration.UI.BanList;
 
+[UsedImplicitly]
 public sealed class BanListEui : BaseEui
 {
+    [Dependency] private readonly IUserInterfaceManager _ui = default!;
+
+    private BanListIdsPopup? _popup;
+
     public BanListEui()
     {
         BanWindow = new BanListWindow();
         BanWindow.OnClose += OnClosed;
+
         BanControl = BanWindow.BanList;
+        BanControl.LineIdsClicked += OnLineIdsClicked;
+
+        RoleBanControl = BanWindow.RoleBanList;
+        RoleBanControl.LineIdsClicked += OnLineIdsClicked;
     }
 
+    private BanListWindow BanWindow { get; }
+
+    private BanListControl BanControl { get; }
+    private RoleBanListControl RoleBanControl { get; }
+
     private void OnClosed()
     {
+        if (_popup != null)
+        {
+            _popup.Close();
+            _popup.Dispose();
+            _popup = null;
+        }
+
         SendMessage(new CloseEuiMessage());
     }
 
@@ -25,10 +51,6 @@ public sealed class BanListEui : BaseEui
         BanWindow.Close();
     }
 
-    private BanListWindow BanWindow { get; }
-
-    private BanListControl BanControl { get; }
-
     public override void HandleState(EuiStateBase state)
     {
         if (state is not BanListEuiState s)
@@ -38,10 +60,58 @@ public sealed class BanListEui : BaseEui
 
         s.Bans.Sort((a, b) => a.BanTime.CompareTo(b.BanTime));
         BanControl.SetBans(s.Bans);
+        RoleBanControl.SetRoleBans(s.RoleBans);
     }
 
     public override void Opened()
     {
         BanWindow.OpenCentered();
     }
+
+    private static string FormatDate(DateTimeOffset date)
+    {
+        return date.ToString("MM/dd/yyyy h:mm tt");
+    }
+
+    public static void SetData<T>(IBanListLine<T> line, SharedServerBan ban) where T : SharedServerBan
+    {
+        line.Reason.Text = ban.Reason;
+        line.BanTime.Text = FormatDate(ban.BanTime);
+        line.Expires.Text = ban.ExpirationTime == null
+            ? Loc.GetString("ban-list-permanent")
+            : FormatDate(ban.ExpirationTime.Value);
+
+        if (ban.Unban is { } unban)
+        {
+            var unbanned = Loc.GetString("ban-list-unbanned", ("date", FormatDate(unban.UnbanTime)));
+            var unbannedBy = unban.UnbanningAdmin == null
+                ? string.Empty
+                : $"\n{Loc.GetString("ban-list-unbanned-by", ("unbanner", unban.UnbanningAdmin))}";
+
+            line.Expires.Text += $"\n{unbanned}{unbannedBy}";
+        }
+
+        line.BanningAdmin.Text = ban.BanningAdminName;
+    }
+
+    private void OnLineIdsClicked<T>(IBanListLine<T> line) where T : SharedServerBan
+    {
+        _popup?.Close();
+        _popup = null;
+
+        var ban = line.Ban;
+        var id = ban.Id == null ? string.Empty : Loc.GetString("ban-list-id", ("id", ban.Id.Value));
+        var ip = ban.Address == null
+            ? string.Empty
+            : Loc.GetString("ban-list-ip", ("ip", ban.Address.Value.address));
+        var hwid = ban.HWId == null ? string.Empty : Loc.GetString("ban-list-hwid", ("hwid", ban.HWId));
+        var guid = ban.UserId == null
+            ? string.Empty
+            : Loc.GetString("ban-list-guid", ("guid", ban.UserId.Value.ToString()));
+
+        _popup = new BanListIdsPopup(id, ip, hwid, guid);
+
+        var box = UIBox2.FromDimensions(_ui.MousePositionScaled.Position, new Vector2(1, 1));
+        _popup.Open(box);
+    }
 }

Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml

@@ -1,9 +1,5 @@
-<Popup xmlns="https://spacestation14.io"
-       xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="#25252A"/>
-        </PanelContainer.PanelOverride>
+<Popup xmlns="https://spacestation14.io">
+    <PanelContainer StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Vertical">
             <Label Name="ID" HorizontalExpand="True"/>
             <Label Name="IP" HorizontalExpand="True"/>

Content.Client/Administration/UI/BanList/BanListLine.xaml.cs

@@ -1,59 +0,0 @@
-using Content.Shared.Administration.BanList;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client.Administration.UI.BanList;
-
-[GenerateTypedNameReferences]
-public sealed partial class BanListLine : BoxContainer
-{
-    public readonly SharedServerBan Ban;
-
-    public event Func<BanListLine, bool>? OnIdsClicked;
-
-    public BanListLine(SharedServerBan ban)
-    {
-        RobustXamlLoader.Load(this);
-
-        Ban = ban;
-
-        IdsHidden.OnPressed += IdsPressed;
-
-        Reason.Text = ban.Reason;
-        BanTime.Text = FormatDate(ban.BanTime);
-        Expires.Text = ban.ExpirationTime == null
-            ? Loc.GetString("ban-list-permanent")
-            : FormatDate(ban.ExpirationTime.Value);
-
-        if (ban.Unban is { } unban)
-        {
-            var unbanned = Loc.GetString("ban-list-unbanned", ("date", FormatDate(unban.UnbanTime)));
-            var unbannedBy = unban.UnbanningAdmin == null
-                ? string.Empty
-                : $"\n{Loc.GetString("ban-list-unbanned-by", ("unbanner", unban.UnbanningAdmin))}";
-
-            Expires.Text += $"\n{unbanned}{unbannedBy}";
-        }
-
-        BanningAdmin.Text = ban.BanningAdminName;
-    }
-
-    private static string FormatDate(DateTimeOffset date)
-    {
-        return date.ToString("MM/dd/yyyy h:mm tt");
-    }
-
-    private void IdsPressed(BaseButton.ButtonEventArgs buttonEventArgs)
-    {
-        OnIdsClicked?.Invoke(this);
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        IdsHidden.OnPressed -= IdsPressed;
-        OnIdsClicked = null;
-    }
-}

Content.Client/Administration/UI/BanList/BanListWindow.xaml

@@ -1,6 +1,11 @@
 <controls:BanListWindow
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.Administration.UI.BanList"
+    xmlns:bans="clr-namespace:Content.Client.Administration.UI.BanList.Bans"
+    xmlns:roleBans="clr-namespace:Content.Client.Administration.UI.BanList.RoleBans"
     SetSize="1400 400">
-    <controls:BanListControl Name="BanList" Access="Public"/>
+    <TabContainer Name="TabContainer">
+        <bans:BanListControl Name="BanList" Access="Public"/>
+        <roleBans:RoleBanListControl Name="RoleBanList" Access="Public"/>
+    </TabContainer>
 </controls:BanListWindow>

Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs

@@ -10,6 +10,9 @@ public sealed partial class BanListWindow : DefaultWindow
     public BanListWindow()
     {
         RobustXamlLoader.Load(this);
+
+        TabContainer.SetTabTitle(0, Loc.GetString("ban-list-bans"));
+        TabContainer.SetTabTitle(1, Loc.GetString("ban-list-role-bans"));
     }
 
     public void SetTitlePlayer(string playerName)

Content.Client/Administration/UI/BanList/Bans/BanListControl.xaml

@@ -0,0 +1,11 @@
+<bans:BanListControl
+    xmlns="https://spacestation14.io"
+    xmlns:bans="clr-namespace:Content.Client.Administration.UI.BanList.Bans">
+    <PanelContainer StyleClasses="BackgroundDark">
+        <ScrollContainer>
+            <BoxContainer Name="Bans" Access="Public" Orientation="Vertical">
+                <bans:BanListHeader Name="BansHeader"/>
+            </BoxContainer>
+        </ScrollContainer>
+    </PanelContainer>
+</bans:BanListControl>

Content.Client/Administration/UI/BanList/Bans/BanListControl.xaml.cs

@@ -0,0 +1,36 @@
+using Content.Client.Administration.UI.CustomControls;
+using Content.Shared.Administration.BanList;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Administration.UI.BanList.Bans;
+
+[GenerateTypedNameReferences]
+public sealed partial class BanListControl : Control
+{
+    public event Action<BanListLine>? LineIdsClicked;
+
+    public BanListControl()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void SetBans(List<SharedServerBan> bans)
+    {
+        for (var i = Bans.ChildCount - 1; i >= 1; i--)
+        {
+            Bans.GetChild(i).Dispose();
+        }
+
+        foreach (var ban in bans)
+        {
+            Bans.AddChild(new HSeparator());
+
+            var line = new BanListLine(ban);
+            line.IdsClicked += LineIdsClicked;
+
+            Bans.AddChild(line);
+        }
+    }
+}

Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml

@@ -25,7 +25,6 @@
             <Label Text="{Loc ban-list-header-banning-admin}"
                    SizeFlagsStretchRatio="2"
                    HorizontalExpand="True"/>
-            <cc:VSeparator/>
         </BoxContainer>
     </PanelContainer>
 </ContainerButton>

Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml.cs

@@ -2,7 +2,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Administration.UI.BanList;
+namespace Content.Client.Administration.UI.BanList.Bans;
 
 [GenerateTypedNameReferences]
 public sealed partial class BanListHeader : ContainerButton

Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml

@@ -16,23 +16,26 @@
     </BoxContainer>
     <cc:VSeparator/>
     <Label Name="Reason"
+           Access="Public"
            SizeFlagsStretchRatio="6"
            HorizontalExpand="True"
            VerticalExpand="True"/>
     <cc:VSeparator/>
     <Label Name="BanTime"
+           Access="Public"
            SizeFlagsStretchRatio="2"
            HorizontalExpand="True"
            ClipText="True"/>
     <cc:VSeparator/>
     <Label Name="Expires"
+           Access="Public"
            SizeFlagsStretchRatio="4"
            HorizontalExpand="True"
            ClipText="True"/>
     <cc:VSeparator/>
     <Label Name="BanningAdmin"
+           Access="Public"
            SizeFlagsStretchRatio="2"
            HorizontalExpand="True"
            ClipText="True"/>
-    <cc:VSeparator/>
 </BoxContainer>

Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml.cs

@@ -0,0 +1,38 @@
+using Content.Shared.Administration.BanList;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using static Robust.Client.UserInterface.Controls.BaseButton;
+
+namespace Content.Client.Administration.UI.BanList.Bans;
+
+[GenerateTypedNameReferences]
+public sealed partial class BanListLine : BoxContainer, IBanListLine<SharedServerBan>
+{
+    public SharedServerBan Ban { get; }
+
+    public event Action<BanListLine>? IdsClicked;
+
+    public BanListLine(SharedServerBan ban)
+    {
+        RobustXamlLoader.Load(this);
+
+        Ban = ban;
+        IdsHidden.OnPressed += IdsPressed;
+
+        BanListEui.SetData(this, ban);
+    }
+
+    private void IdsPressed(ButtonEventArgs buttonEventArgs)
+    {
+        IdsClicked?.Invoke(this);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+
+        IdsHidden.OnPressed -= IdsPressed;
+        IdsClicked = null;
+    }
+}

Content.Client/Administration/UI/BanList/IBanListLine.cs

@@ -0,0 +1,13 @@
+using Content.Shared.Administration.BanList;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Administration.UI.BanList;
+
+public interface IBanListLine<T> where T : SharedServerBan
+{
+    T Ban { get; }
+    Label Reason { get; }
+    Label BanTime { get; }
+    Label Expires { get; }
+    Label BanningAdmin { get; }
+}

Content.Client/Administration/UI/BanList/RoleBans/RoleBanListControl.xaml

@@ -0,0 +1,11 @@
+<roleBans:RoleBanListControl
+    xmlns="https://spacestation14.io"
+    xmlns:roleBans="clr-namespace:Content.Client.Administration.UI.BanList.RoleBans">
+    <PanelContainer StyleClasses="BackgroundDark">
+        <ScrollContainer>
+            <BoxContainer Name="RoleBans" Access="Public" Orientation="Vertical">
+                <roleBans:RoleBanListHeader Name="BansHeader"/>
+            </BoxContainer>
+        </ScrollContainer>
+    </PanelContainer>
+</roleBans:RoleBanListControl>

Content.Client/Administration/UI/BanList/RoleBans/RoleBanListControl.xaml.cs

@@ -0,0 +1,36 @@
+using Content.Client.Administration.UI.CustomControls;
+using Content.Shared.Administration.BanList;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Administration.UI.BanList.RoleBans;
+
+[GenerateTypedNameReferences]
+public sealed partial class RoleBanListControl : Control
+{
+    public event Action<RoleBanListLine>? LineIdsClicked;
+
+    public RoleBanListControl()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void SetRoleBans(List<SharedServerRoleBan> bans)
+    {
+        for (var i = RoleBans.ChildCount - 1; i >= 1; i--)
+        {
+            RoleBans.GetChild(i).Dispose();
+        }
+
+        foreach (var ban in bans)
+        {
+            RoleBans.AddChild(new HSeparator());
+
+            var line = new RoleBanListLine(ban);
+            line.IdsClicked += LineIdsClicked;
+
+            RoleBans.AddChild(line);
+        }
+    }
+}

Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml

@@ -0,0 +1,34 @@
+<ContainerButton
+    xmlns="https://spacestation14.io"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    <PanelContainer Name="BackgroundPanel" Access="Public">
+        <BoxContainer
+            Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="4">
+            <Label Text="{Loc ban-list-header-ids}"
+                   SizeFlagsStretchRatio="1"
+                   HorizontalExpand="True"/>
+            <cc:VSeparator/>
+            <Label Text="{Loc ban-list-header-reason}"
+                   SizeFlagsStretchRatio="4.5"
+                   HorizontalExpand="True"/>
+            <cc:VSeparator Name="ReasonSeparator" Access="Public"/>
+            <Label Text="{Loc ban-list-header-role}"
+                   SizeFlagsStretchRatio="1.5"
+                   HorizontalExpand="True"/>
+            <cc:VSeparator/>
+            <Label Text="{Loc ban-list-header-time}"
+                   SizeFlagsStretchRatio="2"
+                   HorizontalExpand="True"/>
+            <cc:VSeparator/>
+            <Label Text="{Loc ban-list-header-expires}"
+                   SizeFlagsStretchRatio="4"
+                   HorizontalExpand="True"/>
+            <cc:VSeparator/>
+            <Label Text="{Loc ban-list-header-banning-admin}"
+                   SizeFlagsStretchRatio="2"
+                   HorizontalExpand="True"/>
+        </BoxContainer>
+    </PanelContainer>
+</ContainerButton>

Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml.cs

@@ -0,0 +1,14 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Administration.UI.BanList.RoleBans;
+
+[GenerateTypedNameReferences]
+public sealed partial class RoleBanListHeader : ContainerButton
+{
+    public RoleBanListHeader()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}

Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml

@@ -0,0 +1,46 @@
+<BoxContainer
+    xmlns="https://spacestation14.io"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    Orientation="Horizontal"
+    HorizontalExpand="True"
+    SeparationOverride="4">
+    <BoxContainer Orientation="Vertical"
+                  SizeFlagsStretchRatio="1"
+                  HorizontalExpand="True"
+                  RectClipContent="True">
+        <Button Name="IdsHidden"
+                Text="{Loc 'ban-list-view'}"
+                HorizontalExpand="True"
+                VerticalExpand="True"
+                MouseFilter="Pass"/>
+    </BoxContainer>
+    <cc:VSeparator/>
+    <Label Name="Reason"
+           Access="Public"
+           SizeFlagsStretchRatio="4.5"
+           HorizontalExpand="True"
+           VerticalExpand="True"/>
+    <cc:VSeparator/>
+    <Label Name="Role"
+           SizeFlagsStretchRatio="1.5"
+           HorizontalExpand="True"
+           VerticalExpand="True"/>
+    <cc:VSeparator/>
+    <Label Name="BanTime"
+           Access="Public"
+           SizeFlagsStretchRatio="2"
+           HorizontalExpand="True"
+           ClipText="True"/>
+    <cc:VSeparator/>
+    <Label Name="Expires"
+           Access="Public"
+           SizeFlagsStretchRatio="4"
+           HorizontalExpand="True"
+           ClipText="True"/>
+    <cc:VSeparator/>
+    <Label Name="BanningAdmin"
+           Access="Public"
+           SizeFlagsStretchRatio="2"
+           HorizontalExpand="True"
+           ClipText="True"/>
+</BoxContainer>

Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml.cs

@@ -0,0 +1,40 @@
+using Content.Shared.Administration.BanList;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using static Robust.Client.UserInterface.Controls.BaseButton;
+
+namespace Content.Client.Administration.UI.BanList.RoleBans;
+
+[GenerateTypedNameReferences]
+public sealed partial class RoleBanListLine : BoxContainer, IBanListLine<SharedServerRoleBan>
+{
+    public SharedServerRoleBan Ban { get; }
+
+    public event Action<RoleBanListLine>? IdsClicked;
+
+    public RoleBanListLine(SharedServerRoleBan ban)
+    {
+        RobustXamlLoader.Load(this);
+
+        Ban = ban;
+        IdsHidden.OnPressed += IdsPressed;
+
+        BanListEui.SetData(this, ban);
+        Role.Text = ban.Role;
+    }
+
+    private void IdsPressed(ButtonEventArgs buttonEventArgs)
+    {
+        IdsClicked?.Invoke(this);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+
+        IdsHidden.OnPressed -= IdsPressed;
+        IdsClicked = null;
+    }
+}
+

Content.Client/Administration/UI/BanPanel/BanPanel.xaml

@@ -22,6 +22,7 @@
                     <LineEdit Name="HwidLine" MinWidth="100" HorizontalExpand="True" PlaceHolder="{Loc ban-panel-hwid}" ToolTip="{Loc ban-panel-ip-hwid-tooltip}" />
                 </BoxContainer>
                 <CheckBox Name="LastConnCheckbox" Margin="2" Text="{Loc ban-panel-last-conn}" Pressed="True" />
+                <CheckBox Name="EraseCheckbox" Margin="2" Text="{Loc ban-panel-erase}" Pressed="False" />
                 <BoxContainer Orientation="Horizontal" Margin="2">
                     <LineEdit Name="TimeLine" MaxWidth="150" MinWidth="70" PlaceHolder="0" />
                     <OptionButton Name="MultiplierOption" />
@@ -30,7 +31,7 @@
                 </BoxContainer>
                 <BoxContainer Orientation="Horizontal" Margin="4">
                     <OptionButton Name="TypeOption" />
-                    <Control MinWidth="30"></Control>
+                    <Control MinWidth="30" />
                     <Label Text="{Loc ban-panel-severity}" />
                     <OptionButton Name="SeverityOption" />
                 </BoxContainer>

Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs

@@ -1,10 +1,7 @@
-using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
-using System.Text.RegularExpressions;
 using Content.Client.Administration.UI.CustomControls;
-using Content.Client.Stylesheets;
 using Content.Shared.Administration;
 using Content.Shared.Database;
 using Content.Shared.Roles;
@@ -23,7 +20,7 @@ namespace Content.Client.Administration.UI.BanPanel;
 [GenerateTypedNameReferences]
 public sealed partial class BanPanel : DefaultWindow
 {
-    public event Action<string?, (IPAddress, int)?, bool, byte[]?, bool, uint, string, NoteSeverity, string[]?>? BanSubmitted;
+    public event Action<string?, (IPAddress, int)?, bool, byte[]?, bool, uint, string, NoteSeverity, string[]?, bool>? BanSubmitted;
     public event Action<string>? PlayerChanged;
     private string? PlayerUsername { get; set; }
     private (IPAddress, int)? IpAddress { get; set; }
@@ -441,7 +438,8 @@ public sealed partial class BanPanel : DefaultWindow
         var useLastIp = IpCheckbox.Pressed && LastConnCheckbox.Pressed && IpAddress is null;
         var useLastHwid = HwidCheckbox.Pressed && LastConnCheckbox.Pressed && Hwid is null;
         var severity = (NoteSeverity) SeverityOption.SelectedId;
-        BanSubmitted?.Invoke(player, IpAddress, useLastIp, Hwid, useLastHwid, (uint) (TimeEntered * Multiplier), reason, severity, roles);
+        var erase = EraseCheckbox.Pressed;
+        BanSubmitted?.Invoke(player, IpAddress, useLastIp, Hwid, useLastHwid, (uint) (TimeEntered * Multiplier), reason, severity, roles, erase);
     }
 
     protected override void FrameUpdate(FrameEventArgs args)

Content.Client/Administration/UI/BanPanel/BanPanelEui.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Content.Client.Eui;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
@@ -19,8 +14,8 @@ public sealed class BanPanelEui : BaseEui
     {
         BanPanel = new BanPanel();
         BanPanel.OnClose += () => SendMessage(new CloseEuiMessage());
-        BanPanel.BanSubmitted += (player, ip, useLastIp, hwid, useLastHwid, minutes, reason, severity, roles)
-            => SendMessage(new BanPanelEuiStateMsg.CreateBanRequest(player, ip, useLastIp, hwid, useLastHwid, minutes, reason, severity, roles));
+        BanPanel.BanSubmitted += (player, ip, useLastIp, hwid, useLastHwid, minutes, reason, severity, roles, erase)
+            => SendMessage(new BanPanelEuiStateMsg.CreateBanRequest(player, ip, useLastIp, hwid, useLastHwid, minutes, reason, severity, roles, erase));
         BanPanel.PlayerChanged += player => SendMessage(new BanPanelEuiStateMsg.GetPlayerInfoRequest(player));
     }
 

Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml

@@ -1,23 +1,20 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
-         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252A"/>
-         </PanelContainer.PanelOverride>
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    <PanelContainer StyleClasses="BackgroundDark">
         <SplitContainer Orientation="Horizontal" VerticalExpand="True">
             <cc:PlayerListControl Access="Public" Name="ChannelSelector" HorizontalExpand="True" SizeFlagsStretchRatio="1" />
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">
                 <BoxContainer Access="Public" Name="BwoinkArea" VerticalExpand="True" />
-                <BoxContainer Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button Margin="0 0 10 0" Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}"/>
-                    <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" />
-                    <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" />
-                    <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" />
-                    <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" />
-                    <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" />
-                    <Button Visible="False" Name="Teleport" Text="{Loc 'admin-player-actions-teleport'}" />
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                    <Button Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}" StyleClasses="OpenBoth" HorizontalAlignment="Left" />
+                    <Control HorizontalExpand="True" />
+                    <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" StyleClasses="OpenRight" />
+                    <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Teleport" Text="{Loc 'admin-player-actions-teleport'}" StyleClasses="OpenLeft" />
                 </BoxContainer>
             </BoxContainer>
         </SplitContainer>

Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs

@@ -1,22 +1,16 @@
 using System.Linq;
 using System.Text;
-using System.Threading;
 using Content.Client.Administration.Managers;
 using Content.Client.Administration.UI.CustomControls;
-using Content.Client.Administration.UI.Tabs.AdminTab;
-using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Bwoink;
-using Content.Client.UserInterface.Systems.Chat.Controls;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
-using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Client.Administration.UI.Bwoink
 {
@@ -31,8 +25,8 @@ namespace Content.Client.Administration.UI.Bwoink
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
         public AdminAHelpUIHandler AHelpHelper = default!;
 
-        //private readonly BwoinkSystem _bwoinkSystem;
-        private PlayerInfo? _currentPlayer = default;
+        private PlayerInfo? _currentPlayer;
+        private readonly Dictionary<Button, ConfirmationData> _confirmations = new();
 
         public BwoinkControl()
         {
@@ -45,17 +39,13 @@ namespace Content.Client.Administration.UI.Bwoink
 
             AHelpHelper = helper;
 
-            _adminManager.AdminStatusUpdated += FixButtons;
-            FixButtons();
+            _adminManager.AdminStatusUpdated += UpdateButtons;
+            UpdateButtons();
 
             ChannelSelector.OnSelectionChanged += sel =>
             {
                 _currentPlayer = sel;
-                if (sel is not null)
-                {
-                    SwitchToChannel(sel.SessionId);
-                }
-
+                SwitchToChannel(sel?.SessionId);
                 ChannelSelector.PlayerListContainer.DirtyList();
             };
 
@@ -131,7 +121,7 @@ namespace Content.Client.Administration.UI.Bwoink
 
             Kick.OnPressed += _ =>
             {
-                if (!TryConfirm(Kick))
+                if (!AdminUIHelpers.TryConfirm(Kick, _confirmations))
                 {
                     return;
                 }
@@ -149,7 +139,7 @@ namespace Content.Client.Administration.UI.Bwoink
 
             Respawn.OnPressed += _ =>
             {
-                if (!TryConfirm(Respawn))
+                if (!AdminUIHelpers.TryConfirm(Respawn, _confirmations))
                 {
                     return;
                 }
@@ -164,8 +154,6 @@ namespace Content.Client.Administration.UI.Bwoink
             };
         }
 
-        private Dictionary<Control, (CancellationTokenSource cancellation, string? originalText)> Confirmations { get; } = new();
-
         public void OnBwoink(NetUserId channel)
         {
             ChannelSelector.PopulateList();
@@ -190,25 +178,27 @@ namespace Content.Client.Administration.UI.Bwoink
             ChannelSelector.PlayerListContainer.Select(data);
         }
 
-        private void FixButtons()
+        public void UpdateButtons()
         {
+            var disabled = _currentPlayer == null;
+
             Bans.Visible = _adminManager.HasFlag(AdminFlags.Ban);
-            Bans.Disabled = !Bans.Visible;
+            Bans.Disabled = !Bans.Visible || disabled;
 
             Notes.Visible = _adminManager.HasFlag(AdminFlags.ViewNotes);
-            Notes.Disabled = !Notes.Visible;
+            Notes.Disabled = !Notes.Visible || disabled;
 
             Ban.Visible = _adminManager.HasFlag(AdminFlags.Ban);
-            Ban.Disabled = !Ban.Visible;
+            Ban.Disabled = !Ban.Visible || disabled;
 
             Kick.Visible = _adminManager.CanCommand("kick");
-            Kick.Disabled = !Kick.Visible;
-
-            Teleport.Visible = _adminManager.CanCommand("tpto");
-            Teleport.Disabled = !Teleport.Visible;
+            Kick.Disabled = !Kick.Visible || disabled;
 
             Respawn.Visible = _adminManager.CanCommand("respawn");
-            Respawn.Disabled = !Respawn.Visible;
+            Respawn.Disabled = !Respawn.Visible || disabled;
+
+            Teleport.Visible = _adminManager.CanCommand("tpto");
+            Teleport.Disabled = !Teleport.Visible || disabled;
         }
 
         private string FormatTabTitle(ItemList.Item li, PlayerInfo? pl = default)
@@ -239,37 +229,22 @@ namespace Content.Client.Administration.UI.Bwoink
             return sb.ToString();
         }
 
-        private void SwitchToChannel(NetUserId ch)
+        private void SwitchToChannel(NetUserId? ch)
         {
-            foreach (var bw in BwoinkArea.Children)
-                bw.Visible = false;
-            var panel = AHelpHelper.EnsurePanel(ch);
-            panel.Visible = true;
+            UpdateButtons();
+
+            if (ch != null)
+            {
+                AHelpHelper.HideAllPanels();
+                var panel = AHelpHelper.EnsurePanel(ch.Value);
+                panel.Visible = true;
+            }
         }
 
-        private bool TryConfirm(Button button)
+        public void PopulateList()
         {
-            if (Confirmations.Remove(button, out var tuple))
-            {
-                tuple.cancellation.Cancel();
-                button.ModulateSelfOverride = null;
-                button.Text = tuple.originalText;
-                return true;
-            }
-
-            tuple = (new CancellationTokenSource(), button.Text);
-            Confirmations[button] = tuple;
-
-            Timer.Spawn(TimeSpan.FromSeconds(5), () =>
-            {
-                Confirmations.Remove(button);
-                button.ModulateSelfOverride = null;
-                button.Text = tuple.originalText;
-            }, tuple.cancellation.Token);
-
-            button.ModulateSelfOverride = StyleNano.ButtonColorCautionDefault;
-            button.Text = Loc.GetString("admin-player-actions-confirm");
-            return false;
+            ChannelSelector.PopulateList();
+            UpdateButtons();
         }
     }
 }

Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs

@@ -1,20 +1,6 @@
-using System.Text;
-using System.Threading;
-using Content.Client.Administration.Managers;
-using Content.Client.Administration.UI.CustomControls;
-using Content.Client.Administration.UI.Tabs.AdminTab;
-using Content.Client.Stylesheets;
-using Content.Client.UserInterface.Systems.Bwoink;
-using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
-using Robust.Client.Console;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Network;
-using Robust.Shared.Utility;
-using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Client.Administration.UI.Bwoink
 {
@@ -33,10 +19,15 @@ namespace Content.Client.Administration.UI.Bwoink
                 if (sel is not null)
                 {
                     Title = $"{sel.CharacterName} / {sel.Username}";
+
+                    if (sel.OverallPlaytime != null)
+                    {
+                        Title += $" | {Loc.GetString("generic-playtime-title")}: {sel.PlaytimeString}";
+                    }
                 }
             };
 
-            OnOpen += () => Bwoink.ChannelSelector.PopulateList();
+            OnOpen += () => Bwoink.PopulateList();
         }
     }
 }

Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs

@@ -18,22 +18,24 @@ namespace Content.Client.Administration.UI.CustomControls
     public sealed partial class PlayerListControl : BoxContainer
     {
         private readonly AdminSystem _adminSystem;
-        private readonly VerbSystem _verbSystem;
 
         private List<PlayerInfo> _playerList = new();
         private readonly List<PlayerInfo> _sortedPlayerList = new();
 
-        public event Action<PlayerInfo?>? OnSelectionChanged;
+        public event Action<PlayerInfo>? OnSelectionChanged;
         public IReadOnlyList<PlayerInfo> PlayerInfo => _playerList;
 
         public Func<PlayerInfo, string, string>? OverrideText;
         public Comparison<PlayerInfo>? Comparison;
 
+        private IEntityManager _entManager;
+        private IUserInterfaceManager _uiManager;
+
         public PlayerListControl()
         {
-            _adminSystem = EntitySystem.Get<AdminSystem>();
-            _verbSystem = EntitySystem.Get<VerbSystem>();
-            IoCManager.InjectDependencies(this);
+            _entManager = IoCManager.Resolve<IEntityManager>();
+            _uiManager = IoCManager.Resolve<IUserInterfaceManager>();
+            _adminSystem = _entManager.System<AdminSystem>();
             RobustXamlLoader.Load(this);
             // Fill the Option data
             PlayerListContainer.ItemPressed += PlayerListItemPressed;
@@ -44,9 +46,9 @@ namespace Content.Client.Administration.UI.CustomControls
             BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)};
         }
 
-        private void PlayerListItemPressed(BaseButton.ButtonEventArgs args, ListData data)
+        private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data)
         {
-            if (data is not PlayerListData {Info: var selectedPlayer})
+            if (args == null || data is not PlayerListData {Info: var selectedPlayer})
                 return;
             if (args.Event.Function == EngineKeyFunctions.UIClick)
             {
@@ -56,9 +58,9 @@ namespace Content.Client.Administration.UI.CustomControls
                 if (OverrideText != null && args.Button.Children.FirstOrDefault()?.Children?.FirstOrDefault() is Label label)
                     label.Text = GetText(selectedPlayer);
             }
-            else if (args.Event.Function == EngineKeyFunctions.UseSecondary && selectedPlayer.EntityUid != null)
+            else if (args.Event.Function == EngineKeyFunctions.UseSecondary && selectedPlayer.NetEntity != null)
             {
-                IoCManager.Resolve<IUserInterfaceManager>().GetUIController<VerbMenuUIController>().OpenVerbMenu(selectedPlayer.EntityUid.Value);
+                _uiManager.GetUIController<VerbMenuUIController>().OpenVerbMenu(selectedPlayer.NetEntity.Value, true);
             }
         }
 

Content.Client/Administration/UI/Logs/AdminLogsControl.xaml

@@ -1,10 +1,6 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls"
-         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252A"/>
-        </PanelContainer.PanelOverride>
+         xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    <PanelContainer StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Horizontal">
             <BoxContainer Orientation="Vertical">
                 <BoxContainer Orientation="Horizontal" MinWidth="400">

Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs

@@ -21,14 +21,14 @@ namespace Content.Client.Administration.UI.ManageSolutions
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
 
-        private readonly EntityUid _targetEntity;
+        private readonly NetEntity _targetEntity;
         private string _targetSolution;
         private ReagentPrototype? _selectedReagent;
 
         // FloatSpinBox does not (yet?) play nice with xaml
         private FloatSpinBox _quantitySpin = new(1, 2) { Value = 10, HorizontalExpand = true};
 
-        public AddReagentWindow(EntityUid targetEntity, string targetSolution)
+        public AddReagentWindow(NetEntity targetEntity, string targetSolution)
         {
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);

Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
@@ -16,7 +17,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
-        private EntityUid _target = EntityUid.Invalid;
+        private NetEntity _target = NetEntity.Invalid;
         private string? _selectedSolution;
         private AddReagentWindow? _addReagentWindow;
         private Dictionary<string, Solution>? _solutions;
@@ -37,12 +38,13 @@ namespace Content.Client.Administration.UI.ManageSolutions
             _addReagentWindow?.Dispose();
         }
 
-        public void SetTargetEntity(EntityUid target)
+        public void SetTargetEntity(NetEntity target)
         {
             _target = target;
+            var uid = _entityManager.GetEntity(target);
 
-            var targetName = _entityManager.EntityExists(target)
-                ? IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(target).EntityName
+            var targetName = _entityManager.EntityExists(uid)
+                ? _entityManager.GetComponent<MetaDataComponent>(uid).EntityName
                 : string.Empty;
 
             Title = Loc.GetString("admin-solutions-window-title", ("targetName", targetName));
@@ -176,16 +178,16 @@ namespace Content.Client.Administration.UI.ManageSolutions
         /// <summary>
         ///     Add a single reagent entry to the list
         /// </summary>
-        private void AddReagentEntry(Solution.ReagentQuantity reagent)
+        private void AddReagentEntry(ReagentQuantity reagentQuantity)
         {
             var box = new BoxContainer();
             var spin = new FloatSpinBox(1, 2);
 
-            spin.Value = reagent.Quantity.Float();
-            spin.OnValueChanged += (args) => SetReagent(args, reagent.ReagentId);
+            spin.Value = reagentQuantity.Quantity.Float();
+            spin.OnValueChanged += (args) => SetReagent(args, reagentQuantity.Reagent.Prototype);
             spin.HorizontalExpand = true;
 
-            box.AddChild(new Label() { Text = reagent.ReagentId , HorizontalExpand = true});
+            box.AddChild(new Label() { Text = reagentQuantity.Reagent.Prototype , HorizontalExpand = true});
             box.AddChild(spin);
 
             ReagentList.AddChild(box);
@@ -194,18 +196,18 @@ namespace Content.Client.Administration.UI.ManageSolutions
         /// <summary>
         ///     Execute a command to modify the reagents in the solution.
         /// </summary>
-        private void SetReagent(FloatSpinBox.FloatSpinBoxEventArgs args, string reagentId)
+        private void SetReagent(FloatSpinBox.FloatSpinBoxEventArgs args, string prototype)
         {
             if (_solutions == null || _selectedSolution == null)
                 return;
 
-            var current = _solutions[_selectedSolution].GetReagentQuantity(reagentId);
+            var current = _solutions[_selectedSolution].GetTotalPrototypeQuantity(prototype);
             var delta = args.Value - current.Float();
 
             if (MathF.Abs(delta) < 0.01)
                 return;
 
-            var command = $"addreagent {_target} {_selectedSolution} {reagentId} {delta}";
+            var command = $"addreagent {_target} {_selectedSolution} {prototype} {delta}";
             _consoleHost.ExecuteCommand(command);
         }
 

Content.Client/Administration/UI/Notes/AdminNotesControl.xaml

@@ -1,9 +1,5 @@
-<Control xmlns="https://spacestation14.io"
-         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252A"/>
-        </PanelContainer.PanelOverride>
+<Control xmlns="https://spacestation14.io">
+    <PanelContainer StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Vertical">
             <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
                 <BoxContainer Orientation="Vertical" Name="Notes" Access="Public" VerticalExpand="True"/>

Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml

@@ -1,8 +1,8 @@
 <Popup xmlns="https://spacestation14.io"
        xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
+    <PanelContainer StyleClasses="BackgroundDark">
         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252A" BorderThickness="1" BorderColor="#18181B"/>
+            <gfx:StyleBoxFlat BorderThickness="1" BorderColor="#18181B"/>
         </PanelContainer.PanelOverride>
         <BoxContainer Orientation="Vertical">
             <Label Name="PlayerNameLabel"/>

Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs

@@ -9,8 +9,11 @@ namespace Content.Client.Administration.UI.SetOutfit
     public sealed class SetOutfitEui : BaseEui
     {
         private readonly SetOutfitMenu _window;
+        private IEntityManager _entManager;
+
         public SetOutfitEui()
         {
+            _entManager = IoCManager.Resolve<IEntityManager>();
             _window = new SetOutfitMenu();
             _window.OnClose += OnClosed;
         }
@@ -34,7 +37,7 @@ namespace Content.Client.Administration.UI.SetOutfit
         public override void HandleState(EuiStateBase state)
         {
             var outfitState = (SetOutfitEuiState) state;
-            _window.TargetEntityId = outfitState.TargetEntityId;
+            _window.TargetEntityId = outfitState.TargetNetEntity;
 
         }
     }

Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs

@@ -18,7 +18,7 @@ namespace Content.Client.Administration.UI.SetOutfit
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
 
-        public EntityUid? TargetEntityId { get; set; }
+        public NetEntity? TargetEntityId { get; set; }
         private StartingGearPrototype? _selectedOutfit;
 
         public SetOutfitMenu()

Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs

@@ -1,10 +1,12 @@
+using System.Linq;
+using System.Numerics;
 using JetBrains.Annotations;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
-using System.Linq;
-using System.Numerics;
+using Robust.Shared.Map.Components;
 
 namespace Content.Client.Administration.UI.SpawnExplosion;
 
@@ -13,7 +15,6 @@ public sealed class ExplosionDebugOverlay : Overlay
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IEyeManager _eyeManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
 
     public Dictionary<int, List<Vector2i>>? SpaceTiles;
     public Dictionary<EntityUid, Dictionary<int, List<Vector2i>>> Tiles = new();
@@ -61,14 +62,15 @@ public sealed class ExplosionDebugOverlay : Overlay
         var handle = args.ScreenHandle;
         Box2 gridBounds;
         var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
+        var xformSystem = _entityManager.System<TransformSystem>();
 
         foreach (var (gridId, tileSets) in Tiles)
         {
-            if (!_mapManager.TryGetGrid(gridId, out var grid))
+            if (!_entityManager.TryGetComponent(gridId, out MapGridComponent? grid))
                 continue;
 
-            var gridXform = xformQuery.GetComponent(grid.Owner);
-            var (_, _, matrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv(xformQuery);
+            var gridXform = xformQuery.GetComponent(gridId);
+            var (_, _, matrix, invMatrix) = xformSystem.GetWorldPositionRotationMatrixWithInv(gridXform, xformQuery);
             gridBounds = invMatrix.TransformBox(args.WorldBounds).Enlarged(grid.TileSize * 2);
             DrawText(handle, gridBounds, matrix, tileSets, grid.TileSize);
         }
@@ -114,9 +116,9 @@ public sealed class ExplosionDebugOverlay : Overlay
             }
         }
 
-        if (tileSets.ContainsKey(0))
+        if (tileSets.TryGetValue(0, out var set))
         {
-            var epicenter = tileSets[0].First();
+            var epicenter = set.First();
             var worldCenter = transform.Transform((epicenter + Vector2Helpers.Half) * tileSize);
             var screenCenter = _eyeManager.WorldToScreen(worldCenter) + new Vector2(-24, -24);
             var text = $"{Intensity[0]:F2}\nΣ={TotalIntensity:F1}\nΔ={Slope:F1}";
@@ -129,14 +131,15 @@ public sealed class ExplosionDebugOverlay : Overlay
         var handle = args.WorldHandle;
         Box2 gridBounds;
         var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
+        var xformSystem = _entityManager.System<TransformSystem>();
 
         foreach (var (gridId, tileSets) in Tiles)
         {
-            if (!_mapManager.TryGetGrid(gridId, out var grid))
+            if (!_entityManager.TryGetComponent(gridId, out MapGridComponent? grid))
                 continue;
 
-            var gridXform = xformQuery.GetComponent(grid.Owner);
-            var (_, _, worldMatrix, invWorldMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv(xformQuery);
+            var gridXform = xformQuery.GetComponent(gridId);
+            var (_, _, worldMatrix, invWorldMatrix) = xformSystem.GetWorldPositionRotationMatrixWithInv(gridXform, xformQuery);
             gridBounds = invWorldMatrix.TransformBox(args.WorldBounds).Enlarged(grid.TileSize * 2);
             handle.SetTransform(worldMatrix);
             DrawTiles(handle, gridBounds, tileSets, SpaceTileSize);

Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs

@@ -10,6 +10,7 @@ namespace Content.Client.Administration.UI.SpawnExplosion;
 [UsedImplicitly]
 public sealed class SpawnExplosionEui : BaseEui
 {
+    [Dependency] private readonly EntityManager _entManager = default!;
     [Dependency] private readonly IOverlayManager _overlayManager = default!;
 
     private readonly SpawnExplosionWindow _window;
@@ -69,7 +70,15 @@ public sealed class SpawnExplosionEui : BaseEui
             _overlayManager.AddOverlay(_debugOverlay);
         }
 
-        _debugOverlay.Tiles = data.Explosion.Tiles;
+        var tiles = new Dictionary<EntityUid, Dictionary<int, List<Vector2i>>>();
+        _debugOverlay.Tiles.Clear();
+
+        foreach (var (nent, det) in data.Explosion.Tiles)
+        {
+            tiles[_entManager.GetEntity(nent)] = det;
+        }
+
+        _debugOverlay.Tiles = tiles;
         _debugOverlay.SpaceTiles = data.Explosion.SpaceTiles;
         _debugOverlay.Intensity = data.Explosion.Intensity;
         _debugOverlay.Slope = data.Slope;

Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs

@@ -4,8 +4,7 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.IoC;
-using Robust.Shared.Players;
+using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.UI.Tabs.AdminTab
@@ -15,9 +14,12 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
     public sealed partial class PlayerActionsWindow : DefaultWindow
     {
         private PlayerInfo? _selectedPlayer;
+        private readonly Dictionary<Button, ConfirmationData> _confirmations = new();
 
-        protected override void EnteredTree()
+        public PlayerActionsWindow()
         {
+            RobustXamlLoader.Load(this);
+
             SubmitKickButton.OnPressed += SubmitKickButtonOnPressed;
             SubmitAHelpButton.OnPressed += SubmitAhelpButtonOnPressed;
             SubmitRespawnButton.OnPressed += SubmitRespawnButtonOnPressed;
@@ -26,6 +28,9 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
 
         private void OnListOnOnSelectionChanged(PlayerInfo? obj)
         {
+            if (_selectedPlayer != obj)
+                AdminUIHelpers.RemoveAllConfirms(_confirmations);
+
             _selectedPlayer = obj;
             var disableButtons = _selectedPlayer == null;
             SubmitKickButton.Disabled = disableButtons;
@@ -37,6 +42,10 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
         {
             if (_selectedPlayer == null)
                 return;
+
+            if (!AdminUIHelpers.TryConfirm(SubmitKickButton, _confirmations))
+                return;
+
             IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
                 $"kick \"{_selectedPlayer.Username}\" \"{CommandParsing.Escape(ReasonLine.Text)}\"");
         }
@@ -54,6 +63,10 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
         {
             if (_selectedPlayer == null)
                 return;
+
+            if (!AdminUIHelpers.TryConfirm(SubmitRespawnButton, _confirmations))
+                return;
+
             IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
                 $"respawn \"{_selectedPlayer.Username}\"");
         }

Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs

@@ -5,7 +5,6 @@ using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
-using Robust.Shared.Players;
 
 namespace Content.Client.Administration.UI.Tabs.AdminTab
 {

Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs

@@ -104,7 +104,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
         private void OnTeleportButtonPressed(BaseButton.ButtonEventArgs obj)
         {
             IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
-                $"tp {XCoordinate.Value} {YCoordinate.Value} {MapOptions.SelectedId}");
+                $"tp {XCoordinate.Value} {YCoordinate.Value} {new MapId(MapOptions.SelectedId)}");
         }
 
         private void OnSubmitButtonPressed(BaseButton.ButtonEventArgs obj)
@@ -112,7 +112,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
             if (MapPath.Text.Length == 0) return;
 
             IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
-                $"loadbp {MapOptions.SelectedId} \"{MapPath.Text}\" {XCoordinate.Value} {YCoordinate.Value} {RotationSpin.Value}");
+                $"loadbp {new MapId(MapOptions.SelectedId)} \"{MapPath.Text}\" {XCoordinate.Value} {YCoordinate.Value} {RotationSpin.Value}");
         }
     }
 }

Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs

@@ -1,14 +1,10 @@
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.Player;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
+using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Map.Components;
 
 namespace Content.Client.Administration.UI.Tabs.AtmosTab
@@ -17,16 +13,29 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
     [UsedImplicitly]
     public sealed partial class AddAtmosWindow : DefaultWindow
     {
-        private IEnumerable<MapGridComponent>? _data;
+        [Dependency] private readonly IPlayerManager _players = default!;
+        [Dependency] private readonly IEntityManager _entities = default!;
+
+        private readonly List<Entity<MapGridComponent>> _data = new();
+
+        public AddAtmosWindow()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+        }
 
         protected override void EnteredTree()
         {
-            _data = IoCManager.Resolve<IMapManager>().GetAllGrids().Where(g => (int) g.Owner != 0);
-            foreach (var grid in _data)
+            _data.Clear();
+
+            var player = _players.LocalPlayer?.ControlledEntity;
+            var playerGrid = _entities.GetComponentOrNull<TransformComponent>(player)?.GridUid;
+            var query = IoCManager.Resolve<IEntityManager>().AllEntityQueryEnumerator<MapGridComponent>();
+
+            while (query.MoveNext(out var uid, out var grid))
             {
-                var player = IoCManager.Resolve<IPlayerManager>().LocalPlayer?.ControlledEntity;
-                var playerGrid = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<TransformComponent>(player)?.GridUid;
-                GridOptions.AddItem($"{grid.Owner} {(playerGrid == grid.Owner ? " (Current)" : "")}");
+                _data.Add((uid, grid));
+                GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);
@@ -35,11 +44,8 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
 
         private void SubmitButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
         {
-            if (_data == null)
-                return;
-            var dataList = _data.ToList();
-            var selectedGrid = dataList[GridOptions.SelectedId].Owner;
-            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"addatmos {selectedGrid}");
+            var selectedGrid = _data[GridOptions.SelectedId].Owner;
+            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"addatmos {_entities.GetNetEntity(selectedGrid)}");
         }
     }
 }

Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs

@@ -15,7 +15,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
     [UsedImplicitly]
     public sealed partial class AddGasWindow : DefaultWindow
     {
-        private List<EntityUid>? _gridData;
+        private List<NetEntity>? _gridData;
         private IEnumerable<GasPrototype>? _gasData;
 
         protected override void EnteredTree()
@@ -25,11 +25,12 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
             var playerManager = IoCManager.Resolve<IPlayerManager>();
 
             var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>();
-            _gridData ??= new List<EntityUid>();
+            _gridData ??= new List<NetEntity>();
             _gridData.Clear();
 
             while (gridQuery.MoveNext(out var uid, out _))
             {
+                _gridData.Add(entManager.GetNetEntity(uid));
                 var player = playerManager.LocalPlayer?.ControlledEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
@@ -60,7 +61,6 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
 
             var gasList = _gasData.ToList();
             var gasId = gasList[GasOptions.SelectedId].ID;
-
             IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
                 $"addgas {TileXSpin.Value} {TileYSpin.Value} {gridIndex} {gasId} {AmountSpin.Value}");
         }

Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs

@@ -19,7 +19,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
     [UsedImplicitly]
     public sealed partial class FillGasWindow : DefaultWindow
     {
-        private List<EntityUid>? _gridData;
+        private List<NetEntity>? _gridData;
         private IEnumerable<GasPrototype>? _gasData;
 
         protected override void EnteredTree()
@@ -29,7 +29,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
             var playerManager = IoCManager.Resolve<IPlayerManager>();
 
             var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>();
-            _gridData ??= new List<EntityUid>();
+            _gridData ??= new List<NetEntity>();
             _gridData.Clear();
 
             while (gridQuery.MoveNext(out var uid, out _))
@@ -37,7 +37,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
                 var player = playerManager.LocalPlayer?.ControlledEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
-                _gridData.Add(uid);
+                _gridData.Add(entManager.GetNetEntity(uid));
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);

Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs

@@ -17,7 +17,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
     [UsedImplicitly]
     public sealed partial class SetTemperatureWindow : DefaultWindow
     {
-        private List<EntityUid>? _data;
+        private List<NetEntity>? _data;
 
         protected override void EnteredTree()
         {
@@ -25,7 +25,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
             var playerManager = IoCManager.Resolve<IPlayerManager>();
 
             var gridQuery = entManager.AllEntityQueryEnumerator<MapGridComponent>();
-            _data ??= new List<EntityUid>();
+            _data ??= new List<NetEntity>();
             _data.Clear();
 
             while (gridQuery.MoveNext(out var uid, out _))
@@ -33,7 +33,7 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
                 var player = playerManager.LocalPlayer?.ControlledEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
-                _data.Add(uid);
+                _data.Add(entManager.GetNetEntity(uid));
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs

@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Client.Station;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
@@ -40,13 +39,34 @@ public sealed partial class ObjectsTab : Control
 
     private void RefreshObjectList(ObjectsTabSelection selection)
     {
-        var entities = selection switch
+        var entities = new List<EntityUid>();
+        switch (selection)
         {
-            ObjectsTabSelection.Stations => _entityManager.EntitySysManager.GetEntitySystem<StationSystem>().Stations.ToList(),
-            ObjectsTabSelection.Grids => _entityManager.EntityQuery<MapGridComponent>(true).Select(x => x.Owner).ToList(),
-            ObjectsTabSelection.Maps => _entityManager.EntityQuery<MapComponent>(true).Select(x => x.Owner).ToList(),
-            _ => throw new ArgumentOutOfRangeException(nameof(selection), selection, null),
-        };
+            case ObjectsTabSelection.Stations:
+                entities.AddRange(_entityManager.EntitySysManager.GetEntitySystem<StationSystem>().Stations);
+                break;
+            case ObjectsTabSelection.Grids:
+            {
+                var query = _entityManager.AllEntityQueryEnumerator<MapGridComponent>();
+                while (query.MoveNext(out var uid, out _))
+                {
+                    entities.Add(uid);
+                }
+
+                break;
+            }
+            case ObjectsTabSelection.Maps:
+            {
+                var query = _entityManager.AllEntityQueryEnumerator<MapComponent>();
+                while (query.MoveNext(out var uid, out _))
+                {
+                    entities.Add(uid);
+                }
+                break;
+            }
+            default:
+                throw new ArgumentOutOfRangeException(nameof(selection), selection, null);
+        }
 
         foreach (var control in _objects)
         {

Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerStatusWindow.xaml

@@ -0,0 +1,6 @@
+<controls:PanicBunkerStatusWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab"
+    Title="{Loc admin-ui-panic-bunker-window-title}">
+    <Label Name="MessageLabel" Access="Public" Text="{Loc admin-ui-panic-bunker-is-enabled}" />
+</controls:PanicBunkerStatusWindow>

Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerStatusWindow.xaml.cs

@@ -0,0 +1,14 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Administration.UI.Tabs.PanicBunkerTab;
+
+[GenerateTypedNameReferences]
+public sealed partial class PanicBunkerStatusWindow : DefaultWindow
+{
+    public PanicBunkerStatusWindow()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}

Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml

@@ -0,0 +1,43 @@
+<controls:PanicBunkerTab
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    Margin="4">
+    <BoxContainer Orientation="Vertical">
+        <cc:CommandButton Name="EnabledButton" Command="panicbunker" ToggleMode="True"
+                          Text="{Loc admin-ui-panic-bunker-disabled}"
+                          ToolTip="{Loc admin-ui-panic-bunker-tooltip}" />
+        <BoxContainer Orientation="Horizontal">
+            <cc:CommandButton Name="DisableAutomaticallyButton" HorizontalExpand="True"
+                              Command="panicbunker_disable_with_admins"
+                              ToggleMode="True"
+                              Text="{Loc admin-ui-panic-bunker-disable-automatically}"
+                              ToolTip="{Loc admin-ui-panic-bunker-disable-automatically-tooltip}" />
+            <cc:CommandButton Name="EnableAutomaticallyButton" HorizontalExpand="True"
+                              Command="panicbunker_enable_without_admins"
+                              ToggleMode="True"
+                              Text="{Loc admin-ui-panic-bunker-enable-automatically}"
+                              ToolTip="{Loc admin-ui-panic-bunker-enable-automatically-tooltip}" />
+            <cc:CommandButton Name="CountDeadminnedButton" HorizontalExpand="True"
+                              Command="panicbunker_count_deadminned_admins"
+                              ToggleMode="True"
+                              Text="{Loc admin-ui-panic-bunker-count-deadminned-admins}"
+                              ToolTip="{Loc admin-ui-panic-bunker-count-deadminned-admins-tooltip}" />
+        </BoxContainer>
+        <cc:CommandButton Name="ShowReasonButton" Command="panicbunker_show_reason"
+                          ToggleMode="True" Text="{Loc admin-ui-panic-bunker-show-reason}"
+                          ToolTip="{Loc admin-ui-panic-bunker-show-reason-tooltip}" />
+        <BoxContainer Orientation="Vertical" Margin="0 10 0 0">
+            <BoxContainer Orientation="Horizontal" Margin="2">
+                <Label Text="{Loc admin-ui-panic-bunker-min-account-age}" MinWidth="175" />
+                <LineEdit Name="MinAccountAge" MinWidth="50" Margin="0 0 5 0" />
+                <Label Text="{Loc generic-hours}" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal" Margin="2">
+                <Label Text="{Loc admin-ui-panic-bunker-min-overall-hours}" MinWidth="175" />
+                <LineEdit Name="MinOverallHours" MinWidth="50" Margin="0 0 5 0" />
+                <Label Text="{Loc generic-hours}" />
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+</controls:PanicBunkerTab>

Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs

@@ -0,0 +1,77 @@
+using Content.Shared.Administration.Events;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Console;
+
+namespace Content.Client.Administration.UI.Tabs.PanicBunkerTab;
+
+[GenerateTypedNameReferences]
+public sealed partial class PanicBunkerTab : Control
+{
+    [Dependency] private readonly IConsoleHost _console = default!;
+
+    private string _minAccountAge;
+    private string _minOverallHours;
+
+    public PanicBunkerTab()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        DisableAutomaticallyButton.ToolTip = Loc.GetString("admin-ui-panic-bunker-disable-automatically-tooltip");
+
+        MinAccountAge.OnTextEntered += args => SendMinAccountAge(args.Text);
+        MinAccountAge.OnFocusExit += args => SendMinAccountAge(args.Text);
+        _minAccountAge = MinAccountAge.Text;
+
+        MinOverallHours.OnTextEntered += args => SendMinOverallHours(args.Text);
+        MinOverallHours.OnFocusExit += args => SendMinOverallHours(args.Text);
+        _minOverallHours = MinOverallHours.Text;
+    }
+
+    private void SendMinAccountAge(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text) ||
+            text == _minAccountAge ||
+            !int.TryParse(text, out var minutes))
+        {
+            return;
+        }
+
+        _console.ExecuteCommand($"panicbunker_min_account_age {minutes}");
+    }
+
+    private void SendMinOverallHours(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text) ||
+            text == _minOverallHours ||
+            !int.TryParse(text, out var hours))
+        {
+            return;
+        }
+
+        _console.ExecuteCommand($"panicbunker_min_overall_hours {hours}");
+    }
+
+    public void UpdateStatus(PanicBunkerStatus status)
+    {
+        EnabledButton.Pressed = status.Enabled;
+        EnabledButton.Text = Loc.GetString(status.Enabled
+            ? "admin-ui-panic-bunker-enabled"
+            : "admin-ui-panic-bunker-disabled"
+        );
+        EnabledButton.ModulateSelfOverride = status.Enabled ? Color.Red : null;
+
+        DisableAutomaticallyButton.Pressed = status.DisableWithAdmins;
+        EnableAutomaticallyButton.Pressed = status.EnableWithoutAdmins;
+        CountDeadminnedButton.Pressed = status.CountDeadminnedAdmins;
+        ShowReasonButton.Pressed = status.ShowReason;
+
+        MinAccountAge.Text = status.MinAccountAgeHours.ToString();
+        _minAccountAge = MinAccountAge.Text;
+
+        MinOverallHours.Text = status.MinOverallHours.ToString();
+        _minOverallHours = MinOverallHours.Text;
+    }
+}

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs

@@ -14,6 +14,9 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
     [GenerateTypedNameReferences]
     public sealed partial class PlayerTab : Control
     {
+        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IPlayerManager _playerMan = default!;
+
         private const string ArrowUp = "↑";
         private const string ArrowDown = "↓";
         private readonly Color _altColor = Color.FromHex("#292B38");
@@ -29,7 +32,8 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
 
         public PlayerTab()
         {
-            _adminSystem = EntitySystem.Get<AdminSystem>();
+            IoCManager.InjectDependencies(this);
+            _adminSystem = _entManager.System<AdminSystem>();
             RobustXamlLoader.Load(this);
             RefreshPlayerList(_adminSystem.PlayerList);
 
@@ -93,13 +97,11 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
             foreach (var child in PlayerList.Children.ToArray())
             {
                 if (child is PlayerTabEntry)
-                    child.Orphan();
+                    child.Dispose();
             }
 
             _players = players;
-
-            var playerManager = IoCManager.Resolve<IPlayerManager>();
-            PlayerCount.Text = $"Players: {playerManager.PlayerCount}";
+            PlayerCount.Text = $"Players: {_playerMan.PlayerCount}";
 
             var sortedPlayers = new List<PlayerInfo>(players);
             sortedPlayers.Sort(Compare);
@@ -118,9 +120,11 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
                     player.StartingJob,
                     player.Antag ? "YES" : "NO",
                     new StyleBoxFlat(useAltColor ? _altColor : _defaultColor),
-                    player.Connected);
-                entry.PlayerUid = player.EntityUid;
+                    player.Connected,
+                    player.PlaytimeString);
+                entry.PlayerEntity = player.NetEntity;
                 entry.OnPressed += args => OnEntryPressed?.Invoke(args);
+                entry.ToolTip = Loc.GetString("player-tab-entry-tooltip");
                 PlayerList.AddChild(entry);
 
                 useAltColor ^= true;
@@ -146,6 +150,7 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
                 Header.Character => Compare(x.CharacterName, y.CharacterName),
                 Header.Job => Compare(x.StartingJob, y.StartingJob),
                 Header.Antagonist => x.Antag.CompareTo(y.Antag),
+                Header.Playtime => TimeSpan.Compare(x.OverallPlaytime ?? default, y.OverallPlaytime ?? default),
                 _ => 1
             };
         }

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml

@@ -24,5 +24,9 @@
                SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"/>
+        <Label Name="OverallPlaytimeLabel"
+               SizeFlagsStretchRatio="2"
+               HorizontalExpand="True"
+               ClipText="True"/>
     </BoxContainer>
 </ContainerButton>

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs

@@ -8,9 +8,9 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab;
 [GenerateTypedNameReferences]
 public sealed partial class PlayerTabEntry : ContainerButton
 {
-    public EntityUid? PlayerUid;
+    public NetEntity? PlayerEntity;
 
-    public PlayerTabEntry(string username, string character, string identity, string job, string antagonist, StyleBox styleBox, bool connected)
+    public PlayerTabEntry(string username, string character, string identity, string job, string antagonist, StyleBox styleBox, bool connected, string overallPlaytime)
     {
         RobustXamlLoader.Load(this);
 
@@ -23,5 +23,6 @@ public sealed partial class PlayerTabEntry : ContainerButton
             CharacterLabel.Text += $" [{identity}]";
         AntagonistLabel.Text = antagonist;
         BackgroundColorPanel.PanelOverride = styleBox;
+        OverallPlaytimeLabel.Text = overallPlaytime;
     }
 }

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml

@@ -32,5 +32,11 @@
                ClipText="True"
                Text="{Loc player-tab-antagonist}"
                MouseFilter="Pass"/>
+        <Label Name="PlaytimeLabel"
+               SizeFlagsStretchRatio="2"
+               HorizontalExpand="True"
+               ClipText="True"
+               Text="{Loc player-tab-playtime}"
+               MouseFilter="Pass"/>
     </BoxContainer>
 </ContainerButton>

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs

@@ -19,6 +19,7 @@ public sealed partial class PlayerTabHeader : ContainerButton
         CharacterLabel.OnKeyBindDown += CharacterClicked;
         JobLabel.OnKeyBindDown += JobClicked;
         AntagonistLabel.OnKeyBindDown += AntagonistClicked;
+        PlaytimeLabel.OnKeyBindDown += PlaytimeClicked;
     }
 
     public Label GetHeader(Header header)
@@ -29,6 +30,7 @@ public sealed partial class PlayerTabHeader : ContainerButton
             Header.Character => CharacterLabel,
             Header.Job => JobLabel,
             Header.Antagonist => AntagonistLabel,
+            Header.Playtime => PlaytimeLabel,
             _ => throw new ArgumentOutOfRangeException(nameof(header), header, null)
         };
     }
@@ -39,6 +41,7 @@ public sealed partial class PlayerTabHeader : ContainerButton
         CharacterLabel.Text = Loc.GetString("player-tab-character");
         JobLabel.Text = Loc.GetString("player-tab-job");
         AntagonistLabel.Text = Loc.GetString("player-tab-antagonist");
+        PlaytimeLabel.Text = Loc.GetString("player-tab-playtime");
     }
 
     private void HeaderClicked(GUIBoundKeyEventArgs args, Header header)
@@ -72,16 +75,22 @@ public sealed partial class PlayerTabHeader : ContainerButton
         HeaderClicked(args, Header.Antagonist);
     }
 
+    private void PlaytimeClicked(GUIBoundKeyEventArgs args)
+    {
+        HeaderClicked(args, Header.Playtime);
+    }
+
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
 
         if (disposing)
         {
-            UsernameLabel.OnKeyBindDown += UsernameClicked;
-            CharacterLabel.OnKeyBindDown += CharacterClicked;
-            JobLabel.OnKeyBindDown += JobClicked;
-            AntagonistLabel.OnKeyBindDown += AntagonistClicked;
+            UsernameLabel.OnKeyBindDown -= UsernameClicked;
+            CharacterLabel.OnKeyBindDown -= CharacterClicked;
+            JobLabel.OnKeyBindDown -= JobClicked;
+            AntagonistLabel.OnKeyBindDown -= AntagonistClicked;
+            PlaytimeLabel.OnKeyBindDown -= PlaytimeClicked;
         }
     }
 
@@ -90,6 +99,7 @@ public sealed partial class PlayerTabHeader : ContainerButton
         Username,
         Character,
         Job,
-        Antagonist
+        Antagonist,
+        Playtime
     }
 }

Content.Client/Administration/UI/Tabs/ServerTab.xaml

@@ -8,6 +8,5 @@
         <cc:CommandButton Command="shutdown" Text="{Loc server-shutdown}" />
         <cc:CommandButton Name="SetOocButton" Command="setooc" Text="{Loc server-ooc-toggle}" ToggleMode="True" />
         <cc:CommandButton Name="SetLoocButton" Command="setlooc" Text="{Loc server-looc-toggle}" ToggleMode="True" />
-        <cc:CommandButton Name="SetPanicbunkerButton" Command="panicbunker" Text="{Loc server-panicbunker-toggle}" ToggleMode="True" />
     </GridContainer>
 </Control>

Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs

@@ -18,7 +18,6 @@ namespace Content.Client.Administration.UI.Tabs
 
             _config.OnValueChanged(CCVars.OocEnabled, OocEnabledChanged, true);
             _config.OnValueChanged(CCVars.LoocEnabled, LoocEnabledChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerEnabled, BunkerEnabledChanged, true);
         }
 
         private void OocEnabledChanged(bool value)
@@ -31,11 +30,6 @@ namespace Content.Client.Administration.UI.Tabs
             SetLoocButton.Pressed = value;
         }
 
-        private void BunkerEnabledChanged(bool value)
-        {
-            SetPanicbunkerButton.Pressed = value;
-        }
-
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
@@ -44,7 +38,6 @@ namespace Content.Client.Administration.UI.Tabs
             {
                 _config.UnsubValueChanged(CCVars.OocEnabled, OocEnabledChanged);
                 _config.UnsubValueChanged(CCVars.LoocEnabled, LoocEnabledChanged);
-                _config.UnsubValueChanged(CCVars.PanicBunkerEnabled, BunkerEnabledChanged);
             }
         }
     }

Content.Client/Alerts/ClientAlertsSystem.cs

@@ -1,10 +1,7 @@
 using System.Linq;
 using Content.Shared.Alert;
-using Content.Shared.Mobs.Systems;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.Player;
-using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Alerts;
@@ -24,10 +21,10 @@ public sealed class ClientAlertsSystem : AlertsSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<AlertsComponent, PlayerAttachedEvent>(OnPlayerAttached);
-        SubscribeLocalEvent<AlertsComponent, PlayerDetachedEvent>(OnPlayerDetached);
+        SubscribeLocalEvent<AlertsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<AlertsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
 
-        SubscribeLocalEvent<AlertsComponent, ComponentHandleState>(ClientAlertsHandleState);
+        SubscribeLocalEvent<AlertsComponent, AfterAutoHandleStateEvent>(ClientAlertsHandleState);
     }
     protected override void LoadPrototypes()
     {
@@ -49,35 +46,29 @@ public sealed class ClientAlertsSystem : AlertsSystem
         }
     }
 
-    protected override void AfterShowAlert(AlertsComponent alertsComponent)
+    protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
+    {
+        if (_playerManager.LocalPlayer?.ControlledEntity != alerts.Owner)
+            return;
+
+        SyncAlerts?.Invoke(this, alerts.Comp.Alerts);
+    }
+
+    protected override void AfterClearAlert(Entity<AlertsComponent> alertsComponent)
     {
         if (_playerManager.LocalPlayer?.ControlledEntity != alertsComponent.Owner)
             return;
 
-        SyncAlerts?.Invoke(this, alertsComponent.Alerts);
+        SyncAlerts?.Invoke(this, alertsComponent.Comp.Alerts);
     }
 
-    protected override void AfterClearAlert(AlertsComponent alertsComponent)
+    private void ClientAlertsHandleState(EntityUid uid, AlertsComponent component, ref AfterAutoHandleStateEvent args)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity != alertsComponent.Owner)
-            return;
-
-        SyncAlerts?.Invoke(this, alertsComponent.Alerts);
-    }
-
-    private void ClientAlertsHandleState(EntityUid uid, AlertsComponent component, ref ComponentHandleState args)
-    {
-        var componentAlerts = (args.Current as AlertsComponentState)?.Alerts;
-        if (componentAlerts == null)
-            return;
-
-        component.Alerts = new Dictionary<AlertKey, AlertState>(componentAlerts);
-
         if (_playerManager.LocalPlayer?.ControlledEntity == uid)
-            SyncAlerts?.Invoke(this, componentAlerts);
+            SyncAlerts?.Invoke(this, component.Alerts);
     }
 
-    private void OnPlayerAttached(EntityUid uid, AlertsComponent component, PlayerAttachedEvent args)
+    private void OnPlayerAttached(EntityUid uid, AlertsComponent component, LocalPlayerAttachedEvent args)
     {
         if (_playerManager.LocalPlayer?.ControlledEntity != uid)
             return;
@@ -95,7 +86,7 @@ public sealed class ClientAlertsSystem : AlertsSystem
         ClearAlerts?.Invoke(this, EventArgs.Empty);
     }
 
-    private void OnPlayerDetached(EntityUid uid, AlertsComponent component, PlayerDetachedEvent args)
+    private void OnPlayerDetached(EntityUid uid, AlertsComponent component, LocalPlayerDetachedEvent args)
     {
         ClearAlerts?.Invoke(this, EventArgs.Empty);
     }

Content.Client/Ame/UI/AmeWindow.xaml

@@ -1,7 +1,7 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'ame-window-title'}"
             MinSize="250 250">
-    <BoxContainer Orientation="Vertical">
+    <GridContainer Columns="2">
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc 'ame-window-engine-status-label'}" />
             <Label Text=" " />
@@ -42,5 +42,19 @@
             <Label Text=" " />
             <Label Name="CoreCount" Text="0" />
         </BoxContainer>
-    </BoxContainer>
+        <BoxContainer></BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'ame-window-power-currentsupply-label'}" />
+            <Label Text=" " />
+            <Label Name="CurrentPowerSupply" Text="0" />
+            <Label Text=" kW" />
+        </BoxContainer>
+        <BoxContainer></BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc 'ame-window-power-targetsupply-label'}" />
+            <Label Text=" " />
+            <Label Name="TargetedPowerSupply" Text="0" />
+            <Label Text=" kW" />
+        </BoxContainer>
+    </GridContainer>
 </DefaultWindow>

Content.Client/Ame/UI/AmeWindow.xaml.cs

@@ -64,6 +64,9 @@ namespace Content.Client.Ame.UI
 
             CoreCount.Text = $"{castState.CoreCount}";
             InjectionAmount.Text = $"{castState.InjectionAmount}";
+            // format power statistics to pretty numbers
+            CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply.ToString("N1")}";
+            TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply.ToString("N1")}";
         }
     }
 }

Content.Client/Animations/EntityPickupAnimationComponent.cs

@@ -0,0 +1,11 @@
+namespace Content.Client.Animations;
+
+/// <summary>
+///     Applied to client-side clone entities to animate them approaching the player that
+///     picked up the original entity.
+/// </summary>
+[RegisterComponent]
+[Access(typeof(EntityPickupAnimationSystem))]
+public sealed partial class EntityPickupAnimationComponent : Component
+{
+}

Content.Client/Animations/EntityPickupAnimationSystem.cs

@@ -0,0 +1,87 @@
+using System.Numerics;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Shared.Animations;
+using Robust.Shared.Map;
+using Robust.Shared.Spawners;
+using static Robust.Client.Animations.AnimationTrackProperty;
+
+namespace Content.Client.Animations;
+
+/// <summary>
+///     System that handles animating an entity that a player has picked up.
+/// </summary>
+public sealed class EntityPickupAnimationSystem : EntitySystem
+{
+    [Dependency] private readonly AnimationPlayerSystem _animations = default!;
+    [Dependency] private readonly MetaDataSystem _metaData = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EntityPickupAnimationComponent, AnimationCompletedEvent>(OnEntityPickupAnimationCompleted);
+    }
+
+    private void OnEntityPickupAnimationCompleted(EntityUid uid, EntityPickupAnimationComponent component, AnimationCompletedEvent args)
+    {
+        Del(uid);
+    }
+
+    /// <summary>
+    ///     Animates a clone of an entity moving from one point to another before
+    ///     being deleted.
+    ///     Used when the player picks up an entity.
+    /// </summary>
+    public void AnimateEntityPickup(EntityUid uid, EntityCoordinates initial, Vector2 final, Angle initialAngle)
+    {
+        if (Deleted(uid) || !initial.IsValid(EntityManager))
+            return;
+
+        var metadata = MetaData(uid);
+
+        if (IsPaused(uid, metadata))
+            return;
+
+        var animatableClone = Spawn("clientsideclone", initial);
+        EnsureComp<EntityPickupAnimationComponent>(animatableClone);
+        var val = metadata.EntityName;
+        _metaData.SetEntityName(animatableClone, val);
+
+        if (!TryComp(uid, out SpriteComponent? sprite0))
+        {
+            Log.Error("Entity ({0}) couldn't be animated for pickup since it doesn't have a {1}!", metadata.EntityName, nameof(SpriteComponent));
+            return;
+        }
+
+        var sprite = Comp<SpriteComponent>(animatableClone);
+        sprite.CopyFrom(sprite0);
+        sprite.Visible = true;
+
+        var animations = Comp<AnimationPlayerComponent>(animatableClone);
+
+        var despawn = EnsureComp<TimedDespawnComponent>(animatableClone);
+        despawn.Lifetime = 0.25f;
+        _transform.SetLocalRotationNoLerp(animatableClone, initialAngle);
+
+        _animations.Play(animatableClone, animations, new Animation
+        {
+            Length = TimeSpan.FromMilliseconds(125),
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty
+                {
+                    ComponentType = typeof(TransformComponent),
+                    Property = nameof(TransformComponent.LocalPosition),
+                    InterpolationMode = AnimationInterpolationMode.Linear,
+                    KeyFrames =
+                    {
+                        new KeyFrame(initial.Position, 0),
+                        new KeyFrame(final, 0.125f)
+                    }
+                },
+            }
+        }, "fancy_pickup_anim");
+    }
+}

Content.Client/Animations/ReusableAnimations.cs

@@ -1,66 +0,0 @@
-using System.Numerics;
-using Content.Shared.Spawners.Components;
-using Robust.Client.Animations;
-using Robust.Client.GameObjects;
-using Robust.Shared.Animations;
-using Robust.Shared.Map;
-
-namespace Content.Client.Animations
-{
-    public static class ReusableAnimations
-    {
-        public static void AnimateEntityPickup(EntityUid entity, EntityCoordinates initialPosition, Vector2 finalPosition, Angle initialAngle, IEntityManager? entMan = null)
-        {
-            IoCManager.Resolve(ref entMan);
-
-            if (entMan.Deleted(entity) || !initialPosition.IsValid(entMan))
-                return;
-
-            var metadata = entMan.GetComponent<MetaDataComponent>(entity);
-
-            if (entMan.IsPaused(entity, metadata))
-                return;
-
-            var animatableClone = entMan.SpawnEntity("clientsideclone", initialPosition);
-            string val = entMan.GetComponent<MetaDataComponent>(entity).EntityName;
-            entMan.System<MetaDataSystem>().SetEntityName(animatableClone, val);
-
-            if (!entMan.TryGetComponent(entity, out SpriteComponent? sprite0))
-            {
-                Logger.Error("Entity ({0}) couldn't be animated for pickup since it doesn't have a {1}!", entMan.GetComponent<MetaDataComponent>(entity).EntityName, nameof(SpriteComponent));
-                return;
-            }
-            var sprite = entMan.GetComponent<SpriteComponent>(animatableClone);
-            sprite.CopyFrom(sprite0);
-            sprite.Visible = true;
-
-            var animations = entMan.GetComponent<AnimationPlayerComponent>(animatableClone);
-            animations.AnimationCompleted += (_) => {
-                entMan.DeleteEntity(animatableClone);
-            };
-
-            var despawn = entMan.EnsureComponent<TimedDespawnComponent>(animatableClone);
-            despawn.Lifetime = 0.25f;
-            entMan.System<SharedTransformSystem>().SetLocalRotationNoLerp(animatableClone, initialAngle);
-
-            animations.Play(new Animation
-            {
-                Length = TimeSpan.FromMilliseconds(125),
-                AnimationTracks =
-                {
-                    new AnimationTrackComponentProperty
-                    {
-                        ComponentType = typeof(TransformComponent),
-                        Property = nameof(TransformComponent.LocalPosition),
-                        InterpolationMode = AnimationInterpolationMode.Linear,
-                        KeyFrames =
-                        {
-                            new AnimationTrackProperty.KeyFrame(initialPosition.Position, 0),
-                            new AnimationTrackProperty.KeyFrame(finalPosition, 0.125f)
-                        }
-                    },
-                }
-            }, "fancy_pickup_anim");
-        }
-    }
-}

Content.Client/Antag/AntagStatusIconSystem.cs

@@ -0,0 +1,32 @@
+using Content.Shared.Ghost;
+using Content.Shared.StatusIcon;
+using Content.Shared.StatusIcon.Components;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Antag;
+
+/// <summary>
+/// Used for assigning specified icons for antags.
+/// </summary>
+public abstract class AntagStatusIconSystem<T> : SharedStatusIconSystem
+    where T : IComponent
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+
+    /// <summary>
+    /// Will check if the local player has the same component as the one who called it and give the status icon.
+    /// </summary>
+    /// <param name="antagStatusIcon">The status icon that your antag uses</param>
+    /// <param name="args">The GetStatusIcon event.</param>
+    protected virtual void GetStatusIcon(string antagStatusIcon, ref GetStatusIconsEvent args)
+    {
+        var ent = _player.LocalPlayer?.ControlledEntity;
+
+        if (!HasComp<T>(ent) && !HasComp<GhostComponent>(ent))
+            return;
+
+        args.StatusIcons.Add(_prototype.Index<StatusIconPrototype>(antagStatusIcon));
+    }
+}

Content.Client/Arcade/BlockGameMenu.cs

@@ -12,6 +12,7 @@ using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;

Content.Client/Armor/ArmorSystem.cs

@@ -0,0 +1,9 @@
+using Content.Shared.Armor;
+
+namespace Content.Client.Armor;
+
+/// <inheritdoc/>
+public sealed class ArmorSystem : SharedArmorSystem
+{
+
+}

Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs

@@ -56,7 +56,7 @@ namespace Content.Client.Atmos.EntitySystems
 
         private void HandleAtmosDebugOverlayMessage(AtmosDebugOverlayMessage message)
         {
-            _tileData[message.GridId] = message;
+            _tileData[GetEntity(message.GridId)] = message;
         }
 
         private void HandleAtmosDebugOverlayDisableMessage(AtmosDebugOverlayDisableMessage ev)

Content.Client/Atmos/EntitySystems/FireVisualizerSystem.cs

@@ -10,6 +10,8 @@ namespace Content.Client.Atmos.EntitySystems;
 /// </summary>
 public sealed class FireVisualizerSystem : VisualizerSystem<FireVisualsComponent>
 {
+    [Dependency] private readonly PointLightSystem _lights = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -83,11 +85,11 @@ public sealed class FireVisualizerSystem : VisualizerSystem<FireVisualsComponent
         component.LightEntity ??= Spawn(null, new EntityCoordinates(uid, default));
         var light = EnsureComp<PointLightComponent>(component.LightEntity.Value);
 
-        light.Color = component.LightColor;
+        _lights.SetColor(component.LightEntity.Value, component.LightColor, light);
 
         // light needs a minimum radius to be visible at all, hence the + 1.5f
-        light.Radius = Math.Clamp(1.5f + component.LightRadiusPerStack * fireStacks, 0f, component.MaxLightRadius);
-        light.Energy = Math.Clamp(1 + component.LightEnergyPerStack * fireStacks, 0f, component.MaxLightEnergy);
+        _lights.SetRadius(component.LightEntity.Value, Math.Clamp(1.5f + component.LightRadiusPerStack * fireStacks, 0f, component.MaxLightRadius), light);
+        _lights.SetEnergy(component.LightEntity.Value, Math.Clamp(1 + component.LightEnergyPerStack * fireStacks, 0f, component.MaxLightEnergy), light);
 
         // TODO flickering animation? Or just add a noise mask to the light? But that requires an engine PR.
     }

Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs

@@ -65,8 +65,10 @@ namespace Content.Client.Atmos.EntitySystems
 
         private void HandleGasOverlayUpdate(GasOverlayUpdateEvent ev)
         {
-            foreach (var (grid, removedIndicies) in ev.RemovedChunks)
+            foreach (var (nent, removedIndicies) in ev.RemovedChunks)
             {
+                var grid = GetEntity(nent);
+
                 if (!TryComp(grid, out GasTileOverlayComponent? comp))
                     continue;
 
@@ -76,8 +78,10 @@ namespace Content.Client.Atmos.EntitySystems
                 }
             }
 
-            foreach (var (grid, gridData) in ev.UpdatedChunks)
+            foreach (var (nent, gridData) in ev.UpdatedChunks)
             {
+                var grid = GetEntity(nent);
+
                 if (!TryComp(grid, out GasTileOverlayComponent? comp))
                     continue;
 

Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs

@@ -48,7 +48,7 @@ public sealed class AirAlarmBoundUserInterface : BoundUserInterface
     {
         SendMessage(new AirAlarmUpdateDeviceDataMessage(address, data));
     }
-	
+
 	private void OnDeviceDataCopied(IAtmosDeviceData data)
     {
         SendMessage(new AirAlarmCopyDeviceDataMessage(data));

Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs

@@ -4,10 +4,8 @@ using Content.Shared.Atmos;
 using Content.Shared.Atmos.EntitySystems;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
+using Robust.Shared.Map.Components;
 
 namespace Content.Client.Atmos.Overlays
 {
@@ -19,6 +17,7 @@ namespace Content.Client.Atmos.Overlays
         [Dependency] private readonly IMapManager _mapManager = default!;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
+        private List<Entity<MapGridComponent>> _grids = new();
 
         internal AtmosDebugOverlay(AtmosDebugOverlaySystem system)
         {
@@ -41,10 +40,19 @@ namespace Content.Client.Atmos.Overlays
             // 3. "Is this going to make it harder for atmos programmers to add data that may not be chunk-friendly into the atmos debugger?"
             // Nanotrasen needs YOU! to avoid premature optimization in critical debugging tools - 20kdc
 
-            foreach (var mapGrid in _mapManager.FindGridsIntersecting(mapId, worldBounds))
+            _grids.Clear();
+
+            _mapManager.FindGridsIntersecting(mapId, worldBounds, ref _grids, (EntityUid uid, MapGridComponent grid,
+                ref List<Entity<MapGridComponent>> state) =>
             {
-                if (!_atmosDebugOverlaySystem.HasData(mapGrid.Owner) ||
-                    !_entManager.TryGetComponent<TransformComponent>(mapGrid.Owner, out var xform))
+                state.Add((uid, grid));
+                return true;
+            });
+
+            foreach (var (uid, mapGrid) in _grids)
+            {
+                if (!_atmosDebugOverlaySystem.HasData(uid) ||
+                    !_entManager.TryGetComponent<TransformComponent>(uid, out var xform))
                     continue;
 
                 drawHandle.SetTransform(xform.WorldMatrix);
@@ -53,7 +61,7 @@ namespace Content.Client.Atmos.Overlays
                 {
                     foreach (var tile in mapGrid.GetTilesIntersecting(worldBounds))
                     {
-                        var dataMaybeNull = _atmosDebugOverlaySystem.GetData(mapGrid.Owner, tile.GridIndices);
+                        var dataMaybeNull = _atmosDebugOverlaySystem.GetData(uid, tile.GridIndices);
                         if (dataMaybeNull != null)
                         {
                             var data = (SharedAtmosDebugOverlaySystem.AtmosDebugOverlayData) dataMaybeNull;
@@ -61,9 +69,10 @@ namespace Content.Client.Atmos.Overlays
                             {
                                 // -- Mole Count --
                                 float total = 0;
-                                switch (_atmosDebugOverlaySystem.CfgMode) {
+                                switch (_atmosDebugOverlaySystem.CfgMode)
+                                {
                                     case AtmosDebugOverlayMode.TotalMoles:
-                                        foreach (float f in data.Moles)
+                                        foreach (var f in data.Moles)
                                         {
                                             total += f;
                                         }
@@ -75,7 +84,7 @@ namespace Content.Client.Atmos.Overlays
                                         total = data.Temperature;
                                         break;
                                 }
-                                var interp = ((total - _atmosDebugOverlaySystem.CfgBase) / _atmosDebugOverlaySystem.CfgScale);
+                                var interp = (total - _atmosDebugOverlaySystem.CfgBase) / _atmosDebugOverlaySystem.CfgScale;
                                 Color res;
                                 if (_atmosDebugOverlaySystem.CfgCBM)
                                 {

Content.Client/Atmos/Overlays/GasTileOverlay.cs

@@ -8,6 +8,8 @@ using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
+using Robust.Shared.Graphics;
+using Robust.Shared.Graphics.RSI;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Prototypes;
@@ -79,7 +81,7 @@ namespace Content.Client.Atmos.Overlays
 
                         if (!rsi.TryGetState(stateId, out var state)) continue;
 
-                        _frames[i] = state.GetFrames(RSI.State.Direction.South);
+                        _frames[i] = state.GetFrames(RsiDirection.South);
                         _frameDelays[i] = state.GetDelays();
                         _frameCounter[i] = 0;
                         break;
@@ -97,7 +99,7 @@ namespace Content.Client.Atmos.Overlays
                 if (!fire.TryGetState((i + 1).ToString(), out var state))
                     throw new ArgumentOutOfRangeException($"Fire RSI doesn't have state \"{i}\"!");
 
-                _fireFrames[i] = state.GetFrames(RSI.State.Direction.South);
+                _fireFrames[i] = state.GetFrames(RsiDirection.South);
                 _fireFrameDelays[i] = state.GetDelays();
                 _fireFrameCounter[i] = 0;
             }

Content.Client/Atmos/UI/GasAnalyzerWindow.xaml.cs

@@ -9,6 +9,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using static Content.Shared.Atmos.Components.GasAnalyzerComponent;
+using Direction = Robust.Shared.Maths.Direction;
 
 namespace Content.Client.Atmos.UI
 {
@@ -68,7 +69,7 @@ namespace Content.Client.Atmos.UI
                     _ => GridIcon.OverrideDirection
                 };
 
-                GridIcon.SetEntity(msg.DeviceUid);
+                GridIcon.SetEntity(IoCManager.Resolve<IEntityManager>().GetEntity(msg.DeviceUid));
                 LeftPanel.RemoveAllChildren();
                 MiddlePanel.RemoveAllChildren();
                 RightPanel.RemoveAllChildren();

Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs

@@ -19,7 +19,7 @@ namespace Content.Client.Atmos.UI
 
         [ViewVariables]
         private float _maxTemp = 0.0f;
-        
+
         [ViewVariables]
         private bool _isHeater = true;