refactor Prototype class init

.editorconfig

@@ -127,7 +127,6 @@ csharp_indent_braces = false
 #csharp_indent_case_contents_when_block = true
 #csharp_indent_labels = one_less_than_current
 csharp_indent_switch_labels = true
-xmldoc_indent_text = zeroindent
 
 # Space preferences
 csharp_space_after_cast = false
@@ -345,9 +344,6 @@ resharper_keep_existing_attribute_arrangement = true
 resharper_wrap_chained_binary_patterns = chop_if_long
 resharper_wrap_chained_method_calls = chop_if_long
 resharper_csharp_trailing_comma_in_multiline_lists = true
-resharper_csharp_qualified_using_at_nested_scope = false
-resharper_csharp_prefer_qualified_reference = false
-resharper_csharp_allow_alias = false
 
 [*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
 indent_size = 2

.envrc

@@ -1,5 +1,4 @@
-set -e
-if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
 fi
 use flake

.github/CODEOWNERS

@@ -1,6 +1,64 @@
-# TheShuEd
-* @TheShuEd
+# Last match in file takes precedence.
 
-# TornadoTechnology
-*.cs @Tornado-Technology
-*.xaml @Tornado-Technology
+# Sorting by path instead of by who added it one day :(
+# this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
+/Resources/ConfigPresets/WizardsDen/  @Chief-Engineer
+
+# Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short.
+# You need to add your name to these entries, not make a new one, if you care about them.
+/Content.*/Toolshed/ @moonheart08
+**/Toolshed/** @moonheart08
+*Command.cs @moonheart08
+/Content.*/Administration/ @moonheart08 @DrSmugleaf @Chief-Engineer
+/Content.*/Station/ @moonheart08
+/Content.*/Maps/ @moonheart08
+/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
+/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
+/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
+/Resources/ServerInfo/Guidebook/ServerRules/ @Chief-Engineer
+/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
+/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
+
+/Resources/Prototypes/Maps/** @Emisse
+
+/Resources/Prototypes/Body/ @DrSmugleaf # suffering
+/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
+/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
+/Resources/Prototypes/Guidebook/rules.yml @Chief-Engineer
+/Content.*/Body/ @DrSmugleaf
+/Content.YAMLLinter @DrSmugleaf
+/Content.Shared/Damage/ @DrSmugleaf
+
+/Content.*/Anomaly/ @EmoGarbage404 @TheShuEd
+/Content.*/Lathe/ @EmoGarbage404
+/Content.*/Materials/ @EmoGarbage404
+/Content.*/Mech/ @EmoGarbage404
+/Content.*/Research/ @EmoGarbage404
+/Content.*/Stack/ @EmoGarbage404
+/Content.*/Xenoarchaeology/ @EmoGarbage404
+/Content.*/Zombies/ @EmoGarbage404
+/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404 @TheShuEd
+/Resources/Prototypes/Research/ @EmoGarbage404
+
+/Content.*/Forensics/ @ficcialfaint
+
+# SKREEEE
+/Content.*.Database/ @PJB3005 @DrSmugleaf
+/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
+/Pow3r/ @PJB3005
+/Content.Server/Power/Pow3r/ @PJB3005
+
+# notafet
+/Content.*/Atmos/ @Partmedia
+/Content.*/Botany/ @Partmedia
+
+#Jezi
+/Content.*/Medical @Jezithyr
+/Content.*/Body @Jezithyr
+
+# Sloth
+/Content.*/Audio @metalgearsloth
+/Content.*/Movement @metalgearsloth
+/Content.*/NPC @metalgearsloth
+/Content.*/Shuttles @metalgearsloth
+/Content.*/Weapons @metalgearsloth

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +1,17 @@
 ## About the PR
 <!-- What did you change in this PR? -->
+<!-- Что вы изменили в своем пулл реквесте? -->
 
 ## Why / Balance
 <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. -->
+<!-- Зачем нужно это изменение? Прикрепите любые обсуждения или проблемы здесь. Опишите, как это повлияет на текущий баланс игры. -->
 
 ## Media
 <!--
 PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes.
 Small fixes/refactors are exempt.
 -->
-
-**Changelog**
-<!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay.
-Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up.
-Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. -->
 <!--
-:cl:
-- add: Added fun!
-- remove: Removed fun!
-- tweak: Changed fun!
-- fix: Fixed fun!
+Пулл реквесты, которые несут за собой игровые изменения (добавления одежды, предметов и так далее) требуют чтобы вы прикрепили скриншоты или видеоролики, демонстрирующие эти изменения.
+Небольшие исправления не считаются.
 -->

.github/labeler.yml

@@ -16,11 +16,7 @@
 - changed-files:
   - any-glob-to-any-file: '**/*.swsl'
 
-"Changes: Audio":
-- changed-files:
-  - any-glob-to-any-file: '**/*.ogg'
-
-"Changes: No C#":
+"No C#":
 - changed-files:
   # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label.
   - all-globs-to-all-files: "!**/*.cs"

.github/workflows/CP14Publish.yml

@@ -1,4 +1,4 @@
-name: Edge Publish
+name: Publish
 
 concurrency:
   group: publish
@@ -10,15 +10,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    
-    - name: Install Python dependencies
-      run: sudo apt-get install -y python3-paramiko python3-lxml
-      
     - name: Send POST-request
       uses: appleboy/ssh-action@master
       with:
@@ -27,10 +18,3 @@ jobs:
         password: ${{ secrets.BUILD_PASS }}
         port: 22
         script: sh update.sh &> /dev/null
-
-    - name: Publish changelog (Discord)
-      continue-on-error: true
-      run: Tools/actions_changelogs_since_last_run.py
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}

.github/workflows/benchmarks.yml

@@ -11,7 +11,7 @@ jobs:
     name: Run Benchmarks
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: 'recursive'
     - name: Get Engine version

.github/workflows/build-docfx.yml

@@ -8,7 +8,7 @@ jobs:
   docfx:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
     - name: Setup submodule
       run: |
         git submodule update --init --recursive
@@ -19,9 +19,9 @@ jobs:
         cd RobustToolbox/
         git submodule update --init --recursive
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v4.1.0
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore

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

@@ -2,11 +2,11 @@
 
 on:
   push:
-    branches: [ master, staging, stable ]
+    branches: [ master, staging, trying ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
-    branches: [ master, staging, stable ]
+    branches: [ master ]
 
 jobs:
   build:
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout Master
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v3.6.0
 
       - name: Setup Submodule
         run: |
@@ -34,9 +34,9 @@ jobs:
           git submodule update --init --recursive
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
+        uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore

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

@@ -2,11 +2,11 @@ name: Build & Test Debug
 
 on:
   push:
-    branches: [ master, staging, stable ]
+    branches: [ master, staging, trying ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
-    branches: [ master, staging, stable ]
+    branches: [ master ]
 
 jobs:
   build:
@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout Master
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v3.6.0
 
     - name: Setup Submodule
       run: |
@@ -34,9 +34,9 @@ jobs:
         git submodule update --init --recursive
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v4.1.0
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/check-crlf.yml

@@ -10,6 +10,6 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
     - name: Check for CRLF
       run: Tools/check_crlf.py

.github/workflows/check-trailing-whitespace.yml

@@ -1,59 +0,0 @@
-name: Trailing Whitespace Check
-
-on:
-  pull_request:
-    types: [ opened, reopened, synchronize, ready_for_review ]
-
-jobs:
-  build:
-    name: Trailing Whitespace Check
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4.2.2
-    - name: Get changed text files
-      id: changed-files
-      uses: tj-actions/changed-files@v46.0.5
-      with:
-        files: |
-          **.cs
-          **.yml
-          **.swsl
-          **.json
-          **.py
-    - name: Check for trailing whitespace and EOF newline
-      env:
-        ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
-      run: |
-        has_trailing_whitespace=0
-        has_missing_eof_newline=0
-
-        for file in ${ALL_CHANGED_FILES}; do
-          # Ignore vanilla not CrystallEdge files
-          if [[ "$file" != *CP14* ]]; then
-              continue
-            fi
-          
-          echo "Checking $file"
-
-          # Check for trailing whitespace
-          if grep -qP '[ \t]+$' "$file"; then
-            echo "::error file=$file::Trailing whitespace found"
-            has_trailing_whitespace=1
-          fi
-
-          # Check for missing EOF newline
-          if [ -f "$file" ] && [ -s "$file" ]; then
-            last_char=$(tail -c 1 "$file")
-            if [ "$last_char" != "" ] && [ "$last_char" != $'\n' ]; then
-              echo "::error file=$file::Missing newline at end of file"
-              has_missing_eof_newline=1
-            fi
-          fi
-        done
-
-        if [ "$has_trailing_whitespace" -eq 1 ] || [ "$has_missing_eof_newline" -eq 1 ]; then
-          echo "Issues found: trailing whitespace or missing EOF newline."
-          echo "We recommend using an IDE to prevent this from happening."
-          exit 1
-        fi

.github/workflows/cla.yml

@@ -1,38 +0,0 @@
-name: "CLA Assistant"
-on:
-  issue_comment:
-    types: [created]
-  pull_request_target:
-    types: [opened,closed,synchronize]
-    paths:
-      - '**CP14**'
-
-# explicitly configure permissions, in case your GITHUB_TOKEN workflow permissions are set to read-only in repository settings
-permissions:
-  actions: write
-  contents: write # this can be 'read' if the signatures are in remote repository
-  pull-requests: write
-  statuses: write
-
-jobs:
-  CLAAssistant:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "CLA Assistant"
-        if: ((github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target') && github.actor != 'TheShuEd'
-        uses: contributor-assistant/github-action@v2.6.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # the below token should have repo scope and must be manually added by you in the repository's secret
-          # This token is required only if you have configured to store the signatures in a remote repository/organization
-          # PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-        with:
-          path-to-signatures: 'signatures/version1/cla.json'
-          path-to-document: 'https://github.com/crystallpunk-14/crystall-punk-14/blob/master/CLA.md' # e.g. a CLA or a DCO document
-          # branch should not be protected
-          branch: 'master'
-          allowlist: TheShuEd,bot*
-
-         # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
-          #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
-          #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'

.github/workflows/close-master-pr.yml

@@ -12,7 +12,7 @@ jobs:
     steps:    
     - uses: superbrothers/close-pull-request@v3
       with:
-        comment: "Thank you for your contribution! It appears you created a PR from your master branch, this is [something you should avoid doing](https://jmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/), and thus this PR has been automatically closed. \n \n We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n \n You can move your current work from the master branch to another branch by following [these commands](https://ohshitgit.com/#accidental-commit-master). And then you may recreate your PR using the new branch."
+        comment: "Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html) \n\n You can move your current work from the master branch to another branch by doing `git branch <branch_name` and resetting the master branch."
 
     # If you prefer to just comment on the pr and not close it, uncomment the bellow and comment the above
       

.github/workflows/conflict-labeler.yml

@@ -0,0 +1,21 @@
+name: Check Merge Conflicts
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+
+jobs:
+  Label:
+    if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' )
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for Merge Conflicts
+        uses: eps1lon/actions-label-merge-conflict@v3.0.0
+        with:
+          dirtyLabel: "Merge Conflict"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."

.github/workflows/labeler-conflict.yml

@@ -1,21 +0,0 @@
-name: Check Merge Conflicts
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-
-jobs:
-  Label:
-    if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' )
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for Merge Conflicts
-        uses: eps1lon/actions-label-merge-conflict@v3.0.0
-        with:
-          dirtyLabel: "S: Merge Conflict"
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."

.github/workflows/labeler-needsreview.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
       with:
-        labels: "S: Needs Review"
+        labels: "Status: Needs Review"
     - uses: actions-ecosystem/action-remove-labels@v1
       with:
-        labels: "S: Awaiting Changes"
+        labels: "Status: Awaiting Changes"

.github/workflows/labeler-review.yml

@@ -1,23 +0,0 @@
-name: "Labels: Approved"
-on:
-  pull_request_review:
-    types: [submitted]
-jobs:
-  add_label:
-    # Change the repository name after you've made sure the team name is correct for your fork!
-    if: ${{ (github.repository == 'space-wizards/space-station-14') && (github.event.review.state == 'APPROVED') }}
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-    - uses: tspascoal/get-user-teams-membership@v3
-      id: checkUserMember
-      with:
-        username: ${{ github.actor }}
-        team: "content-maintainers,junior-maintainers"
-        GITHUB_TOKEN: ${{ secrets.LABELER_PAT }}
-    - if: ${{ steps.checkUserMember.outputs.isTeamMember == 'true' }}
-      uses: actions-ecosystem/action-add-labels@v1
-      with:
-        labels: "S: Approved"

.github/workflows/labeler-size.yml

@@ -1,20 +0,0 @@
-name: "Labels: Size"
-on: pull_request_target
-jobs:
-  size-label:
-    runs-on: ubuntu-latest
-    steps:
-      - name: size-label
-        uses: "pascalgn/size-label-action@v0.5.5"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        with:
-          # Custom size configuration
-          sizes: >
-            {
-              "0": "XS",
-              "10": "S",
-              "100": "M",
-              "1000": "L",
-              "5000": "XL"
-            }

.github/workflows/labeler-stable.yml

@@ -1,16 +0,0 @@
-name: "Labels: Branch stable"
-
-on:
-  pull_request_target:
-    types:
-      - opened
-    branches:
-      - 'stable'
-
-jobs:
-  add_label:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions-ecosystem/action-add-labels@v1
-      with:
-        labels: "Branch: Stable"

.github/workflows/labeler-staging.yml

@@ -1,16 +0,0 @@
-name: "Labels: Branch staging"
-
-on:
-  pull_request_target:
-    types:
-      - opened
-    branches:
-      - 'staging'
-
-jobs:
-  add_label:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions-ecosystem/action-add-labels@v1
-      with:
-        labels: "Branch: Staging"

.github/workflows/labeler-untriaged.yml

@@ -3,8 +3,6 @@
 on:
   issues:
     types: [opened]
-  pull_request_target:
-    types: [opened]
 
 jobs:
   add_label:
@@ -13,4 +11,4 @@ jobs:
     - uses: actions-ecosystem/action-add-labels@v1
       if: join(github.event.issue.labels) == ''
       with:
-        labels: "S: Untriaged"
+        labels: "Status: Untriaged"

.github/workflows/publish-testing.yml

@@ -1,46 +0,0 @@
-name: Publish Testing
-
-concurrency:
-  group: publish-testing
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-  schedule:
-  - cron: '0 10 * * *'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3.6.0
-      with:
-        submodules: 'recursive'
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3.2.0
-      with:
-        dotnet-version: 9.0.x
-
-    - name: Get Engine Tag
-      run: |
-        cd RobustToolbox
-        git fetch --depth=1
-
-    - 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: Publish version
-      run: Tools/publish_multi_request.py --fork-id wizards-testing
-      env:
-        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
-        GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}

.github/workflows/publish.yml

@@ -2,7 +2,6 @@ name: Publish
 
 concurrency:
   group: publish
-  cancel-in-progress: true
 
 on:
   workflow_dispatch:
@@ -17,13 +16,13 @@ jobs:
     - name: Install dependencies
       run: sudo apt-get install -y python3-paramiko python3-lxml
 
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
       with:
         submodules: 'recursive'
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v4.1.0
+      uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 8.0.x
 
     - name: Get Engine Tag
       run: |
@@ -49,14 +48,12 @@ jobs:
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
     - name: Publish changelog (Discord)
-      continue-on-error: true
       run: Tools/actions_changelogs_since_last_run.py
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
 
     - name: Publish changelog (RSS)
-      continue-on-error: true
       run: Tools/actions_changelog_rss.py
       env:
         CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}

.github/workflows/rsi-diff.yml

@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v3.6.0
 
       - name: Get changed files
         id: files
         uses: Ana06/get-changed-files@v2.3.0
         with:
           format: 'space-delimited'
-          filter: |
+          filter: | 
             **.rsi
             **.png
 

.github/workflows/test-packaging.yml

@@ -2,7 +2,7 @@
 
 on:
   push:
-    branches: [ master, staging, stable ]
+    branches: [ master, staging, trying ]
     paths:
       - '**.cs'
       - '**.csproj'
@@ -16,7 +16,7 @@ on:
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
-    branches: [ master, staging, stable ]
+    branches: [ master ]
     paths:
       - '**.cs'
       - '**.csproj'
@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout Master
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v3.6.0
 
       - name: Setup Submodule
         run: |
@@ -49,9 +49,9 @@ jobs:
           git submodule update --init --recursive
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
+        uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/update-credits.yml

@@ -4,19 +4,19 @@ 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@v4.2.2
+      - uses: actions/checkout@v3.6.0
         with:
           ref: master
-
+        
       - name: Get this week's Contributors
         shell: pwsh
         env:
@@ -25,25 +25,25 @@ jobs:
 
       # TODO
       #- name: Get this week's Patreons
-      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml
-
+      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml        
+      
       # MAKE SURE YOU ENABLED "Allow GitHub Actions to create and approve pull requests" IN YOUR ACTIONS, OTHERWISE IT WILL MOST LIKELY FAIL
 
 
-      # For this you can use a pat token of an account with direct push access to the repo if you have protected branches.
+      # For this you can use a pat token of an account with direct push access to the repo if you have protected branches. 
       # Uncomment this and comment the other line if you do this.
       # https://github.com/stefanzweifel/git-auto-commit-action#push-to-protected-branches
-
+      
       #- 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>
-
+      
       # This will make a PR
       - name: Set current date as env variable
         run: echo "NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_ENV
-
+        
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:

.github/workflows/validate-rgas.yml

@@ -1,7 +1,7 @@
 name: RGA schema validator
 on:
   push:
-    branches: [ master, staging, stable ]
+    branches: [ master, staging, trying ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
@@ -12,7 +12,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
     - name: Setup Submodule
       run: git submodule update --init
     - name: Pull engine updates

.github/workflows/validate-rsis.yml

@@ -2,7 +2,7 @@ name: RSI Validator
 
 on:
   push:
-    branches: [ master, staging, stable ]
+    branches: [ staging, trying ]
   merge_group:
   pull_request:
     paths:
@@ -13,7 +13,7 @@ jobs:
     name: Validate RSIs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v3.6.0
       - name: Setup Submodule
         run: git submodule update --init
       - name: Pull engine updates

.github/workflows/validate_mapfiles.yml

@@ -1,7 +1,7 @@
 name: Map file schema validator
 on:
   push:
-    branches: [ master, staging, stable ]
+    branches: [ master, staging, trying ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
@@ -12,7 +12,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v3.6.0
     - name: Setup Submodule
       run: git submodule update --init
     - name: Pull engine updates

.github/workflows/yaml-linter.yml

@@ -2,7 +2,7 @@ name: YAML Linter
 
 on:
   push:
-    branches: [ master, staging, stable ]
+    branches: [ master, staging, trying ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
@@ -13,7 +13,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v3.6.0
       - name: Setup submodule
         run: |
           git submodule update --init --recursive
@@ -24,9 +24,9 @@ jobs:
           cd RobustToolbox/
           git submodule update --init --recursive
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
+        uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 8.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

.vscode/tasks.json

@@ -32,50 +32,6 @@
                 "/consoleloggerparameters:'ForceNoAlign;NoSummary'"
             ],
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "test",
-            "command": "dotnet",
-            "type": "shell",
-            "args": [
-                "test",
-                "--no-build",
-                "--configuration",
-                "DebugOpt",
-                "Content.Tests/Content.Tests.csproj",
-                "--",
-                "NUnit.ConsoleOut=0"
-            ],
-            "group": {
-                "kind": "test"
-            },
-            "presentation": {
-                "reveal": "silent"
-            },
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "integration-test",
-            "command": "dotnet",
-            "type": "shell",
-            "args": [
-                "test",
-                "--no-build",
-                "--configuration",
-                "DebugOpt",
-                "Content.IntegrationTests/Content.IntegrationTests.csproj",
-                "--",
-                "NUnit.ConsoleOut=0",
-                "NUnit.MapWarningTo=Failed.ConsoleOut=0",
-                "NUnit.MapWarningTo=Failed"
-            ],
-            "group": {
-                "kind": "test"
-            },
-            "presentation": {
-                "reveal": "silent"
-            },
-            "problemMatcher": "$msCompile"
         }
     ]
 }

BuildChecker/BuildChecker.csproj

@@ -12,12 +12,12 @@ You want to handle the Build, Clean and Rebuild tasks to prevent missing task er
 If you want to learn more about these kinds of things, check out Microsoft's official documentation about MSBuild:
 https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
 -->
-<Project Sdk="Microsoft.NET.Sdk">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Python>python3</Python>
     <Python Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">py -3</Python>
     <ProjectGuid>{C899FCA4-7037-4E49-ABC2-44DE72487110}</ProjectGuid>
-    <TargetFramework>net4.7.2</TargetFramework>
+    <TargetFrameworkMoniker>.NETFramework, Version=v4.7.2</TargetFrameworkMoniker>
     <RestorePackages>false</RestorePackages>
   </PropertyGroup>
   <PropertyGroup>

BuildChecker/git_helper.py

@@ -5,7 +5,6 @@ import subprocess
 import sys
 import os
 import shutil
-import time
 from pathlib import Path
 from typing import List
 
@@ -105,21 +104,7 @@ def reset_solution():
     with SOLUTION_PATH.open("w") as f:
         f.write(content)
 
-def check_for_zip_download():
-    # Check if .git exists,
-    cur_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-    if not os.path.isdir(os.path.join(cur_dir, ".git")):
-        print("It appears that you downloaded this repository directly from GitHub. (Using the .zip download option) \n"
-              "When downloading straight from GitHub, it leaves out important information that git needs to function. "
-              "Such as information to download the engine or even the ability to even be able to create contributions. \n"
-              "Please read and follow https://docs.spacestation14.com/en/general-development/setup/setting-up-a-development-environment.html \n"
-              "If you just want a Sandbox Server, you are following the wrong guide! You can download a premade server following the instructions here:"
-              "https://docs.spacestation14.com/en/general-development/setup/server-hosting-tutorial.html \n"
-              "Closing automatically in 30 seconds.")
-        time.sleep(30)
-        exit(1)
 
 if __name__ == '__main__':
-    check_for_zip_download()
     install_hooks()
     update_submodules()

CLA.md

@@ -1,80 +0,0 @@
-# CrystallEdge Contributor License Agreement
-### Version 1.0
-##### Thank you for your interest in contributing to CrystallEdge ("We" or "Us").
-
-##### The purpose of this contributor agreement ("Agreement") is for Your protection as a Contributor in addition to the protection of our community.
-
-##### If you wish to contact us regarding licensing matters we can be reached at crystalledge14@gmail.com
-
-## How to use this Contributor Agreement
-
-##### If You are an employee and have created the Contribution as part of your employment, You need to have Your employer approve this Agreement or sign the Entity version of this document as well.
-## 1.  Definitions
-- _**"You"**_ means the individual Copyright owner who Submits a Contribution to Us.
-- _**"Contribution(s)"**_ means any work(s) of authorship, including any original modifications or additions to an existing work of authorships, Submitted by You to Us, where You are the author, holder of copyright, or Licensee under an Approved License specified by Us.
-- _**"Copyright"**_ means all rights protecting works of authorship, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence.
-- **_"Material"_** means the software or documentation made available by Us to third parties. When this Agreement covers more than one software project, the Material means the software or documentation to which the Contributions were Submitted. After You Submit the Contributions, theymay be included in the Material.
-- **_"Submit"_** means any act by which Contributions are transferred to Us by You by means of tangible or intangible media, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us, but excluding any transfer that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
-- **_"Documentation"_** means any non-software portion of Contributions.
-- **_"Approved License"_** means any License specified by CrystallEdge to be Approved or “Compatible” with the Project the Contributions are Submitted to.
-## 2.  Representations
-
-### 2.1  Representation of legal age
-
-##### You represent that you are older than 16 years of age, and if required by law, have authorization by a legal guardian to enter this agreement.
-
-### 2.2  Assurance of legal rights
-
-##### You represent and assure that You have sufficient rights to your Contribution and are legally entitled to enter this Agreement and grant the licenses specified below or an Approved license if Your Contribution or portions thereof are provided to You under one of the Approved Licenses.
-
-### 2.3  Third Party Contributions
-
-##### If You act on behalf of Your employer or other third party You represent that You are authorized and have the right to Submit the Contribution on behalf of Your employer or the mentioned third party.
-
-### 2.4 Compliance and Non-infringement
-##### You represent and warrant that each of your Contributions:
-- Is and will remain an original work of authorship;
-- to the best of Your knowledge, does not and will not infringe any third party’s copyright, trademark, patent, or other intellectual property rights;
-- In part or in whole, is licensed under one of the Approved Licenses or is an original work you have the rights to.
-- includes the complete and correct details of any license, third-party license, patent, trademark, necessary attributions or other restriction associated with all or any part of Your Contribution in a conspicuous location;
-- complies and will continue to comply with all applicable laws, including export control laws and regulations;
-
-### 2.5  Mixed license Contributions
-
-##### Subject to the terms and conditions of this agreement, specifically section 2, if there is a conflict between the grants in section 3, 4 and a Contribution under an Approved License, the terms of the Approved License supersede.
-## 2.6 Employee or Representative Submissions
-
-##### If You Submit as a company, You agree that a) Your employees, contractors, and representatives may Submit Contributions on Your behalf; and b) the individual signing this Agreement on Your behalf has the necessary authority including the authority to bind You to the Agreement.
-
-## 3. License grant
-###   3.1  Copyright license to Us
-##### Subject to the terms and conditions of this Agreement, You hereby grant to Us a worldwide, royalty-free, NON-exclusive, perpetual and irrevocable (except as stated in Sections 2.4 and 8.2) license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, under the Copyright covering the Contributions to use the Contributions by all means, including, but not limited to:
-- publish the Contributions,
-- modify the Contributions,
-- prepare derivative works based upon or containing the Contributions and/or to combine the Contributions with other Materials,
-- reproduce the Contributions in original or modified form,
-- distribute, to make the Contributions available to the public, display and publicly perform the Contributions in original or modified form.
-##   3.2  Moral rights
-##### Moral Rights remain unaffected to the extent they are recognized and not waivable by applicable law. Notwithstanding, You may add your name to the attribution mechanism customary used in the Materials you Contribute to, such as the header of the source code files of Your Contributions, and We will respect this attribution when using Your Contributions.
-## 4. Patents
-###   4.1  Patent license
-##### Subject to the terms and conditions of this Agreement You hereby grant to Us and to recipients of Materials distributed by Us a worldwide, royalty-free, non-exclusive, perpetual and irrevocable (except as stated in Section 3.2) patent license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contributions and the Contributions in combination with any Material (and portions of such combination). This license applies to all patents owned or controlled by You, whether already acquired or hereafter acquired, that would be infringed by making, having made, using, selling, offering for sale, importing or otherwise transferring of Your Contribution(s) alone or by combination of Your Contribution(s) with any Material.
-###   4.2  Revocation of patent license
-##### You reserve the right to revoke the patent license stated in section 3.1 if We make any infringement claim that is targeted at your Contribution(s) and not asserted for a Defensive Purpose. An assertion of claims of the Patents shall be considered for a "Defensive Purpose" if the claims are asserted against an entity that has filed, maintained, threatened, or voluntarily participated in a patent infringement lawsuit against Us or any of Our licensees.
-## 5. Disclaimer
-####   CONTRIBUTIONS ARE PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US AND BY US TO YOU. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION AND EXTENT TO THE MINIMUM PERIOD AND EXTENT PERMITTED BY LAW.
-## 6. Consequential damage waiver
-####   TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR WE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
-## 7. Approximation of disclaimer and damage waiver
-####   IF THE DISCLAIMER AND DAMAGE WAIVER MENTIONED IN SECTION 4. AND SECTION 5. CANNOT BE GIVEN LEGAL EFFECT UNDER APPLICABLE LOCAL LAW, REVIEWING COURTS SHALL APPLY LOCAL LAW THAT MOST CLOSELY APPROXIMATES AN ABSOLUTE WAIVER OF ALL CIVIL OR CONTRACTUAL LIABILITY IN CONNECTION WITH THE CONTRIBUTION.
-## 8. Term
-#####   8.1  This Agreement shall come into effect upon Your acceptance of the terms and conditions, either by replying to the CLA Bot or by sending a signed copy to crystalledge14@gmail.com with the subject: "\<your name\>  CLA"
-#####   8.2  In the event of a termination of this Agreement Sections 4, 5, 6, 7 and 8 shall survive such termination and shall remain in full force thereafter. For the avoidance of doubt, Approved (sub)licenses that have already been granted for Contributions at the date of the termination shall remain in full force after the termination of this Agreement.
-## 9. Miscellaneous
-#####   9.1  This Agreement and all disputes, claims, actions, suits or other proceedings arising out of this agreement or relating in any way to it shall be governed by the laws of Russia excluding its private international law provisions.
-#####   9.2  This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.
-#####   9.3  In case of Your death, this agreement shall continue with Your heirs. In case of more than one heir, all heirs must exercise their rights through a commonly authorized person.
-#####   9.4  If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and that is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.
-#####   9.5  You agree to notify Us of any facts or circumstances of which you become aware that would make this Agreement inaccurate in any respect.
-#####   9.6  Any Substantive modifications to this Agreement will result in a new version being created, to continue Contributing you must agree to the latest version of the Agreement, which supersedes any previous versions. 
-#####   9.7  CrystallEdge will provide notification of any new version of this agreement being created, if you do not agree to the new version of the Agreement the previous Agreement remains binding.

Content.Benchmarks/ComponentQueryBenchmark.cs

@@ -9,14 +9,13 @@ using Content.IntegrationTests.Pair;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Doors.Components;
 using Content.Shared.Item;
+using Robust.Server.GameObjects;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
-using Robust.Shared.EntitySerialization;
-using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
-using Robust.Shared.Utility;
 
 namespace Content.Benchmarks;
 
@@ -29,10 +28,11 @@ namespace Content.Benchmarks;
 [CategoriesColumn]
 public class ComponentQueryBenchmark
 {
-    public const string Map = "Maps/saltern.yml";
+    public const string Map = "Maps/atlas.yml";
 
     private TestPair _pair = default!;
     private IEntityManager _entMan = default!;
+    private MapId _mapId = new(10);
     private EntityQuery<ItemComponent> _itemQuery;
     private EntityQuery<ClothingComponent> _clothingQuery;
     private EntityQuery<MapComponent> _mapQuery;
@@ -54,10 +54,10 @@ public class ComponentQueryBenchmark
         _pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42);
         _pair.Server.WaitPost(() =>
         {
-            var map = new ResPath(Map);
-            var opts = DeserializationOptions.Default with {InitializeMaps = true};
-            if (!_entMan.System<MapLoaderSystem>().TryLoadMap(map, out _, out _, opts))
+            var success = _entMan.System<MapLoaderSystem>().TryLoad(_mapId, Map, out _);
+            if (!success)
                 throw new Exception("Map load failed");
+            _pair.Server.MapMan.DoMapInitialize(_mapId);
         }).GetAwaiter().GetResult();
 
         _items = new EntityUid[_entMan.Count<ItemComponent>()];

Content.Benchmarks/DynamicTreeBenchmark.cs

@@ -44,7 +44,7 @@ namespace Content.Benchmarks
             for (var i = 0; i < Aabbs1.Length; i++)
             {
                 var aabb = Aabbs1[i];
-                _b2Tree.CreateProxy(aabb, uint.MaxValue, i);
+                _b2Tree.CreateProxy(aabb, i);
                 _tree.Add(i);
             }
         }

Content.Benchmarks/MapLoadBenchmark.cs

@@ -6,13 +6,12 @@ using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.Server.Maps;
+using Robust.Server.GameObjects;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
-using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
 
 namespace Content.Benchmarks;
 
@@ -21,7 +20,7 @@ public class MapLoadBenchmark
 {
     private TestPair _pair = default!;
     private MapLoaderSystem _mapLoader = default!;
-    private SharedMapSystem _mapSys = default!;
+    private IMapManager _mapManager = default!;
 
     [GlobalSetup]
     public void Setup()
@@ -37,7 +36,7 @@ public class MapLoadBenchmark
             .ToDictionary(x => x.ID, x => x.MapPath.ToString());
 
         _mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
-        _mapSys = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<SharedMapSystem>();
+        _mapManager = server.ResolveDependency<IMapManager>();
     }
 
     [GlobalCleanup]
@@ -47,25 +46,23 @@ public class MapLoadBenchmark
         PoolManager.Shutdown();
     }
 
-    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Convex"};
+    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog" };
 
     [ParamsSource(nameof(MapsSource))]
     public string Map;
 
     public Dictionary<string, string> Paths;
-    private MapId _mapId;
 
     [Benchmark]
     public async Task LoadMap()
     {
-        var mapPath = new ResPath(Paths[Map]);
+        var mapPath = Paths[Map];
         var server = _pair.Server;
         await server.WaitPost(() =>
         {
-            var success = _mapLoader.TryLoadMap(mapPath, out var map, out _);
+            var success = _mapLoader.TryLoad(new MapId(10), mapPath, out _);
             if (!success)
                 throw new Exception("Map load failed");
-            _mapId = map.Value.Comp.MapId;
         });
     }
 
@@ -73,7 +70,9 @@ public class MapLoadBenchmark
     public void IterationCleanup()
     {
         var server = _pair.Server;
-        server.WaitPost(() => _mapSys.DeleteMap(_mapId))
-            .Wait();
+        server.WaitPost(() =>
+        {
+            _mapManager.DeleteMap(new MapId(10));
+        }).Wait();
     }
 }

Content.Benchmarks/Program.cs

@@ -1,7 +1,15 @@
 using System;
+using System.Linq;
+using System.Threading.Tasks;
 using BenchmarkDotNet.Running;
+using Content.IntegrationTests;
+using Content.Server.Maps;
+#if DEBUG
 using BenchmarkDotNet.Configs;
+#else
 using Robust.Benchmarks.Configs;
+#endif
+using Robust.Shared.Prototypes;
 
 namespace Content.Benchmarks
 {
@@ -14,15 +22,11 @@ namespace Content.Benchmarks
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine("\nWARNING: YOU ARE RUNNING A DEBUG BUILD, USE A RELEASE BUILD FOR AN ACCURATE BENCHMARK");
             Console.WriteLine("THE DEBUG BUILD IS ONLY GOOD FOR FIXING A CRASHING BENCHMARK\n");
-            var baseConfig = new DebugInProcessConfig();
+            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, new DebugInProcessConfig());
 #else
-            var baseConfig = Environment.GetEnvironmentVariable("ROBUST_BENCHMARKS_ENABLE_SQL") != null
-                ? DefaultSQLConfig.Instance
-                : DefaultConfig.Instance;
-#endif
-            var config = ManualConfig.Create(baseConfig);
-            config.BuildTimeout = TimeSpan.FromMinutes(5);
+            var config = Environment.GetEnvironmentVariable("ROBUST_BENCHMARKS_ENABLE_SQL") != null ? DefaultSQLConfig.Instance : null;
             BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, config);
+#endif
         }
     }
 }

Content.Benchmarks/PvsBenchmark.cs

@@ -7,16 +7,13 @@ using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.Server.Mind;
 using Content.Server.Warps;
-using Content.Shared.Warps;
+using Robust.Server.GameObjects;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
-using Robust.Shared.EntitySerialization;
-using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
-using Robust.Shared.Utility;
 
 namespace Content.Benchmarks;
 
@@ -37,6 +34,7 @@ public class PvsBenchmark
 
     private TestPair _pair = default!;
     private IEntityManager _entMan = default!;
+    private MapId _mapId = new(10);
     private ICommonSession[] _players = default!;
     private EntityCoordinates[] _spawns = default!;
     public int _cycleOffset = 0;
@@ -67,10 +65,10 @@ public class PvsBenchmark
         _pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42);
         await _pair.Server.WaitPost(() =>
         {
-            var path = new ResPath(Map);
-            var opts = DeserializationOptions.Default with {InitializeMaps = true};
-            if (!_entMan.System<MapLoaderSystem>().TryLoadMap(path, out _, out _, opts))
+            var success = _entMan.System<MapLoaderSystem>().TryLoad(_mapId, Map, out _);
+            if (!success)
                 throw new Exception("Map load failed");
+            _pair.Server.MapMan.DoMapInitialize(_mapId);
         });
 
         // Get list of ghost warp positions

Content.Benchmarks/RaiseEventBenchmark.cs

@@ -1,126 +0,0 @@
-#nullable enable
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-using Content.IntegrationTests;
-using Content.IntegrationTests.Pair;
-using Robust.Shared;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-
-namespace Content.Benchmarks;
-
-[Virtual]
-public class RaiseEventBenchmark
-{
-    private TestPair _pair = default!;
-    private BenchSystem _sys = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        ProgramShared.PathOffset = "../../../../";
-        PoolManager.Startup(typeof(BenchSystem).Assembly);
-        _pair = PoolManager.GetServerClient().GetAwaiter().GetResult();
-        var entMan = _pair.Server.EntMan;
-        _sys = entMan.System<BenchSystem>();
-
-        _pair.Server.WaitPost(() =>
-        {
-            var uid = entMan.Spawn();
-            _sys.Ent = new(uid, entMan.GetComponent<TransformComponent>(uid));
-            _sys.Ent2 = new(_sys.Ent.Owner, _sys.Ent.Comp);
-        })
-            .GetAwaiter()
-            .GetResult();
-    }
-
-    [GlobalCleanup]
-    public async Task Cleanup()
-    {
-        await _pair.DisposeAsync();
-        PoolManager.Shutdown();
-    }
-
-    [Benchmark(Baseline = true)]
-    public int RaiseEvent()
-    {
-        return _sys.RaiseEvent();
-    }
-
-    [Benchmark]
-    public int RaiseCompEvent()
-    {
-        return _sys.RaiseCompEvent();
-    }
-
-    [Benchmark]
-    public int RaiseICompEvent()
-    {
-        return _sys.RaiseICompEvent();
-    }
-
-    [Benchmark]
-    public int RaiseCSharpEvent()
-    {
-        return _sys.CSharpEvent();
-    }
-
-    public sealed class BenchSystem : EntitySystem
-    {
-        public Entity<TransformComponent> Ent;
-        public Entity<IComponent> Ent2;
-
-        public delegate void EntityEventHandler(EntityUid uid, TransformComponent comp, ref BenchEv ev);
-
-        public event EntityEventHandler? OnCSharpEvent;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<TransformComponent, BenchEv>(OnEvent);
-            OnCSharpEvent += OnEvent;
-        }
-
-        public int RaiseEvent()
-        {
-            var ev = new BenchEv();
-            RaiseLocalEvent(Ent.Owner, ref ev);
-            return ev.N;
-        }
-
-        public int RaiseCompEvent()
-        {
-            var ev = new BenchEv();
-            EntityManager.EventBus.RaiseComponentEvent(Ent.Owner, Ent.Comp, ref ev);
-            return ev.N;
-        }
-
-        public int RaiseICompEvent()
-        {
-            // Raise with an IComponent instead of concrete type
-            var ev = new BenchEv();
-            EntityManager.EventBus.RaiseComponentEvent(Ent2.Owner, Ent2.Comp, ref ev);
-            return ev.N;
-        }
-
-        public int CSharpEvent()
-        {
-            var ev = new BenchEv();
-            OnCSharpEvent?.Invoke(Ent.Owner, Ent.Comp, ref ev);
-            return ev.N;
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private void OnEvent(EntityUid uid, TransformComponent component, ref BenchEv args)
-        {
-            args.N += uid.Id;
-        }
-
-        [ByRefEvent]
-        public struct BenchEv
-        {
-            public int N;
-        }
-    }
-}

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

@@ -88,9 +88,8 @@ namespace Content.Client.Access.UI
                 button.Disabled = !interfaceEnabled;
                 if (interfaceEnabled)
                 {
-                    // Explicit cast because Rider gives a false error otherwise.
-                    button.Pressed = state.TargetAccessReaderIdAccessList?.Contains((ProtoId<AccessLevelPrototype>) accessName) ?? false;
-                    button.Disabled = (!state.AllowedModifyAccessList?.Contains((ProtoId<AccessLevelPrototype>) accessName)) ?? true;
+                    button.Pressed = state.TargetAccessReaderIdAccessList?.Contains(accessName) ?? false;
+                    button.Disabled = (!state.AllowedModifyAccessList?.Contains(accessName)) ?? true;
                 }
             }
         }

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -1,10 +1,8 @@
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
-using Content.Shared.CCVar;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
-using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
 
@@ -13,21 +11,13 @@ namespace Content.Client.Access.UI
     public sealed class IdCardConsoleBoundUserInterface : BoundUserInterface
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IConfigurationManager _cfgManager = default!;
         private readonly SharedIdCardConsoleSystem _idCardConsoleSystem = default!;
 
         private IdCardConsoleWindow? _window;
 
-        // CCVar.
-        private int _maxNameLength;
-        private int _maxIdJobLength;
-
         public IdCardConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
             _idCardConsoleSystem = EntMan.System<SharedIdCardConsoleSystem>();
-
-            _maxNameLength =_cfgManager.GetCVar(CCVars.MaxNameLength);
-            _maxIdJobLength = _cfgManager.GetCVar(CCVars.MaxIdJobLength);
         }
 
         protected override void Open()
@@ -76,11 +66,11 @@ namespace Content.Client.Access.UI
 
         public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<AccessLevelPrototype>> newAccessList, string newJobPrototype)
         {
-            if (newFullName.Length > _maxNameLength)
-                newFullName = newFullName[.._maxNameLength];
+            if (newFullName.Length > MaxFullNameLength)
+                newFullName = newFullName[..MaxFullNameLength];
 
-            if (newJobTitle.Length > _maxIdJobLength)
-                newJobTitle = newJobTitle[.._maxIdJobLength];
+            if (newJobTitle.Length > MaxJobTitleLength)
+                newJobTitle = newJobTitle[..MaxJobTitleLength];
 
             SendMessage(new WriteToTargetIdMessage(
                 newFullName,

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

@@ -1,13 +1,11 @@
 using System.Linq;
 using Content.Shared.Access;
 using Content.Shared.Access.Systems;
-using Content.Shared.CCVar;
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
 
@@ -16,17 +14,12 @@ namespace Content.Client.Access.UI
     [GenerateTypedNameReferences]
     public sealed partial class IdCardConsoleWindow : DefaultWindow
     {
-        [Dependency] private readonly IConfigurationManager _cfgManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
         private readonly ISawmill _logMill = default!;
 
         private readonly IdCardConsoleBoundUserInterface _owner;
 
-        // CCVar.
-        private int _maxNameLength;
-        private int _maxIdJobLength;
-
         private AccessLevelControl _accessButtons = new();
         private readonly List<string> _jobPrototypeIds = new();
 
@@ -46,11 +39,7 @@ namespace Content.Client.Access.UI
 
             _owner = owner;
 
-            _maxNameLength = _cfgManager.GetCVar(CCVars.MaxNameLength);
-            _maxIdJobLength = _cfgManager.GetCVar(CCVars.MaxIdJobLength);
-
             FullNameLineEdit.OnTextEntered += _ => SubmitData();
-            FullNameLineEdit.IsValid = s => s.Length <= _maxNameLength;
             FullNameLineEdit.OnTextChanged += _ =>
             {
                 FullNameSaveButton.Disabled = FullNameSaveButton.Text == _lastFullName;
@@ -58,7 +47,6 @@ namespace Content.Client.Access.UI
             FullNameSaveButton.OnPressed += _ => SubmitData();
 
             JobTitleLineEdit.OnTextEntered += _ => SubmitData();
-            JobTitleLineEdit.IsValid = s => s.Length <= _maxIdJobLength;
             JobTitleLineEdit.OnTextChanged += _ =>
             {
                 JobTitleSaveButton.Disabled = JobTitleLineEdit.Text == _lastJobTitle;
@@ -186,8 +174,7 @@ namespace Content.Client.Access.UI
                                        new List<ProtoId<AccessLevelPrototype>>());
 
             var jobIndex = _jobPrototypeIds.IndexOf(state.TargetIdJobPrototype);
-            // If the job index is < 0 that means they don't have a job registered in the station records
-            // or the IdCardComponent's JobPrototype field.
+            // If the job index is < 0 that means they don't have a job registered in the station records.
             // For example, a new ID from a box would have no job index.
             if (jobIndex < 0)
             {

Content.Client/Actions/ActionsSystem.cs

@@ -1,7 +1,6 @@
 using System.IO;
 using System.Linq;
 using Content.Shared.Actions;
-using Content.Shared.Charges.Systems;
 using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Shared.ContentPack;
@@ -23,7 +22,6 @@ namespace Content.Client.Actions
     {
         public delegate void OnActionReplaced(EntityUid actionId);
 
-        [Dependency] private readonly SharedChargesSystem _sharedCharges = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IResourceManager _resources = default!;
         [Dependency] private readonly ISerializationManager _serialization = default!;
@@ -53,6 +51,29 @@ namespace Content.Client.Actions
             SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentHandleState>(OnEntityWorldTargetHandleState);
         }
 
+        public override void FrameUpdate(float frameTime)
+        {
+            base.FrameUpdate(frameTime);
+
+            var worldActionQuery = EntityQueryEnumerator<WorldTargetActionComponent>();
+            while (worldActionQuery.MoveNext(out var uid, out var action))
+            {
+                UpdateAction(uid, action);
+            }
+
+            var instantActionQuery = EntityQueryEnumerator<InstantActionComponent>();
+            while (instantActionQuery.MoveNext(out var uid, out var action))
+            {
+                UpdateAction(uid, action);
+            }
+
+            var entityActionQuery = EntityQueryEnumerator<EntityTargetActionComponent>();
+            while (entityActionQuery.MoveNext(out var uid, out var action))
+            {
+                UpdateAction(uid, action);
+            }
+        }
+
         private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args)
         {
             if (args.Current is not InstantActionComponentState state)
@@ -67,7 +88,6 @@ namespace Content.Client.Actions
                 return;
 
             component.Whitelist = state.Whitelist;
-            component.Blacklist = state.Blacklist;
             component.CanTargetSelf = state.CanTargetSelf;
             BaseHandleState<EntityTargetActionComponent>(uid, component, state);
         }
@@ -106,6 +126,9 @@ namespace Content.Client.Actions
             component.Toggled = state.Toggled;
             component.Cooldown = state.Cooldown;
             component.UseDelay = state.UseDelay;
+            component.Charges = state.Charges;
+            component.MaxCharges = state.MaxCharges;
+            component.RenewCharges = state.RenewCharges;
             component.Container = EnsureEntity<T>(state.Container, uid);
             component.EntityIcon = EnsureEntity<T>(state.EntityIcon, uid);
             component.CheckCanInteract = state.CheckCanInteract;
@@ -114,7 +137,6 @@ namespace Content.Client.Actions
             component.Priority = state.Priority;
             component.AttachedEntity = EnsureEntity<T>(state.AttachedEntity, uid);
             component.RaiseOnUser = state.RaiseOnUser;
-            component.RaiseOnAction = state.RaiseOnAction;
             component.AutoPopulate = state.AutoPopulate;
             component.Temporary = state.Temporary;
             component.ItemIconStyle = state.ItemIconStyle;
@@ -128,8 +150,7 @@ namespace Content.Client.Actions
             if (!ResolveActionData(actionId, ref action))
                 return;
 
-            // TODO: Decouple this.
-            action.IconColor = _sharedCharges.GetCurrentCharges(actionId.Value) == 0 ? action.DisabledIconColor : action.OriginalIconColor;
+            action.IconColor = action.Charges < 1 ? action.DisabledIconColor : action.OriginalIconColor;
 
             base.UpdateAction(actionId, action);
             if (_playerManager.LocalEntity != action.AttachedEntity)
@@ -202,7 +223,6 @@ namespace Content.Client.Actions
                 return;
 
             OnActionAdded?.Invoke(actionId);
-            ActionsUpdated?.Invoke();
         }
 
         protected override void ActionRemoved(EntityUid performer, EntityUid actionId, ActionsComponent comp, BaseActionComponent action)
@@ -211,7 +231,6 @@ namespace Content.Client.Actions
                 return;
 
             OnActionRemoved?.Invoke(actionId);
-            ActionsUpdated?.Invoke();
         }
 
         public IEnumerable<(EntityUid Id, BaseActionComponent Comp)> GetClientActions()
@@ -239,13 +258,13 @@ namespace Content.Client.Actions
 
         public void LinkAllActions(ActionsComponent? actions = null)
         {
-            if (_playerManager.LocalEntity is not { } user ||
-                !Resolve(user, ref actions, false))
-            {
-                return;
-            }
+             if (_playerManager.LocalEntity is not { } user ||
+                 !Resolve(user, ref actions, false))
+             {
+                 return;
+             }
 
-            LinkActions?.Invoke(actions);
+             LinkActions?.Invoke(actions);
         }
 
         public override void Shutdown()

Content.Client/Administration/AdminNameOverlay.cs

@@ -1,18 +1,11 @@
-using System.Linq;
 using System.Numerics;
 using Content.Client.Administration.Systems;
-using Content.Client.Stylesheets;
-using Content.Shared.Administration;
-using Content.Shared.CCVar;
-using Content.Shared.Ghost;
-using Content.Shared.Mind;
-using Content.Shared.Roles;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
-using Robust.Shared.Configuration;
+using Robust.Shared;
 using Robust.Shared.Enums;
-using Robust.Shared.Prototypes;
+using Robust.Shared.Configuration;
 
 namespace Content.Client.Administration;
 
@@ -23,69 +16,17 @@ internal sealed class AdminNameOverlay : Overlay
     private readonly IEyeManager _eyeManager;
     private readonly EntityLookupSystem _entityLookup;
     private readonly IUserInterfaceManager _userInterfaceManager;
-    private readonly SharedRoleSystem _roles;
     private readonly Font _font;
-    private readonly Font _fontBold;
-    private AdminOverlayAntagFormat _overlayFormat;
-    private AdminOverlayAntagSymbolStyle _overlaySymbolStyle;
-    private bool _overlayPlaytime;
-    private bool _overlayStartingJob;
-    private float _ghostFadeDistance;
-    private float _ghostHideDistance;
-    private int _overlayStackMax;
-    private float _overlayMergeDistance;
 
-    //TODO make this adjustable via GUI?
-    private readonly ProtoId<RoleTypePrototype>[] _filter =
-        ["SoloAntagonist", "TeamAntagonist", "SiliconAntagonist", "FreeAgent"];
-
-    private readonly string _antagLabelClassic = Loc.GetString("admin-overlay-antag-classic");
-
-    public AdminNameOverlay(
-        AdminSystem system,
-        IEntityManager entityManager,
-        IEyeManager eyeManager,
-        IResourceCache resourceCache,
-        EntityLookupSystem entityLookup,
-        IUserInterfaceManager userInterfaceManager,
-        IConfigurationManager config,
-        SharedRoleSystem roles)
+    public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeManager eyeManager, IResourceCache resourceCache, EntityLookupSystem entityLookup, IUserInterfaceManager userInterfaceManager)
     {
         _system = system;
         _entityManager = entityManager;
         _eyeManager = eyeManager;
         _entityLookup = entityLookup;
         _userInterfaceManager = userInterfaceManager;
-        _roles = roles;
         ZIndex = 200;
-        // Setting these to a specific ttf would break the antag symbols
-        _font = resourceCache.NotoStack();
-        _fontBold = resourceCache.NotoStack(variation: "Bold");
-
-        config.OnValueChanged(CCVars.AdminOverlayAntagFormat, (show) => { _overlayFormat = UpdateOverlayFormat(show); }, true);
-        config.OnValueChanged(CCVars.AdminOverlaySymbolStyle, (show) => { _overlaySymbolStyle = UpdateOverlaySymbolStyle(show); }, true);
-        config.OnValueChanged(CCVars.AdminOverlayPlaytime, (show) => { _overlayPlaytime = show; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayStartingJob, (show) => { _overlayStartingJob = show; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayGhostHideDistance, (f) => { _ghostHideDistance = f; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayGhostFadeDistance, (f) => { _ghostFadeDistance = f; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayStackMax, (i) => { _overlayStackMax = i; }, true);
-        config.OnValueChanged(CCVars.AdminOverlayMergeDistance, (f) => { _overlayMergeDistance = f; }, true);
-    }
-
-    private AdminOverlayAntagFormat UpdateOverlayFormat(string formatString)
-    {
-        if (!Enum.TryParse<AdminOverlayAntagFormat>(formatString, out var format))
-            format = AdminOverlayAntagFormat.Binary;
-
-        return format;
-    }
-
-    private AdminOverlayAntagSymbolStyle UpdateOverlaySymbolStyle(string symbolString)
-    {
-        if (!Enum.TryParse<AdminOverlayAntagSymbolStyle>(symbolString, out var symbolStyle))
-            symbolStyle = AdminOverlayAntagSymbolStyle.Off;
-
-        return symbolStyle;
+        _font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
     }
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
@@ -93,169 +34,43 @@ internal sealed class AdminNameOverlay : Overlay
     protected override void Draw(in OverlayDrawArgs args)
     {
         var viewport = args.WorldAABB;
-        var colorDisconnected = Color.White;
-        var uiScale = _userInterfaceManager.RootControl.UIScale;
-        var lineoffset = new Vector2(0f, 14f) * uiScale;
-        var drawnOverlays = new List<(Vector2,Vector2)>() ; // A saved list of the overlays already drawn
 
-        // Get all player positions before drawing overlays, so they can be sorted before iteration
-        var sortable = new List<(PlayerInfo, Box2, EntityUid, Vector2)>();
-        foreach (var info in _system.PlayerList)
+        foreach (var playerInfo in _system.PlayerList)
         {
-            var entity = _entityManager.GetEntity(info.NetEntity);
+            var entity = _entityManager.GetEntity(playerInfo.NetEntity);
 
-            // If entity does not exist or is on a different map, skip
-            if (entity == null
-                || !_entityManager.EntityExists(entity)
-                || _entityManager.GetComponent<TransformComponent>(entity.Value).MapID != args.MapId)
+            // Otherwise the entity can not exist yet
+            if (entity == null || !_entityManager.EntityExists(entity))
+            {
                 continue;
+            }
+
+            // if not on the same map, continue
+            if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != args.MapId)
+            {
+                continue;
+            }
 
             var aabb = _entityLookup.GetWorldAABB(entity.Value);
-            // if not on screen, skip
+
+            // if not on screen, continue
             if (!aabb.Intersects(in viewport))
+            {
                 continue;
-
-            // Get on-screen coordinates of player
-            var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center).Rounded();
-
-            sortable.Add((info, aabb, entity.Value, screenCoordinates));
-        }
-
-        // Draw overlays for visible players, starting from the top of the screen
-        foreach (var info in sortable.OrderBy(s => s.Item4.Y).ToList())
-        {
-            var playerInfo = info.Item1;
-            var aabb = info.Item2;
-            var entity = info.Item3;
-            var screenCoordinatesCenter = info.Item4;
-            //the center position is kept separately, for simpler position comparison later
-            var centerOffset = new Vector2(28f, -18f) * uiScale;
-            var screenCoordinates = screenCoordinatesCenter + centerOffset;
-            var alpha = 1f;
-
-            //TODO make a smarter system where the starting offset can be modified by the predicted position and size of already-drawn overlays/stacks?
-            var currentOffset = Vector2.Zero;
-
-            //  Ghosts near the cursor are made transparent/invisible
-            //  TODO would be "cheaper" if playerinfo already contained a ghost bool, this gets called every frame for every onscreen player!
-            if (_entityManager.HasComponent<GhostComponent>(entity))
-            {
-                // We want the map positions here, so we don't have to worry about resolution and such shenanigans
-                var mobPosition = aabb.Center;
-                var mousePosition = _eyeManager
-                    .ScreenToMap(_userInterfaceManager.MousePositionScaled.Position * uiScale)
-                    .Position;
-                var dist = Vector2.Distance(mobPosition, mousePosition);
-                if (dist < _ghostHideDistance)
-                    continue;
-
-                alpha = Math.Clamp((dist - _ghostHideDistance) / (_ghostFadeDistance - _ghostHideDistance), 0f, 1f);
-                colorDisconnected.A = alpha;
             }
 
-            // If the new overlay text block is within merge distance of any previous ones
-            // merge them into a stack so they don't hide each other
-            var stack = drawnOverlays.FindAll(x =>
-                Vector2.Distance(_eyeManager.ScreenToMap(x.Item1).Position, aabb.Center) <= _overlayMergeDistance);
-            if (stack.Count > 0)
+            var uiScale = _userInterfaceManager.RootControl.UIScale;
+            var lineoffset = new Vector2(0f, 11f) * uiScale;
+            var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center +
+                                                              new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec(
+                                                                  aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f);
+            if (playerInfo.Antag)
             {
-                screenCoordinates = stack.First().Item1 + centerOffset;
-                // Replacing this overlay's coordinates for the later save with the stack root's coordinates
-                // so that other overlays don't try to stack to these coordinates
-                screenCoordinatesCenter = stack.First().Item1;
-
-                var i = 1;
-                foreach (var s in stack)
-                {
-                    // additional entries after maximum stack size is reached will be drawn over the last entry
-                    if (i <= _overlayStackMax - 1)
-                        currentOffset = lineoffset + s.Item2 ;
-                    i++;
-                }
+                args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", uiScale, Color.OrangeRed);
+;
             }
-
-            // Character name
-            var color = Color.Aquamarine;
-            color.A = alpha;
-            args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.CharacterName, uiScale, playerInfo.Connected ? color : colorDisconnected);
-            currentOffset += lineoffset;
-
-            // Username
-            color = Color.Yellow;
-            color.A = alpha;
-            args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.Username, uiScale, playerInfo.Connected ? color : colorDisconnected);
-            currentOffset += lineoffset;
-
-            // Playtime
-            if (!string.IsNullOrEmpty(playerInfo.PlaytimeString) && _overlayPlaytime)
-            {
-                color = Color.Orange;
-                color.A = alpha;
-                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.PlaytimeString, uiScale, playerInfo.Connected ? color : colorDisconnected);
-                currentOffset += lineoffset;
-            }
-
-            // Job
-            if (!string.IsNullOrEmpty(playerInfo.StartingJob) && _overlayStartingJob)
-            {
-                color = Color.GreenYellow;
-                color.A = alpha;
-                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, Loc.GetString(playerInfo.StartingJob), uiScale, playerInfo.Connected ? color : colorDisconnected);
-                currentOffset += lineoffset;
-            }
-
-            // Determine antag symbol
-            string? symbol;
-            switch (_overlaySymbolStyle)
-            {
-                case AdminOverlayAntagSymbolStyle.Specific:
-                    symbol = playerInfo.RoleProto.Symbol;
-                    break;
-                case AdminOverlayAntagSymbolStyle.Basic:
-                    symbol = Loc.GetString("player-tab-antag-prefix");
-                    break;
-                default:
-                case AdminOverlayAntagSymbolStyle.Off:
-                    symbol = string.Empty;
-                    break;
-            }
-
-            // Determine antag/role type name
-            string? text;
-            switch (_overlayFormat)
-            {
-                case AdminOverlayAntagFormat.Roletype:
-                    color = playerInfo.RoleProto.Color;
-                    symbol = _filter.Contains(playerInfo.RoleProto) ? symbol : string.Empty;
-                    text = _filter.Contains(playerInfo.RoleProto)
-                        ? Loc.GetString(playerInfo.RoleProto.Name).ToUpper()
-                        : string.Empty;
-                    break;
-                case AdminOverlayAntagFormat.Subtype:
-                    color = playerInfo.RoleProto.Color;
-                    symbol = _filter.Contains(playerInfo.RoleProto) ? symbol : string.Empty;
-                    text = _filter.Contains(playerInfo.RoleProto)
-                        ? _roles.GetRoleSubtypeLabel(playerInfo.RoleProto.Name, playerInfo.Subtype).ToUpper()
-                        : string.Empty;
-                    break;
-                default:
-                case AdminOverlayAntagFormat.Binary:
-                    color = Color.OrangeRed;
-                    symbol = playerInfo.Antag ? symbol : string.Empty;
-                    text = playerInfo.Antag ? _antagLabelClassic : string.Empty;
-                    break;
-            }
-
-            // Draw antag label
-            color.A = alpha;
-            var label = !string.IsNullOrEmpty(symbol)
-                ? Loc.GetString("player-tab-character-name-antag-symbol", ("symbol", symbol), ("name", text))
-                : text;
-            args.ScreenHandle.DrawString(_fontBold, screenCoordinates + currentOffset, label, uiScale, color);
-            currentOffset += lineoffset;
-
-            //Save the coordinates and size of the text block, for stack merge check
-            drawnOverlays.Add((screenCoordinatesCenter, currentOffset));
+            args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, uiScale, playerInfo.Connected ? Color.Yellow : Color.White);
+            args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, uiScale, playerInfo.Connected ? Color.Aquamarine : Color.White);
         }
     }
 }

Content.Client/Administration/OverlayOptions.cs

@@ -1,15 +0,0 @@
-namespace Content.Client.Administration;
-
-public enum AdminOverlayAntagFormat
-{
-    Binary,
-    Roletype,
-    Subtype
-}
-
-public enum AdminOverlayAntagSymbolStyle
-{
-    Off,
-    Basic,
-    Specific
-}

Content.Client/Administration/Systems/AdminSystem.Overlay.cs

@@ -1,5 +1,4 @@
 using Content.Client.Administration.Managers;
-using Content.Shared.Roles;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -15,8 +14,6 @@ namespace Content.Client.Administration.Systems
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
-        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
-        [Dependency] private readonly SharedRoleSystem _roles = default!;
 
         private AdminNameOverlay _adminNameOverlay = default!;
 
@@ -25,15 +22,7 @@ namespace Content.Client.Administration.Systems
 
         private void InitializeOverlay()
         {
-            _adminNameOverlay = new AdminNameOverlay(
-                this,
-                EntityManager,
-                _eyeManager,
-                _resourceCache,
-                _entityLookup,
-                _userInterfaceManager,
-                _configurationManager,
-                _roles);
+            _adminNameOverlay = new AdminNameOverlay(this, EntityManager, _eyeManager, _resourceCache, _entityLookup, _userInterfaceManager);
             _adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
         }
 
@@ -49,8 +38,7 @@ namespace Content.Client.Administration.Systems
 
         public void AdminOverlayOn()
         {
-            if (_overlayManager.HasOverlay<AdminNameOverlay>())
-                return;
+            if (_overlayManager.HasOverlay<AdminNameOverlay>()) return;
             _overlayManager.AddOverlay(_adminNameOverlay);
             OverlayEnabled?.Invoke();
         }

Content.Client/Administration/Systems/AdminVerbSystem.cs

@@ -32,7 +32,7 @@ namespace Content.Client.Administration.Systems
                 var verb = new VvVerb()
                 {
                     Text = Loc.GetString("view-variables"),
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/vv.svg.192dpi.png")),
+                    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.
                 };

Content.Client/Administration/Systems/BwoinkSystem.cs

@@ -19,11 +19,11 @@ namespace Content.Client.Administration.Systems
             OnBwoinkTextMessageRecieved?.Invoke(this, message);
         }
 
-        public void Send(NetUserId channelId, string text, bool playSound, bool adminOnly)
+        public void Send(NetUserId channelId, string text, bool playSound)
         {
             // Reuse the channel ID as the 'true sender'.
             // Server will ignore this and if someone makes it not ignore this (which is bad, allows impersonation!!!), that will help.
-            RaiseNetworkEvent(new BwoinkTextMessage(channelId, channelId, text, playSound: playSound, adminOnly: adminOnly));
+            RaiseNetworkEvent(new BwoinkTextMessage(channelId, channelId, text, playSound: playSound));
             SendInputTextUpdated(channelId, false);
         }
 

Content.Client/Administration/Systems/KillSignSystem.cs

@@ -7,8 +7,6 @@ namespace Content.Client.Administration.Systems;
 
 public sealed class KillSignSystem : EntitySystem
 {
-    [Dependency] private readonly SpriteSystem _sprite = default!;
-
     public override void Initialize()
     {
         SubscribeLocalEvent<KillSignComponent, ComponentStartup>(KillSignAdded);
@@ -20,10 +18,10 @@ public sealed class KillSignSystem : EntitySystem
         if (!TryComp<SpriteComponent>(uid, out var sprite))
             return;
 
-        if (!_sprite.LayerMapTryGet((uid, sprite), KillSignKey.Key, out var layer, false))
+        if (!sprite.LayerMapTryGet(KillSignKey.Key, out var layer))
             return;
 
-        _sprite.RemoveLayer((uid, sprite), layer);
+        sprite.RemoveLayer(layer);
     }
 
     private void KillSignAdded(EntityUid uid, KillSignComponent component, ComponentStartup args)
@@ -31,15 +29,15 @@ public sealed class KillSignSystem : EntitySystem
         if (!TryComp<SpriteComponent>(uid, out var sprite))
             return;
 
-        if (_sprite.LayerMapTryGet((uid, sprite), KillSignKey.Key, out var _, false))
+        if (sprite.LayerMapTryGet(KillSignKey.Key, out var _))
             return;
 
-        var adj = _sprite.GetLocalBounds((uid, sprite)).Height / 2 + ((1.0f / 32) * 6.0f);
+        var adj = sprite.Bounds.Height / 2 + ((1.0f/32) * 6.0f);
 
-        var layer = _sprite.AddLayer((uid, sprite), new SpriteSpecifier.Rsi(new ResPath("Objects/Misc/killsign.rsi"), "sign"));
-        _sprite.LayerMapSet((uid, sprite), KillSignKey.Key, layer);
+        var layer = sprite.AddLayer(new SpriteSpecifier.Rsi(new ResPath("Objects/Misc/killsign.rsi"), "sign"));
+        sprite.LayerMapSet(KillSignKey.Key, layer);
 
-        _sprite.LayerSetOffset((uid, sprite), layer, new Vector2(0.0f, adj));
+        sprite.LayerSetOffset(layer, new Vector2(0.0f, adj));
         sprite.LayerSetShader(layer, "unshaded");
     }
 

Content.Client/Administration/UI/AdminMenuWindow.xaml

@@ -6,7 +6,8 @@
     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:panic="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab">
+    xmlns:panic="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab"
+    xmlns:baby="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab">
     <TabContainer Name="MasterTabContainer">
         <adminTab:AdminTab />
         <adminbusTab:AdminbusTab />
@@ -14,6 +15,7 @@
         <tabs:RoundTab />
         <tabs:ServerTab />
         <panic:PanicBunkerTab Name="PanicBunkerControl" Access="Public" />
+        <baby:BabyJailTab Name="BabyJailControl" Access="Public" />
         <playerTab:PlayerTab Name="PlayerTabControl" Access="Public" />
         <objectsTab:ObjectsTab Name="ObjectsTabControl" Access="Public" />
     </TabContainer>

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

@@ -21,6 +21,10 @@ public sealed partial class AdminMenuWindow : DefaultWindow
         MasterTabContainer.SetTabTitle((int) TabIndex.Round, Loc.GetString("admin-menu-round-tab"));
         MasterTabContainer.SetTabTitle((int) TabIndex.Server, Loc.GetString("admin-menu-server-tab"));
         MasterTabContainer.SetTabTitle((int) TabIndex.PanicBunker, Loc.GetString("admin-menu-panic-bunker-tab"));
+        /*
+         * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+         */
+        MasterTabContainer.SetTabTitle((int) TabIndex.BabyJail, Loc.GetString("admin-menu-baby-jail-tab"));
         MasterTabContainer.SetTabTitle((int) TabIndex.Players, Loc.GetString("admin-menu-players-tab"));
         MasterTabContainer.SetTabTitle((int) TabIndex.Objects, Loc.GetString("admin-menu-objects-tab"));
         MasterTabContainer.OnTabChanged += OnTabChanged;
@@ -48,6 +52,7 @@ public sealed partial class AdminMenuWindow : DefaultWindow
         Round,
         Server,
         PanicBunker,
+        BabyJail,
         Players,
         Objects,
     }

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/BanPanel/BanPanel.xaml.cs

@@ -22,11 +22,11 @@ namespace Content.Client.Administration.UI.BanPanel;
 [GenerateTypedNameReferences]
 public sealed partial class BanPanel : DefaultWindow
 {
-    public event Action<string?, (IPAddress, int)?, bool, ImmutableTypedHwid?, bool, uint, string, NoteSeverity, string[]?, bool>? 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; }
-    private ImmutableTypedHwid? Hwid { get; set; }
+    private byte[]? Hwid { get; set; }
     private double TimeEntered { get; set; }
     private uint Multiplier { get; set; }
     private bool HasBanFlag { get; set; }
@@ -371,8 +371,9 @@ public sealed partial class BanPanel : DefaultWindow
     private void OnHwidChanged()
     {
         var hwidString = HwidLine.Text;
-        ImmutableTypedHwid? hwid = null;
-        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !ImmutableTypedHwid.TryParse(hwidString, out hwid))
+        var length = 3 * (hwidString.Length / 4) - hwidString.TakeLast(2).Count(c => c == '=');
+        Hwid = new byte[length];
+        if (HwidCheckbox.Pressed && !(string.IsNullOrEmpty(hwidString) && LastConnCheckbox.Pressed) && !Convert.TryFromBase64String(hwidString, Hwid, out _))
         {
             ErrorLevel |= ErrorLevelEnum.Hwid;
             HwidLine.ModulateSelfOverride = Color.Red;
@@ -389,7 +390,7 @@ public sealed partial class BanPanel : DefaultWindow
             Hwid = null;
             return;
         }
-        Hwid = hwid;
+        Hwid = Convert.FromHexString(hwidString);
     }
 
     private void OnTypeChanged()

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

@@ -1,28 +1,23 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
     <PanelContainer StyleClasses="BackgroundDark">
-        <SplitContainer Orientation="Vertical" ResizeMode="NotResizable">
-            <SplitContainer Orientation="Horizontal" VerticalExpand="True">
-                <cc:PlayerListControl Access="Public" Name="ChannelSelector" HorizontalExpand="True" SizeFlagsStretchRatio="2" />
-                <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">
-                    <BoxContainer Access="Public" Name="BwoinkArea" VerticalExpand="True" />
+        <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" HorizontalExpand="True">
+                    <CheckBox Visible="True" Name="PlaySound" Access="Public" Text="{Loc 'admin-bwoink-play-sound'}" Pressed="True" />
+                    <Control HorizontalExpand="True" MinWidth="5" />
+                    <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="Follow" Text="{Loc 'admin-player-actions-follow'}" StyleClasses="OpenLeft" />
                 </BoxContainer>
-            </SplitContainer>
-            <BoxContainer Orientation="Horizontal" SetHeight="30" >
-                <CheckBox Name="AdminOnly" Access="Public" Text="{Loc 'admin-ahelp-admin-only'}" ToolTip="{Loc 'admin-ahelp-admin-only-tooltip'}" />
-                <Control HorizontalExpand="True" MinWidth="5" />
-                <CheckBox Name="PlaySound" Access="Public" Text="{Loc 'admin-bwoink-play-sound'}" Pressed="True" />
-                <Control HorizontalExpand="True" MinWidth="5" />
-                <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" />
-                <controls:ConfirmButton Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" ConfirmationText="{Loc 'admin-player-actions-confirm'}" StyleClasses="OpenBoth" />
-                <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" StyleClasses="OpenBoth" />
-                <controls:ConfirmButton Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" ConfirmationText="{Loc 'admin-player-actions-confirm'}" StyleClasses="OpenBoth" />
-                <Button Visible="False" Name="Follow" Text="{Loc 'admin-player-actions-follow'}" StyleClasses="OpenLeft" />
             </BoxContainer>
         </SplitContainer>
     </PanelContainer>

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

@@ -29,15 +29,13 @@ namespace Content.Client.Administration.UI.Bwoink
         public AdminAHelpUIHandler AHelpHelper = default!;
 
         private PlayerInfo? _currentPlayer;
+        private readonly Dictionary<Button, ConfirmationData> _confirmations = new();
 
         public BwoinkControl()
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
-            var newPlayerThreshold = 0;
-            _cfg.OnValueChanged(CCVars.NewPlayerThreshold, (val) => { newPlayerThreshold = val; }, true);
-
             var uiController = _ui.GetUIController<AHelpUIController>();
             if (uiController.UIHelper is not AdminAHelpUIHandler helper)
                 return;
@@ -47,8 +45,6 @@ namespace Content.Client.Administration.UI.Bwoink
             _adminManager.AdminStatusUpdated += UpdateButtons;
             UpdateButtons();
 
-            AdminOnly.OnToggled += args => PlaySound.Disabled = args.Pressed;
-
             ChannelSelector.OnSelectionChanged += sel =>
             {
                 _currentPlayer = sel;
@@ -61,9 +57,9 @@ namespace Content.Client.Administration.UI.Bwoink
                 var sb = new StringBuilder();
 
                 if (info.Connected)
-                    sb.Append(info.ActiveThisRound ? '⚫' : '◐');
+                    sb.Append('●');
                 else
-                    sb.Append(info.ActiveThisRound ? '⭘' : '·');
+                    sb.Append(info.ActiveThisRound ? '○' : '·');
 
                 sb.Append(' ');
                 if (AHelpHelper.TryGetChannel(info.SessionId, out var panel) && panel.Unread > 0)
@@ -75,12 +71,10 @@ namespace Content.Client.Administration.UI.Bwoink
                     sb.Append(' ');
                 }
 
-                // Mark antagonists with symbol
                 if (info.Antag && info.ActiveThisRound)
                     sb.Append(new Rune(0x1F5E1)); // 🗡
 
-                // Mark new players with symbol
-                if (IsNewPlayer(info))
+                if (info.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold)))
                     sb.Append(new Rune(0x23F2)); // ⏲
 
                 sb.AppendFormat("\"{0}\"", text);
@@ -88,19 +82,6 @@ namespace Content.Client.Administration.UI.Bwoink
                 return sb.ToString();
             };
 
-            // <summary>
-            // Returns true if the player's overall playtime is under the set threshold
-            // </summary>
-            bool IsNewPlayer(PlayerInfo info)
-            {
-                // Don't show every disconnected player as new, don't show 0-minute players as new if threshold is
-                if (newPlayerThreshold <= 0 || info.OverallPlaytime is null && !info.Connected)
-                    return false;
-
-                return (info.OverallPlaytime is null
-                        || info.OverallPlaytime < TimeSpan.FromMinutes(newPlayerThreshold));
-            }
-
             ChannelSelector.Comparison = (a, b) =>
             {
                 var ach = AHelpHelper.EnsurePanel(a.SessionId);
@@ -110,37 +91,31 @@ namespace Content.Client.Administration.UI.Bwoink
                 if (a.IsPinned != b.IsPinned)
                     return a.IsPinned ? -1 : 1;
 
-                // Then, any chat with unread messages.
+                // First, sort by unread. Any chat with unread messages appears first.
                 var aUnread = ach.Unread > 0;
                 var bUnread = bch.Unread > 0;
                 if (aUnread != bUnread)
                     return aUnread ? -1 : 1;
 
-                // Then, any chat with recent messages from the current round
+                // Sort by recent messages during the current round.
                 var aRecent = a.ActiveThisRound && ach.LastMessage != DateTime.MinValue;
                 var bRecent = b.ActiveThisRound && bch.LastMessage != DateTime.MinValue;
                 if (aRecent != bRecent)
                     return aRecent ? -1 : 1;
 
-                // Sort by connection status. Disconnected players will be last.
+                // Next, sort by connection status. Any disconnected players are grouped towards the end.
                 if (a.Connected != b.Connected)
                     return a.Connected ? -1 : 1;
 
-                // Sort connected players by whether they have joined the round, then by New Player status, then by Antag status
+                // Sort connected players by New Player status, then by Antag status
                 if (a.Connected && b.Connected)
                 {
-                    var aNewPlayer = IsNewPlayer(a);
-                    var bNewPlayer = IsNewPlayer(b);
+                    var aNewPlayer = a.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold));
+                    var bNewPlayer = b.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold));
 
-                    //  Players who have joined the round will be listed before players in the lobby
-                    if (a.ActiveThisRound != b.ActiveThisRound)
-                        return a.ActiveThisRound ? -1 : 1;
-
-                    //  Within both the joined group and lobby group, new players will be grouped and listed first
                     if (aNewPlayer != bNewPlayer)
                         return aNewPlayer ? -1 : 1;
 
-                    //  Within all four previous groups, antagonists will be listed first.
                     if (a.Antag != b.Antag)
                         return a.Antag ? -1 : 1;
                 }
@@ -177,6 +152,11 @@ namespace Content.Client.Administration.UI.Bwoink
 
             Kick.OnPressed += _ =>
             {
+                if (!AdminUIHelpers.TryConfirm(Kick, _confirmations))
+                {
+                    return;
+                }
+
                 // TODO: Reason field
                 if (_currentPlayer is not null)
                     _console.ExecuteCommand($"kick \"{_currentPlayer.Username}\"");
@@ -190,6 +170,11 @@ namespace Content.Client.Administration.UI.Bwoink
 
             Respawn.OnPressed += _ =>
             {
+                if (!AdminUIHelpers.TryConfirm(Respawn, _confirmations))
+                {
+                    return;
+                }
+
                 if (_currentPlayer is not null)
                     _console.ExecuteCommand($"respawn \"{_currentPlayer.Username}\"");
             };

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

@@ -22,9 +22,12 @@ namespace Content.Client.Administration.UI.Bwoink
                     return;
                 }
 
-                Title = $"{sel.CharacterName} / {sel.Username} | {Loc.GetString("generic-playtime-title")}: ";
+                Title = $"{sel.CharacterName} / {sel.Username}";
 
-                Title += sel.OverallPlaytime != null ? sel.PlaytimeString : Loc.GetString("generic-unknown-title");
+                if (sel.OverallPlaytime != null)
+                {
+                    Title += $" | {Loc.GetString("generic-playtime-title")}: {sel.PlaytimeString}";
+                }
             };
 
             OnOpen += () =>

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

@@ -1,6 +1,5 @@
 <Popup xmlns="https://spacestation14.io"
-       xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+       xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
     <PanelContainer>
         <PanelContainer.PanelOverride>
             <gfx:StyleBoxFlat BorderThickness="2" BorderColor="#18181B" BackgroundColor="#25252a"/>
@@ -20,7 +19,7 @@
             <BoxContainer Orientation="Horizontal">
                 <Button Name="EditButton" Text="{Loc admin-notes-edit}"/>
                 <Control HorizontalExpand="True"/>
-                <controls:ConfirmButton Name="DeleteButton" Text="{Loc admin-notes-delete}" ConfirmationText="{Loc 'admin-player-actions-confirm'}" HorizontalAlignment="Right"/>
+                <Button Name="DeleteButton" Text="{Loc admin-notes-delete}" HorizontalAlignment="Right"/>
             </BoxContainer>
         </BoxContainer>
     </PanelContainer>

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

@@ -8,7 +8,6 @@
             <Label Name="ExpiryLabel" Text="{Loc admin-note-editor-expiry-label}" Visible="False" />
             <HistoryLineEdit Name="ExpiryLineEdit" PlaceHolder="{Loc admin-note-editor-expiry-placeholder}"
                              Visible="False" HorizontalExpand="True" />
-            <OptionButton Name="ExpiryLengthDropdown" Visible="False" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <OptionButton Name="TypeOption" HorizontalAlignment="Center" />

Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs

@@ -17,17 +17,6 @@ public sealed partial class NoteEdit : FancyWindow
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IClientConsoleHost _console = default!;
 
-    private enum Multipliers
-    {
-        Minutes,
-        Hours,
-        Days,
-        Weeks,
-        Months,
-        Years,
-        Centuries
-    }
-
     public event Action<int, NoteType, string, NoteSeverity?, bool, DateTime?>? SubmitPressed;
 
     public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool canEdit)
@@ -42,20 +31,6 @@ public sealed partial class NoteEdit : FancyWindow
 
         ResetSubmitButton();
 
-        // It's weird to use minutes as the IDs, but it works and makes sense kind of :)
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-minutes"), (int) Multipliers.Minutes);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-hours"), (int) Multipliers.Hours);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-days"), (int) Multipliers.Days);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-weeks"), (int) Multipliers.Weeks);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-months"), (int) Multipliers.Months);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-years"), (int) Multipliers.Years);
-        ExpiryLengthDropdown.AddItem(Loc.GetString("admin-note-button-centuries"), (int) Multipliers.Centuries);
-        ExpiryLengthDropdown.OnItemSelected += OnLengthChanged;
-
-        ExpiryLengthDropdown.SelectId((int) Multipliers.Weeks);
-
-        ExpiryLineEdit.OnTextChanged += OnTextChanged;
-
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-note"), (int) NoteType.Note);
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-message"), (int) NoteType.Message);
         TypeOption.AddItem(Loc.GetString("admin-note-editor-type-watchlist"), (int) NoteType.Watchlist);
@@ -159,7 +134,6 @@ public sealed partial class NoteEdit : FancyWindow
                 SecretCheckBox.Pressed = false;
                 SeverityOption.Disabled = false;
                 PermanentCheckBox.Pressed = true;
-                SubmitButton.Disabled = true;
                 UpdatePermanentCheckboxFields();
                 break;
             case (int) NoteType.Message: // Message: these are shown to the player when they log on
@@ -198,9 +172,8 @@ public sealed partial class NoteEdit : FancyWindow
     {
         ExpiryLabel.Visible = !PermanentCheckBox.Pressed;
         ExpiryLineEdit.Visible = !PermanentCheckBox.Pressed;
-        ExpiryLengthDropdown.Visible = !PermanentCheckBox.Pressed;
 
-        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? 1.ToString() : string.Empty;
+        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty;
     }
 
     private void OnSecretPressed(BaseButton.ButtonEventArgs _)
@@ -214,16 +187,6 @@ public sealed partial class NoteEdit : FancyWindow
         SeverityOption.SelectId(args.Id);
     }
 
-    private void OnLengthChanged(OptionButton.ItemSelectedEventArgs args)
-    {
-        ExpiryLengthDropdown.SelectId(args.Id);
-    }
-
-    private void OnTextChanged(HistoryLineEdit.LineEditEventArgs args)
-    {
-        ParseExpiryTime();
-    }
-
     private void OnSubmitButtonPressed(BaseButton.ButtonEventArgs args)
     {
         if (!ParseExpiryTime())
@@ -300,24 +263,13 @@ public sealed partial class NoteEdit : FancyWindow
             return true;
         }
 
-        if (string.IsNullOrWhiteSpace(ExpiryLineEdit.Text) || !uint.TryParse(ExpiryLineEdit.Text, out var inputInt))
+        if (string.IsNullOrWhiteSpace(ExpiryLineEdit.Text) || !DateTime.TryParse(ExpiryLineEdit.Text, out var result) || DateTime.UtcNow > result)
         {
             ExpiryLineEdit.ModulateSelfOverride = Color.Red;
             return false;
         }
 
-        var mult = ExpiryLengthDropdown.SelectedId switch
-        {
-            (int) Multipliers.Minutes => TimeSpan.FromMinutes(1).TotalMinutes,
-            (int) Multipliers.Hours => TimeSpan.FromHours(1).TotalMinutes,
-            (int) Multipliers.Days => TimeSpan.FromDays(1).TotalMinutes,
-            (int) Multipliers.Weeks => TimeSpan.FromDays(7).TotalMinutes,
-            (int) Multipliers.Months => TimeSpan.FromDays(30).TotalMinutes,
-            (int) Multipliers.Years => TimeSpan.FromDays(365).TotalMinutes,
-            (int) Multipliers.Centuries => TimeSpan.FromDays(36525).TotalMinutes,
-            _ => throw new ArgumentOutOfRangeException(nameof(ExpiryLengthDropdown.SelectedId), "Multiplier out of range :(")
-        };
-        ExpiryTime = DateTime.UtcNow.AddMinutes(inputInt * mult);
+        ExpiryTime = result.ToUniversalTime();
         ExpiryLineEdit.ModulateSelfOverride = null;
         return true;
     }

Content.Client/Administration/UI/PermissionsEui.cs

@@ -130,7 +130,6 @@ namespace Content.Client.Administration.UI
             }
 
             var title = string.IsNullOrWhiteSpace(popup.TitleEdit.Text) ? null : popup.TitleEdit.Text;
-            var suspended = popup.SuspendedCheckbox.Pressed;
 
             if (popup.SourceData is { } src)
             {
@@ -140,8 +139,7 @@ namespace Content.Client.Administration.UI
                     Title = title,
                     PosFlags = pos,
                     NegFlags = neg,
-                    RankId = rank,
-                    Suspended = suspended,
+                    RankId = rank
                 });
             }
             else
@@ -154,8 +152,7 @@ namespace Content.Client.Administration.UI
                     Title = title,
                     PosFlags = pos,
                     NegFlags = neg,
-                    RankId = rank,
-                    Suspended = suspended,
+                    RankId = rank
                 });
             }
 
@@ -174,7 +171,7 @@ namespace Content.Client.Administration.UI
                 {
                     Id = src,
                     Flags = flags,
-                    Name = name,
+                    Name = name
                 });
             }
             else
@@ -354,7 +351,6 @@ namespace Content.Client.Administration.UI
             public readonly OptionButton RankButton;
             public readonly Button SaveButton;
             public readonly Button? RemoveButton;
-            public readonly CheckBox SuspendedCheckbox;
 
             public readonly Dictionary<AdminFlags, (Button inherit, Button sub, Button plus)> FlagButtons
                 = new();
@@ -385,12 +381,6 @@ namespace Content.Client.Administration.UI
                 RankButton = new OptionButton();
                 SaveButton = new Button { Text = Loc.GetString("permissions-eui-edit-admin-window-save-button"), HorizontalAlignment = HAlignment.Right };
 
-                SuspendedCheckbox = new CheckBox
-                {
-                    Text = Loc.GetString("permissions-eui-edit-admin-window-suspended"),
-                    Pressed = data?.Suspended ?? false,
-                };
-
                 RankButton.AddItem(Loc.GetString("permissions-eui-edit-admin-window-no-rank-button"), NoRank);
                 foreach (var (rId, rank) in ui._ranks)
                 {
@@ -498,8 +488,7 @@ namespace Content.Client.Administration.UI
                                     {
                                         nameControl,
                                         TitleEdit,
-                                        RankButton,
-                                        SuspendedCheckbox,
+                                        RankButton
                                     }
                                 },
                                 permGrid

Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml

@@ -19,13 +19,12 @@
        <Label Name="SharedConnections"/>
 
        <BoxContainer Align="Center">
-           <GridContainer Rows="6">
+           <GridContainer Rows="5">
             <Button Name="NotesButton" Text="{Loc player-panel-show-notes}" SetWidth="136" Disabled="True"/>
             <Button Name="AhelpButton" Text="{Loc player-panel-help}" Disabled="True"/>
             <Button Name="FreezeButton" Text = "{Loc player-panel-freeze}" Disabled="True"/>
             <controls:ConfirmButton Name="KickButton" Text="{Loc player-panel-kick}" Disabled="True"/>
             <controls:ConfirmButton Name="DeleteButton" Text="{Loc player-panel-delete}" Disabled="True"/>
-            <Button Name="FollowButton" Text="{Loc player-panel-follow}"/>
             <Button Name="ShowBansButton" Text="{Loc player-panel-show-bans}" SetWidth="136" Disabled="True"/>
             <Button Name="LogsButton" Text="{Loc player-panel-logs}" Disabled="True"/>
             <Button Name="FreezeAndMuteToggleButton" Text="{Loc player-panel-freeze-and-mute}" Disabled="True"/>

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

@@ -2,6 +2,7 @@ using Content.Client.Administration.Managers;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
@@ -20,7 +21,6 @@ public sealed partial class PlayerPanel : FancyWindow
     public event Action<string?>? OnKick;
     public event Action<NetUserId?>? OnOpenBanPanel;
     public event Action<NetUserId?, bool>? OnWhitelistToggle;
-    public event Action? OnFollow;
     public event Action? OnFreezeAndMuteToggle;
     public event Action? OnFreeze;
     public event Action? OnLogs;
@@ -36,7 +36,7 @@ public sealed partial class PlayerPanel : FancyWindow
             RobustXamlLoader.Load(this);
             _adminManager = adminManager;
 
-            UsernameCopyButton.OnPressed += _ => OnUsernameCopy?.Invoke(TargetUsername ?? "");
+            UsernameCopyButton.OnPressed += _ => OnUsernameCopy?.Invoke(PlayerName.Text ?? "");
             BanButton.OnPressed += _ => OnOpenBanPanel?.Invoke(TargetPlayer);
             KickButton.OnPressed += _ => OnKick?.Invoke(TargetUsername);
             NotesButton.OnPressed += _ => OnOpenNotes?.Invoke(TargetPlayer);
@@ -47,7 +47,6 @@ public sealed partial class PlayerPanel : FancyWindow
                 OnWhitelistToggle?.Invoke(TargetPlayer, _isWhitelisted);
                 SetWhitelisted(!_isWhitelisted);
             };
-            FollowButton.OnPressed += _ => OnFollow?.Invoke();
             FreezeButton.OnPressed += _ => OnFreeze?.Invoke();
             FreezeAndMuteToggleButton.OnPressed += _ => OnFreezeAndMuteToggle?.Invoke();
             LogsButton.OnPressed += _ => OnLogs?.Invoke();

Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs

@@ -38,7 +38,6 @@ public sealed class PlayerPanelEui : BaseEui
         PlayerPanel.OnLogs += () => SendMessage(new PlayerPanelLogsMessage());
         PlayerPanel.OnRejuvenate += () => SendMessage(new PlayerPanelRejuvenationMessage());
         PlayerPanel.OnDelete+= () => SendMessage(new PlayerPanelDeleteMessage());
-        PlayerPanel.OnFollow += () => SendMessage(new PlayerPanelFollowMessage());
 
         PlayerPanel.OnClose += () => SendMessage(new CloseEuiMessage());
     }

Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs

@@ -19,10 +19,10 @@ namespace Content.Client.Administration.UI.SpawnExplosion;
 public sealed partial class SpawnExplosionWindow : DefaultWindow
 {
     [Dependency] private readonly IClientConsoleHost _conHost = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
-    private readonly SharedMapSystem _mapSystem;
     private readonly SharedTransformSystem _transform = default!;
 
     private readonly SpawnExplosionEui _eui;
@@ -38,7 +38,6 @@ public sealed partial class SpawnExplosionWindow : DefaultWindow
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
-        _mapSystem = _entMan.System<SharedMapSystem>();
         _transform = _entMan.System<TransformSystem>();
         _eui = eui;
 
@@ -88,7 +87,7 @@ public sealed partial class SpawnExplosionWindow : DefaultWindow
     {
         _mapData.Clear();
         MapOptions.Clear();
-        foreach (var map in _mapSystem.GetAllMapIds())
+        foreach (var map in _mapManager.GetAllMapIds())
         {
             _mapData.Add(map);
             MapOptions.AddItem(map.ToString());

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

@@ -16,7 +16,6 @@
             <cc:UICommandButton Command="callshuttle" Text="{Loc admin-player-actions-window-shuttle}" WindowType="{x:Type at:AdminShuttleWindow}"/>
             <cc:CommandButton Command="adminlogs" Text="{Loc admin-player-actions-window-admin-logs}"/>
             <cc:CommandButton Command="faxui" Text="{Loc admin-player-actions-window-admin-fax}"/>
-            <cc:CommandButton Command="achatwindow" Text="{Loc admin-player-actions-window-admin-chat}"/>
         </GridContainer>
     </BoxContainer>
 </Control>

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

@@ -1,7 +1,6 @@
 <DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     Title="{Loc admin-player-actions-window-title}" MinSize="425 272">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
@@ -11,9 +10,9 @@
         </BoxContainer>
         <cc:PlayerListControl Name="PlayerList" VerticalExpand="True" />
         <BoxContainer Orientation="Horizontal">
-            <controls:ConfirmButton Name="SubmitKickButton" Text="{Loc admin-player-actions-kick}" ConfirmationText="{Loc 'admin-player-actions-confirm'}" Disabled="True"/>
+            <Button Name="SubmitKickButton" Text="{Loc admin-player-actions-kick}" Disabled="True"/>
             <Button Name="SubmitAHelpButton" Text="{Loc admin-player-actions-ahelp}" Disabled="True"/>
-            <controls:ConfirmButton Name="SubmitRespawnButton" Text="{Loc admin-player-actions-respawn}" ConfirmationText="{Loc 'admin-player-actions-confirm'}" Disabled="True"/>
+            <Button Name="SubmitRespawnButton" Text="{Loc admin-player-actions-respawn}" Disabled="True"/>
         </BoxContainer>
     </BoxContainer>
 </DefaultWindow>

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

@@ -14,6 +14,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
     public sealed partial class PlayerActionsWindow : DefaultWindow
     {
         private PlayerInfo? _selectedPlayer;
+        private readonly Dictionary<Button, ConfirmationData> _confirmations = new();
 
         public PlayerActionsWindow()
         {
@@ -27,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;
@@ -39,6 +43,9 @@ 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)}\"");
         }
@@ -57,6 +64,9 @@ 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/AdminbusTab/LoadBlueprintsWindow.xaml.cs

@@ -14,9 +14,6 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
     [UsedImplicitly]
     public sealed partial class LoadBlueprintsWindow : DefaultWindow
     {
-        [Dependency] private readonly IEntityManager _entityManager = default!;
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-
         public LoadBlueprintsWindow()
         {
             RobustXamlLoader.Load(this);
@@ -24,9 +21,9 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
 
         protected override void EnteredTree()
         {
-            var mapSystem = _entityManager.System<SharedMapSystem>();
+            var mapManager = IoCManager.Resolve<IMapManager>();
 
-            foreach (var mapId in mapSystem.GetAllMapIds())
+            foreach (var mapId in mapManager.GetAllMapIds())
             {
                 MapOptions.AddItem(mapId.ToString(), (int) mapId);
             }
@@ -42,19 +39,21 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
 
         private void Reset()
         {
-            var xformSystem = _entityManager.System<SharedTransformSystem>();
-            var player = _playerManager.LocalEntity;
+            var entManager = IoCManager.Resolve<IEntityManager>();
+            var xformSystem = entManager.System<SharedTransformSystem>();
+            var playerManager = IoCManager.Resolve<IPlayerManager>();
+            var player = playerManager.LocalEntity;
 
             var currentMap = MapId.Nullspace;
             var position = Vector2.Zero;
             var rotation = Angle.Zero;
 
-            if (_entityManager.TryGetComponent<TransformComponent>(player, out var xform))
+            if (entManager.TryGetComponent<TransformComponent>(player, out var xform))
             {
                 currentMap = xform.MapID;
                 position = xformSystem.GetWorldPosition(xform);
 
-                if (_entityManager.TryGetComponent<TransformComponent>(xform.GridUid, out var gridXform))
+                if (entManager.TryGetComponent<TransformComponent>(xform.GridUid, out var gridXform))
                 {
                     rotation = xformSystem.GetWorldRotation(gridXform);
                 }

Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml

@@ -0,0 +1,6 @@
+<controls:BabyJailStatusWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab"
+    Title="{Loc admin-ui-baby-jail-window-title}">
+    <RichTextLabel Name="MessageLabel" Access="Public" />
+</controls:BabyJailStatusWindow>

Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml.cs

@@ -0,0 +1,21 @@
+using Content.Client.Message;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Administration.UI.Tabs.BabyJailTab;
+
+/*
+ * TODO: Remove me once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+ */
+
+[GenerateTypedNameReferences]
+public sealed partial class BabyJailStatusWindow : FancyWindow
+{
+    public BabyJailStatusWindow()
+    {
+        RobustXamlLoader.Load(this);
+        MessageLabel.SetMarkup(Loc.GetString("admin-ui-baby-jail-is-enabled"));
+    }
+}

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

@@ -0,0 +1,26 @@
+<controls:BabyJailTab
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    Margin="4">
+    <BoxContainer Orientation="Vertical">
+        <cc:CommandButton Name="EnabledButton" Command="babyjail" ToggleMode="True"
+                          Text="{Loc admin-ui-baby-jail-disabled}"
+                          ToolTip="{Loc admin-ui-baby-jail-tooltip}" />
+        <cc:CommandButton Name="ShowReasonButton" Command="babyjail_show_reason"
+                          ToggleMode="True" Text="{Loc admin-ui-baby-jail-show-reason}"
+                          ToolTip="{Loc admin-ui-baby-jail-show-reason-tooltip}" />
+        <BoxContainer Orientation="Vertical" Margin="0 10 0 0">
+            <BoxContainer Orientation="Horizontal" Margin="2">
+                <Label Text="{Loc admin-ui-baby-jail-max-account-age}" MinWidth="175" />
+                <LineEdit Name="MaxAccountAge" MinWidth="50" Margin="0 0 5 0" />
+                <Label Text="{Loc generic-minutes}" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal" Margin="2">
+                <Label Text="{Loc admin-ui-baby-jail-max-overall-minutes}" MinWidth="175" />
+                <LineEdit Name="MaxOverallMinutes" MinWidth="50" Margin="0 0 5 0" />
+                <Label Text="{Loc generic-minutes}" />
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+</controls:BabyJailTab>

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

@@ -0,0 +1,75 @@
+using Content.Shared.Administration.Events;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Console;
+
+/*
+ * TODO: Remove me once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+ */
+
+namespace Content.Client.Administration.UI.Tabs.BabyJailTab;
+
+[GenerateTypedNameReferences]
+public sealed partial class BabyJailTab : Control
+{
+    [Dependency] private readonly IConsoleHost _console = default!;
+
+    private string _maxAccountAge;
+    private string _maxOverallMinutes;
+
+    public BabyJailTab()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        MaxAccountAge.OnTextEntered += args => SendMaxAccountAge(args.Text);
+        MaxAccountAge.OnFocusExit += args => SendMaxAccountAge(args.Text);
+        _maxAccountAge = MaxAccountAge.Text;
+
+        MaxOverallMinutes.OnTextEntered += args => SendMaxOverallMinutes(args.Text);
+        MaxOverallMinutes.OnFocusExit += args => SendMaxOverallMinutes(args.Text);
+        _maxOverallMinutes = MaxOverallMinutes.Text;
+    }
+
+    private void SendMaxAccountAge(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text) ||
+            text == _maxAccountAge ||
+            !int.TryParse(text, out var minutes))
+        {
+            return;
+        }
+
+        _console.ExecuteCommand($"babyjail_max_account_age {minutes}");
+    }
+
+    private void SendMaxOverallMinutes(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text) ||
+            text == _maxOverallMinutes ||
+            !int.TryParse(text, out var minutes))
+        {
+            return;
+        }
+
+        _console.ExecuteCommand($"babyjail_max_overall_minutes {minutes}");
+    }
+
+    public void UpdateStatus(BabyJailStatus status)
+    {
+        EnabledButton.Pressed = status.Enabled;
+        EnabledButton.Text = Loc.GetString(status.Enabled
+            ? "admin-ui-baby-jail-enabled"
+            : "admin-ui-baby-jail-disabled"
+        );
+        EnabledButton.ModulateSelfOverride = status.Enabled ? Color.Red : null;
+        ShowReasonButton.Pressed = status.ShowReason;
+
+        MaxAccountAge.Text = status.MaxAccountAgeMinutes.ToString();
+        _maxAccountAge = MaxAccountAge.Text;
+
+        MaxOverallMinutes.Text = status.MaxOverallMinutes.ToString();
+        _maxOverallMinutes = MaxOverallMinutes.Text;
+    }
+}

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

@@ -13,6 +13,7 @@ public sealed partial class ObjectsTabEntry : PanelContainer
 
     public Action<NetEntity>? OnTeleport;
     public Action<NetEntity>? OnDelete;
+    private readonly Dictionary<Button, ConfirmationData> _confirmations = new();
 
     public ObjectsTabEntry(IClientAdminManager manager, string name, NetEntity nent, StyleBox styleBox)
     {
@@ -27,6 +28,13 @@ public sealed partial class ObjectsTabEntry : PanelContainer
         DeleteButton.Disabled = !manager.CanCommand("delete");
 
         TeleportButton.OnPressed += _ => OnTeleport?.Invoke(nent);
-        DeleteButton.OnPressed += _ => OnDelete?.Invoke(nent);
+        DeleteButton.OnPressed += _ =>
+        {
+            if (!AdminUIHelpers.TryConfirm(DeleteButton, _confirmations))
+            {
+                return;
+            }
+            OnDelete?.Invoke(nent);
+        };
     }
 }

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

@@ -2,13 +2,11 @@ using System.Linq;
 using Content.Client.Administration.Systems;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration;
-using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Configuration;
 using static Content.Client.Administration.UI.Tabs.PlayerTab.PlayerTabHeader;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
@@ -18,7 +16,6 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab;
 public sealed partial class PlayerTab : Control
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly IPlayerManager _playerMan = default!;
 
     private const string ArrowUp = "↑";
@@ -32,10 +29,6 @@ public sealed partial class PlayerTab : Control
     private bool _ascending = true;
     private bool _showDisconnected;
 
-    private AdminPlayerTabColorOption _playerTabColorSetting;
-    private AdminPlayerTabRoleTypeOption _playerTabRoleSetting;
-    private AdminPlayerTabSymbolOption _playerTabSymbolSetting;
-
     public event Action<GUIBoundKeyEventArgs, ListData>? OnEntryKeyBindDown;
 
     public PlayerTab()
@@ -48,11 +41,6 @@ public sealed partial class PlayerTab : Control
         _adminSystem.OverlayEnabled += OverlayEnabled;
         _adminSystem.OverlayDisabled += OverlayDisabled;
 
-        _config.OnValueChanged(CCVars.AdminPlayerTabRoleSetting, RoleSettingChanged, true);
-        _config.OnValueChanged(CCVars.AdminPlayerTabColorSetting, ColorSettingChanged, true);
-        _config.OnValueChanged(CCVars.AdminPlayerTabSymbolSetting, SymbolSettingChanged, true);
-
-
         OverlayButton.OnPressed += OverlayButtonPressed;
         ShowDisconnectedButton.OnPressed += ShowDisconnectedPressed;
 
@@ -118,30 +106,6 @@ public sealed partial class PlayerTab : Control
 
     #region ListContainer
 
-    private void RoleSettingChanged(string s)
-    {
-        if (!Enum.TryParse<AdminPlayerTabRoleTypeOption>(s, out var format))
-            format = AdminPlayerTabRoleTypeOption.Subtype;
-        _playerTabRoleSetting = format;
-        RefreshPlayerList(_adminSystem.PlayerList);
-    }
-
-    private void ColorSettingChanged(string s)
-    {
-        if (!Enum.TryParse<AdminPlayerTabColorOption>(s, out var format))
-            format = AdminPlayerTabColorOption.Both;
-        _playerTabColorSetting = format;
-        RefreshPlayerList(_adminSystem.PlayerList);
-    }
-
-    private void SymbolSettingChanged(string s)
-    {
-        if (!Enum.TryParse<AdminPlayerTabSymbolOption>(s, out var format))
-            format = AdminPlayerTabSymbolOption.Specific;
-        _playerTabSymbolSetting = format;
-        RefreshPlayerList(_adminSystem.PlayerList);
-    }
-
     private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
     {
         _players = players;
@@ -164,12 +128,7 @@ public sealed partial class PlayerTab : Control
         if (data is not PlayerListData { Info: var player})
             return;
 
-        var entry = new PlayerTabEntry(
-            player,
-            new StyleBoxFlat(button.Index % 2 == 0 ? _altColor : _defaultColor),
-            _playerTabColorSetting,
-            _playerTabRoleSetting,
-            _playerTabSymbolSetting);
+        var entry = new PlayerTabEntry(player, new StyleBoxFlat(button.Index % 2 == 0 ? _altColor : _defaultColor));
         button.AddChild(entry);
         button.ToolTip = $"{player.Username}, {player.CharacterName}, {player.IdentityName}, {player.StartingJob}";
     }
@@ -237,7 +196,7 @@ public sealed partial class PlayerTab : Control
             Header.Username => Compare(x.Username, y.Username),
             Header.Character => Compare(x.CharacterName, y.CharacterName),
             Header.Job => Compare(x.StartingJob, y.StartingJob),
-            Header.RoleType => y.SortWeight - x.SortWeight,
+            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

@@ -19,8 +19,8 @@
                HorizontalExpand="True"
                ClipText="True"/>
         <customControls:VSeparator/>
-        <Label Name="RoleTypeLabel"
-               SizeFlagsStretchRatio="2"
+        <Label Name="AntagonistLabel"
+               SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
                ClipText="True"/>
         <customControls:VSeparator/>

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

@@ -1,5 +1,4 @@
 using Content.Shared.Administration;
-using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
@@ -10,90 +9,22 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab;
 [GenerateTypedNameReferences]
 public sealed partial class PlayerTabEntry : PanelContainer
 {
-    [Dependency] private readonly IEntityManager _entMan = default!;
+    public NetEntity? PlayerEntity;
 
-    public PlayerTabEntry(
-        PlayerInfo player,
-        StyleBoxFlat styleBoxFlat,
-        AdminPlayerTabColorOption colorOption,
-        AdminPlayerTabRoleTypeOption roleSetting,
-        AdminPlayerTabSymbolOption symbolSetting)
+    public PlayerTabEntry(PlayerInfo player, StyleBoxFlat styleBoxFlat)
     {
-        IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
-        var roles = _entMan.System<SharedRoleSystem>();
 
         UsernameLabel.Text = player.Username;
         if (!player.Connected)
             UsernameLabel.StyleClasses.Add("Disabled");
         JobLabel.Text = player.StartingJob;
-
-        var colorAntags = false;
-        var colorRoles = false;
-        switch (colorOption)
-        {
-            case AdminPlayerTabColorOption.Off:
-                break;
-            case AdminPlayerTabColorOption.Character:
-                colorAntags = true;
-                break;
-            case AdminPlayerTabColorOption.Roletype:
-                colorRoles = true;
-                break;
-            default:
-            case AdminPlayerTabColorOption.Both:
-                colorAntags = true;
-                colorRoles = true;
-                break;
-        }
-
-        var symbol = string.Empty;
-        switch (symbolSetting)
-        {
-            case AdminPlayerTabSymbolOption.Off:
-                break;
-            case AdminPlayerTabSymbolOption.Basic:
-                symbol = player.Antag ? Loc.GetString("player-tab-antag-prefix") : string.Empty;
-                break;
-            default:
-            case AdminPlayerTabSymbolOption.Specific:
-                symbol = player.Antag ? player.RoleProto.Symbol : string.Empty;
-                break;
-        }
-
-        CharacterLabel.Text = Loc.GetString("player-tab-character-name-antag-symbol", ("symbol", symbol), ("name", player.CharacterName));
-
-        if (player.Antag && colorAntags)
-            CharacterLabel.FontColorOverride = player.RoleProto.Color;
+        CharacterLabel.Text = player.CharacterName;
         if (player.IdentityName != player.CharacterName)
             CharacterLabel.Text += $" [{player.IdentityName}]";
-
-        var roletype = RoleTypeLabel.Text = Loc.GetString(player.RoleProto.Name);
-        var subtype = roles.GetRoleSubtypeLabel(player.RoleProto.Name, player.Subtype);
-        switch (roleSetting)
-        {
-            case AdminPlayerTabRoleTypeOption.RoleTypeSubtype:
-                RoleTypeLabel.Text = roletype != subtype
-                    ? roletype + " - " +subtype
-                    : roletype;
-                break;
-            case AdminPlayerTabRoleTypeOption.SubtypeRoleType:
-                RoleTypeLabel.Text = roletype != subtype
-                    ? subtype + " - " + roletype
-                    : roletype;
-                break;
-            case AdminPlayerTabRoleTypeOption.RoleType:
-                RoleTypeLabel.Text = roletype;
-                break;
-            default:
-            case AdminPlayerTabRoleTypeOption.Subtype:
-                RoleTypeLabel.Text = subtype;
-                break;
-        }
-
-        if (colorRoles)
-            RoleTypeLabel.FontColorOverride = player.RoleProto.Color;
+        AntagonistLabel.Text = Loc.GetString(player.Antag ? "player-tab-is-antag-yes" : "player-tab-is-antag-no");
         BackgroundColorPanel.PanelOverride = styleBoxFlat;
         OverallPlaytimeLabel.Text = player.PlaytimeString;
+        PlayerEntity = player.NetEntity;
     }
 }

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

@@ -25,11 +25,11 @@
                Text="{Loc player-tab-job}"
                MouseFilter="Pass"/>
         <cc:VSeparator/>
-        <Label Name="RoleTypeLabel"
-               SizeFlagsStretchRatio="2"
+        <Label Name="AntagonistLabel"
+               SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
                ClipText="True"
-               Text="{Loc player-tab-roletype}"
+               Text="{Loc player-tab-antagonist}"
                MouseFilter="Pass"/>
         <cc:VSeparator/>
         <Label Name="PlaytimeLabel"

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

@@ -18,7 +18,7 @@ public sealed partial class PlayerTabHeader : Control
         UsernameLabel.OnKeyBindDown += UsernameClicked;
         CharacterLabel.OnKeyBindDown += CharacterClicked;
         JobLabel.OnKeyBindDown += JobClicked;
-        RoleTypeLabel.OnKeyBindDown += RoleTypeClicked;
+        AntagonistLabel.OnKeyBindDown += AntagonistClicked;
         PlaytimeLabel.OnKeyBindDown += PlaytimeClicked;
     }
 
@@ -29,7 +29,7 @@ public sealed partial class PlayerTabHeader : Control
             Header.Username => UsernameLabel,
             Header.Character => CharacterLabel,
             Header.Job => JobLabel,
-            Header.RoleType => RoleTypeLabel,
+            Header.Antagonist => AntagonistLabel,
             Header.Playtime => PlaytimeLabel,
             _ => throw new ArgumentOutOfRangeException(nameof(header), header, null)
         };
@@ -40,7 +40,7 @@ public sealed partial class PlayerTabHeader : Control
         UsernameLabel.Text = Loc.GetString("player-tab-username");
         CharacterLabel.Text = Loc.GetString("player-tab-character");
         JobLabel.Text = Loc.GetString("player-tab-job");
-        RoleTypeLabel.Text = Loc.GetString("player-tab-roletype");
+        AntagonistLabel.Text = Loc.GetString("player-tab-antagonist");
         PlaytimeLabel.Text = Loc.GetString("player-tab-playtime");
     }
 
@@ -70,9 +70,9 @@ public sealed partial class PlayerTabHeader : Control
         HeaderClicked(args, Header.Job);
     }
 
-    private void RoleTypeClicked(GUIBoundKeyEventArgs args)
+    private void AntagonistClicked(GUIBoundKeyEventArgs args)
     {
-        HeaderClicked(args, Header.RoleType);
+        HeaderClicked(args, Header.Antagonist);
     }
 
     private void PlaytimeClicked(GUIBoundKeyEventArgs args)
@@ -89,7 +89,7 @@ public sealed partial class PlayerTabHeader : Control
             UsernameLabel.OnKeyBindDown -= UsernameClicked;
             CharacterLabel.OnKeyBindDown -= CharacterClicked;
             JobLabel.OnKeyBindDown -= JobClicked;
-            RoleTypeLabel.OnKeyBindDown -= RoleTypeClicked;
+            AntagonistLabel.OnKeyBindDown -= AntagonistClicked;
             PlaytimeLabel.OnKeyBindDown -= PlaytimeClicked;
         }
     }
@@ -99,7 +99,7 @@ public sealed partial class PlayerTabHeader : Control
         Username,
         Character,
         Job,
-        RoleType,
+        Antagonist,
         Playtime
     }
 }

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

@@ -1,24 +0,0 @@
-namespace Content.Client.Administration.UI.Tabs.PlayerTab;
-
-public enum AdminPlayerTabColorOption
-{
-    Off,
-    Character,
-    Roletype,
-    Both
-}
-
-public enum AdminPlayerTabRoleTypeOption
-{
-    RoleType,
-    Subtype,
-    RoleTypeSubtype,
-    SubtypeRoleType
-}
-
-public enum AdminPlayerTabSymbolOption
-{
-    Off,
-    Basic,
-    Specific
-}

Content.Client/Advertise/Systems/SpeakOnUIClosedSystem.cs

@@ -1,5 +0,0 @@
-using Content.Shared.Advertise.Systems;
-
-namespace Content.Client.Advertise.Systems;
-
-public sealed class SpeakOnUIClosedSystem : SharedSpeakOnUIClosedSystem;

Content.Client/AlertLevel/AlertLevelDisplaySystem.cs

@@ -8,8 +8,6 @@ namespace Content.Client.AlertLevel;
 
 public sealed class AlertLevelDisplaySystem : EntitySystem
 {
-    [Dependency] private readonly SpriteSystem _sprite = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -23,26 +21,26 @@ public sealed class AlertLevelDisplaySystem : EntitySystem
         {
             return;
         }
-        var layer = _sprite.LayerMapReserve((uid, args.Sprite), AlertLevelDisplay.Layer);
+        var layer = args.Sprite.LayerMapReserveBlank(AlertLevelDisplay.Layer);
 
         if (args.AppearanceData.TryGetValue(AlertLevelDisplay.Powered, out var poweredObject))
         {
-            _sprite.LayerSetVisible((uid, args.Sprite), layer, poweredObject is true);
+            args.Sprite.LayerSetVisible(layer, poweredObject is true);
         }
 
         if (!args.AppearanceData.TryGetValue(AlertLevelDisplay.CurrentLevel, out var level))
         {
-            _sprite.LayerSetRsiState((uid, args.Sprite), layer, alertLevelDisplay.AlertVisuals.Values.First());
+            args.Sprite.LayerSetState(layer, alertLevelDisplay.AlertVisuals.Values.First());
             return;
         }
 
-        if (alertLevelDisplay.AlertVisuals.TryGetValue((string)level, out var visual))
+        if (alertLevelDisplay.AlertVisuals.TryGetValue((string) level, out var visual))
         {
-            _sprite.LayerSetRsiState((uid, args.Sprite), layer, visual);
+            args.Sprite.LayerSetState(layer, visual);
         }
         else
         {
-            _sprite.LayerSetRsiState((uid, args.Sprite), layer, alertLevelDisplay.AlertVisuals.Values.First());
+            args.Sprite.LayerSetState(layer, alertLevelDisplay.AlertVisuals.Values.First());
         }
     }
 }

Content.Client/Alerts/ClientAlertsSystem.cs

@@ -2,8 +2,6 @@ using System.Linq;
 using Content.Shared.Alert;
 using JetBrains.Annotations;
 using Robust.Client.Player;
-using Robust.Client.UserInterface;
-using Robust.Shared.GameStates;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
@@ -16,7 +14,6 @@ public sealed class ClientAlertsSystem : AlertsSystem
 
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IUserInterfaceManager _ui = default!;
 
     public event EventHandler? ClearAlerts;
     public event EventHandler<IReadOnlyDictionary<AlertKey, AlertState>>? SyncAlerts;
@@ -27,14 +24,9 @@ public sealed class ClientAlertsSystem : AlertsSystem
 
         SubscribeLocalEvent<AlertsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<AlertsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
-        SubscribeLocalEvent<AlertsComponent, ComponentHandleState>(OnHandleState);
-    }
 
-    protected override void HandledAlert()
-    {
-        _ui.ClickSound();
+        SubscribeLocalEvent<AlertsComponent, AfterAutoHandleStateEvent>(ClientAlertsHandleState);
     }
-
     protected override void LoadPrototypes()
     {
         base.LoadPrototypes();
@@ -55,32 +47,6 @@ public sealed class ClientAlertsSystem : AlertsSystem
         }
     }
 
-    private void OnHandleState(Entity<AlertsComponent> alerts, ref ComponentHandleState args)
-    {
-        if (args.Current is not AlertComponentState cast)
-            return;
-
-        // Save all client-sided alerts to later put back in
-        var clientAlerts = new Dictionary<AlertKey, AlertState>();
-        foreach (var alert in alerts.Comp.Alerts)
-        {
-            if (alert.Key.AlertType != null && TryGet(alert.Key.AlertType.Value, out var alertProto))
-            {
-                if (alertProto.ClientHandled)
-                    clientAlerts[alert.Key] = alert.Value;
-            }
-        }
-
-        alerts.Comp.Alerts = new(cast.Alerts);
-
-        foreach (var alert in clientAlerts)
-        {
-            alerts.Comp.Alerts[alert.Key] = alert.Value;
-        }
-
-        UpdateHud(alerts);
-    }
-
     protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
     {
         UpdateHud(alerts);
@@ -91,6 +57,11 @@ public sealed class ClientAlertsSystem : AlertsSystem
         UpdateHud(alerts);
     }
 
+    private void ClientAlertsHandleState(Entity<AlertsComponent> alerts, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateHud(alerts);
+    }
+
     private void UpdateHud(Entity<AlertsComponent> entity)
     {
         if (_playerManager.LocalEntity == entity.Owner)

Content.Client/Animations/EntityPickupAnimationSystem.cs

@@ -15,7 +15,6 @@ public sealed class EntityPickupAnimationSystem : EntitySystem
 {
     [Dependency] private readonly AnimationPlayerSystem _animations = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
-    [Dependency] private readonly SpriteSystem _sprite = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
 
     public override void Initialize()
@@ -57,8 +56,8 @@ public sealed class EntityPickupAnimationSystem : EntitySystem
         }
 
         var sprite = Comp<SpriteComponent>(animatableClone);
-        _sprite.CopySprite((uid, sprite0), (animatableClone, sprite));
-        _sprite.SetVisible((animatableClone, sprite), true);
+        sprite.CopyFrom(sprite0);
+        sprite.Visible = true;
 
         var animations = Comp<AnimationPlayerComponent>(animatableClone);
 

Content.Client/Anomaly/AnomalySystem.cs

@@ -11,7 +11,6 @@ public sealed class AnomalySystem : SharedAnomalySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly FloatingVisualizerSystem _floating = default!;
-    [Dependency] private readonly SpriteSystem _sprite = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -50,12 +49,12 @@ public sealed class AnomalySystem : SharedAnomalySystem
         if (HasComp<AnomalySupercriticalComponent>(uid))
             pulsing = true;
 
-        if (!_sprite.LayerMapTryGet((uid, sprite), AnomalyVisualLayers.Base, out var layer, false) ||
-            !_sprite.LayerMapTryGet((uid, sprite), AnomalyVisualLayers.Animated, out var animatedLayer, false))
+        if (!sprite.LayerMapTryGet(AnomalyVisualLayers.Base, out var layer) ||
+            !sprite.LayerMapTryGet(AnomalyVisualLayers.Animated, out var animatedLayer))
             return;
 
-        _sprite.LayerSetVisible((uid, sprite), layer, !pulsing);
-        _sprite.LayerSetVisible((uid, sprite), animatedLayer, pulsing);
+        sprite.LayerSetVisible(layer, !pulsing);
+        sprite.LayerSetVisible(animatedLayer, pulsing);
     }
 
     public override void Update(float frameTime)
@@ -64,16 +63,16 @@ public sealed class AnomalySystem : SharedAnomalySystem
 
         var query = EntityQueryEnumerator<AnomalySupercriticalComponent, SpriteComponent>();
 
-        while (query.MoveNext(out var uid, out var super, out var sprite))
+        while (query.MoveNext(out var super, out var sprite))
         {
-            var completion = 1f - (float)((super.EndTime - _timing.CurTime) / super.SupercriticalDuration);
+            var completion = 1f - (float) ((super.EndTime - _timing.CurTime) / super.SupercriticalDuration);
             var scale = completion * (super.MaxScaleAmount - 1f) + 1f;
-            _sprite.SetScale((uid, sprite), new Vector2(scale, scale));
+            sprite.Scale = new Vector2(scale, scale);
 
-            var transparency = (byte)(65 * (1f - completion) + 190);
+            var transparency = (byte) (65 * (1f - completion) + 190);
             if (transparency < sprite.Color.AByte)
             {
-                _sprite.SetColor((uid, sprite), sprite.Color.WithAlpha(transparency));
+                sprite.Color = sprite.Color.WithAlpha(transparency);
             }
         }
     }
@@ -83,7 +82,7 @@ public sealed class AnomalySystem : SharedAnomalySystem
         if (!TryComp<SpriteComponent>(ent, out var sprite))
             return;
 
-        _sprite.SetScale((ent.Owner, sprite), Vector2.One);
-        _sprite.SetColor((ent.Owner, sprite), sprite.Color.WithAlpha(1f));
+        sprite.Scale = Vector2.One;
+        sprite.Color = sprite.Color.WithAlpha(1f);
     }
 }

Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs

@@ -7,8 +7,6 @@ namespace Content.Client.Anomaly.Effects;
 
 public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
 {
-    [Dependency] private readonly SpriteSystem _sprite = default!;
-
     public override void Initialize()
     {
         SubscribeLocalEvent<InnerBodyAnomalyComponent, AfterAutoHandleStateEvent>(OnAfterHandleState);
@@ -23,20 +21,21 @@ public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
         if (ent.Comp.FallbackSprite is null)
             return;
 
-        var index = _sprite.LayerMapReserve((ent.Owner, sprite), ent.Comp.LayerMap);
+        if (!sprite.LayerMapTryGet(ent.Comp.LayerMap, out var index))
+            index = sprite.LayerMapReserveBlank(ent.Comp.LayerMap);
 
         if (TryComp<BodyComponent>(ent, out var body) &&
             body.Prototype is not null &&
             ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite))
         {
-            _sprite.LayerSetSprite((ent.Owner, sprite), index, speciesSprite);
+            sprite.LayerSetSprite(index, speciesSprite);
         }
         else
         {
-            _sprite.LayerSetSprite((ent.Owner, sprite), index, ent.Comp.FallbackSprite);
+            sprite.LayerSetSprite(index, ent.Comp.FallbackSprite);
         }
 
-        _sprite.LayerSetVisible((ent.Owner, sprite), index, true);
+        sprite.LayerSetVisible(index, true);
         sprite.LayerSetShader(index, "unshaded");
     }
 
@@ -45,7 +44,7 @@ public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
         if (!TryComp<SpriteComponent>(ent, out var sprite))
             return;
 
-        var index = _sprite.LayerMapGet((ent.Owner, sprite), ent.Comp.LayerMap);
-        _sprite.LayerSetVisible((ent.Owner, sprite), index, false);
+        var index = sprite.LayerMapGet(ent.Comp.LayerMap);
+        sprite.LayerSetVisible(index, false);
     }
 }

Content.Client/Atmos/Components/PipeColorVisualsComponent.cs

@@ -1,4 +1,8 @@
+using Robust.Shared.GameObjects;
+
 namespace Content.Client.Atmos.Components;
 
 [RegisterComponent]
-public sealed partial class PipeColorVisualsComponent : Component;
+public sealed partial class PipeColorVisualsComponent : Component
+{
+}

Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml

@@ -1,5 +1,6 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+         xmlns:s="clr-namespace:Content.Client.Stylesheets"
          xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
          xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
          Orientation="Vertical" HorizontalExpand ="True" Margin="0 0 0 3">
@@ -61,7 +62,7 @@
                     </PanelContainer>
                 </BoxContainer>
 
-                <!-- If the alarm is inactive, this is label is displayed instead -->
+                <!-- If the alarm is inactive, this is label is diplayed instead -->
                 <Label Name="NoDataLabel" Text="{Loc 'atmos-alerts-window-no-data-available'}" HorizontalAlignment="Center" Margin="0 15" FontColorOverride="#a9a9a9" ReservesSpace="False" Visible="False"></Label>
 
                 <!-- Silencing progress bar -->

Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs

@@ -31,6 +31,19 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
         [AtmosAlarmType.Danger] = "atmos-alerts-window-danger-state",
     };
 
+    private Dictionary<Gas, string> _gasShorthands = new Dictionary<Gas, string>()
+    {
+        [Gas.Ammonia] = "NH₃",
+        [Gas.CarbonDioxide] = "CO₂",
+        [Gas.Frezon] = "F",
+        [Gas.Nitrogen] = "N₂",
+        [Gas.NitrousOxide] = "N₂O",
+        [Gas.Oxygen] = "O₂",
+        [Gas.Plasma] = "P",
+        [Gas.Tritium] = "T",
+        [Gas.WaterVapor] = "H₂O",
+    };
+
     public AtmosAlarmEntryContainer(NetEntity uid, EntityCoordinates? coordinates)
     {
         RobustXamlLoader.Load(this);
@@ -123,9 +136,8 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
                 GasGridContainer.RemoveAllChildren();
 
                 var gasData = focusData.Value.GasData.Where(g => g.Key != Gas.Oxygen);
-                var keyValuePairs = gasData.ToList();
 
-                if (keyValuePairs.Count == 0)
+                if (gasData.Count() == 0)
                 {
                     // No other gases
                     var gasLabel = new Label()
@@ -146,14 +158,17 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
                 else
                 {
                     // Add an entry for each gas
-                    foreach ((var gas, (var mol, var percent, var alert)) in keyValuePairs)
+                    foreach ((var gas, (var mol, var percent, var alert)) in gasData)
                     {
-                        FixedPoint2 gasPercent = percent * 100f;
-                        var gasAbbreviation = Atmospherics.GasAbbreviations.GetValueOrDefault(gas, Loc.GetString("gas-unknown-abbreviation"));
+                        var gasPercent = (FixedPoint2)0f;
+                        gasPercent = percent * 100f;
+
+                        if (!_gasShorthands.TryGetValue(gas, out var gasShorthand))
+                            gasShorthand = "X";
 
                         var gasLabel = new Label()
                         {
-                            Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasAbbreviation), ("value", gasPercent)),
+                            Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasShorthand), ("value", gasPercent)),
                             FontOverride = normalFont,
                             FontColorOverride = GetAlarmStateColor(alert),
                             HorizontalAlignment = HAlignment.Center,

Content.Client/Atmos/Consoles/AtmosAlertsComputerBoundUserInterface.cs

@@ -11,11 +11,11 @@ public sealed class AtmosAlertsComputerBoundUserInterface : BoundUserInterface
 
     protected override void Open()
     {
-        base.Open();
-
         _menu = new AtmosAlertsComputerWindow(this, Owner);
         _menu.OpenCentered();
         _menu.OnClose += Close;
+
+        EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -24,6 +24,9 @@ public sealed class AtmosAlertsComputerBoundUserInterface : BoundUserInterface
 
         var castState = (AtmosAlertsComputerBoundInterfaceState) state;
 
+        if (castState == null)
+            return;
+
         EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
         _menu?.UpdateUI(xform?.Coordinates, castState.AirAlarms, castState.FireAlarms, castState.FocusData);
     }

Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml

@@ -1,6 +1,7 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                xmlns:ui="clr-namespace:Content.Client.Pinpointer.UI"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                Title="{Loc 'atmos-alerts-window-title'}"
                Resizable="False"
                SetSize="1120 750"

Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs

@@ -512,15 +512,39 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow
         if (scroll == null)
             return;
 
+        if (!TryGetVerticalScrollbar(scroll, out var vScrollbar))
+            return;
+
         if (!TryGetNextScrollPosition(out float? nextScrollPosition))
             return;
 
-        scroll.VScrollTarget = nextScrollPosition.Value;
+        vScrollbar.ValueTarget = nextScrollPosition.Value;
 
-        if (MathHelper.CloseToPercent(scroll.VScroll, scroll.VScrollTarget))
+        if (MathHelper.CloseToPercent(vScrollbar.Value, vScrollbar.ValueTarget))
             _autoScrollActive = false;
     }
 
+    private bool TryGetVerticalScrollbar(ScrollContainer scroll, [NotNullWhen(true)] out VScrollBar? vScrollBar)
+    {
+        vScrollBar = null;
+
+        foreach (var child in scroll.Children)
+        {
+            if (child is not VScrollBar)
+                continue;
+
+            var castChild = child as VScrollBar;
+
+            if (castChild != null)
+            {
+                vScrollBar = castChild;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private bool TryGetNextScrollPosition([NotNullWhen(true)] out float? nextScrollPosition)
     {
         nextScrollPosition = null;

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleBoundUserInterface.cs

@@ -1,40 +0,0 @@
-using Content.Shared.Atmos.Components;
-
-namespace Content.Client.Atmos.Consoles;
-
-public sealed class AtmosMonitoringConsoleBoundUserInterface : BoundUserInterface
-{
-    [ViewVariables]
-    private AtmosMonitoringConsoleWindow? _menu;
-
-    public AtmosMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
-
-    protected override void Open()
-    {
-        base.Open();
-
-        _menu = new AtmosMonitoringConsoleWindow(this, Owner);
-        _menu.OpenCentered();
-        _menu.OnClose += Close;
-    }
-
-    protected override void UpdateState(BoundUserInterfaceState state)
-    {
-        base.UpdateState(state);
-
-        if (state is not AtmosMonitoringConsoleBoundInterfaceState castState)
-            return;
-
-        EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
-        _menu?.UpdateUI(xform?.Coordinates, castState.AtmosNetworks);
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (!disposing)
-            return;
-
-        _menu?.Dispose();
-    }
-}

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs

@@ -1,295 +0,0 @@
-using Content.Client.Pinpointer.UI;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Pinpointer;
-using Robust.Client.Graphics;
-using Robust.Shared.Collections;
-using Robust.Shared.Map.Components;
-using System.Linq;
-using System.Numerics;
-
-namespace Content.Client.Atmos.Consoles;
-
-public sealed partial class AtmosMonitoringConsoleNavMapControl : NavMapControl
-{
-    [Dependency] private readonly IEntityManager _entManager = default!;
-
-    public bool ShowPipeNetwork = true;
-    public int? FocusNetId = null;
-
-    private const int ChunkSize = 4;
-
-    private readonly Color _basePipeNetColor = Color.LightGray;
-    private readonly Color _unfocusedPipeNetColor = Color.DimGray;
-
-    private List<AtmosMonitoringConsoleLine> _atmosPipeNetwork = new();
-    private Dictionary<Color, Color> _sRGBLookUp = new Dictionary<Color, Color>();
-
-    // Look up tables for merging continuous lines. Indexed by line color
-    private Dictionary<Color, Dictionary<Vector2i, Vector2i>> _horizLines = new();
-    private Dictionary<Color, Dictionary<Vector2i, Vector2i>> _horizLinesReversed = new();
-    private Dictionary<Color, Dictionary<Vector2i, Vector2i>> _vertLines = new();
-    private Dictionary<Color, Dictionary<Vector2i, Vector2i>> _vertLinesReversed = new();
-
-    public AtmosMonitoringConsoleNavMapControl() : base()
-    {
-        PostWallDrawingAction += DrawAllPipeNetworks;
-    }
-
-    protected override void UpdateNavMap()
-    {
-        base.UpdateNavMap();
-
-        if (!_entManager.TryGetComponent<AtmosMonitoringConsoleComponent>(Owner, out var console))
-            return;
-
-        if (!_entManager.TryGetComponent<MapGridComponent>(MapUid, out var grid))
-            return;
-
-        _atmosPipeNetwork = GetDecodedAtmosPipeChunks(console.AtmosPipeChunks, grid);
-    }
-
-    private void DrawAllPipeNetworks(DrawingHandleScreen handle)
-    {
-        if (!ShowPipeNetwork)
-            return;
-
-        // Draw networks
-        if (_atmosPipeNetwork != null && _atmosPipeNetwork.Any())
-            DrawPipeNetwork(handle, _atmosPipeNetwork);
-    }
-
-    private void DrawPipeNetwork(DrawingHandleScreen handle, List<AtmosMonitoringConsoleLine> atmosPipeNetwork)
-    {
-        var offset = GetOffset();
-        offset = offset with { Y = -offset.Y };
-
-        if (WorldRange / WorldMaxRange > 0.5f)
-        {
-            var pipeNetworks = new Dictionary<Color, ValueList<Vector2>>();
-
-            foreach (var chunkedLine in atmosPipeNetwork)
-            {
-                var start = ScalePosition(chunkedLine.Origin - offset);
-                var end = ScalePosition(chunkedLine.Terminus - offset);
-
-                if (!pipeNetworks.TryGetValue(chunkedLine.Color, out var subNetwork))
-                    subNetwork = new ValueList<Vector2>();
-
-                subNetwork.Add(start);
-                subNetwork.Add(end);
-
-                pipeNetworks[chunkedLine.Color] = subNetwork;
-            }
-
-            foreach ((var color, var subNetwork) in pipeNetworks)
-            {
-                if (subNetwork.Count > 0)
-                    handle.DrawPrimitives(DrawPrimitiveTopology.LineList, subNetwork.Span, color);
-            }
-        }
-
-        else
-        {
-            var pipeVertexUVs = new Dictionary<Color, ValueList<Vector2>>();
-
-            foreach (var chunkedLine in atmosPipeNetwork)
-            {
-                var leftTop = ScalePosition(new Vector2
-                    (Math.Min(chunkedLine.Origin.X, chunkedLine.Terminus.X) - 0.1f,
-                    Math.Min(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) - 0.1f)
-                    - offset);
-
-                var rightTop = ScalePosition(new Vector2
-                    (Math.Max(chunkedLine.Origin.X, chunkedLine.Terminus.X) + 0.1f,
-                    Math.Min(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) - 0.1f)
-                    - offset);
-
-                var leftBottom = ScalePosition(new Vector2
-                    (Math.Min(chunkedLine.Origin.X, chunkedLine.Terminus.X) - 0.1f,
-                    Math.Max(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) + 0.1f)
-                    - offset);
-
-                var rightBottom = ScalePosition(new Vector2
-                    (Math.Max(chunkedLine.Origin.X, chunkedLine.Terminus.X) + 0.1f,
-                    Math.Max(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) + 0.1f)
-                    - offset);
-
-                if (!pipeVertexUVs.TryGetValue(chunkedLine.Color, out var pipeVertexUV))
-                    pipeVertexUV = new ValueList<Vector2>();
-
-                pipeVertexUV.Add(leftBottom);
-                pipeVertexUV.Add(leftTop);
-                pipeVertexUV.Add(rightBottom);
-                pipeVertexUV.Add(leftTop);
-                pipeVertexUV.Add(rightBottom);
-                pipeVertexUV.Add(rightTop);
-
-                pipeVertexUVs[chunkedLine.Color] = pipeVertexUV;
-            }
-
-            foreach ((var color, var pipeVertexUV) in pipeVertexUVs)
-            {
-                if (pipeVertexUV.Count > 0)
-                    handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList, pipeVertexUV.Span, color);
-            }
-        }
-    }
-
-    private List<AtmosMonitoringConsoleLine> GetDecodedAtmosPipeChunks(Dictionary<Vector2i, AtmosPipeChunk>? chunks, MapGridComponent? grid)
-    {
-        var decodedOutput = new List<AtmosMonitoringConsoleLine>();
-
-        if (chunks == null || grid == null)
-            return decodedOutput;
-
-        // Clear stale look up table values 
-        _horizLines.Clear();
-        _horizLinesReversed.Clear();
-        _vertLines.Clear();
-        _vertLinesReversed.Clear();
-
-        // Generate masks
-        var northMask = (ulong)1 << 0;
-        var southMask = (ulong)1 << 1;
-        var westMask = (ulong)1 << 2;
-        var eastMask = (ulong)1 << 3;
-
-        foreach ((var chunkOrigin, var chunk) in chunks)
-        {
-            var list = new List<AtmosMonitoringConsoleLine>();
-
-            foreach (var ((netId, hexColor), atmosPipeData) in chunk.AtmosPipeData)
-            {
-                // Determine the correct coloration for the pipe
-                var color = Color.FromHex(hexColor) * _basePipeNetColor;
-
-                if (FocusNetId != null && FocusNetId != netId)
-                    color *= _unfocusedPipeNetColor;
-
-                // Get the associated line look up tables
-                if (!_horizLines.TryGetValue(color, out var horizLines))
-                {
-                    horizLines = new();
-                    _horizLines[color] = horizLines;
-                }
-
-                if (!_horizLinesReversed.TryGetValue(color, out var horizLinesReversed))
-                {
-                    horizLinesReversed = new();
-                    _horizLinesReversed[color] = horizLinesReversed;
-                }
-
-                if (!_vertLines.TryGetValue(color, out var vertLines))
-                {
-                    vertLines = new();
-                    _vertLines[color] = vertLines;
-                }
-
-                if (!_vertLinesReversed.TryGetValue(color, out var vertLinesReversed))
-                {
-                    vertLinesReversed = new();
-                    _vertLinesReversed[color] = vertLinesReversed;
-                }
-
-                // Loop over the chunk
-                for (var tileIdx = 0; tileIdx < ChunkSize * ChunkSize; tileIdx++)
-                {
-                    if (atmosPipeData == 0)
-                        continue;
-
-                    var mask = (ulong)SharedNavMapSystem.AllDirMask << tileIdx * SharedNavMapSystem.Directions;
-
-                    if ((atmosPipeData & mask) == 0)
-                        continue;
-
-                    var relativeTile = GetTileFromIndex(tileIdx);
-                    var tile = (chunk.Origin * ChunkSize + relativeTile) * grid.TileSize;
-                    tile = tile with { Y = -tile.Y };
-
-                    // Calculate the draw point offsets
-                    var vertLineOrigin = (atmosPipeData & northMask << tileIdx * SharedNavMapSystem.Directions) > 0 ?
-                        new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 1f) : new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 0.5f);
-
-                    var vertLineTerminus = (atmosPipeData & southMask << tileIdx * SharedNavMapSystem.Directions) > 0 ?
-                        new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 0f) : new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 0.5f);
-
-                    var horizLineOrigin = (atmosPipeData & eastMask << tileIdx * SharedNavMapSystem.Directions) > 0 ?
-                        new Vector2(grid.TileSize * 1f, -grid.TileSize * 0.5f) : new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 0.5f);
-
-                    var horizLineTerminus = (atmosPipeData & westMask << tileIdx * SharedNavMapSystem.Directions) > 0 ?
-                        new Vector2(grid.TileSize * 0f, -grid.TileSize * 0.5f) : new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 0.5f);
-
-                    // Since we can have pipe lines that have a length of a half tile, 
-                    // double the vectors and convert to vector2i so we can merge them
-                    AddOrUpdateNavMapLine(ConvertVector2ToVector2i(tile + horizLineOrigin, 2), ConvertVector2ToVector2i(tile + horizLineTerminus, 2), horizLines, horizLinesReversed);
-                    AddOrUpdateNavMapLine(ConvertVector2ToVector2i(tile + vertLineOrigin, 2), ConvertVector2ToVector2i(tile + vertLineTerminus, 2), vertLines, vertLinesReversed);
-                }
-            }
-        }
-
-        // Scale the vector2is back down and convert to vector2
-        foreach (var (color, horizLines) in _horizLines)
-        {
-            // Get the corresponding sRBG color
-            var sRGB = GetsRGBColor(color);
-
-            foreach (var (origin, terminal) in horizLines)
-                decodedOutput.Add(new AtmosMonitoringConsoleLine
-                    (ConvertVector2iToVector2(origin, 0.5f), ConvertVector2iToVector2(terminal, 0.5f), sRGB));
-        }
-
-        foreach (var (color, vertLines) in _vertLines)
-        {
-            // Get the corresponding sRBG color
-            var sRGB = GetsRGBColor(color);
-
-            foreach (var (origin, terminal) in vertLines)
-                decodedOutput.Add(new AtmosMonitoringConsoleLine
-                    (ConvertVector2iToVector2(origin, 0.5f), ConvertVector2iToVector2(terminal, 0.5f), sRGB));
-        }
-
-        return decodedOutput;
-    }
-
-    private Vector2 ConvertVector2iToVector2(Vector2i vector, float scale = 1f)
-    {
-        return new Vector2(vector.X * scale, vector.Y * scale);
-    }
-
-    private Vector2i ConvertVector2ToVector2i(Vector2 vector, float scale = 1f)
-    {
-        return new Vector2i((int)MathF.Round(vector.X * scale), (int)MathF.Round(vector.Y * scale));
-    }
-
-    private Vector2i GetTileFromIndex(int index)
-    {
-        var x = index / ChunkSize;
-        var y = index % ChunkSize;
-        return new Vector2i(x, y);
-    }
-
-    private Color GetsRGBColor(Color color)
-    {
-        if (!_sRGBLookUp.TryGetValue(color, out var sRGB))
-        {
-            sRGB = Color.ToSrgb(color);
-            _sRGBLookUp[color] = sRGB;
-        }
-
-        return sRGB;
-    }
-}
-
-public struct AtmosMonitoringConsoleLine
-{
-    public readonly Vector2 Origin;
-    public readonly Vector2 Terminus;
-    public readonly Color Color;
-
-    public AtmosMonitoringConsoleLine(Vector2 origin, Vector2 terminus, Color color)
-    {
-        Origin = origin;
-        Terminus = terminus;
-        Color = color;
-    }
-}

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs

@@ -1,69 +0,0 @@
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.Consoles;
-using Robust.Shared.GameStates;
-
-namespace Content.Client.Atmos.Consoles;
-
-public sealed class AtmosMonitoringConsoleSystem : SharedAtmosMonitoringConsoleSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<AtmosMonitoringConsoleComponent, ComponentHandleState>(OnHandleState);
-    }
-
-    private void OnHandleState(EntityUid uid, AtmosMonitoringConsoleComponent component, ref ComponentHandleState args)
-    {
-        Dictionary<Vector2i, Dictionary<(int, string), ulong>> modifiedChunks;
-        Dictionary<NetEntity, AtmosDeviceNavMapData> atmosDevices;
-
-        switch (args.Current)
-        {
-            case AtmosMonitoringConsoleDeltaState delta:
-                {
-                    modifiedChunks = delta.ModifiedChunks;
-                    atmosDevices = delta.AtmosDevices;
-
-                    foreach (var index in component.AtmosPipeChunks.Keys)
-                    {
-                        if (!delta.AllChunks!.Contains(index))
-                            component.AtmosPipeChunks.Remove(index);
-                    }
-
-                    break;
-                }
-
-            case AtmosMonitoringConsoleState state:
-                {
-                    modifiedChunks = state.Chunks;
-                    atmosDevices = state.AtmosDevices;
-
-                    foreach (var index in component.AtmosPipeChunks.Keys)
-                    {
-                        if (!state.Chunks.ContainsKey(index))
-                            component.AtmosPipeChunks.Remove(index);
-                    }
-
-                    break;
-                }
-            default:
-                return;
-        }
-
-        foreach (var (origin, chunk) in modifiedChunks)
-        {
-            var newChunk = new AtmosPipeChunk(origin);
-            newChunk.AtmosPipeData = new Dictionary<(int, string), ulong>(chunk);
-
-            component.AtmosPipeChunks[origin] = newChunk;
-        }
-
-        component.AtmosDevices.Clear();
-
-        foreach (var (nuid, atmosDevice) in atmosDevices)
-        {
-            component.AtmosDevices[nuid] = atmosDevice;
-        }
-    }
-}

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml

@@ -1,99 +0,0 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
-               xmlns:ui="clr-namespace:Content.Client.Atmos.Consoles"
-               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-               Title="{Loc 'atmos-monitoring-window-title'}"
-               Resizable="False"
-               SetSize="1120 750"
-               MinSize="1120 750">
-    <BoxContainer Orientation="Vertical">
-        <!-- Main display -->
-        <BoxContainer Orientation="Horizontal" VerticalExpand="True" HorizontalExpand="True">
-            <!-- Nav map -->
-            <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
-                <ui:AtmosMonitoringConsoleNavMapControl Name="NavMap" Margin="5 5" VerticalExpand="True" HorizontalExpand="True">
-
-                    <!-- System warning -->
-                    <PanelContainer Name="SystemWarningPanel"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Top"
-                                    HorizontalExpand="True"
-                                    Margin="0 48 0 0"
-                                    Visible="False">
-                        <RichTextLabel Name="SystemWarningLabel" Margin="12 8 12 8"/>
-                    </PanelContainer>
-
-                </ui:AtmosMonitoringConsoleNavMapControl>
-
-                <!-- Nav map legend -->
-                <BoxContainer Orientation="Horizontal" Margin="0 10 0 10">
-                    <TextureRect Stretch="KeepAspectCentered"
-                                 TexturePath="/Textures/Interface/NavMap/beveled_square.png"
-                                 Modulate="#a9a9a9"
-                                 SetSize="16 16"
-                                 Margin="20 0 5 0"/>
-                    <Label Text="{Loc 'atmos-monitoring-window-label-gas-opening'}"/>
-                    <TextureRect Stretch="KeepAspectCentered"
-                                 TexturePath="/Textures/Interface/NavMap/beveled_circle.png"
-                                 SetSize="16 16"
-                                 Modulate="#a9a9a9"
-                                 Margin="20 0 5 0"/>
-                    <Label Text="{Loc 'atmos-monitoring-window-label-gas-scrubber'}"/>
-                    <TextureRect Stretch="KeepAspectCentered"
-                                 TexturePath="/Textures/Interface/NavMap/beveled_arrow_east.png"
-                                 SetSize="16 16"
-                                 Modulate="#a9a9a9"
-                                 Margin="20 0 5 0"/>
-                    <Label Text="{Loc 'atmos-monitoring-window-label-gas-flow-regulator'}"/>
-                    <TextureRect Stretch="KeepAspectCentered"
-                                 TexturePath="/Textures/Interface/NavMap/beveled_hexagon.png"
-                                 SetSize="16 16"
-                                 Modulate="#a9a9a9"
-                                 Margin="20 0 5 0"/>
-                    <Label Text="{Loc 'atmos-monitoring-window-label-thermoregulator'}"/>
-                </BoxContainer>
-            </BoxContainer>
-
-            <!-- Atmosphere status -->
-            <BoxContainer Orientation="Vertical" VerticalExpand="True" SetWidth="440" Margin="0 0 10 10">
-
-                <!-- Station name -->
-                <controls:StripeBack>
-                    <PanelContainer>
-                        <RichTextLabel Name="StationName" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 5 0 3"/>
-                    </PanelContainer>
-                </controls:StripeBack>
-
-                <!-- Alarm status (entries added by C# code) -->
-                <TabContainer Name="MasterTabContainer" VerticalExpand="True" HorizontalExpand="True" Margin="0 10 0 0">
-                    <ScrollContainer HorizontalExpand="True" Margin="8, 8, 8, 8">
-                        <BoxContainer Name="AtmosNetworksTable" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="0 0 0 10"/>
-                    </ScrollContainer>
-                </TabContainer>
-
-                <!-- Overlay toggles -->
-                <BoxContainer Orientation="Vertical" Margin="0 10 0 0">
-                    <Label Text="{Loc 'atmos-monitoring-window-toggle-overlays'}" Margin="0 0 0 5"/>
-                    <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                        <CheckBox Name="ShowPipeNetwork" Text="{Loc 'atmos-monitoring-window-show-pipe-network'}" Pressed="True" HorizontalExpand="True"/>
-                        <CheckBox Name="ShowGasPipeSensors" Text="{Loc 'atmos-monitoring-window-show-gas-pipe-sensors'}" Pressed="False" HorizontalExpand="True"/>
-                    </BoxContainer>
-                </BoxContainer>
-
-            </BoxContainer>
-
-        </BoxContainer>
-
-        <!-- Footer -->
-        <BoxContainer Orientation="Vertical">
-            <PanelContainer StyleClasses="LowDivider" />
-            <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
-                <Label Text="{Loc 'atmos-monitoring-window-flavor-left'}" StyleClasses="WindowFooterText" />
-                <Label Text="{Loc 'atmos-monitoring-window-flavor-right'}" StyleClasses="WindowFooterText"
-                        HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
-                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
-                        VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
-            </BoxContainer>
-        </BoxContainer>
-    </BoxContainer>
-</controls:FancyWindow>

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml.cs

@@ -1,435 +0,0 @@
-using Content.Client.Pinpointer.UI;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Prototypes;
-using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
-namespace Content.Client.Atmos.Consoles;
-
-[GenerateTypedNameReferences]
-public sealed partial class AtmosMonitoringConsoleWindow : FancyWindow
-{
-    private readonly IEntityManager _entManager;
-    private readonly IPrototypeManager _protoManager;
-    private readonly SpriteSystem _spriteSystem;
-
-    private EntityUid? _owner;
-    private NetEntity? _focusEntity;
-    private int? _focusNetId;
-
-    private bool _autoScrollActive = false;
-
-    private readonly Color _unfocusedDeviceColor = Color.DimGray;
-    private ProtoId<NavMapBlipPrototype> _navMapConsoleProtoId = "NavMapConsole";
-    private ProtoId<NavMapBlipPrototype> _gasPipeSensorProtoId = "GasPipeSensor";
-
-    public AtmosMonitoringConsoleWindow(AtmosMonitoringConsoleBoundUserInterface userInterface, EntityUid? owner)
-    {
-        RobustXamlLoader.Load(this);
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _protoManager = IoCManager.Resolve<IPrototypeManager>();
-        _spriteSystem = _entManager.System<SpriteSystem>();
-
-        // Pass the owner to nav map
-        _owner = owner;
-        NavMap.Owner = _owner;
-
-        // Set nav map grid uid
-        var stationName = Loc.GetString("atmos-monitoring-window-unknown-location");
-        EntityCoordinates? consoleCoords = null;
-
-        if (_entManager.TryGetComponent<TransformComponent>(owner, out var xform))
-        {
-            consoleCoords = xform.Coordinates;
-            NavMap.MapUid = xform.GridUid;
-
-            // Assign station name      
-            if (_entManager.TryGetComponent<MetaDataComponent>(xform.GridUid, out var stationMetaData))
-                stationName = stationMetaData.EntityName;
-
-            var msg = new FormattedMessage();
-            msg.TryAddMarkup(Loc.GetString("atmos-monitoring-window-station-name", ("stationName", stationName)), out _);
-
-            StationName.SetMessage(msg);
-        }
-
-        else
-        {
-            StationName.SetMessage(stationName);
-            NavMap.Visible = false;
-        }
-
-        // Set trackable entity selected action
-        NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
-
-        // Update nav map
-        NavMap.ForceNavMapUpdate();
-
-        // Set tab container headers
-        MasterTabContainer.SetTabTitle(0, Loc.GetString("atmos-monitoring-window-tab-networks"));
-
-        // Set UI toggles
-        ShowPipeNetwork.OnToggled += _ => OnShowPipeNetworkToggled();
-        ShowGasPipeSensors.OnToggled += _ => OnShowGasPipeSensors();
-
-        // Set nav map colors
-        if (!_entManager.TryGetComponent<AtmosMonitoringConsoleComponent>(_owner, out var console))
-            return;
-
-        NavMap.TileColor = console.NavMapTileColor;
-        NavMap.WallColor = console.NavMapWallColor;
-
-        // Initalize
-        UpdateUI(consoleCoords, Array.Empty<AtmosMonitoringConsoleEntry>());
-    }
-
-    #region Toggle handling
-
-    private void OnShowPipeNetworkToggled()
-    {
-        if (_owner == null)
-            return;
-
-        if (!_entManager.TryGetComponent<AtmosMonitoringConsoleComponent>(_owner.Value, out var console))
-            return;
-
-        NavMap.ShowPipeNetwork = ShowPipeNetwork.Pressed;
-
-        foreach (var (netEnt, device) in console.AtmosDevices)
-        {
-            if (device.NavMapBlip == _gasPipeSensorProtoId)
-                continue;
-
-            if (ShowPipeNetwork.Pressed)
-                AddTrackedEntityToNavMap(device);
-
-            else
-                NavMap.TrackedEntities.Remove(netEnt);
-        }
-    }
-
-    private void OnShowGasPipeSensors()
-    {
-        if (_owner == null)
-            return;
-
-        if (!_entManager.TryGetComponent<AtmosMonitoringConsoleComponent>(_owner.Value, out var console))
-            return;
-
-        foreach (var (netEnt, device) in console.AtmosDevices)
-        {
-            if (device.NavMapBlip != _gasPipeSensorProtoId)
-                continue;
-
-            if (ShowGasPipeSensors.Pressed)
-                AddTrackedEntityToNavMap(device, true);
-
-            else
-                NavMap.TrackedEntities.Remove(netEnt);
-        }
-    }
-
-    #endregion
-
-    public void UpdateUI
-        (EntityCoordinates? consoleCoords,
-        AtmosMonitoringConsoleEntry[] atmosNetworks)
-    {
-        if (_owner == null)
-            return;
-
-        if (!_entManager.TryGetComponent<AtmosMonitoringConsoleComponent>(_owner.Value, out var console))
-            return;
-
-        // Reset nav map values
-        NavMap.TrackedCoordinates.Clear();
-        NavMap.TrackedEntities.Clear();
-
-        if (_focusEntity != null && !console.AtmosDevices.Any(x => x.Key == _focusEntity))
-            ClearFocus();
-
-        // Add tracked entities to the nav map
-        UpdateNavMapBlips();
-
-        // Show the monitor location
-        var consoleNetEnt = _entManager.GetNetEntity(_owner);
-
-        if (consoleCoords != null && consoleNetEnt != null)
-        {
-            var proto = _protoManager.Index(_navMapConsoleProtoId);
-
-            if (proto.TexturePaths != null && proto.TexturePaths.Length != 0)
-            {
-                var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(proto.TexturePaths[0]));
-                var blip = new NavMapBlip(consoleCoords.Value, texture, proto.Color, proto.Blinks, proto.Selectable);
-                NavMap.TrackedEntities[consoleNetEnt.Value] = blip;
-            }
-        }
-
-        // Update the nav map
-        NavMap.ForceNavMapUpdate();
-
-        // Clear excess children from the tables
-        while (AtmosNetworksTable.ChildCount > atmosNetworks.Length)
-            AtmosNetworksTable.RemoveChild(AtmosNetworksTable.GetChild(AtmosNetworksTable.ChildCount - 1));
-
-        // Update all entries in each table
-        for (int index = 0; index < atmosNetworks.Length; index++)
-        {
-            var entry = atmosNetworks.ElementAt(index);
-            UpdateUIEntry(entry, index, AtmosNetworksTable, console);
-        }
-    }
-
-    private void UpdateNavMapBlips()
-    {
-        if (_owner == null || !_entManager.TryGetComponent<AtmosMonitoringConsoleComponent>(_owner.Value, out var console))
-            return;
-
-        if (NavMap.Visible)
-        {
-            foreach (var (netEnt, device) in console.AtmosDevices)
-            {
-                // Update the focus network ID, incase it has changed
-                if (_focusEntity == netEnt)
-                {
-                    _focusNetId = device.NetId;
-                    NavMap.FocusNetId = _focusNetId;
-                }
-
-                var isSensor = device.NavMapBlip == _gasPipeSensorProtoId;
-
-                // Skip network devices if the toggled is off
-                if (!ShowPipeNetwork.Pressed && !isSensor)
-                    continue;
-
-                // Skip gas pipe sensors if the toggle is off
-                if (!ShowGasPipeSensors.Pressed && isSensor)
-                    continue;
-
-                AddTrackedEntityToNavMap(device, isSensor);
-            }
-        }
-    }
-
-    private void AddTrackedEntityToNavMap(AtmosDeviceNavMapData metaData, bool isSensor = false)
-    {
-        var proto = _protoManager.Index(metaData.NavMapBlip);
-
-        if (proto.TexturePaths == null || proto.TexturePaths.Length == 0)
-            return;
-
-        var idx = Math.Clamp((int)metaData.Direction / 2, 0, proto.TexturePaths.Length - 1);
-        var texture = proto.TexturePaths.Length > 0 ? proto.TexturePaths[idx] : proto.TexturePaths[0];
-        var color = isSensor ? proto.Color : proto.Color * metaData.PipeColor;
-
-        if (_focusNetId != null && metaData.NetId != _focusNetId)
-            color *= _unfocusedDeviceColor;
-
-        var blinks = proto.Blinks || _focusEntity == metaData.NetEntity;
-        var coords = _entManager.GetCoordinates(metaData.NetCoordinates);
-        var blip = new NavMapBlip(coords, _spriteSystem.Frame0(new SpriteSpecifier.Texture(texture)), color, blinks, proto.Selectable, proto.Scale);
-        NavMap.TrackedEntities[metaData.NetEntity] = blip;
-    }
-
-    private void UpdateUIEntry(AtmosMonitoringConsoleEntry data, int index, Control table, AtmosMonitoringConsoleComponent console)
-    {
-        // Make new UI entry if required
-        if (index >= table.ChildCount)
-        {
-            var newEntryContainer = new AtmosMonitoringEntryContainer(data);
-
-            // On click
-            newEntryContainer.FocusButton.OnButtonUp += args =>
-            {
-                if (_focusEntity == newEntryContainer.Data.NetEntity)
-                {
-                    ClearFocus();
-                }
-
-                else
-                {
-                    SetFocus(newEntryContainer.Data.NetEntity, newEntryContainer.Data.NetId);
-
-                    var coords = _entManager.GetCoordinates(newEntryContainer.Data.Coordinates);
-                    NavMap.CenterToCoordinates(coords);
-                }
-
-                // Update affected UI elements across all tables
-                UpdateConsoleTable(console, AtmosNetworksTable, _focusEntity);
-            };
-
-            // Add the entry to the current table
-            table.AddChild(newEntryContainer);
-        }
-
-        // Update values and UI elements
-        var tableChild = table.GetChild(index);
-
-        if (tableChild is not AtmosMonitoringEntryContainer)
-        {
-            table.RemoveChild(tableChild);
-            UpdateUIEntry(data, index, table, console);
-
-            return;
-        }
-
-        var entryContainer = (AtmosMonitoringEntryContainer)tableChild;
-        entryContainer.UpdateEntry(data, data.NetEntity == _focusEntity);
-    }
-
-    private void UpdateConsoleTable(AtmosMonitoringConsoleComponent console, Control table, NetEntity? currTrackedEntity)
-    {
-        foreach (var tableChild in table.Children)
-        {
-            if (tableChild is not AtmosAlarmEntryContainer)
-                continue;
-
-            var entryContainer = (AtmosAlarmEntryContainer)tableChild;
-
-            if (entryContainer.NetEntity != currTrackedEntity)
-                entryContainer.RemoveAsFocus();
-
-            else if (entryContainer.NetEntity == currTrackedEntity)
-                entryContainer.SetAsFocus();
-        }
-    }
-
-    private void SetTrackedEntityFromNavMap(NetEntity? focusEntity)
-    {
-        if (focusEntity == null)
-            return;
-
-        if (!_entManager.TryGetComponent<AtmosMonitoringConsoleComponent>(_owner, out var console))
-            return;
-
-        foreach (var (netEnt, device) in console.AtmosDevices)
-        {
-            if (netEnt != focusEntity)
-                continue;
-
-            if (device.NavMapBlip != _gasPipeSensorProtoId)
-                return;
-
-            // Set new focus
-            SetFocus(focusEntity.Value, device.NetId);
-
-            // Get the scroll position of the selected entity on the selected button the UI
-            ActivateAutoScrollToFocus();
-
-            break;
-        }
-    }
-
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        AutoScrollToFocus();
-    }
-
-    private void ActivateAutoScrollToFocus()
-    {
-        _autoScrollActive = true;
-    }
-
-    private void AutoScrollToFocus()
-    {
-        if (!_autoScrollActive)
-            return;
-
-        var scroll = AtmosNetworksTable.Parent as ScrollContainer;
-        if (scroll == null)
-            return;
-
-        if (!TryGetNextScrollPosition(out float? nextScrollPosition))
-            return;
-
-        scroll.VScrollTarget = nextScrollPosition.Value;
-
-        if (MathHelper.CloseToPercent(scroll.VScroll, scroll.VScrollTarget))
-            _autoScrollActive = false;
-    }
-
-    private bool TryGetNextScrollPosition([NotNullWhen(true)] out float? nextScrollPosition)
-    {
-        nextScrollPosition = null;
-
-        var scroll = AtmosNetworksTable.Parent as ScrollContainer;
-        if (scroll == null)
-            return false;
-
-        var container = scroll.Children.ElementAt(0) as BoxContainer;
-        if (container == null || container.Children.Count() == 0)
-            return false;
-
-        // Exit if the heights of the children haven't been initialized yet
-        if (!container.Children.Any(x => x.Height > 0))
-            return false;
-
-        nextScrollPosition = 0;
-
-        foreach (var control in container.Children)
-        {
-            if (control is not AtmosMonitoringEntryContainer)
-                continue;
-
-            var entry = (AtmosMonitoringEntryContainer)control;
-
-            if (entry.Data.NetEntity == _focusEntity)
-                return true;
-
-            nextScrollPosition += control.Height;
-        }
-
-        // Failed to find control
-        nextScrollPosition = null;
-
-        return false;
-    }
-
-    private void SetFocus(NetEntity focusEntity, int focusNetId)
-    {
-        _focusEntity = focusEntity;
-        _focusNetId = focusNetId;
-        NavMap.FocusNetId = focusNetId;
-
-        OnFocusChanged();
-    }
-
-    private void ClearFocus()
-    {
-        _focusEntity = null;
-        _focusNetId = null;
-        NavMap.FocusNetId = null;
-
-        OnFocusChanged();
-    }
-
-    private void OnFocusChanged()
-    {
-        UpdateNavMapBlips();
-        NavMap.ForceNavMapUpdate();
-
-        if (!_entManager.TryGetComponent<AtmosMonitoringConsoleComponent>(_owner, out var console))
-            return;
-
-        for (int index = 0; index < AtmosNetworksTable.ChildCount; index++)
-        {
-            var entry = (AtmosMonitoringEntryContainer)AtmosNetworksTable.GetChild(index);
-
-            if (entry == null)
-                continue;
-
-            UpdateUIEntry(entry.Data, index, AtmosNetworksTable, console);
-        }
-    }
-}

Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml

@@ -1,74 +0,0 @@
-<BoxContainer xmlns="https://spacestation14.io"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:s="clr-namespace:Content.Client.Stylesheets"
-         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-         Orientation="Vertical" HorizontalExpand ="True" Margin="0 0 0 3">
-
-    <!-- Network selection button -->
-    <Button Name="FocusButton" HorizontalExpand="True" VerticalExpand="True" Margin="0 0 6 8" StyleClasses="OpenLeft" Access="Public">
-        <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical">
-            <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Horizontal" SetHeight="32">
-                <PanelContainer Name="NetworkColorStripe" HorizontalAlignment="Left" SetWidth="8" VerticalExpand="True" Margin="-8 -2 0 0">
-                    <PanelContainer.PanelOverride>
-                        <gfx:StyleBoxFlat BackgroundColor="#d7d7d7"/>
-                    </PanelContainer.PanelOverride>
-                </PanelContainer>
-                <Label Name="NetworkNameLabel" Text="???" HorizontalExpand="True" HorizontalAlignment="Center"/>
-            </BoxContainer>
-
-            <!-- Panel that appears on selecting the device -->
-        
-            <PanelContainer HorizontalExpand="True" Margin="-8 0 -14 -4" Access="Public">
-                <PanelContainer.PanelOverride>
-                    <gfx:StyleBoxFlat BackgroundColor="#25252a"/>
-                </PanelContainer.PanelOverride>
-                <BoxContainer Name="MainDataContainer" HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical">
-                    <Control>
-                        <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical">
-                            <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
-                                <Label Name="TemperatureHeaderLabel" Text="{Loc 'atmos-alerts-window-temperature-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label>
-                                <Label Name="PressureHeaderLabel" Text="{Loc 'atmos-alerts-window-pressure-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label>
-                                <Label Name="TotalMolHeaderLabel" Text="{Loc 'atmos-alerts-window-total-mol-label'}" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label>
-                            </BoxContainer>
-                            <PanelContainer HorizontalExpand="True">
-                                <PanelContainer.PanelOverride>
-                                    <gfx:StyleBoxFlat BackgroundColor="#202023"/>
-                                </PanelContainer.PanelOverride>
-                                <BoxContainer HorizontalExpand="True" Orientation="Horizontal">
-                                    <Label Name="TemperatureLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label>
-                                    <Label Name="PressureLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label>
-                                    <Label Name="TotalMolLabel" Text="???" HorizontalAlignment="Center" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="0 2 0 0" SetHeight="24"></Label>
-                                </BoxContainer>
-                            </PanelContainer>
-                            <BoxContainer HorizontalExpand="True" Orientation="Horizontal" Margin="8 0">
-                                <TextureRect Name="ArrowTexture" VerticalAlignment="Center" SetSize="12 12" Stretch="KeepAspectCentered" Margin="3 0" TexturePath="/Textures/Interface/Nano/triangle_right.png"></TextureRect>
-                                <Label Name="GasesHeaderLabel" Text="{Loc 'atmos-monitoring-window-label-gases'}" HorizontalAlignment="Left" HorizontalExpand="True" FontColorOverride="#a9a9a9" Margin="4 0 0 0" SetHeight="24"></Label>
-                            </BoxContainer>
-                    
-                        </BoxContainer>
-                    </Control>
-            
-                    <!-- Atmosphere status -->
-                    <Control Name="FocusContainer" ReservesSpace="False"  Visible="False">
-                        <!-- Main container for displaying atmospheric data -->
-                        <BoxContainer HorizontalExpand="True" VerticalExpand="True" Orientation="Vertical">
-                            <PanelContainer HorizontalExpand="True">
-                                <PanelContainer.PanelOverride>
-                                    <gfx:StyleBoxFlat BackgroundColor="#202023"/>
-                                </PanelContainer.PanelOverride>
-
-                                <!-- Gas entries added via C# code -->
-                                <GridContainer Name="GasGridContainer" HorizontalExpand="True" Columns = "4"></GridContainer>
-                            </PanelContainer>
-                        </BoxContainer>
-                    </Control>
-                </BoxContainer>
-
-                <!-- If the alarm is inactive, this is label is displayed instead -->
-                <Label Name="NoDataLabel" Text="{Loc 'atmos-alerts-window-no-data-available'}" HorizontalAlignment="Center" Margin="0 15" FontColorOverride="#a9a9a9" ReservesSpace="False" Visible="False"></Label>
-                
-            </PanelContainer>
-        </BoxContainer>
-    </Button>
-</BoxContainer>

Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs

@@ -1,166 +0,0 @@
-using Content.Client.Stylesheets;
-using Content.Shared.Atmos;
-using Content.Shared.Atmos.Components;
-using Content.Shared.FixedPoint;
-using Content.Shared.Temperature;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using System.Linq;
-
-namespace Content.Client.Atmos.Consoles;
-
-[GenerateTypedNameReferences]
-public sealed partial class AtmosMonitoringEntryContainer : BoxContainer
-{
-    public AtmosMonitoringConsoleEntry Data;
-
-    private readonly IEntityManager _entManager;
-    private readonly IResourceCache _cache;
-
-    public AtmosMonitoringEntryContainer(AtmosMonitoringConsoleEntry data)
-    {
-        RobustXamlLoader.Load(this);
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _cache = IoCManager.Resolve<IResourceCache>();
-
-        Data = data;
-
-        // Modulate colored stripe
-        NetworkColorStripe.Modulate = data.Color;
-
-        // Load fonts
-        var headerFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Bold.ttf"), 11);
-        var normalFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"), 11);
-
-        // Set fonts
-        TemperatureHeaderLabel.FontOverride = headerFont;
-        PressureHeaderLabel.FontOverride = headerFont;
-        TotalMolHeaderLabel.FontOverride = headerFont;
-        GasesHeaderLabel.FontOverride = headerFont;
-
-        TemperatureLabel.FontOverride = normalFont;
-        PressureLabel.FontOverride = normalFont;
-        TotalMolLabel.FontOverride = normalFont;
-
-        NoDataLabel.FontOverride = headerFont;
-    }
-
-    public void UpdateEntry(AtmosMonitoringConsoleEntry updatedData, bool isFocus)
-    {
-        // Load fonts
-        var normalFont = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"), 11);
-
-        // Update name and values
-        if (!string.IsNullOrEmpty(updatedData.Address))
-            NetworkNameLabel.Text = Loc.GetString("atmos-alerts-window-alarm-label", ("name", updatedData.EntityName), ("address", updatedData.Address));
-
-        else
-            NetworkNameLabel.Text = Loc.GetString(updatedData.EntityName);
-
-        Data = updatedData;
-
-        // Modulate colored stripe
-        NetworkColorStripe.Modulate = Data.Color;
-
-        // Focus updates
-        if (isFocus)
-            SetAsFocus();
-        else
-            RemoveAsFocus();
-
-        // Check if powered
-        if (!updatedData.IsPowered)
-        {
-            MainDataContainer.Visible = false;
-            NoDataLabel.Visible = true;
-
-            return;
-        }
-
-        // Set container visibility
-        MainDataContainer.Visible = true;
-        NoDataLabel.Visible = false;
-
-        // Update temperature
-        var isNotVacuum = updatedData.TotalMolData > 1e-6f;
-        var tempK = (FixedPoint2)updatedData.TemperatureData;
-        var tempC = (FixedPoint2)TemperatureHelpers.KelvinToCelsius(tempK.Float());
-
-        TemperatureLabel.Text = isNotVacuum ?
-            Loc.GetString("atmos-alerts-window-temperature-value", ("valueInC", tempC), ("valueInK", tempK)) :
-            Loc.GetString("atmos-alerts-window-invalid-value");
-
-        TemperatureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
-
-        // Update pressure
-        PressureLabel.Text = Loc.GetString("atmos-alerts-window-pressure-value", ("value", (FixedPoint2)updatedData.PressureData));
-        PressureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
-
-        // Update total mol
-        TotalMolLabel.Text = Loc.GetString("atmos-alerts-window-total-mol-value", ("value", (FixedPoint2)updatedData.TotalMolData));
-        TotalMolLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
-
-        // Update other present gases
-        GasGridContainer.RemoveAllChildren();
-
-        if (updatedData.GasData.Count() == 0)
-        {
-            // No gases
-            var gasLabel = new Label()
-            {
-                Text = Loc.GetString("atmos-alerts-window-other-gases-value-nil"),
-                FontOverride = normalFont,
-                FontColorOverride = StyleNano.DisabledFore,
-                HorizontalAlignment = HAlignment.Center,
-                VerticalAlignment = VAlignment.Center,
-                HorizontalExpand = true,
-                Margin = new Thickness(0, 2, 0, 0),
-                SetHeight = 24f,
-            };
-
-            GasGridContainer.AddChild(gasLabel);
-        }
-
-        else
-        {
-            // Add an entry for each gas
-            foreach (var (gas, percent) in updatedData.GasData)
-            {
-                var gasPercent = (FixedPoint2)0f;
-                gasPercent = percent * 100f;
-
-                var gasAbbreviation = Atmospherics.GasAbbreviations.GetValueOrDefault(gas, Loc.GetString("gas-unknown-abbreviation"));
-
-                var gasLabel = new Label()
-                {
-                    Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasAbbreviation), ("value", gasPercent)),
-                    FontOverride = normalFont,
-                    HorizontalAlignment = HAlignment.Center,
-                    VerticalAlignment = VAlignment.Center,
-                    HorizontalExpand = true,
-                    Margin = new Thickness(0, 2, 0, 0),
-                    SetHeight = 24f,
-                };
-
-                GasGridContainer.AddChild(gasLabel);
-            }
-        }
-    }
-
-    public void SetAsFocus()
-    {
-        FocusButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
-        ArrowTexture.TexturePath = "/Textures/Interface/Nano/inverted_triangle.svg.png";
-        FocusContainer.Visible = true;
-    }
-
-    public void RemoveAsFocus()
-    {
-        FocusButton.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
-        ArrowTexture.TexturePath = "/Textures/Interface/Nano/triangle_right.png";
-        FocusContainer.Visible = false;
-    }
-}