Version: 237.2.2

(cherry picked from commit 51bbc5dc45)

.github/workflows/build-all-configurations.yml

@@ -1,34 +0,0 @@
-name: Build All Configurations
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        targetOS: [Windows, Linux, MacOS]
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
-
-      - name: Install dependencies
-        run: dotnet restore
-      - name: Build Debug
-        run: dotnet build --no-restore --configuration Debug /p:WarningsAsErrors=nullable /p:TargetOS=${{ matrix.targetOS }}
-      - name: Build Tools
-        run: dotnet build --no-restore --configuration Tools /p:WarningsAsErrors=nullable /p:TargetOS=${{ matrix.targetOS }}
-      - name: Build Release
-        run: dotnet build --no-restore --configuration Release /p:WarningsAsErrors=nullable /p:TargetOS=${{ matrix.targetOS }}

.github/workflows/build-docfx.yml

@@ -5,30 +5,30 @@ on:
     - cron: "0 0 * * 0"
 jobs:
   docfx:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+   runs-on: ubuntu-latest
+   steps:
+    - uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0.x
 
-      - name: Install dependencies
-        run: dotnet restore
+    - name: Install dependencies
+      run: dotnet restore
 
-      - name: Build Project
-        run: dotnet build --no-restore /p:WarningsAsErrors=nullable
+    - name: Build Project
+      run: dotnet build --no-restore /p:WarningsAsErrors=nullable
 
-      - name: Build DocFX
-        uses: nikeee/docfx-action@v1.0.0
-        with:
-          args: Robust.Docfx/docfx.json
+    - name: Build DocFX
+      uses: nikeee/docfx-action@v1.0.0
+      with:
+        args: Robust.Docfx/docfx.json
 
-      - name: Publish Docfx Documentation on GitHub Pages
-        uses: maxheld83/ghpages@master
-        env:
-          BUILD_DIR: Robust.Docfx/_robust-site
-          GH_PAT: ${{ secrets.GH_PAT }}
+    - name: Publish Docfx Documentation on GitHub Pages
+      uses: maxheld83/ghpages@master
+      env:
+        BUILD_DIR: Robust.Docfx/_robust-site
+        GH_PAT: ${{ secrets.GH_PAT }}

.github/workflows/build-test.yml

@@ -2,32 +2,33 @@ name: Build & Test
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
-    branches: [master]
+    branches: [ master ]
 
 jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest] # , macos-latest] - temporarily disabled due to libfreetype.dll errors.
+        os: [ubuntu-latest, windows-latest ] # , macos-latest] - temporarily disabled due to libfreetype.dll errors.
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+    - uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
+
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0.x
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore /p:WarningsAsErrors=nullable
+    - name: Robust.UnitTesting
+      run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
+    - name: Robust.Analyzers.Tests
+      run: dotnet test --no-build Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj -- NUnit.ConsoleOut=0
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
-      - name: Install dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --no-restore /p:WarningsAsErrors=nullable
-      - name: Robust.UnitTesting
-        run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
-      - name: Robust.Analyzers.Tests
-        run: dotnet test --no-build Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj -- NUnit.ConsoleOut=0

.github/workflows/codeql-analysis.yml

@@ -11,8 +11,14 @@
 #
 name: "CodeQL"
 
-on:
-  workflow_dispatch
+#on:
+#  push:
+#    branches: [ master ]
+#  pull_request:
+#    # The branches below must be a subset of the branches above
+#    branches: [ master ]
+#  schedule:
+#    - cron: '30 18 * * 6'
 
 jobs:
   analyze:
@@ -22,50 +28,50 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ["csharp"]
+        language: [ 'csharp' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+    - name: Checkout repository
+      uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 7.0.x
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 7.0.x
 
-      - name: Build
-        run: dotnet build
+    - name: Build
+      run: dotnet build
 
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
 
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
 
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
 
-      #- run: |
-      #   make bootstrap
-      #   make release
+    #- run: |
+    #   make bootstrap
+    #   make release
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/publish-client.yml

@@ -3,50 +3,51 @@
 on:
   push:
     tags:
-      - "v*"
+    - 'v*'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Parse version
-        id: parse_version
-        shell: pwsh
-        run: |
-          $ver = [regex]::Match($env:GITHUB_REF, "refs/tags/v?(.+)").Groups[1].Value
-          echo ("::set-output name=version::{0}" -f $ver)
+    - name: Parse version
+      id: parse_version
+      shell: pwsh
+      run: |
+        $ver = [regex]::Match($env:GITHUB_REF, "refs/tags/v?(.+)").Groups[1].Value
+        echo ("::set-output name=version::{0}" -f $ver)
 
-      - uses: actions/checkout@v4.2.2
-        with:
-          submodules: true
+    - uses: actions/checkout@v3.6.0
+      with:
+        submodules: true
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0.x
 
-      - name: Package client
-        run: Tools/package_client_build.py -p windows mac linux
+    - name: Package client
+      run: Tools/package_client_build.py -p windows mac linux
 
-      - name: Shuffle files around
-        run: |
-          mkdir "release/${{ steps.parse_version.outputs.version }}"
-          mv release/*.zip "release/${{ steps.parse_version.outputs.version }}"
+    - name: Shuffle files around
+      run: |
+        mkdir "release/${{ steps.parse_version.outputs.version }}"
+        mv release/*.zip "release/${{ steps.parse_version.outputs.version }}"
 
-      - name: Upload files to Suns
-        uses: appleboy/scp-action@master
-        with:
-          host: suns.spacestation14.com
-          username: robust-build-push
-          key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
-          source: "release/${{ steps.parse_version.outputs.version }}"
-          target: "/var/lib/robust-builds/builds/"
-          strip_components: 1
+    - name: Upload files to Suns
+      uses: appleboy/scp-action@master
+      with:
+        host: suns.spacestation14.com
+        username: robust-build-push
+        key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
+        source: "release/${{ steps.parse_version.outputs.version }}"
+        target: "/var/lib/robust-builds/builds/"
+        strip_components: 1
+
+    - name: Update manifest JSON
+      uses: appleboy/ssh-action@master
+      with:
+        host: suns.spacestation14.com
+        username: robust-build-push
+        key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
+        script: /home/robust-build-push/push.ps1 ${{ steps.parse_version.outputs.version }}
 
-      - name: Update manifest JSON
-        uses: appleboy/ssh-action@master
-        with:
-          host: suns.spacestation14.com
-          username: robust-build-push
-          key: ${{ secrets.CENTCOMM_ROBUST_BUILDS_PUSH_KEY }}
-          script: /home/robust-build-push/push.ps1 ${{ steps.parse_version.outputs.version }}

.github/workflows/test-content.yml

@@ -2,39 +2,40 @@ name: Test content master against engine
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
-    branches: [master]
+    branches: [ master ]
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
 
     steps:
-      - name: Check out content
-        uses: actions/checkout@v4.2.2
-        with:
-          repository: space-wizards/space-station-14
-          submodules: recursive
+    - name: Check out content
+      uses: actions/checkout@v3.6.0
+      with:
+        repository: space-wizards/space-station-14
+        submodules: recursive
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4.1.0
-        with:
-          dotnet-version: 9.0.x
-      - name: Disable submodule autoupdate
-        run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0.x
+    - name: Disable submodule autoupdate
+      run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
 
-      - name: Check out engine version
-        run: |
-          cd RobustToolbox
-          git fetch origin ${{ github.sha }}
-          git checkout FETCH_HEAD
-          git submodule update --init --recursive
-      - name: Install dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --configuration Tools --no-restore
-      - name: Content.Tests
-        run: dotnet test --no-build Content.Tests/Content.Tests.csproj -v n
-      - name: Content.IntegrationTests
-        run: COMPlus_gcServer=1 dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n
+    - name: Check out engine version
+      run: |
+        cd RobustToolbox
+        git fetch origin ${{ github.sha }}
+        git checkout FETCH_HEAD
+        git submodule update --init --recursive
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --configuration Tools --no-restore
+    - name: Content.Tests
+      run: dotnet test --no-build Content.Tests/Content.Tests.csproj -v n
+    - name: Content.IntegrationTests
+      run: COMPlus_gcServer=1 dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n

Directory.Packages.props

@@ -10,69 +10,66 @@
     <ManagePackageVersionsCentrally />
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
-    <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
-    <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.8" />
+    <PackageVersion Include="ILReader.Core" Version="1.0.0.4" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
+    <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.0" />
     <PackageVersion Include="Linguini.Bundle" Version="0.8.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.CodeCoverage" Version="17.12.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.8.0" />
+    <PackageVersion Include="Microsoft.CodeCoverage" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.0" />
     <PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24059.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.ILVerification" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
-    <PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.ILVerification" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
+    <PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageVersion Include="Moq" Version="4.20.72" />
-    <PackageVersion Include="NUnit" Version="4.3.2" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.5.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageVersion Include="Moq" Version="4.20.70" />
+    <PackageVersion Include="NUnit" Version="4.0.1" />
+    <PackageVersion Include="NUnit.Analyzers" Version="3.10.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="Nett" Version="0.15.0" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
     <PackageVersion Include="OpenTK.OpenAL" Version="4.7.7" />
     <PackageVersion Include="OpenToolkit.Graphics" Version="4.0.0-pre9.1" />
-    <PackageVersion Include="Pidgin" Version="3.3.0" />
+    <PackageVersion Include="Pidgin" Version="3.2.2" />
     <PackageVersion Include="Robust.Natives" Version="0.1.1" />
-    <PackageVersion Include="Robust.Natives.Cef" Version="131.3.5" />
+    <PackageVersion Include="Robust.Natives.Cef" Version="120.1.9" />
     <PackageVersion Include="Robust.Shared.AuthLib" Version="0.1.2" />
-    <PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
-    <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
-    <PackageVersion Include="Serilog" Version="4.2.0" />
+    <PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.7" />
+    <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.7" />
+    <PackageVersion Include="Serilog" Version="3.1.1" />
     <PackageVersion Include="Serilog.Sinks.Loki" Version="4.0.0-beta3" />
     <PackageVersion Include="SharpZstd.Interop" Version="1.5.2-beta2" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.7" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5" />
     <PackageVersion Include="SpaceWizards.HttpListener" Version="0.1.1" />
-    <PackageVersion Include="SpaceWizards.NFluidsynth" Version="0.1.1" />
+    <PackageVersion Include="SpaceWizards.NFluidsynth" Version="0.2.2" />
     <PackageVersion Include="SpaceWizards.SharpFont" Version="1.0.2" />
     <PackageVersion Include="SpaceWizards.Sodium" Version="0.2.1" />
-    <PackageVersion Include="TerraFX.Interop.Windows" Version="10.0.26100.1" />
+    <PackageVersion Include="System.Numerics.Vectors" Version="4.5.0" />
+    <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+    <PackageVersion Include="TerraFX.Interop.Windows" Version="10.0.22621.5" />
     <PackageVersion Include="TerraFX.Interop.Xlib" Version="6.4.0" />
     <PackageVersion Include="VorbisPizza" Version="1.3.0" />
-    <PackageVersion Include="YamlDotNet" Version="16.3.0" />
+    <PackageVersion Include="YamlDotNet" Version="13.7.1" />
     <PackageVersion Include="prometheus-net" Version="8.2.1" />
     <PackageVersion Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
-    <PackageVersion Include="PolySharp" Version="1.15.0" />
-
-    <!-- Transitive deps that we need to pin versions for to avoid NuGet warnings. -->
-    <PackageVersion Include="System.Formats.Asn1" Version="9.0.0" />
-    <PackageVersion Include="System.Reflection.Metadata" Version="9.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0" />
+    <PackageVersion Include="PolySharp" Version="1.14.1" />
   </ItemGroup>
 </Project>

Lidgren.Network/Lidgren.Network.csproj

@@ -12,7 +12,7 @@
     <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
 
     <Nullable>enable</Nullable>
-    <LangVersion>13.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
 <Project>
 
-    <!-- This file automatically reset by Tools/version.py -->
+    <!-- This file automatically reset by Tools/version.py -->
 

MSBuild/Robust.Engine.props

@@ -1,8 +1,8 @@
 <Project>
     <!-- Engine-specific properties. Content should not use this file. -->
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
-        <LangVersion>13</LangVersion>
+        <TargetFramework>net8.0</TargetFramework>
+        <LangVersion>12</LangVersion>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
     </PropertyGroup>

MSBuild/Robust.Properties.targets

@@ -3,7 +3,7 @@
   <!-- Import this at the end of any project files in Robust and Content. -->
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 

MSBuild/XamlIL.targets

@@ -71,6 +71,6 @@
     </PropertyGroup>
     <Exec
       Condition="'$(_RobustUseExternalMSBuild)' == 'true'"
-      Command="&quot;$(DOTNET_HOST_PATH)&quot; msbuild /nodereuse:false $(MSBuildProjectFile) /t:CompileRobustXaml /p:_RobustForceInternalMSBuild=true /p:Configuration=$(Configuration) /p:RuntimeIdentifier=$(RuntimeIdentifier) /p:TargetFramework=$(TargetFramework) /p:BuildProjectReferences=false /p:IntermediateOutputPath=&quot;$(IntermediateOutputPath.TrimEnd('\'))/&quot;"/>
+      Command="&quot;$(DOTNET_HOST_PATH)&quot; msbuild /nodereuse:false $(MSBuildProjectFile) /t:CompileRobustXaml /p:_RobustForceInternalMSBuild=true /p:Configuration=$(Configuration) /p:RuntimeIdentifier=$(RuntimeIdentifier) /p:TargetFramework=$(TargetFramework) /p:BuildProjectReferences=false"/>
   </Target>
 </Project>

Resources/EnginePrototypes/Shaders/stockshaders.yml

@@ -4,12 +4,6 @@
   kind: canvas
   light_mode: unshaded
 
-# Simple mix blend
-- type: shader
-  id: Mix
-  kind: canvas
-  blend_mode: Mix
-
 - type: shader
   id: shaded
   kind: canvas

Resources/Locale/en-US/_engine_lib.ftl

@@ -21,8 +21,7 @@ zzzz-object-pronoun = { GENDER($ent) ->
    }
 
 # Used internally by the DAT-OBJ() function.
-# Not used in en-US. Created to support other languages.
-# (e.g., "to him," "for her")
+# Not used in en-US. Created for supporting other languages.
 zzzz-dat-object = { GENDER($ent) ->
     [male] him
     [female] her
@@ -30,16 +29,6 @@ zzzz-dat-object = { GENDER($ent) ->
    *[neuter] it
    }
 
-# Used internally by the GENITIVE() function.
-# Not used in en-US. Created to support other languages.
-# e.g., "у него" (Russian), "seines Vaters" (German).
-zzzz-genitive = { GENDER($ent) ->
-    [male] his
-    [female] her
-    [epicene] their
-   *[neuter] its
-   }
-
 # Used internally by the POSS-PRONOUN() function.
 zzzz-possessive-pronoun = { GENDER($ent) ->
     [male] his

Resources/Locale/en-US/color-naming.ftl

@@ -1,32 +0,0 @@
-color-hue-chroma-lightness = {$lightness} {$chroma} {$hue}
-color-hue-chroma = {$chroma} {$hue}
-color-hue-lightness = {$lightness} {$hue}
-color-very-dark = very dark
-color-dark = dark
-color-light = light
-color-very-light = very light
-color-mixed-hue = {$a} {$b}
-color-pale = pale
-color-gray-adjective = gray
-color-strong = strong
-color-pink = pink
-color-red = red
-color-orange = orange
-color-yellow = yellow
-color-green = green
-color-cyan = cyan
-color-blue = blue
-color-purple = purple
-color-brown = brown
-color-white = white
-color-gray = gray
-color-black = black
-
-color-pink-color-red = pinkish red
-color-red-color-orange = reddish orange
-color-orange-color-yellow = orangeish yellow
-color-yellow-color-green = yellowish green
-color-green-color-cyan = greenish cyan
-color-cyan-color-blue = cyanish blue
-color-blue-color-purple = blueish purple
-color-purple-color-pink = purpleish pink

Resources/Locale/en-US/commands.ftl

@@ -1,7 +1,5 @@
 ### Localization for engine console commands
 
-cmd-hint-float = [float]
-
 ## generic command errors
 
 cmd-invalid-arg-number-error = Invalid number of arguments.
@@ -13,7 +11,6 @@ cmd-parse-failure-uid = {$arg} is not a valid entity UID.
 cmd-parse-failure-mapid = {$arg} is not a valid MapId.
 cmd-parse-failure-enum = {$arg} is not a {$enum} Enum.
 cmd-parse-failure-grid = {$arg} is not a valid grid.
-cmd-parse-failure-cultureinfo = "{$arg}" is not valid CultureInfo.
 cmd-parse-failure-entity-exist = UID {$arg} does not correspond to an existing entity.
 cmd-parse-failure-session = There is no session with username: {$username}
 
@@ -159,7 +156,6 @@ cmd-savemap-not-exist = Target map does not exist.
 cmd-savemap-init-warning = Attempted to save a post-init map without forcing the save.
 cmd-savemap-attempt = Attempting to save map {$mapId} to {$path}.
 cmd-savemap-success = Map successfully saved.
-cmd-savemap-error = Could not save map! See server log for details.
 cmd-hint-savemap-id = <MapID>
 cmd-hint-savemap-path = <Path>
 cmd-hint-savemap-force = [bool]
@@ -297,7 +293,7 @@ cmd-lsgrid-desc = Lists grids.
 cmd-lsgrid-help = lsgrid
 
 cmd-addmap-desc = Adds a new empty map to the round. If the mapID already exists, this command does nothing.
-cmd-addmap-help = addmap <mapID> [pre-init]
+cmd-addmap-help = addmap <mapID> [initialize]
 
 cmd-rmmap-desc = Removes a map from the world. You cannot remove nullspace.
 cmd-rmmap-help = rmmap <mapId>
@@ -431,20 +427,11 @@ cmd-entfo-help = Usage: entfo <entityuid>
     The entity UID can be prefixed with 'c' to convert it to a client entity UID.
 
 cmd-fuck-desc = Throws an exception
-cmd-fuck-help = Usage: fuck
+cmd-fuck-help = Throws an exception
 
-cmd-showpos-desc = Show the position of all entities on the screen.
+cmd-showpos-desc = Enables debug drawing over all entity positions in the game.
 cmd-showpos-help = Usage: showpos
 
-cmd-showrot-desc = Show the rotation of all entities on the screen.
-cmd-showrot-help = Usage: showrot
-
-cmd-showvel-desc = Show the local velocity of all entites on the screen.
-cmd-showvel-help = Usage: showvel
-
-cmd-showangvel-desc = Show the angular velocity of all entities on the screen.
-cmd-showangvel-help = Usage: showangvel
-
 cmd-sggcell-desc = Lists entities on a snap grid cell.
 cmd-sggcell-help = Usage: sggcell <gridID> <vector2i>\nThat vector2i param is in the form x<int>,y<int>.
 
@@ -575,8 +562,3 @@ cmd-pvs-override-info-desc = Prints information about any PVS overrides associat
 cmd-pvs-override-info-empty = Entity {$nuid} has no PVS overrides.
 cmd-pvs-override-info-global = Entity {$nuid} has a global override.
 cmd-pvs-override-info-clients = Entity {$nuid} has a session override for {$clients}.
-
-cmd-localization_set_culture-desc = Set DefaultCulture for the client LocalizationManager
-cmd-localization_set_culture-help = Usage: localization_set_culture <cultureName>
-cmd-localization_set_culture-culture-name = <cultureName>
-cmd-localization_set_culture-changed = Localization changed to { $code } ({ $nativeName } / { $englishName })

Resources/Locale/en-US/custom-controls.ftl

@@ -9,16 +9,11 @@ entity-spawn-window-override-menu-tooltip = Override placement
 ## TileSpawnWindow
 
 tile-spawn-window-title = Place Tiles
-tile-spawn-window-mirror-button-text = Mirror Tiles
 
 ## Console
 
 console-line-edit-placeholder = Command Here
 
-## OutputPanel
-
-output-panel-scroll-down-button-text = Scroll Down
-
 ## Common Used
 
 window-erase-button-text = Erase Mode

Resources/Locale/en-US/dev-window.ftl

@@ -1,10 +0,0 @@
-## "Textures" dev window tab
-
-dev-window-tab-textures-title = Textures
-dev-window-tab-textures-reload = Reload
-dev-window-tab-textures-filter = Filter
-dev-window-tab-textures-summary = Total (est): { $bytes }
-dev-window-tab-textures-info = Width: { $width } Height: { $height }
-    PixelType: { $pixelType } sRGB: { $srgb }
-    Name: { $name }
-    Est. memory usage: { $bytes }

Resources/Locale/en-US/toolshed-commands.ftl

@@ -1,8 +1,4 @@
-command-help-usage =
-    Usage:
-command-help-invertible =
-    The behaviour of this command can be inverted using the "not" prefix.
-command-description-tpto =
+command-description-tpto =
     Teleport the given entities to some target entity.
 command-description-player-list =
     Returns a list of all player sessions.
@@ -23,7 +19,7 @@ command-description-buildinfo =
 command-description-cmd-list =
     Returns a list of all commands, for this side.
 command-description-explain =
-    Explains the given expression, providing command descriptions and signatures. This only works for valid expressions, it can't explain commands that it fails to parse.
+    Explains the given expression, providing command descriptions and signatures.
 command-description-search =
     Searches through the input for the provided value.
 command-description-stopwatch =
@@ -42,7 +38,8 @@ command-description-as =
 command-description-count =
     Counts the amount of entries in it's input, returning an integer.
 command-description-map =
-    Maps the input over the given block.
+    Maps the input over the given block, with the provided expected return type.
+    This command may be modified to not need an explicit return type in the future.
 command-description-select =
     Selects N objects or N% of objects from the input.
     One can additionally invert this command with not to make it select everything except N objects instead.
@@ -56,8 +53,10 @@ command-description-entities =
     Returns all entities on the server.
 command-description-paused =
     Filters the input entities by whether or not they are paused.
+    This command can be inverted with not.
 command-description-with =
     Filters the input entities by whether or not they have the given component.
+    This command can be inverted with not.
 command-description-fuck =
     Throws an exception.
 command-description-ecscomp-listty =
@@ -96,8 +95,6 @@ command-description-vars =
     Provides a list of all variables set in this session.
 command-description-any =
     Returns true if there's any values in the input, otherwise false.
-command-description-contains =
-    Returns whether the input enumerable contains the specified value.
 command-description-ArrowCommand =
     Assigns the input to a variable.
 command-description-isempty =
@@ -122,8 +119,6 @@ command-description-splat =
     "Splats" a block, value, or variable, creating N copies of it in a list.
 command-description-val =
     Casts the given value, block, or variable to the given type. This is mostly a workaround for current limitations of variables.
-command-description-var =
-    Returns the contents of the given variable. This will attempt to automatically infer a variables type. Compound commands that modify a variable may need to use the 'val' command instead.
 command-description-actor-controlled =
     Filters entities by whether or not they're actively controlled.
 command-description-actor-session =
@@ -148,7 +143,7 @@ command-description-max =
     Returns the maximum of two values.
 command-description-BitAndCommand =
     Performs bitwise AND.
-command-description-bitor =
+command-description-BitOrCommand =
     Performs bitwise OR.
 command-description-BitXorCommand =
     Performs bitwise XOR.
@@ -195,8 +190,6 @@ command-description-spawn-at =
     Spawns an entity at the given coordinates.
 command-description-spawn-on =
     Spawns an entity on the given entity, at it's coordinates.
-command-description-spawn-in =
-    Spawns an entity in the given container on the given entity, dropping it at its coordinates if it doesn't fit
 command-description-spawn-attached =
     Spawns an entity attached to the given entity, at (0 0) relative to it.
 command-description-mappos =
@@ -204,11 +197,11 @@ command-description-mappos =
 command-description-pos =
     Returns an entity's coordinates.
 command-description-tp-coords =
-    Teleports the given entities to the target coordinates.
+    Teleports the target to the given coordinates.
 command-description-tp-to =
-    Teleports the given entities to the target entity.
+    Teleports the target to the given other entity.
 command-description-tp-into =
-    Teleports the given entities "into" the target entity, attaching it at (0 0) relative to it.
+    Teleports the target "into" the given other entity, attaching it at (0 0) relative to it.
 command-description-comp-get =
     Gets the given component from the given entity.
 command-description-comp-add =
@@ -278,7 +271,7 @@ command-description-ModVecCommand =
     Performs the modulus operation over the input with the given constant right-hand value.
 command-description-BitAndNotCommand =
     Performs bitwise AND-NOT over the input.
-command-description-bitornot =
+command-description-BitOrNotCommand =
     Performs bitwise OR-NOT over the input.
 command-description-BitXnorCommand =
     Performs bitwise XNOR over the input.

Resources/Locale/pt-BR/commands.ftl

@@ -136,7 +136,6 @@ cmd-savemap-not-exist = O mapa de destino não existe.
 cmd-savemap-init-warning = Tentativa de salvar um mapa pós-inicialização sem forçar o salvamento.
 cmd-savemap-attempt = Tentando salvar o mapa {$mapId} em {$path}.
 cmd-savemap-success = Mapa salvo com sucesso.
-cmd-savemap-error = Não foi possível salvar o mapa! Consulte o log do servidor para obter detalhes.
 cmd-hint-savemap-id = <MapID>
 cmd-hint-savemap-path = <Path>
 cmd-hint-savemap-force = [bool]

Robust.Analyzers.Tests/AccessAnalyzer_Test.cs

@@ -1,8 +1,12 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
-using VerifyCS = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.AccessAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+using Robust.Analyzers;
+
+using VerifyCS = Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.AccessAnalyzer>;
+using static Microsoft.CodeAnalysis.Testing.DiagnosticResult;
 
 namespace Robust.Analyzers.Tests;
 
@@ -12,7 +16,7 @@ public sealed class AccessAnalyzer_Test
 {
     public Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<AccessAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<AccessAnalyzer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/ByRefEventAnalyzerTest.cs

@@ -1,114 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.ByRefEventAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture, TestOf(typeof(ByRefEventAnalyzer))]
-public sealed class ByRefEventAnalyzerTest
-{
-    private const string EventBusDef = """
-        namespace Robust.Shared.GameObjects;
-
-        public readonly struct EntityUid;
-
-        public sealed class EntitySystem
-        {
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, ref TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-        }
-
-        public sealed class EntityEventBus
-        {
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, ref TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-
-            public void RaiseLocalEvent<TEvent>(EntityUid uid, TEvent args, bool broadcast = false)
-                where TEvent : notnull { }
-        }
-        """;
-
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<ByRefEventAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.GameObjects.EventBusAttributes.cs"
-        );
-
-        test.TestState.Sources.Add(("EntityEventBus.cs", EventBusDef));
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task TestSuccess()
-    {
-        const string code = """
-            using Robust.Shared.GameObjects;
-
-            [ByRefEvent]
-            public readonly struct RefEvent;
-            public readonly struct ValueEvent;
-
-            public static class Foo
-            {
-                public static void Bar(EntityEventBus bus)
-                {
-                    bus.RaiseLocalEvent(default(EntityUid), new ValueEvent());
-                    var refEv = new RefEvent();
-                    bus.RaiseLocalEvent(default(EntityUid), ref refEv);
-                }
-            }
-            """;
-
-        await Verifier(code);
-    }
-
-    [Test]
-    public async Task TestWrong()
-    {
-        const string code = """
-            using Robust.Shared.GameObjects;
-
-            [ByRefEvent]
-            public readonly struct RefEvent;
-            public readonly struct ValueEvent;
-
-            public static class Foo
-            {
-                public static void Bar(EntityEventBus bus)
-                {
-                    bus.RaiseLocalEvent(default(EntityUid), new RefEvent());
-                    var valueEv = new ValueEvent();
-                    bus.RaiseLocalEvent(default(EntityUid), ref valueEv);
-                }
-            }
-            """;
-
-        await Verifier(
-            code,
-            // /0/Test0.cs(11,49): error RA0015: Tried to raise a by-ref event 'RefEvent' by value
-            VerifyCS.Diagnostic(ByRefEventAnalyzer.ByRefEventRaisedByValueRule).WithSpan(11, 49, 11, 63).WithArguments("RefEvent"),
-            // /0/Test0.cs(13,49): error RA0016: Tried to raise a value event 'ValueEvent' by-ref
-            VerifyCS.Diagnostic(ByRefEventAnalyzer.ByValueEventRaisedByRefRule).WithSpan(13, 49, 13, 60).WithArguments("ValueEvent")
-        );
-    }
-}

Robust.Analyzers.Tests/ComponentPauseGeneratorTest.cs

@@ -66,7 +66,6 @@ public sealed class ComponentPauseGeneratorTest
             public partial class FooComponent
             {
             [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             public sealed class FooComponent_AutoPauseSystem : EntitySystem
             {
                 public override void Initialize()
@@ -107,7 +106,6 @@ public sealed class ComponentPauseGeneratorTest
             public partial class FooComponent
             {
             [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             public sealed class FooComponent_AutoPauseSystem : EntitySystem
             {
                 public override void Initialize()
@@ -149,7 +147,6 @@ public sealed class ComponentPauseGeneratorTest
             public partial class FooComponent
             {
             [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             public sealed class FooComponent_AutoPauseSystem : EntitySystem
             {
                 public override void Initialize()
@@ -191,7 +188,6 @@ public sealed class ComponentPauseGeneratorTest
             public partial class FooComponent
             {
             [RobustAutoGenerated]
-            [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
             public sealed class FooComponent_AutoPauseSystem : EntitySystem
             {
                 public override void Initialize()

Robust.Analyzers.Tests/DataDefinitionAnalyzerTest.cs

@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
 using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.DataDefinitionAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.DataDefinitionAnalyzer>;
 
 namespace Robust.Analyzers.Tests;
 
@@ -13,7 +14,7 @@ public sealed class DataDefinitionAnalyzerTest
 {
     private static Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<DataDefinitionAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<DataDefinitionAnalyzer, NUnitVerifier>()
         {
             TestState =
             {
@@ -21,53 +22,47 @@ public sealed class DataDefinitionAnalyzerTest
             },
         };
 
-        test.TestState.Sources.Add(("TestTypeDefs.cs", TestTypeDefs));
-
         // ExpectedDiagnostics cannot be set, so we need to AddRange here...
         test.TestState.ExpectedDiagnostics.AddRange(expected);
 
         return test.RunAsync();
     }
 
-    private const string TestTypeDefs = """
-        using System;
-
-        namespace Robust.Shared.ViewVariables
-        {
-            public sealed class ViewVariablesAttribute : Attribute
-            {
-                public readonly VVAccess Access = VVAccess.ReadOnly;
-
-                public ViewVariablesAttribute() { }
-
-                public ViewVariablesAttribute(VVAccess access)
-                {
-                    Access = access;
-                }
-            }
-            public enum VVAccess : byte
-            {
-                ReadOnly = 0,
-                ReadWrite = 1,
-            }
-        }
-
-        namespace Robust.Shared.Serialization.Manager.Attributes
-        {
-            public class DataFieldBaseAttribute : Attribute;
-            public class DataFieldAttribute(string? tag = null) : DataFieldBaseAttribute;
-            public sealed class DataDefinitionAttribute : Attribute;
-            public sealed class NotYamlSerializableAttribute : Attribute;
-        }
-    """;
-
     [Test]
-    public async Task NoVVReadOnlyTest()
+    public async Task Test()
     {
         const string code = """
+            using System;
             using Robust.Shared.ViewVariables;
             using Robust.Shared.Serialization.Manager.Attributes;
 
+            namespace Robust.Shared.ViewVariables
+            {
+                public sealed class ViewVariablesAttribute : Attribute
+                {
+                    public readonly VVAccess Access = VVAccess.ReadOnly;
+
+                    public ViewVariablesAttribute() { }
+
+                    public ViewVariablesAttribute(VVAccess access)
+                    {
+                        Access = access;
+                    }
+                }
+                public enum VVAccess : byte
+                {
+                    ReadOnly = 0,
+                    ReadWrite = 1,
+                }
+            }
+
+            namespace Robust.Shared.Serialization.Manager.Attributes
+            {
+                public class DataFieldBaseAttribute : Attribute;
+                public class DataFieldAttribute : DataFieldBaseAttribute;
+                public sealed class DataDefinitionAttribute : Attribute;
+            }
+
             [DataDefinition]
             public sealed partial class Foo
             {
@@ -89,141 +84,8 @@ public sealed class DataDefinitionAnalyzerTest
             """;
 
         await Verifier(code,
-            // /0/Test0.cs(7,17): info RA0028: Data field Bad in data definition Foo has ViewVariables attribute with ReadWrite access, which is redundant
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataFieldNoVVReadWriteRule).WithSpan(7, 17, 7, 50).WithArguments("Bad", "Foo")
-        );
-    }
-
-    [Test]
-    public async Task ReadOnlyFieldTest()
-    {
-        const string code = """
-            using Robust.Shared.Serialization.Manager.Attributes;
-
-            [DataDefinition]
-            public sealed partial class Foo
-            {
-                [DataField]
-                public readonly int Bad;
-
-                [DataField]
-                public int Good;
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(7,12): error RA0019: Data field Bad in data definition Foo is readonly
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataFieldWritableRule).WithSpan(7, 12, 7, 20).WithArguments("Bad", "Foo")
-        );
-    }
-
-    [Test]
-    public async Task PartialDataDefinitionTest()
-    {
-        const string code = """
-            using Robust.Shared.Serialization.Manager.Attributes;
-
-            [DataDefinition]
-            public sealed class Foo { }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(4,15): error RA0017: Type Foo is a DataDefinition but is not partial
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataDefinitionPartialRule).WithSpan(4, 15, 4, 20).WithArguments("Foo")
-        );
-    }
-
-    [Test]
-    public async Task NestedPartialDataDefinitionTest()
-    {
-        const string code = """
-            using Robust.Shared.Serialization.Manager.Attributes;
-
-            public sealed class Foo
-            {
-                [DataDefinition]
-                public sealed partial class Nested { }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(3,15): error RA0018: Type Foo contains nested data definition Nested but is not partial
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.NestedDataDefinitionPartialRule).WithSpan(3, 15, 3, 20).WithArguments("Foo", "Nested")
-        );
-    }
-
-    [Test]
-    public async Task RedundantDataFieldTagTest()
-    {
-        const string code = """
-            using Robust.Shared.Serialization.Manager.Attributes;
-
-            [DataDefinition]
-            public sealed partial class Foo
-            {
-                [DataField("someValue")]
-                public int SomeValue;
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(6,6): info RA0027: Data field SomeValue in data definition Foo has an explicitly set tag that matches autogenerated tag
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataFieldRedundantTagRule).WithSpan(6, 6, 6, 28).WithArguments("SomeValue", "Foo")
-        );
-    }
-
-    [Test]
-    public async Task ReadOnlyPropertyTest()
-    {
-        const string code = """
-            using Robust.Shared.Serialization.Manager.Attributes;
-
-            [DataDefinition]
-            public sealed partial class Foo
-            {
-                [DataField]
-                public int Bad { get; }
-
-                [DataField]
-                public int Good { get; private set; }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(7,20): error RA0020: Data field property Bad in data definition Foo does not have a setter
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataFieldPropertyWritableRule).WithSpan(7, 20, 7, 28).WithArguments("Bad", "Foo")
-        );
-    }
-
-    [Test]
-    public async Task NotYamlSerializableTest()
-    {
-        const string code = """
-            using Robust.Shared.Serialization.Manager.Attributes;
-
-            [NotYamlSerializable]
-            public sealed class NotSerializableClass { }
-
-            [DataDefinition]
-            public sealed partial class Foo
-            {
-                [DataField]
-                public NotSerializableClass BadField;
-
-                [DataField]
-                public NotSerializableClass BadProperty { get; set; }
-
-                public NotSerializableClass GoodField; // Not a DataField, not a problem
-
-                public NotSerializableClass GoodProperty { get; set; } // Not a DataField, not a problem
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,12): error RA0033: Data field BadField in data definition Foo is type NotSerializableClass, which is not YAML serializable
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataFieldYamlSerializableRule).WithSpan(10, 12, 10, 32).WithArguments("BadField", "Foo", "NotSerializableClass"),
-            // /0/Test0.cs(13,12): error RA0033: Data field BadProperty in data definition Foo is type NotSerializableClass, which is not YAML serializable
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataFieldYamlSerializableRule).WithSpan(13, 12, 13, 32).WithArguments("BadProperty", "Foo", "NotSerializableClass")
+            // /0/Test0.cs(35,17): info RA0028: Data field Bad in data definition Foo has ViewVariables attribute with ReadWrite access, which is redundant
+            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataFieldNoVVReadWriteRule).WithSpan(35, 17, 35, 50).WithArguments("Bad", "Foo")
         );
     }
 }

Robust.Analyzers.Tests/DependencyAssignAnalyzerTest.cs

@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
 using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.DependencyAssignAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.DependencyAssignAnalyzer>;
 
 namespace Robust.Analyzers.Tests;
 
@@ -13,7 +14,7 @@ public sealed class DependencyAssignAnalyzerTest
 {
     private static Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<DependencyAssignAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<DependencyAssignAnalyzer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/DuplicateDependencyAnalyzerTest.cs

@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
 using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.DuplicateDependencyAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.DuplicateDependencyAnalyzer>;
 
 namespace Robust.Analyzers.Tests;
 
@@ -14,7 +15,7 @@ public sealed class DuplicateDependencyAnalyzerTest
 {
     private static Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<DuplicateDependencyAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<DuplicateDependencyAnalyzer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/ForbidLiteralAnalyzerTest.cs

@@ -1,189 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.ForbidLiteralAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class ForbidLiteralAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<ForbidLiteralAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.ForbidLiteralAttribute.cs"
-        );
-
-        test.TestState.Sources.Add(("TestTypeDefs.cs", TestTypeDefs));
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    private const string TestTypeDefs = """
-        using System.Collections.Generic;
-        using Robust.Shared.Analyzers;
-
-        public sealed class TestClass
-        {
-            public static void OneParameterForbidden([ForbidLiteral] string value) { }
-            public static void TwoParametersFirstForbidden([ForbidLiteral] string first, string second) { }
-            public static void TwoParametersBothForbidden([ForbidLiteral] string first, [ForbidLiteral] string second) { }
-            public static void ListParameterForbidden([ForbidLiteral] List<string> values) { }
-            public static void ParamsListParameterForbidden([ForbidLiteral] params List<string> values) { }
-        }
-
-        public record struct StringWrapper(string value)
-        {
-            private readonly string _value = value;
-
-            public static implicit operator string(StringWrapper wrapper)
-            {
-                return wrapper._value;
-            }
-        }
-    """;
-
-    [Test]
-    public async Task TestOneParameter()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-                private static readonly StringWrapper WrappedValue = new("biz");
-
-                public void Test()
-                {
-                    TestClass.OneParameterForbidden(_constValue);
-                    TestClass.OneParameterForbidden(StaticValue);
-                    TestClass.OneParameterForbidden(WrappedValue);
-                    TestClass.OneParameterForbidden("baz");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(12,41): error RA0033: The "value" parameter of OneParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(12, 41, 12, 46).WithArguments("value", "OneParameterForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestTwoParametersFirstForbidden()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-
-                public void Test()
-                {
-                    TestClass.TwoParametersFirstForbidden(_constValue, "whatever");
-                    TestClass.TwoParametersFirstForbidden(_constValue, _constValue);
-                    TestClass.TwoParametersFirstForbidden("foo", "whatever");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(9,47): error RA0033: The "first" parameter of TwoParametersFirstForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(9, 47, 9, 52).WithArguments("first", "TwoParametersFirstForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestTwoParametersBothForbidden()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-
-                public void Test()
-                {
-                    TestClass.TwoParametersBothForbidden(_constValue, _constValue);
-                    TestClass.TwoParametersBothForbidden(_constValue, StaticValue);
-                    TestClass.TwoParametersBothForbidden(_constValue, "whatever");
-                    TestClass.TwoParametersBothForbidden("whatever", _constValue);
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,59): error RA0033: The "second" parameter of TwoParametersBothForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 59, 10, 69).WithArguments("second", "TwoParametersBothForbidden"),
-            // /0/Test0.cs(11,46): error RA0033: The "first" parameter of TwoParametersBothForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(11, 46, 11, 56).WithArguments("first", "TwoParametersBothForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestListParameter()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-                private static readonly StringWrapper WrappedValue = new("biz");
-
-                public void Test()
-                {
-                    TestClass.ListParameterForbidden([_constValue, StaticValue, WrappedValue]);
-                    TestClass.ListParameterForbidden(["foo", _constValue, "bar"]);
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,43): warning RA0033: The "values" parameter of ListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 43, 10, 48).WithArguments("values", "ListParameterForbidden"),
-            // /0/Test0.cs(10,63): warning RA0033: The "values" parameter of ListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 63, 10, 68).WithArguments("values", "ListParameterForbidden")
-        );
-    }
-
-    [Test]
-    public async Task TestParamsListParameter()
-    {
-        const string code = """
-            public sealed class Tester
-            {
-                private const string _constValue = "foo";
-                private static readonly string StaticValue = "bar";
-                private static readonly StringWrapper WrappedValue = new("biz");
-
-                public void Test()
-                {
-                    TestClass.ParamsListParameterForbidden(_constValue, StaticValue, WrappedValue);
-                    TestClass.ParamsListParameterForbidden("foo", _constValue, "bar");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,48): warning RA0033: The "values" parameter of ParamsListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 48, 10, 53).WithArguments("values", "ParamsListParameterForbidden"),
-            // /0/Test0.cs(10,68): warning RA0033: The "values" parameter of ParamsListParameterForbidden forbids literal values
-            VerifyCS.Diagnostic().WithSpan(10, 68, 10, 73).WithArguments("values", "ParamsListParameterForbidden")
-        );
-    }
-}

Robust.Analyzers.Tests/MustCallBaseAnalyzerTest.cs

@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
 using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.MustCallBaseAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.MustCallBaseAnalyzer>;
 
 namespace Robust.Analyzers.Tests;
 
@@ -13,7 +14,7 @@ public sealed class MustCallBaseAnalyzerTest
 {
     private static Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<MustCallBaseAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<MustCallBaseAnalyzer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/NoUncachedRegexAnalyzerTest.cs

@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
 using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.NoUncachedRegexAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.NoUncachedRegexAnalyzer>;
 
 namespace Robust.Analyzers.Tests;
 
@@ -13,7 +14,7 @@ public sealed class NoUncachedRegexAnalyzerTest
 {
     private static Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<NoUncachedRegexAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<NoUncachedRegexAnalyzer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/ObsoleteInheritanceAnalyzerTest.cs

@@ -1,86 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.ObsoleteInheritanceAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-/// <summary>
-/// Analyzer that implements <c>[ObsoleteInheritance]</c> checking, to give obsoletion warnings for inheriting types
-/// that should never have been virtual.
-/// </summary>
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class ObsoleteInheritanceAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<ObsoleteInheritanceAnalyzer, DefaultVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.ObsoleteInheritanceAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task TestBasic()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            [ObsoleteInheritance]
-            public class Base;
-
-            public class NotAllowed : Base;
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(6,14): warning RA0034: Type 'NotAllowed' inherits from 'Base', which has obsoleted inheriting from itself
-            VerifyCS.Diagnostic(ObsoleteInheritanceAnalyzer.Rule).WithSpan(6, 14, 6, 24).WithArguments("NotAllowed", "Base")
-            );
-    }
-
-    [Test]
-    public async Task TestMessage()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            [ObsoleteInheritance("Sus")]
-            public class Base;
-
-            public class NotAllowed : Base;
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(6,14): warning RA0034: Type 'NotAllowed' inherits from 'Base', which has obsoleted inheriting from itself: "Sus"
-            VerifyCS.Diagnostic(ObsoleteInheritanceAnalyzer.RuleWithMessage).WithSpan(6, 14, 6, 24).WithArguments("NotAllowed", "Base", "Sus")
-        );
-    }
-
-    [Test]
-    public async Task TestNormal()
-    {
-        const string code = """
-            public class Base;
-
-            public class AllowedAllowed : Base;
-            """;
-
-        await Verifier(code);
-    }
-}

Robust.Analyzers.Tests/PreferNonGenericVariantForTest.cs

@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
 using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PreferNonGenericVariantForAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.PreferNonGenericVariantForAnalyzer>;
 
 namespace Robust.Analyzers.Tests;
 
@@ -13,7 +14,7 @@ public sealed class PreferNonGenericVariantForTest
 {
     private static Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<PreferNonGenericVariantForAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<PreferNonGenericVariantForAnalyzer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/PreferOtherTypeAnalyzerTest.cs

@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
 using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PreferOtherTypeAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.PreferOtherTypeAnalyzer>;
 
 namespace Robust.Analyzers.Tests;
 
@@ -13,7 +14,7 @@ public sealed class PreferOtherTypeAnalyzerTest
 {
     private static Task Verifier(string code, params DiagnosticResult[] expected)
     {
-        var test = new CSharpAnalyzerTest<PreferOtherTypeAnalyzer, DefaultVerifier>()
+        var test = new CSharpAnalyzerTest<PreferOtherTypeAnalyzer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/PreferOtherTypeFixerTest.cs

@@ -1,9 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
 using NUnit.Framework;
 using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PreferOtherTypeAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
+    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.PreferOtherTypeAnalyzer>;
 
 namespace Robust.Analyzers.Tests;
 
@@ -11,7 +12,7 @@ public sealed class PreferOtherTypeFixerTest
 {
     private static Task Verifier(string code, string fixedCode, params DiagnosticResult[] expected)
     {
-        var test = new CSharpCodeFixTest<PreferOtherTypeAnalyzer, PreferOtherTypeFixer, DefaultVerifier>()
+        var test = new CSharpCodeFixTest<PreferOtherTypeAnalyzer, PreferOtherTypeFixer, NUnitVerifier>()
         {
             TestState =
             {

Robust.Analyzers.Tests/PrototypeInstantiationAnalyzerTest.cs

@@ -1,64 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PrototypeInstantiationAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-[TestOf(typeof(PrototypeInstantiationAnalyzer))]
-public sealed class PrototypeInstantiationAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new RTAnalyzerTest<PrototypeInstantiationAnalyzer>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Prototypes.Attributes.cs",
-            "Robust.Shared.Prototypes.IPrototype.cs",
-            "Robust.Shared.Serialization.Manager.Attributes.DataFieldAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Serialization;
-            using Robust.Shared.Prototypes;
-
-            [Prototype]
-            public sealed class FooPrototype : IPrototype
-            {
-                [IdDataField]
-                public string ID { get; private set; } = default!;
-            }
-
-            public static class Bad
-            {
-                public static FooPrototype Real()
-                {
-                    return new FooPrototype();
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(15,16): warning RA0039: Do not instantiate prototypes directly. Prototypes should always be instantiated by the prototype manager.
-            VerifyCS.Diagnostic().WithSpan(15, 16, 15, 34));
-    }
-}

Robust.Analyzers.Tests/PrototypeNetSerializableAnalyzerTest.cs

@@ -1,61 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Testing;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Robust.Analyzers.PrototypeNetSerializableAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-[TestOf(typeof(PrototypeNetSerializableAnalyzer))]
-public sealed class PrototypeNetSerializableAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new RTAnalyzerTest<PrototypeNetSerializableAnalyzer>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Serialization.NetSerializableAttribute.cs",
-            "Robust.Shared.Prototypes.Attributes.cs",
-            "Robust.Shared.Prototypes.IPrototype.cs",
-            "Robust.Shared.Serialization.Manager.Attributes.DataFieldAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using System;
-            using Robust.Shared.Serialization;
-            using Robust.Shared.Prototypes;
-
-            [Prototype]
-            [Serializable, NetSerializable]
-            public sealed class FooPrototype : IPrototype
-            {
-                [IdDataField]
-                public string ID { get; private set; } = default!;
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(7,21): warning RA0037: Type FooPrototype is a prototype and marked as [NetSerializable]. Prototypes should not be directly sent over the network, send their IDs instead.
-            VerifyCS.Diagnostic(PrototypeNetSerializableAnalyzer.RuleNetSerializable).WithSpan(7, 21, 7, 33).WithArguments("FooPrototype"),
-            // /0/Test0.cs(7,21): warning RA0038: Type FooPrototype is a prototype and marked as [Serializable]. Prototypes should not be directly sent over the network, send their IDs instead.
-            VerifyCS.Diagnostic(PrototypeNetSerializableAnalyzer.RuleSerializable).WithSpan(7, 21, 7, 33).WithArguments("FooPrototype"));
-    }
-}

Robust.Analyzers.Tests/RTAnalyzerTest.cs

@@ -1,17 +0,0 @@
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Testing;
-
-namespace Robust.Analyzers.Tests;
-
-public sealed class RTAnalyzerTest<TAnalyzer> : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
-    where TAnalyzer : DiagnosticAnalyzer, new()
-{
-    protected override ParseOptions CreateParseOptions()
-    {
-        var baseOptions = (CSharpParseOptions) base.CreateParseOptions();
-        return baseOptions.WithPreprocessorSymbols("ROBUST_ANALYZERS_TEST");
-    }
-}

Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj

@@ -13,14 +13,7 @@
     <EmbeddedResource Include="..\Robust.Shared\Analyzers\MustCallBaseAttribute.cs" LogicalName="Robust.Shared.IoC.MustCallBaseAttribute.cs" LinkBase="Implementations" />
     <EmbeddedResource Include="..\Robust.Shared\Analyzers\PreferNonGenericVariantForAttribute.cs" LogicalName="Robust.Shared.Analyzers.PreferNonGenericVariantForAttribute.cs" LinkBase="Implementations" />
     <EmbeddedResource Include="..\Robust.Shared\Analyzers\PreferOtherTypeAttribute.cs" LogicalName="Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\ForbidLiteralAttribute.cs" LogicalName="Robust.Shared.Analyzers.ForbidLiteralAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\ObsoleteInheritanceAttribute.cs" LogicalName="Robust.Shared.Analyzers.ObsoleteInheritanceAttribute.cs" LinkBase="Implementations" />
     <EmbeddedResource Include="..\Robust.Shared\IoC\DependencyAttribute.cs" LogicalName="Robust.Shared.IoC.DependencyAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\GameObjects\EventBusAttributes.cs" LogicalName="Robust.Shared.GameObjects.EventBusAttributes.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Serialization\NetSerializableAttribute.cs" LogicalName="Robust.Shared.Serialization.NetSerializableAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Prototypes\Attributes.cs" LogicalName="Robust.Shared.Prototypes.Attributes.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Prototypes\IPrototype.cs" LogicalName="Robust.Shared.Prototypes.IPrototype.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Serialization\Manager\Attributes\DataFieldAttribute.cs" LogicalName="Robust.Shared.Serialization.Manager.Attributes.DataFieldAttribute.cs" LinkBase="Implementations" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -34,17 +27,13 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing"/>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"/>
     <PackageReference Include="NUnit"/>
     <PackageReference Include="NUnit3TestAdapter"/>
     <PackageReference Include="NUnit.Analyzers"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk"/>
-
-    <!-- Needed to fix transitive dependency versions -->
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-    <PackageReference Include="System.Formats.Asn1" />
   </ItemGroup>
 
   <ItemGroup>

Robust.Analyzers/ByRefEventAnalyzer.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
@@ -24,7 +24,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
         "Make sure that methods subscribing to a ref event have the ref keyword for the event argument."
     );
 
-    public static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
+    private static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
         Diagnostics.IdByRefEventRaisedByValue,
         "By-ref event raised by value",
         "Tried to raise a by-ref event '{0}' by value",
@@ -34,7 +34,7 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
         "Make sure to use the ref keyword when raising ref events."
     );
 
-    public static readonly DiagnosticDescriptor ByValueEventRaisedByRefRule = new(
+    private static readonly DiagnosticDescriptor ByValueEventRaisedByRefRule = new(
         Diagnostics.IdValueEventRaisedByRef,
         "Value event raised by-ref",
         "Tried to raise a value event '{0}' by-ref",
@@ -54,44 +54,32 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     {
         context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
         context.EnableConcurrentExecution();
-        context.RegisterCompilationStartAction(compilationContext =>
-        {
-            var raiseMethods = compilationContext.Compilation
-                .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
-                .GetMembers()
-                .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
-                .Cast<IMethodSymbol>();
-
-            var busRaiseMethods = compilationContext.Compilation
-                .GetTypeByMetadataName("Robust.Shared.GameObjects.EntityEventBus")?
-                .GetMembers()
-                .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
-                .Cast<IMethodSymbol>();
-
-            if (raiseMethods == null)
-                return;
-
-            if (busRaiseMethods != null)
-                raiseMethods = raiseMethods.Concat(busRaiseMethods);
-
-            var raiseMethodsArray = raiseMethods.ToArray();
-
-            compilationContext.RegisterOperationAction(
-                ctx => CheckEventRaise(ctx, raiseMethodsArray),
-                OperationKind.Invocation);
-        });
+        context.RegisterOperationAction(CheckEventRaise, OperationKind.Invocation);
     }
 
-    private static void CheckEventRaise(
-        OperationAnalysisContext context,
-        IReadOnlyCollection<IMethodSymbol> raiseMethods)
+    private void CheckEventRaise(OperationAnalysisContext context)
     {
         if (context.Operation is not IInvocationOperation operation)
             return;
 
-        if (!operation.TargetMethod.Name.Contains("RaiseLocalEvent"))
+        var raiseMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
+            .Cast<IMethodSymbol>();
+
+        var busRaiseMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntityEventBus")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("RaiseLocalEvent") && m.Kind == SymbolKind.Method)
+            .Cast<IMethodSymbol>();
+
+        if (raiseMethods == null)
             return;
 
+        if (busRaiseMethods != null)
+            raiseMethods = raiseMethods.Concat(busRaiseMethods);
+
         if (!raiseMethods.Any(m => m.Equals(operation.TargetMethod.OriginalDefinition, Default)))
         {
             // If you try to do this normally by concatenating like busRaiseMethods above

Robust.Analyzers/DataDefinitionAnalyzer.cs

@@ -18,11 +18,10 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private const string ImplicitDataDefinitionNamespace = "Robust.Shared.Serialization.Manager.Attributes.ImplicitDataDefinitionForInheritorsAttribute";
     private const string DataFieldBaseNamespace = "Robust.Shared.Serialization.Manager.Attributes.DataFieldBaseAttribute";
     private const string ViewVariablesNamespace = "Robust.Shared.ViewVariables.ViewVariablesAttribute";
-    private const string NotYamlSerializableName = "Robust.Shared.Serialization.Manager.Attributes.NotYamlSerializableAttribute";
     private const string DataFieldAttributeName = "DataField";
     private const string ViewVariablesAttributeName = "ViewVariables";
 
-    public static readonly DiagnosticDescriptor DataDefinitionPartialRule = new(
+    private static readonly DiagnosticDescriptor DataDefinitionPartialRule = new(
         Diagnostics.IdDataDefinitionPartial,
         "Type must be partial",
         "Type {0} is a DataDefinition but is not partial",
@@ -32,7 +31,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         "Make sure to mark any type that is a data definition as partial."
     );
 
-    public static readonly DiagnosticDescriptor NestedDataDefinitionPartialRule = new(
+    private static readonly DiagnosticDescriptor NestedDataDefinitionPartialRule = new(
         Diagnostics.IdNestedDataDefinitionPartial,
         "Type must be partial",
         "Type {0} contains nested data definition {1} but is not partial",
@@ -42,7 +41,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         "Make sure to mark any type containing a nested data definition as partial."
     );
 
-    public static readonly DiagnosticDescriptor DataFieldWritableRule = new(
+    private static readonly DiagnosticDescriptor DataFieldWritableRule = new(
         Diagnostics.IdDataFieldWritable,
         "Data field must not be readonly",
         "Data field {0} in data definition {1} is readonly",
@@ -52,7 +51,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         "Make sure to remove the readonly modifier."
     );
 
-    public static readonly DiagnosticDescriptor DataFieldPropertyWritableRule = new(
+    private static readonly DiagnosticDescriptor DataFieldPropertyWritableRule = new(
         Diagnostics.IdDataFieldPropertyWritable,
         "Data field property must have a setter",
         "Data field property {0} in data definition {1} does not have a setter",
@@ -62,7 +61,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         "Make sure to add a setter."
     );
 
-    public static readonly DiagnosticDescriptor DataFieldRedundantTagRule = new(
+    private static readonly DiagnosticDescriptor DataFieldRedundantTagRule = new(
         Diagnostics.IdDataFieldRedundantTag,
         "Data field has redundant tag specified",
         "Data field {0} in data definition {1} has an explicitly set tag that matches autogenerated tag",
@@ -82,19 +81,9 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         "Make sure to remove the ViewVariables attribute."
     );
 
-    public static readonly DiagnosticDescriptor DataFieldYamlSerializableRule = new(
-        Diagnostics.IdDataFieldYamlSerializable,
-        "Data field type is not YAML serializable",
-        "Data field {0} in data definition {1} is type {2}, which is not YAML serializable",
-        "Usage",
-        DiagnosticSeverity.Error,
-        true,
-        "Make sure to use a type that is YAML serializable."
-    );
-
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
         DataDefinitionPartialRule, NestedDataDefinitionPartialRule, DataFieldWritableRule, DataFieldPropertyWritableRule,
-        DataFieldRedundantTagRule, DataFieldNoVVReadWriteRule, DataFieldYamlSerializableRule
+        DataFieldRedundantTagRule, DataFieldNoVVReadWriteRule
     );
 
     public override void Initialize(AnalysisContext context)
@@ -102,31 +91,23 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.None);
         context.EnableConcurrentExecution();
 
-        context.RegisterSymbolStartAction(symbolContext =>
-        {
-            if (symbolContext.Symbol is not INamedTypeSymbol typeSymbol)
-                return;
+        context.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.ClassDeclaration);
+        context.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.StructDeclaration);
+        context.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.RecordDeclaration);
+        context.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.RecordStructDeclaration);
+        context.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.InterfaceDeclaration);
 
-            if (!IsDataDefinition(typeSymbol))
-                return;
-
-            symbolContext.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.ClassDeclaration);
-            symbolContext.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.StructDeclaration);
-            symbolContext.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.RecordDeclaration);
-            symbolContext.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.RecordStructDeclaration);
-            symbolContext.RegisterSyntaxNodeAction(AnalyzeDataDefinition, SyntaxKind.InterfaceDeclaration);
-
-            symbolContext.RegisterSyntaxNodeAction(AnalyzeDataField, SyntaxKind.FieldDeclaration);
-            symbolContext.RegisterSyntaxNodeAction(AnalyzeDataFieldProperty, SyntaxKind.PropertyDeclaration);
-        }, SymbolKind.NamedType);
+        context.RegisterSyntaxNodeAction(AnalyzeDataField, SyntaxKind.FieldDeclaration);
+        context.RegisterSyntaxNodeAction(AnalyzeDataFieldProperty, SyntaxKind.PropertyDeclaration);
     }
 
-    private static void AnalyzeDataDefinition(SyntaxNodeAnalysisContext context)
+    private void AnalyzeDataDefinition(SyntaxNodeAnalysisContext context)
     {
         if (context.Node is not TypeDeclarationSyntax declaration)
             return;
 
-        if (context.ContainingSymbol is not INamedTypeSymbol type)
+        var type = context.SemanticModel.GetDeclaredSymbol(declaration)!;
+        if (!IsDataDefinition(type))
             return;
 
         if (!IsPartial(declaration))
@@ -137,7 +118,7 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         var containingType = type.ContainingType;
         while (containingType != null)
         {
-            var containingTypeDeclaration = (TypeDeclarationSyntax)containingType.DeclaringSyntaxReferences[0].GetSyntax();
+            var containingTypeDeclaration = (TypeDeclarationSyntax) containingType.DeclaringSyntaxReferences[0].GetSyntax();
             if (!IsPartial(containingTypeDeclaration))
             {
                 context.ReportDiagnostic(Diagnostic.Create(NestedDataDefinitionPartialRule, containingTypeDeclaration.Keyword.GetLocation(), containingType.Name, type.Name));
@@ -147,31 +128,31 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         }
     }
 
-    private static void AnalyzeDataField(SyntaxNodeAnalysisContext context)
+    private void AnalyzeDataField(SyntaxNodeAnalysisContext context)
     {
         if (context.Node is not FieldDeclarationSyntax field)
             return;
 
-        if (context.ContainingSymbol?.ContainingType is not INamedTypeSymbol type)
+        var typeDeclaration = field.FirstAncestorOrSelf<TypeDeclarationSyntax>();
+        if (typeDeclaration == null)
+            return;
+
+        var type = context.SemanticModel.GetDeclaredSymbol(typeDeclaration)!;
+        if (!IsDataDefinition(type))
             return;
 
         foreach (var variable in field.Declaration.Variables)
         {
             var fieldSymbol = context.SemanticModel.GetDeclaredSymbol(variable);
-
             if (fieldSymbol == null)
                 continue;
 
-            if (!IsDataField(fieldSymbol, out _, out var datafieldAttribute))
-                continue;
-
             if (IsReadOnlyDataField(type, fieldSymbol))
             {
-                TryGetModifierLocation(field, SyntaxKind.ReadOnlyKeyword, out var location);
-                context.ReportDiagnostic(Diagnostic.Create(DataFieldWritableRule, location, fieldSymbol.Name, type.Name));
+                context.ReportDiagnostic(Diagnostic.Create(DataFieldWritableRule, context.Node.GetLocation(), fieldSymbol.Name, type.Name));
             }
 
-            if (HasRedundantTag(fieldSymbol, datafieldAttribute))
+            if (HasRedundantTag(fieldSymbol))
             {
                 TryGetAttributeLocation(field, DataFieldAttributeName, out var location);
                 context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, location, fieldSymbol.Name, type.Name));
@@ -182,49 +163,32 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
                 TryGetAttributeLocation(field, ViewVariablesAttributeName, out var location);
                 context.ReportDiagnostic(Diagnostic.Create(DataFieldNoVVReadWriteRule, location, fieldSymbol.Name, type.Name));
             }
-
-            if (context.SemanticModel.GetSymbolInfo(field.Declaration.Type).Symbol is not ITypeSymbol fieldTypeSymbol)
-                continue;
-
-            if (IsNotYamlSerializable(fieldSymbol, fieldTypeSymbol))
-            {
-                context.ReportDiagnostic(Diagnostic.Create(DataFieldYamlSerializableRule,
-                    (context.Node as FieldDeclarationSyntax)?.Declaration.Type.GetLocation(),
-                    fieldSymbol.Name,
-                    type.Name,
-                    fieldTypeSymbol.MetadataName
-                ));
-            }
         }
     }
 
-    private static void AnalyzeDataFieldProperty(SyntaxNodeAnalysisContext context)
+    private void AnalyzeDataFieldProperty(SyntaxNodeAnalysisContext context)
     {
         if (context.Node is not PropertyDeclarationSyntax property)
             return;
 
-        if (context.ContainingSymbol is not IPropertySymbol propertySymbol)
+        var typeDeclaration = property.FirstAncestorOrSelf<TypeDeclarationSyntax>();
+        if (typeDeclaration == null)
             return;
 
-        if (propertySymbol.ContainingType is not INamedTypeSymbol type)
-            return;
-
-        if (type.IsRecord || type.IsValueType)
+        var type = context.SemanticModel.GetDeclaredSymbol(typeDeclaration)!;
+        if (!IsDataDefinition(type) || type.IsRecord || type.IsValueType)
             return;
 
+        var propertySymbol = context.SemanticModel.GetDeclaredSymbol(property);
         if (propertySymbol == null)
             return;
 
-        if (!IsDataField(propertySymbol, out _, out var datafieldAttribute))
-            return;
-
         if (IsReadOnlyDataField(type, propertySymbol))
         {
-            var location = property.AccessorList != null ? property.AccessorList.GetLocation() : property.GetLocation();
-            context.ReportDiagnostic(Diagnostic.Create(DataFieldPropertyWritableRule, location, propertySymbol.Name, type.Name));
+            context.ReportDiagnostic(Diagnostic.Create(DataFieldPropertyWritableRule, context.Node.GetLocation(), propertySymbol.Name, type.Name));
         }
 
-        if (HasRedundantTag(propertySymbol, datafieldAttribute))
+        if (HasRedundantTag(propertySymbol))
         {
             TryGetAttributeLocation(property, DataFieldAttributeName, out var location);
             context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, location, propertySymbol.Name, type.Name));
@@ -235,23 +199,13 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
             TryGetAttributeLocation(property, ViewVariablesAttributeName, out var location);
             context.ReportDiagnostic(Diagnostic.Create(DataFieldNoVVReadWriteRule, location, propertySymbol.Name, type.Name));
         }
-
-        if (context.SemanticModel.GetSymbolInfo(property.Type).Symbol is not ITypeSymbol propertyTypeSymbol)
-            return;
-
-        if (IsNotYamlSerializable(propertySymbol, propertyTypeSymbol))
-        {
-            context.ReportDiagnostic(Diagnostic.Create(DataFieldYamlSerializableRule,
-                (context.Node as PropertyDeclarationSyntax)?.Type.GetLocation(),
-                propertySymbol.Name,
-                type.Name,
-                propertyTypeSymbol.Name
-            ));
-        }
     }
 
     private static bool IsReadOnlyDataField(ITypeSymbol type, ISymbol field)
     {
+        if (!IsDataField(field, out _, out _))
+            return false;
+
         return IsReadOnlyMember(type, field);
     }
 
@@ -331,20 +285,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         return false;
     }
 
-    private static bool TryGetModifierLocation(MemberDeclarationSyntax syntax, SyntaxKind modifierKind, out Location location)
-    {
-        foreach (var modifier in syntax.Modifiers)
-        {
-            if (modifier.IsKind(modifierKind))
-            {
-                location = modifier.GetLocation();
-                return true;
-            }
-        }
-        location = syntax.GetLocation();
-        return false;
-    }
-
     private static bool IsReadOnlyMember(ITypeSymbol type, ISymbol member)
     {
         if (member is IFieldSymbol field)
@@ -376,14 +316,17 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         return false;
     }
 
-    private static bool HasRedundantTag(ISymbol symbol, AttributeData datafieldAttribute)
+    private static bool HasRedundantTag(ISymbol symbol)
     {
+        if (!IsDataField(symbol, out var _, out var attribute))
+            return false;
+
         // No args, no problem
-        if (datafieldAttribute.ConstructorArguments.Length == 0)
+        if (attribute.ConstructorArguments.Length == 0)
             return false;
 
         // If a tag is explicitly specified, it will be the first argument...
-        var tagArgument = datafieldAttribute.ConstructorArguments[0];
+        var tagArgument = attribute.ConstructorArguments[0];
         // ...but the first arg could also something else, since tag is optional
         // so we make sure that it's a string
         if (tagArgument.Value is not string explicitName)
@@ -398,6 +341,9 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
 
     private static bool HasVVReadWrite(ISymbol symbol)
     {
+        if (!IsDataField(symbol, out _, out _))
+            return false;
+
         // Make sure it has ViewVariablesAttribute
         AttributeData? viewVariablesAttribute = null;
         foreach (var attr in symbol.GetAttributes())
@@ -421,11 +367,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         return (VVAccess)accessByte == VVAccess.ReadWrite;
     }
 
-    private static bool IsNotYamlSerializable(ISymbol field, ITypeSymbol type)
-    {
-        return HasAttribute(type, NotYamlSerializableName);
-    }
-
     private static bool IsImplicitDataDefinition(ITypeSymbol type)
     {
         if (HasAttribute(type, ImplicitDataDefinitionNamespace))

Robust.Analyzers/ForbidLiteralAnalyzer.cs

@@ -1,101 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class ForbidLiteralAnalyzer : DiagnosticAnalyzer
-{
-    private const string ForbidLiteralType = "Robust.Shared.Analyzers.ForbidLiteralAttribute";
-
-    public static DiagnosticDescriptor ForbidLiteralRule = new(
-        Diagnostics.IdForbidLiteral,
-        "Parameter forbids literal values",
-        "The {0} parameter of {1} forbids literal values",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true,
-        "Pass in a validated wrapper type like ProtoId, or a const or static value."
-    );
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => [ForbidLiteralRule];
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
-        context.EnableConcurrentExecution();
-        context.RegisterOperationAction(AnalyzeOperation, OperationKind.Invocation);
-    }
-
-    private void AnalyzeOperation(OperationAnalysisContext context)
-    {
-        if (context.Operation is not IInvocationOperation invocationOperation)
-            return;
-
-        // Check each parameter of the method invocation
-        foreach (var argumentOperation in invocationOperation.Arguments)
-        {
-            // Check for our attribute on the parameter
-            if (!AttributeHelper.HasAttribute(argumentOperation.Parameter, ForbidLiteralType, out _))
-                continue;
-
-            // Handle parameters using the params keyword
-            if (argumentOperation.Syntax is InvocationExpressionSyntax subExpressionSyntax)
-            {
-                // Check each param value
-                foreach (var subArgument in subExpressionSyntax.ArgumentList.Arguments)
-                {
-                    CheckArgumentSyntax(context, argumentOperation, subArgument);
-                }
-                continue;
-            }
-
-            // Not params, so just check the single parameter
-            if (argumentOperation.Syntax is not ArgumentSyntax argumentSyntax)
-                continue;
-
-            CheckArgumentSyntax(context, argumentOperation, argumentSyntax);
-        }
-    }
-
-    private void CheckArgumentSyntax(OperationAnalysisContext context, IArgumentOperation operation, ArgumentSyntax argumentSyntax)
-    {
-        // Handle collection types
-        if (argumentSyntax.Expression is CollectionExpressionSyntax collectionExpressionSyntax)
-        {
-            // Check each value of the collection
-            foreach (var elementSyntax in collectionExpressionSyntax.Elements)
-            {
-                if (elementSyntax is not ExpressionElementSyntax expressionSyntax)
-                    continue;
-
-                // Check if a literal was passed in
-                if (expressionSyntax.Expression is not LiteralExpressionSyntax)
-                    continue;
-
-                context.ReportDiagnostic(Diagnostic.Create(ForbidLiteralRule,
-                    expressionSyntax.GetLocation(),
-                    operation.Parameter.Name,
-                    (context.Operation as IInvocationOperation).TargetMethod.Name
-                ));
-            }
-            return;
-        }
-
-        // Not a collection, just a single value to check
-        // Check if it's a literal
-        if (argumentSyntax.Expression is not LiteralExpressionSyntax)
-            return;
-
-        context.ReportDiagnostic(Diagnostic.Create(ForbidLiteralRule,
-            argumentSyntax.GetLocation(),
-            operation.Parameter.Name,
-            (context.Operation as IInvocationOperation).TargetMethod.Name
-        ));
-    }
-}

Robust.Analyzers/ObsoleteInheritanceAnalyzer.cs

@@ -1,75 +0,0 @@
-#nullable enable
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class ObsoleteInheritanceAnalyzer : DiagnosticAnalyzer
-{
-    private const string Attribute = "Robust.Shared.Analyzers.ObsoleteInheritanceAttribute";
-
-    public static readonly DiagnosticDescriptor Rule = new(
-        Diagnostics.IdObsoleteInheritance,
-        "Parent type has obsoleted inheritance",
-        "Type '{0}' inherits from '{1}', which has obsoleted inheriting from itself",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public static readonly DiagnosticDescriptor RuleWithMessage = new(
-        Diagnostics.IdObsoleteInheritanceWithMessage,
-        "Parent type has obsoleted inheritance",
-        "Type '{0}' inherits from '{1}', which has obsoleted inheriting from itself: \"{2}\"",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => [Rule, RuleWithMessage];
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.EnableConcurrentExecution();
-        context.RegisterSymbolAction(CheckClass, SymbolKind.NamedType);
-    }
-
-    private static void CheckClass(SymbolAnalysisContext context)
-    {
-        if (context.Symbol is not INamedTypeSymbol typeSymbol)
-            return;
-
-        if (typeSymbol.IsValueType || typeSymbol.BaseType is not { } baseType)
-            return;
-
-        if (!AttributeHelper.HasAttribute(baseType, Attribute, out var data))
-            return;
-
-        var location = context.Symbol.Locations[0];
-
-        if (GetMessageFromAttributeData(data) is { } message)
-        {
-            context.ReportDiagnostic(Diagnostic.Create(
-                RuleWithMessage,
-                location,
-                [typeSymbol.Name, baseType.Name, message]));
-        }
-        else
-        {
-            context.ReportDiagnostic(Diagnostic.Create(
-                Rule,
-                location,
-                [typeSymbol.Name, baseType.Name]));
-        }
-    }
-
-    private static string? GetMessageFromAttributeData(AttributeData data)
-    {
-        if (data.ConstructorArguments is not [var message, ..])
-            return null;
-
-        return message.Value as string;
-    }
-}

Robust.Analyzers/PrototypeInstantiationAnalyzer.cs

@@ -1,48 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class PrototypeInstantiationAnalyzer : DiagnosticAnalyzer
-{
-    private const string PrototypeInterfaceType = "Robust.Shared.Prototypes.IPrototype";
-
-    public static readonly DiagnosticDescriptor Rule = new(
-        Diagnostics.IdPrototypeInstantiation,
-        "Do not instantiate prototypes directly",
-        "Do not instantiate prototypes directly. Prototypes should always be instantiated by the prototype manager.",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => [Rule];
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.EnableConcurrentExecution();
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.RegisterCompilationStartAction(static ctx =>
-        {
-            var prototypeInterface = ctx.Compilation.GetTypeByMetadataName(PrototypeInterfaceType);
-            if (prototypeInterface == null)
-                return;
-
-            ctx.RegisterOperationAction(symContext => Check(prototypeInterface, symContext), OperationKind.ObjectCreation);
-        });
-    }
-
-    private static void Check(INamedTypeSymbol prototypeInterface, OperationAnalysisContext ctx)
-    {
-        if (ctx.Operation is not IObjectCreationOperation { Type: { } resultType } creationOp)
-            return;
-
-        if (!TypeSymbolHelper.ImplementsInterface(resultType, prototypeInterface))
-            return;
-
-        ctx.ReportDiagnostic(Diagnostic.Create(Rule, creationOp.Syntax.GetLocation()));
-    }
-}

Robust.Analyzers/PrototypeNetSerializableAnalyzer.cs

@@ -1,76 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class PrototypeNetSerializableAnalyzer : DiagnosticAnalyzer
-{
-    private const string PrototypeInterfaceType = "Robust.Shared.Prototypes.IPrototype";
-    private const string NetSerializableAttributeType = "Robust.Shared.Serialization.NetSerializableAttribute";
-
-    public static readonly DiagnosticDescriptor RuleNetSerializable = new(
-        Diagnostics.IdPrototypeNetSerializable,
-        "Prototypes should not be [NetSerializable]",
-        "Type {0} is a prototype and marked as [NetSerializable]. Prototypes should not be directly sent over the network, send their IDs instead.",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-
-    public static readonly DiagnosticDescriptor RuleSerializable = new(
-        Diagnostics.IdPrototypeSerializable,
-        "Prototypes should not be [Serializable]",
-        "Type {0} is a prototype and marked as [Serializable]. Prototypes should not be directly sent over the network, send their IDs instead.",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => [
-        RuleNetSerializable,
-        RuleSerializable
-    ];
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.EnableConcurrentExecution();
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-
-        context.RegisterCompilationStartAction(static ctx =>
-        {
-            var prototypeInterface = ctx.Compilation.GetTypeByMetadataName(PrototypeInterfaceType);
-            var netSerializableAttribute = ctx.Compilation.GetTypeByMetadataName(NetSerializableAttributeType);
-
-            if (prototypeInterface == null || netSerializableAttribute == null)
-                return;
-
-            ctx.RegisterSymbolAction(symbolContext => CheckClass(prototypeInterface, netSerializableAttribute, symbolContext), SymbolKind.NamedType);
-        });
-    }
-
-    private static void CheckClass(
-        INamedTypeSymbol prototypeInterface,
-        INamedTypeSymbol netSerializableAttribute,
-        SymbolAnalysisContext symbolContext)
-    {
-        if (symbolContext.Symbol is not INamedTypeSymbol symbol)
-            return;
-
-        if (!TypeSymbolHelper.ImplementsInterface(symbol, prototypeInterface))
-            return;
-
-        if (AttributeHelper.HasAttribute(symbol, netSerializableAttribute, out _))
-        {
-            symbolContext.ReportDiagnostic(
-                Diagnostic.Create(RuleNetSerializable, symbol.Locations[0], symbol.ToDisplayString()));
-        }
-
-        if (symbol.IsSerializable)
-        {
-            symbolContext.ReportDiagnostic(
-                Diagnostic.Create(RuleSerializable, symbol.Locations[0], symbol.ToDisplayString()));
-        }
-    }
-}

Robust.Benchmarks/EntityManager/HasComponentBenchmark.cs

@@ -1,96 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Engines;
-using JetBrains.Annotations;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.EntityManager;
-
-[Virtual]
-public partial class HasComponentBenchmark
-{
-    private static readonly Consumer Consumer = new();
-
-    private ISimulation _simulation = default!;
-    private IEntityManager _entityManager = default!;
-
-    private ComponentRegistration _compReg = default!;
-
-    private A _dummyA = new();
-
-    [UsedImplicitly]
-    [Params(1, 10, 100, 1000)]
-    public int N;
-
-    [GlobalSetup]
-    public void GlobalSetup()
-    {
-        _simulation = RobustServerSimulation
-            .NewSimulation()
-            .RegisterComponents(f => f.RegisterClass<A>())
-            .InitializeInstance();
-
-        _entityManager = _simulation.Resolve<IEntityManager>();
-        var map = _simulation.CreateMap().Uid;
-        var coords = new EntityCoordinates(map, default);
-        _compReg = _entityManager.ComponentFactory.GetRegistration(typeof(A));
-
-        for (var i = 0; i < N; i++)
-        {
-            var uid = _entityManager.SpawnEntity(null, coords);
-            _entityManager.AddComponent<A>(uid);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentGeneric()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var result = _entityManager.HasComponent<A>(uid);
-            Consumer.Consume(result);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentCompReg()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var result = _entityManager.HasComponent(uid, _compReg);
-            Consumer.Consume(result);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentType()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var result = _entityManager.HasComponent(uid, typeof(A));
-            Consumer.Consume(result);
-        }
-    }
-
-    [Benchmark]
-    public void HasComponentGetType()
-    {
-        for (var i = 2; i <= N+1; i++)
-        {
-            var uid = new EntityUid(i);
-            var type = _dummyA.GetType();
-            var result = _entityManager.HasComponent(uid, type);
-            Consumer.Consume(result);
-        }
-    }
-
-    [ComponentProtoName("A")]
-    public sealed partial class A : Component
-    {
-    }
-}

Robust.Benchmarks/Physics/TumblerBenchmark.cs

@@ -26,10 +26,10 @@ public class PhysicsTumblerBenchmark
         var entManager = _sim.Resolve<IEntityManager>();
         var physics = entManager.System<SharedPhysicsSystem>();
         var fixtures = entManager.System<FixtureSystem>();
-        var mapUid = entManager.System<SharedMapSystem>().CreateMap(out var mapId);
+        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
         SetupTumbler(entManager, mapId);
 
-        for (var i = 0; i < 300; i++)
+        for (var i = 0; i < 800; i++)
         {
             entManager.TickUpdate(0.016f, false);
             var boxUid = entManager.SpawnEntity(null, new MapCoordinates(0f, 10f, mapId));
@@ -42,9 +42,6 @@ public class PhysicsTumblerBenchmark
             physics.WakeBody(boxUid, body: box);
             physics.SetSleepingAllowed(boxUid, box, false);
         }
-
-        if (entManager.TryGetComponent(mapUid, out BroadphaseComponent? mapBroadphase))
-            entManager.System<SharedBroadphaseSystem>().RebuildBottomUp(mapBroadphase);
     }
 
     [Benchmark]
@@ -52,7 +49,7 @@ public class PhysicsTumblerBenchmark
     {
         var entManager = _sim.Resolve<IEntityManager>();
 
-        for (var i = 0; i < 1000; i++)
+        for (var i = 0; i < 5000; i++)
         {
             entManager.TickUpdate(0.016f, false);
         }

Robust.Benchmarks/Robust.Benchmarks.csproj

@@ -19,10 +19,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
-
-    <!-- Needed to pin transitive dependency versions. -->
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
-    <PackageReference Include="System.Formats.Asn1" />
   </ItemGroup>
 
   <Import Project="..\MSBuild\Robust.Properties.targets" />

Robust.Benchmarks/Transform/RecursiveMoveBenchmark.cs

@@ -42,8 +42,8 @@ public class RecursiveMoveBenchmark : RobustIntegrationTest
     public void GlobalSetup()
     {
         ProgramShared.PathOffset = "../../../../";
-        var server = StartServer(new() {Pool = false});
-        var client = StartClient(new() {Pool = false});
+        var server = StartServer();
+        var client = StartClient();
 
         Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()).Wait();
 

Robust.Client.NameGenerator/XamlUiPartialClassGenerator.cs

@@ -15,9 +15,6 @@ using XamlX.Transform;
 using XamlX.Transform.Transformers;
 using XamlX.TypeSystem;
 
-// Yes dude I know this source generator isn't incremental, I'll fix it eventually.
-#pragma warning disable RS1035
-
 namespace Robust.Client.NameGenerator
 {
     /// <summary>

Robust.Client.WebView/Cef/BaseRobustCefClient.cs

@@ -64,8 +64,6 @@ internal abstract class BaseRobustCefClient : CefClient
             string title,
             string defaultFilePath,
             string[] acceptFilters,
-            string[] acceptExtensions,
-            string[] acceptDescriptions,
             CefFileDialogCallback callback)
         {
             callback.Cancel();

Robust.Client.WebView/Cef/Program.cs

@@ -6,7 +6,7 @@ using Xilium.CefGlue;
 
 namespace Robust.Client.WebView.Cef
 {
-    public static class Program
+    internal static class Program
     {
         // This was supposed to be the main entry for the subprocess program... It doesn't work.
         public static int Main(string[] args)

Robust.Client.WebView/Cef/RobustCefApp.cs

@@ -44,8 +44,6 @@ namespace Robust.Client.WebView.Cef
             //commandLine.AppendSwitch("--disable-gpu-compositing");
             //commandLine.AppendSwitch("--in-process-gpu");
 
-            commandLine.AppendSwitch("--off-screen-rendering-enabled");
-
             commandLine.AppendSwitch("disable-threaded-scrolling", "1");
             commandLine.AppendSwitch("disable-features", "TouchpadAndWheelScrollLatching,AsyncWheelEvents");
 

Robust.Client.WebView/Cef/WebViewManagerCef.BrowserWindow.cs

@@ -23,7 +23,6 @@ namespace Robust.Client.WebView.Cef
             var info = CefWindowInfo.Create();
             info.Bounds = new CefRectangle(0, 0, createParams.Width, createParams.Height);
             info.SetAsPopup(mainHWnd, "ss14cef");
-             info.RuntimeStyle = CefRuntimeStyle.Alloy;
 
             var impl = new WebViewWindowImpl(this);
 

Robust.Client.WebView/Cef/WebViewManagerCef.Control.cs

@@ -162,10 +162,9 @@ namespace Robust.Client.WebView.Cef
                 }
             }
 
-            public bool IsOpen => _data != null;
             public bool IsLoading => _data?.Browser.IsLoading ?? false;
 
-            public void StartBrowser()
+            public void EnteredTree()
             {
                 DebugTools.AssertNull(_data);
 
@@ -196,7 +195,7 @@ namespace Robust.Client.WebView.Cef
                 _data = new LiveData(texture, client, browser, renderer);
             }
 
-            public void CloseBrowser()
+            public void ExitedTree()
             {
                 DebugTools.AssertNotNull(_data);
 
@@ -485,27 +484,27 @@ namespace Robust.Client.WebView.Cef
             public void FocusEntered()
             {
                 if (_textInputActive)
-                    Owner.Root?.Window?.TextInputStart();
+                    _clyde.TextInputStart();
             }
 
             public void FocusExited()
             {
                 if (_textInputActive)
-                    Owner.Root?.Window?.TextInputStop();
+                    _clyde.TextInputStop();
             }
 
             public void TextInputStart()
             {
                 _textInputActive = true;
                 if (Owner.HasKeyboardFocus())
-                    Owner.Root?.Window?.TextInputStart();
+                    _clyde.TextInputStart();
             }
 
             public void TextInputStop()
             {
                 _textInputActive = false;
                 if (Owner.HasKeyboardFocus())
-                    Owner.Root?.Window?.TextInputStop();
+                    _clyde.TextInputStop();
             }
 
             private sealed class LiveData
@@ -588,11 +587,8 @@ namespace Robust.Client.WebView.Cef
                 }
             }
 
-            protected override void OnAcceleratedPaint(
-                CefBrowser browser,
-                CefPaintElementType type,
-                CefRectangle[] dirtyRects,
-                in CefAcceleratedPaintInfo info)
+            protected override void OnAcceleratedPaint(CefBrowser browser, CefPaintElementType type,
+                CefRectangle[] dirtyRects, IntPtr sharedHandle)
             {
                 // Unused, but we're forced to implement it so.. NOOP.
             }

Robust.Client.WebView/Cef/WebViewManagerCef.cs

@@ -5,6 +5,7 @@ using System.Net;
 using System.Reflection;
 using System.Text;
 using Robust.Client.Console;
+using Robust.Client.Utility;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.IoC;
@@ -24,6 +25,7 @@ namespace Robust.Client.WebView.Cef
 
         [Dependency] private readonly IDependencyCollection _dependencyCollection = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IGameControllerInternal _gameController = default!;
         [Dependency] private readonly IResourceManagerInternal _resourceManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
@@ -61,7 +63,10 @@ namespace Robust.Client.WebView.Cef
 
             var cachePath = "";
             if (_resourceManager.UserData is WritableDirProvider userData)
-                cachePath = userData.GetFullPath(new ResPath("/cef_cache"));
+            {
+                var rootDir = UserDataDir.GetRootUserDataDir(_gameController);
+                cachePath = Path.Combine(rootDir, "cef_cache", "0");
+            }
 
             var settings = new CefSettings()
             {

Robust.Client.WebView/Headless/WebViewManagerHeadless.cs

@@ -81,13 +81,11 @@ namespace Robust.Client.WebView.Headless
 
         private sealed class WebViewControlImplDummy : DummyBase, IWebViewControlImpl
         {
-            public bool IsOpen => false;
-
-            public void StartBrowser()
+            public void EnteredTree()
             {
             }
 
-            public void CloseBrowser()
+            public void ExitedTree()
             {
             }
 

Robust.Client.WebView/IWebViewControlImpl.cs

@@ -9,10 +9,8 @@ namespace Robust.Client.WebView
     /// </summary>
     internal interface IWebViewControlImpl : IWebViewControl
     {
-        public bool IsOpen { get; }
-
-        void StartBrowser();
-        void CloseBrowser();
+        void EnteredTree();
+        void ExitedTree();
         void MouseMove(GUIMouseMoveEventArgs args);
         void MouseExited();
         void MouseWheel(GUIMouseWheelEventArgs args);

Robust.Client.WebView/Robust.Client.WebView.csproj

@@ -5,7 +5,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>WinExe</OutputType>
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
-    <CETCompat>false</CETCompat>
   </PropertyGroup>
 
   <ItemGroup>

Robust.Client.WebView/WebViewControl.cs

@@ -14,7 +14,6 @@ namespace Robust.Client.WebView
         [Dependency] private readonly IWebViewManagerInternal _webViewManager = default!;
 
         private readonly IWebViewControlImpl _controlImpl;
-        private bool _alwaysActive;
 
         [ViewVariables(VVAccess.ReadWrite)]
         public string Url
@@ -23,21 +22,6 @@ namespace Robust.Client.WebView
             set => _controlImpl.Url = value;
         }
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool AlwaysActive
-        {
-            get => _alwaysActive;
-            set
-            {
-                _alwaysActive = value;
-
-                if (_alwaysActive && !_controlImpl.IsOpen)
-                    _controlImpl.StartBrowser();
-                else if (!_alwaysActive && _controlImpl.IsOpen && !IsInsideTree)
-                    _controlImpl.CloseBrowser();
-            }
-        }
-
         [ViewVariables] public bool IsLoading => _controlImpl.IsLoading;
 
         public WebViewControl()
@@ -55,16 +39,14 @@ namespace Robust.Client.WebView
         {
             base.EnteredTree();
 
-            if (!_controlImpl.IsOpen)
-                _controlImpl.StartBrowser();
+            _controlImpl.EnteredTree();
         }
 
         protected override void ExitedTree()
         {
             base.ExitedTree();
 
-            if (!_alwaysActive)
-                _controlImpl.CloseBrowser();
+            _controlImpl.ExitedTree();
         }
 
         protected internal override void MouseMove(GUIMouseMoveEventArgs args)

Robust.Client/Animations/AnimationTrackPlaySound.cs

@@ -40,7 +40,11 @@ namespace Robust.Client.Animations
                 var keyFrame = KeyFrames[keyFrameIndex];
 
                 var audioParams = keyFrame.AudioParamsFunc.Invoke();
-                IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AudioSystem>().PlayEntity(keyFrame.Specifier, Filter.Local(), entity, true, audioParams);
+                var audio = new SoundPathSpecifier(keyFrame.Resource)
+                {
+                    Params = audioParams
+                };
+                IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AudioSystem>().PlayEntity(audio, Filter.Local(), entity, true);
             }
 
             return (keyFrameIndex, playingTime);
@@ -51,7 +55,7 @@ namespace Robust.Client.Animations
             /// <summary>
             ///     The RSI state to play when this keyframe gets triggered.
             /// </summary>
-            public readonly ResolvedSoundSpecifier Specifier;
+            public readonly string Resource;
 
             /// <summary>
             ///     A function that returns the audio parameter to be used.
@@ -65,9 +69,9 @@ namespace Robust.Client.Animations
             /// </summary>
             public readonly float KeyTime;
 
-            public KeyFrame(ResolvedSoundSpecifier specifier, float keyTime, Func<AudioParams>? audioParams = null)
+            public KeyFrame(string resource, float keyTime, Func<AudioParams>? audioParams = null)
             {
-                Specifier = specifier;
+                Resource = resource;
                 KeyTime = keyTime;
                 AudioParamsFunc = audioParams ?? (() => AudioParams.Default);
             }

Robust.Client/Animations/AnimationTrackProperty.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Numerics;
 using Robust.Shared.Animations;
 using Robust.Shared.Maths;
+using Vector3 = Robust.Shared.Maths.Vector3;
+using Vector4 = Robust.Shared.Maths.Vector4;
 
 namespace Robust.Client.Animations
 {
@@ -11,7 +13,7 @@ namespace Robust.Client.Animations
     /// </summary>
     public abstract class AnimationTrackProperty : AnimationTrack
     {
-        public List<KeyFrame> KeyFrames { get; set; } = new();
+        public List<KeyFrame> KeyFrames { get; protected set; } = new();
 
         /// <summary>
         ///     How to interpolate values when between two keyframes.
@@ -120,9 +122,9 @@ namespace Robust.Client.Animations
                 case Vector2 vector2:
                     return Vector2Helpers.InterpolateCubic((Vector2) preA, vector2, (Vector2) b, (Vector2) postB, t);
                 case Vector3 vector3:
-                    return VectorHelpers.InterpolateCubic((Vector3) preA, vector3, (Vector3) b, (Vector3) postB, t);
+                    return Vector3.InterpolateCubic((Vector3) preA, vector3, (Vector3) b, (Vector3) postB, t);
                 case Vector4 vector4:
-                    return VectorHelpers.InterpolateCubic((Vector4) preA, vector4, (Vector4) b, (Vector4) postB, t);
+                    return Vector4.InterpolateCubic((Vector4) preA, vector4, (Vector4) b, (Vector4) postB, t);
                 case float f:
                     return MathHelper.InterpolateCubic((float) preA, f, (float) b, (float) postB, t);
                 case double d:

Robust.Client/Audio/AudioManager.Public.cs

@@ -84,19 +84,6 @@ internal partial class AudioManager
         AL.Listener(ALListenerfv.Orientation, ref at, ref up);
     }
 
-    void IAudioInternal.Remove(AudioStream stream)
-    {
-        if (stream.ClydeHandle == null)
-            return;
-
-        if (!_audioSampleBuffers.Remove(stream.BufferId))
-        {
-            return;
-        }
-
-        AL.DeleteBuffer(stream.BufferId);
-    }
-
     /// <inheritdoc/>
     public AudioStream LoadAudioOggVorbis(Stream stream, string? name = null)
     {
@@ -133,9 +120,9 @@ internal partial class AudioManager
         _checkAlError();
 
         var handle = new ClydeHandle(_audioSampleBuffers.Count);
-        _audioSampleBuffers.Add(buffer, new LoadedAudioSample(buffer));
+        _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
         var length = TimeSpan.FromSeconds(vorbis.TotalSamples / (double) vorbis.SampleRate);
-        return new AudioStream(this, buffer, handle, length, (int) vorbis.Channels, name, vorbis.Title, vorbis.Artist);
+        return new AudioStream(handle, length, (int) vorbis.Channels, name, vorbis.Title, vorbis.Artist);
     }
 
     /// <inheritdoc/>
@@ -192,9 +179,9 @@ internal partial class AudioManager
         _checkAlError();
 
         var handle = new ClydeHandle(_audioSampleBuffers.Count);
-        _audioSampleBuffers.Add(buffer, new LoadedAudioSample(buffer));
+        _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
         var length = TimeSpan.FromSeconds(wav.Data.Length / (double) wav.BlockAlign / wav.SampleRate);
-        return new AudioStream(this, buffer, handle, length, wav.NumChannels, name);
+        return new AudioStream(handle, length, wav.NumChannels, name);
     }
 
     /// <inheritdoc/>
@@ -223,8 +210,8 @@ internal partial class AudioManager
 
         var handle = new ClydeHandle(_audioSampleBuffers.Count);
         var length = TimeSpan.FromSeconds((double) samples.Length / channels / sampleRate);
-        _audioSampleBuffers.Add(buffer, new LoadedAudioSample(buffer));
-        return new AudioStream(this, buffer, handle, length, channels, name);
+        _audioSampleBuffers.Add(new LoadedAudioSample(buffer));
+        return new AudioStream(handle, length, channels, name);
     }
 
     public void SetMasterGain(float newGain)
@@ -306,7 +293,7 @@ internal partial class AudioManager
 
         // ReSharper disable once PossibleInvalidOperationException
         // TODO: This really shouldn't be indexing based on the ClydeHandle...
-        AL.Source(source, ALSourcei.Buffer, _audioSampleBuffers[stream.BufferId].BufferHandle);
+        AL.Source(source, ALSourcei.Buffer, _audioSampleBuffers[(int) stream.ClydeHandle!.Value].BufferHandle);
 
         var audioSource = new AudioSource(this, source, stream);
         _audioSources.Add(source, new WeakReference<BaseAudioSource>(audioSource));
@@ -383,12 +370,5 @@ internal partial class AudioManager
         }
 
         _bufferedAudioSources.Clear();
-
-        foreach (var buffer in _audioSampleBuffers.Values)
-        {
-            DeleteAudioBufferOnMainThread(buffer.BufferHandle);
-        }
-
-        _audioSampleBuffers.Clear();
     }
 }

Robust.Client/Audio/AudioManager.cs

@@ -5,7 +5,6 @@ using System.Threading;
 using OpenTK.Audio.OpenAL;
 using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
 using Robust.Client.Audio.Sources;
-using Robust.Client.ResourceManagement;
 using Robust.Shared;
 using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
@@ -18,15 +17,13 @@ internal sealed partial class AudioManager : IAudioInternal
 {
     [Shared.IoC.Dependency] private readonly IConfigurationManager _cfg = default!;
     [Shared.IoC.Dependency] private readonly ILogManager _logMan = default!;
-    [Shared.IoC.Dependency] private readonly IReloadManager _reload = default!;
-    [Shared.IoC.Dependency] private readonly IResourceCache _cache = default!;
 
     private Thread? _gameThread;
 
     private ALDevice _openALDevice;
     private ALContext _openALContext;
 
-    private readonly Dictionary<int, LoadedAudioSample> _audioSampleBuffers = new();
+    private readonly List<LoadedAudioSample> _audioSampleBuffers = new();
 
     private readonly Dictionary<int, WeakReference<BaseAudioSource>> _audioSources =
         new();
@@ -57,8 +54,8 @@ internal sealed partial class AudioManager : IAudioInternal
         _checkAlError();
 
         // Load up AL context extensions.
-        var s = ALC.GetString(_openALDevice, AlcGetString.Extensions) ?? "";
-        foreach (var extension in s.Split(' ', StringSplitOptions.RemoveEmptyEntries))
+        var s = ALC.GetString(ALDevice.Null, AlcGetString.Extensions) ?? "";
+        foreach (var extension in s.Split(' '))
         {
             _alContextExtensions.Add(extension);
         }
@@ -119,22 +116,6 @@ internal sealed partial class AudioManager : IAudioInternal
         IsEfxSupported = HasAlDeviceExtension("ALC_EXT_EFX");
 
         _cfg.OnValueChanged(CVars.AudioMasterVolume, SetMasterGain, true);
-
-        _reload.Register("/Audio", "*.ogg");
-        _reload.Register("/Audio", "*.wav");
-
-        _reload.OnChanged += OnReload;
-    }
-
-    private void OnReload(ResPath args)
-    {
-        if (args.Extension != "ogg" &&
-            args.Extension != "wav")
-        {
-            return;
-        }
-
-        _cache.ReloadResource<AudioResource>(args);
     }
 
     internal bool IsMainThread()
@@ -159,11 +140,6 @@ internal sealed partial class AudioManager : IAudioInternal
         }
     }
 
-    internal void LogError(string message)
-    {
-        OpenALSawmill.Error(message);
-    }
-
     /// <summary>
     /// Like _checkAlError but allows custom data to be passed in as relevant.
     /// </summary>

Robust.Client/Audio/AudioStream.cs

@@ -6,15 +6,8 @@ namespace Robust.Client.Audio;
 /// <summary>
 /// Has the metadata for a particular audio stream as well as the relevant internal handle to it.
 /// </summary>
-public sealed class AudioStream : IDisposable
+public sealed class AudioStream
 {
-    private IAudioInternal _audio;
-
-    /// <summary>
-    /// Buffer ID for this audio in AL.
-    /// </summary>
-    internal int BufferId { get; }
-
     public TimeSpan Length { get; }
     internal IClydeHandle? ClydeHandle { get; }
     public string? Name { get; }
@@ -22,10 +15,8 @@ public sealed class AudioStream : IDisposable
     public string? Artist { get; }
     public int ChannelCount { get; }
 
-    internal AudioStream(IAudioInternal internalAudio, int bufferId, IClydeHandle? handle, TimeSpan length, int channelCount, string? name = null, string? title = null, string? artist = null)
+    internal AudioStream(IClydeHandle? handle, TimeSpan length, int channelCount, string? name = null, string? title = null, string? artist = null)
     {
-        _audio = internalAudio;
-        BufferId = bufferId;
         ClydeHandle = handle;
         Length = length;
         ChannelCount = channelCount;
@@ -33,9 +24,4 @@ public sealed class AudioStream : IDisposable
         Title = title;
         Artist = artist;
     }
-
-    public void Dispose()
-    {
-        _audio.Remove(this);
-    }
 }

Robust.Client/Audio/AudioSystem.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
-using OpenTK.Audio.OpenAL;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
@@ -57,8 +56,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
     private EntityQuery<PhysicsComponent> _physicsQuery;
 
     private float _maxRayLength;
-    private float _zOffset;
-    private float _audioEndBuffer;
 
     public override float ZOffset
     {
@@ -82,6 +79,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
         }
     }
 
+    private float _zOffset;
+
     /// <inheritdoc />
     public override void Initialize()
     {
@@ -109,31 +108,20 @@ public sealed partial class AudioSystem : SharedAudioSystem
         SubscribeNetworkEvent<PlayAudioEntityMessage>(OnEntityAudio);
         SubscribeNetworkEvent<PlayAudioPositionalMessage>(OnEntityCoordinates);
 
-        Subs.CVar(CfgManager, CVars.AudioEndBuffer, OnAudioBuffer, true);
         Subs.CVar(CfgManager, CVars.AudioAttenuation, OnAudioAttenuation, true);
         Subs.CVar(CfgManager, CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
         Subs.CVar(CfgManager, CVars.AudioTickRate, OnAudioTickRate, true);
         InitializeLimit();
     }
 
-    private void OnAudioBuffer(float value)
-    {
-        _audioEndBuffer = value;
-    }
-
     private void OnAudioTickRate(int obj)
     {
         _audioFrameTime = 1f / obj;
         _audioFrameTimeRemaining = MathF.Min(_audioFrameTimeRemaining, _audioFrameTime);
     }
 
-    private void OnAudioState(Entity<AudioComponent> entity, ref AfterAutoHandleStateEvent args)
+    private void OnAudioState(EntityUid uid, AudioComponent component, ref AfterAutoHandleStateEvent args)
     {
-        var component = entity.Comp;
-
-        if (component.LifeStage < ComponentLifeStage.Initialized)
-            return;
-
         ApplyAudioParams(component.Params, component);
         component.Source.Global = component.Global;
 
@@ -157,29 +145,21 @@ public sealed partial class AudioSystem : SharedAudioSystem
             case AudioState.Stopped:
                 component.StopPlaying();
                 component.PlaybackPosition = 0f;
-                return;
+                break;
         }
 
         // If playback position changed then update it.
-        var position = (float) ((entity.Comp.PauseTime ?? Timing.CurTime) - entity.Comp.AudioStart).TotalSeconds;
-        var currentPosition = entity.Comp.Source.PlaybackPosition;
-        var diff = Math.Abs(position - currentPosition);
-
-        // Don't try to set the audio too far ahead.
-        if (!string.IsNullOrEmpty(entity.Comp.FileName))
+        if (!string.IsNullOrEmpty(component.FileName))
         {
-            if (position > GetAudioLengthImpl(entity.Comp.FileName).TotalSeconds - _audioEndBuffer)
+            var position = (float) ((component.PauseTime ?? Timing.CurTime) - component.AudioStart).TotalSeconds;
+            var currentPosition = component.Source.PlaybackPosition;
+            var diff = Math.Abs(position - currentPosition);
+
+            if (diff > 0.1f)
             {
-                entity.Comp.StopPlaying();
-                return;
+                component.PlaybackPosition = position;
             }
         }
-
-        // If the difference is minor then we'll just keep playing it.
-        if (diff > 0.1f)
-        {
-            entity.Comp.PlaybackPosition = position;
-        }
     }
 
     /// <summary>
@@ -227,10 +207,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
     private void SetupSource(Entity<AudioComponent> entity, AudioResource audioResource, TimeSpan? length = null)
     {
         var component = entity.Comp;
-        length ??= GetAudioLength(component.FileName);
-
-        // If audio came into range then start playback at the correct position.
-        var offset = ((entity.Comp.PauseTime ?? Timing.CurTime) - component.AudioStart).TotalSeconds;
 
         if (TryAudioLimit(component.FileName))
         {
@@ -254,17 +230,10 @@ public sealed partial class AudioSystem : SharedAudioSystem
         // Don't play until first frame so occlusion etc. are correct.
         component.Gain = 0f;
 
-        // If the offset < buffer than just play it from the start.
-        if (offset < AudioDespawnBuffer)
-        {
-            offset = 0;
-        }
-        // Not enough audio to play
-        else if (offset > length.Value.TotalSeconds - _audioEndBuffer)
-        {
-            component.StopPlaying();
-            return;
-        }
+        length ??= GetAudioLength(component.FileName);
+
+        // If audio came into range then start playback at the correct position.
+        var offset = (Timing.CurTime - component.AudioStart).TotalSeconds % length.Value.TotalSeconds;
 
         if (offset > 0)
         {
@@ -446,16 +415,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
         return occlusion;
     }
 
-    private bool TryGetAudio(ResolvedSoundSpecifier specifier, [NotNullWhen(true)] out AudioResource? audio)
-    {
-        var filename = GetAudioPath(specifier);
-        if (_resourceCache.TryGetResource(new ResPath(filename), out audio))
-            return true;
-
-        Log.Error($"Server tried to play audio file {filename} which does not exist.");
-        return false;
-    }
-
     private bool TryGetAudio(string filename, [NotNullWhen(true)] out AudioResource? audio)
     {
         if (_resourceCache.TryGetResource(new ResPath(filename), out audio))
@@ -474,15 +433,15 @@ public sealed partial class AudioSystem : SharedAudioSystem
         return false;
     }
 
-    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(ResolvedSoundSpecifier? specifier, EntityCoordinates coordinates,
+    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string? filename, EntityCoordinates coordinates,
         AudioParams? audioParams = null)
     {
-        return PlayStatic(specifier, Filter.Local(), coordinates, true, audioParams);
+        return PlayStatic(filename, Filter.Local(), coordinates, true, audioParams);
     }
 
-    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(ResolvedSoundSpecifier? specifier, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string? filename, EntityUid uid, AudioParams? audioParams = null)
     {
-        return PlayEntity(specifier, Filter.Local(), uid, true, audioParams);
+        return PlayEntity(filename, Filter.Local(), uid, true, audioParams);
     }
 
     /// <inheritdoc />
@@ -518,21 +477,21 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// </summary>
     /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
     /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayGlobal(ResolvedSoundSpecifier? specifier, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (specifier is null)
+        if (string.IsNullOrEmpty(filename))
             return null;
 
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioGlobalMessage
             {
-                Specifier = specifier,
+                FileName = filename,
                 AudioParams = audioParams ?? AudioParams.Default
             });
         }
 
-        return TryGetAudio(specifier, out var audio) ? PlayGlobal(audio, specifier, audioParams) : default;
+        return TryGetAudio(filename, out var audio) ? PlayGlobal(audio, audioParams) : default;
     }
 
     /// <summary>
@@ -540,12 +499,12 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// </summary>
     /// <param name="stream">The audio stream to play.</param>
     /// <param name="audioParams"></param>
-    public (EntityUid Entity, AudioComponent Component)? PlayGlobal(AudioStream stream, ResolvedSoundSpecifier? specifier, AudioParams? audioParams = null)
+    public (EntityUid Entity, AudioComponent Component)? PlayGlobal(AudioStream stream, AudioParams? audioParams = null)
     {
-        var (entity, component) = CreateAndStartPlayingStream(audioParams, specifier, stream);
+        var (entity, component) = CreateAndStartPlayingStream(audioParams, stream);
         component.Global = true;
         component.Source.Global = true;
-        DirtyField(entity, component, nameof(AudioComponent.Global));
+        Dirty(entity, component);
         return (entity, component);
     }
 
@@ -554,22 +513,22 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// </summary>
     /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
     /// <param name="entity">The entity "emitting" the audio.</param>
-    private (EntityUid Entity, AudioComponent Component)? PlayEntity(ResolvedSoundSpecifier? specifier, EntityUid entity, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, EntityUid entity, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (specifier is null)
+        if (string.IsNullOrEmpty(filename))
             return null;
 
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioEntityMessage
             {
-                Specifier = specifier,
+                FileName = filename,
                 NetEntity = GetNetEntity(entity),
                 AudioParams = audioParams ?? AudioParams.Default
             });
         }
 
-        return TryGetAudio(specifier, out var audio) ? PlayEntity(audio, entity, specifier, audioParams) : default;
+        return TryGetAudio(filename, out var audio) ? PlayEntity(audio, entity, audioParams) : default;
     }
 
     /// <summary>
@@ -578,15 +537,15 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// <param name="stream">The audio stream to play.</param>
     /// <param name="entity">The entity "emitting" the audio.</param>
     /// <param name="audioParams"></param>
-    public (EntityUid Entity, AudioComponent Component)? PlayEntity(AudioStream stream, EntityUid entity, ResolvedSoundSpecifier? specifier, AudioParams? audioParams = null)
+    public (EntityUid Entity, AudioComponent Component)? PlayEntity(AudioStream stream, EntityUid entity, AudioParams? audioParams = null)
     {
         if (TerminatingOrDeleted(entity))
         {
-            LogAudioPlaybackOnInvalidEntity(specifier, entity);
+            Log.Error($"Tried to play coordinates audio on a terminating / deleted entity {ToPrettyString(entity)}");
             return null;
         }
 
-        var playing = CreateAndStartPlayingStream(audioParams, specifier, stream);
+        var playing = CreateAndStartPlayingStream(audioParams, stream);
         _xformSys.SetCoordinates(playing.Entity, new EntityCoordinates(entity, Vector2.Zero));
 
         return playing;
@@ -598,22 +557,22 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
     /// <param name="coordinates">The coordinates at which to play the audio.</param>
     /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayStatic(ResolvedSoundSpecifier? specifier, EntityCoordinates coordinates, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, EntityCoordinates coordinates, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (specifier is null)
+        if (string.IsNullOrEmpty(filename))
             return null;
 
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioPositionalMessage
             {
-                Specifier = specifier,
+                FileName = filename,
                 Coordinates = GetNetCoordinates(coordinates),
                 AudioParams = audioParams ?? AudioParams.Default
             });
         }
 
-        return TryGetAudio(specifier, out var audio) ? PlayStatic(audio, coordinates, specifier, audioParams) : default;
+        return TryGetAudio(filename, out var audio) ? PlayStatic(audio, coordinates, audioParams) : default;
     }
 
     /// <summary>
@@ -622,41 +581,41 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// <param name="stream">The audio stream to play.</param>
     /// <param name="coordinates">The coordinates at which to play the audio.</param>
     /// <param name="audioParams"></param>
-    public (EntityUid Entity, AudioComponent Component)? PlayStatic(AudioStream stream, EntityCoordinates coordinates, ResolvedSoundSpecifier? specifier, AudioParams? audioParams = null)
+    public (EntityUid Entity, AudioComponent Component)? PlayStatic(AudioStream stream, EntityCoordinates coordinates, AudioParams? audioParams = null)
     {
         if (TerminatingOrDeleted(coordinates.EntityId))
         {
-            LogAudioPlaybackOnInvalidEntity(specifier, coordinates.EntityId);
+            Log.Error($"Tried to play coordinates audio on a terminating / deleted entity {ToPrettyString(coordinates.EntityId)}");
             return null;
         }
 
-        var playing = CreateAndStartPlayingStream(audioParams, specifier, stream);
+        var playing = CreateAndStartPlayingStream(audioParams, stream);
         _xformSys.SetCoordinates(playing.Entity, coordinates);
         return playing;
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(ResolvedSoundSpecifier? specifier, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
     {
-        return PlayGlobal(specifier, audioParams);
+        return PlayGlobal(filename, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(ResolvedSoundSpecifier? specifier, Filter playerFilter, EntityUid entity, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, Filter playerFilter, EntityUid entity, bool recordReplay, AudioParams? audioParams = null)
     {
-        return PlayEntity(specifier, entity, audioParams);
+        return PlayEntity(filename, entity, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(ResolvedSoundSpecifier? specifier, Filter playerFilter, EntityCoordinates coordinates, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, Filter playerFilter, EntityCoordinates coordinates, bool recordReplay, AudioParams? audioParams = null)
     {
-        return PlayStatic(specifier, coordinates, audioParams);
+        return PlayStatic(filename, coordinates, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(ResolvedSoundSpecifier? specifier, ICommonSession recipient, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, ICommonSession recipient, AudioParams? audioParams = null)
     {
-        return PlayGlobal(specifier, audioParams);
+        return PlayGlobal(filename, audioParams);
     }
 
     public override void LoadStream<T>(Entity<AudioComponent> entity, T stream)
@@ -670,39 +629,39 @@ public sealed partial class AudioSystem : SharedAudioSystem
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(ResolvedSoundSpecifier? specifier, EntityUid recipient, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, EntityUid recipient, AudioParams? audioParams = null)
     {
-        return PlayGlobal(specifier, audioParams);
+        return PlayGlobal(filename, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(ResolvedSoundSpecifier? specifier, ICommonSession recipient, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, ICommonSession recipient, EntityUid uid, AudioParams? audioParams = null)
     {
-        return PlayEntity(specifier, uid, audioParams);
+        return PlayEntity(filename, uid, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(ResolvedSoundSpecifier? specifier, EntityUid recipient, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, EntityUid recipient, EntityUid uid, AudioParams? audioParams = null)
     {
-        return PlayEntity(specifier, uid, audioParams);
+        return PlayEntity(filename, uid, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(ResolvedSoundSpecifier? specifier, ICommonSession recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, ICommonSession recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
     {
-        return PlayStatic(specifier, coordinates, audioParams);
+        return PlayStatic(filename, coordinates, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(ResolvedSoundSpecifier? specifier, EntityUid recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, EntityUid recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
     {
-        return PlayStatic(specifier, coordinates, audioParams);
+        return PlayStatic(filename, coordinates, audioParams);
     }
 
-    private (EntityUid Entity, AudioComponent Component) CreateAndStartPlayingStream(AudioParams? audioParams, ResolvedSoundSpecifier? specifier, AudioStream stream)
+    private (EntityUid Entity, AudioComponent Component) CreateAndStartPlayingStream(AudioParams? audioParams, AudioStream stream)
     {
         var audioP = audioParams ?? AudioParams.Default;
-        var entity = SetupAudio(specifier, audioP, initialize: false, length: stream.Length);
+        var entity = SetupAudio(null, audioP, initialize: false, length: stream.Length);
         LoadStream(entity, stream);
         EntityManager.InitializeAndStartEntity(entity);
         var comp = entity.Comp;
@@ -735,17 +694,17 @@ public sealed partial class AudioSystem : SharedAudioSystem
 
     private void OnEntityCoordinates(PlayAudioPositionalMessage ev)
     {
-        PlayStatic(ev.Specifier, GetCoordinates(ev.Coordinates), ev.AudioParams, false);
+        PlayStatic(ev.FileName, GetCoordinates(ev.Coordinates), ev.AudioParams, false);
     }
 
     private void OnEntityAudio(PlayAudioEntityMessage ev)
     {
-        PlayEntity(ev.Specifier, GetEntity(ev.NetEntity), ev.AudioParams, false);
+        PlayEntity(ev.FileName, GetEntity(ev.NetEntity), ev.AudioParams, false);
     }
 
     private void OnGlobalAudio(PlayAudioGlobalMessage ev)
     {
-        PlayGlobal(ev.Specifier, ev.AudioParams, false);
+        PlayGlobal(ev.FileName, ev.AudioParams, false);
     }
 
     protected override TimeSpan GetAudioLengthImpl(string filename)
@@ -753,12 +712,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
         return _resourceCache.GetResource<AudioResource>(filename).AudioStream.Length;
     }
 
-    private void LogAudioPlaybackOnInvalidEntity(ResolvedSoundSpecifier? specifier, EntityUid entityId)
-    {
-        var soundInfo = specifier?.ToString() ?? "unknown sound";
-        Log.Error($"Tried to play coordinates audio on a terminating / deleted entity {ToPrettyString(entityId)}. Sound: {soundInfo}. Trace: {Environment.StackTrace}");
-    }
-
     #region Jobs
 
     private record struct UpdateAudioJob : IParallelRobustJob

Robust.Client/Audio/Effects/AudioEffect.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Numerics;
 using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Effects;

Robust.Client/Audio/HeadlessAudioManager.cs

@@ -13,8 +13,6 @@ namespace Robust.Client.Audio;
 /// </summary>
 internal sealed class HeadlessAudioManager : IAudioInternal
 {
-    private int _audioBuffer;
-
     /// <inheritdoc />
     public void InitializePostWindowing()
     {
@@ -67,11 +65,6 @@ internal sealed class HeadlessAudioManager : IAudioInternal
     {
     }
 
-    /// <inheritdoc />
-    public void Remove(AudioStream stream)
-    {
-    }
-
     /// <inheritdoc />
     public void StopAllAudio()
     {
@@ -108,11 +101,11 @@ internal sealed class HeadlessAudioManager : IAudioInternal
     public AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int sampleRate, string? name = null)
     {
         var length = TimeSpan.FromSeconds((double) samples.Length / channels / sampleRate);
-        return new AudioStream(this, _audioBuffer++, null, length, channels, name);
+        return new AudioStream(null, length, channels, name);
     }
 
-    private AudioStream AudioStreamFromMetadata(AudioMetadata metadata, string? name)
+    private static AudioStream AudioStreamFromMetadata(AudioMetadata metadata, string? name)
     {
-        return new AudioStream(this, _audioBuffer++, null, metadata.Length, metadata.ChannelCount, name, metadata.Title, metadata.Artist);
+        return new AudioStream(null, metadata.Length, metadata.ChannelCount, name, metadata.Title, metadata.Artist);
     }
 }

Robust.Client/Audio/IAudioInternal.cs

@@ -44,8 +44,6 @@ internal interface IAudioInternal : IAudioManager
 
     void SetAttenuation(Attenuation attenuation);
 
-    void Remove(AudioStream stream);
-
     /// <summary>
     /// Stops all audio from playing.
     /// </summary>

Robust.Client/Audio/IAudioManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Robust.Client.Audio.Sources;
 using Robust.Shared.Audio.Sources;
 
 namespace Robust.Client.Audio;
@@ -10,7 +11,7 @@ namespace Robust.Client.Audio;
 public interface IAudioManager
 {
     IAudioSource? CreateAudioSource(AudioStream stream);
-
+  
     AudioStream LoadAudioOggVorbis(Stream stream, string? name = null);
 
     AudioStream LoadAudioWav(Stream stream, string? name = null);

Robust.Client/Audio/Midi/IMidiRenderer.cs

@@ -6,7 +6,6 @@ using Robust.Shared.Audio.Midi;
 using Robust.Shared.Audio.Sources;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Utility;
 
 namespace Robust.Client.Audio.Midi;
 
@@ -157,13 +156,8 @@ public interface IMidiRenderer : IDisposable
     /// <summary>
     ///     Loads a new soundfont into the renderer.
     /// </summary>
-    [Obsolete("Use LoadSoundfontResource or LoadSoundfontUser instead")]
     void LoadSoundfont(string filename, bool resetPresets = false);
 
-    void LoadSoundfontResource(ResPath path, bool resetPresets = false);
-
-    void LoadSoundfontUser(ResPath path, bool resetPresets = false);
-
     /// <summary>
     ///     Invoked whenever a new midi event is registered.
     /// </summary>

Robust.Client/Audio/Midi/MidiManager.SoundFontLoad.cs

@@ -1,262 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using NFluidsynth;
-using Robust.Shared.ContentPack;
-using Robust.Shared.Utility;
-
-namespace Robust.Client.Audio.Midi;
-
-internal sealed partial class MidiManager
-{
-    // For loading sound fonts, we have to use a callback model where we can only parse a string.
-    // This API, frankly, fucking sucks.
-    //
-    // These prefixes are used to separate the various places a file *can* be loaded from.
-    //
-    // We cannot prevent Fluidsynth from trying to load prefixed paths itself if they are invalid
-    // So if content specifies "/foobar.sf2" to be loaded and it doesn't exist,
-    // Fluidsynth *will* try to fopen("RES:/foobar.sf2"). For this reason I'm putting in some nonsense characters
-    // that will pass through Fluidsynth fine, but make sure the filename is *never* a practically valid OS path.
-    //
-    // NOTE: Raw disk paths *cannot* be prefixed as Fluidsynth needs to load those itself.
-    // Specifically, their .dls loader doesn't respect file callbacks.
-    // If you're curious why this is: it's two-fold:
-    // * The Fluidsynth C code for the .dls loader just doesn't use the file callbacks, period.
-    // * Even if it did, we're not specifying those file callbacks, as they're per loader,
-    //   and we're only adding a *new* sound font loader with file callbacks, not modifying the existing ones.
-    //   The loader for .sfX format and .dls format are different loader objects in Fluidsynth.
-    internal const string PrefixCommon = "!/ -?\x0001";
-    internal const string PrefixLegacy = PrefixCommon + "LEGACY";
-    internal const string PrefixUser = PrefixCommon + "USER";
-    internal const string PrefixResources = PrefixCommon + "RES";
-
-    private void LoadSoundFontSetup(MidiRenderer renderer)
-    {
-        _midiSawmill.Debug($"Loading fallback soundfont {FallbackSoundfont}");
-        // Since the last loaded soundfont takes priority, we load the fallback soundfont before the soundfont.
-        renderer.LoadSoundfontResource(FallbackSoundfont);
-
-        // Load system-specific soundfonts.
-        if (OperatingSystem.IsLinux())
-        {
-            foreach (var filepath in LinuxSoundfonts)
-            {
-                if (!File.Exists(filepath) || !SoundFont.IsSoundFont(filepath))
-                    continue;
-
-                try
-                {
-                    _midiSawmill.Debug($"Loading OS soundfont {filepath}");
-                    renderer.LoadSoundfontDisk(filepath);
-                }
-                catch (Exception)
-                {
-                    continue;
-                }
-
-                break;
-            }
-        }
-        else if (OperatingSystem.IsMacOS())
-        {
-            if (File.Exists(OsxSoundfont) && SoundFont.IsSoundFont(OsxSoundfont))
-            {
-                _midiSawmill.Debug($"Loading OS soundfont {OsxSoundfont}");
-                renderer.LoadSoundfontDisk(OsxSoundfont);
-            }
-        }
-        else if (OperatingSystem.IsWindows())
-        {
-            if (File.Exists(WindowsSoundfont) && SoundFont.IsSoundFont(WindowsSoundfont))
-            {
-                _midiSawmill.Debug($"Loading OS soundfont {WindowsSoundfont}");
-                renderer.LoadSoundfontDisk(WindowsSoundfont);
-            }
-        }
-
-        // Maybe load soundfont specified in environment variable.
-        // Load it here so it can override system soundfonts but not content or user data soundfonts.
-        if (Environment.GetEnvironmentVariable(SoundfontEnvironmentVariable) is { } soundfontOverride)
-        {
-            // Just to avoid funny shit: avoid people smuggling a prefix in here.
-            // I wish I could separate this properly...
-            var (prefix, _) = SplitPrefix(soundfontOverride);
-            if (IsValidPrefix(prefix))
-            {
-                _midiSawmill.Error($"Not respecting {SoundfontEnvironmentVariable} env variable: invalid file path");
-            }
-            else if (File.Exists(soundfontOverride) && SoundFont.IsSoundFont(soundfontOverride))
-            {
-                _midiSawmill.Debug($"Loading environment variable soundfont {soundfontOverride}");
-                renderer.LoadSoundfontDisk(soundfontOverride);
-            }
-        }
-
-        // Load content-specific custom soundfonts, which should override the system/fallback soundfont.
-        _midiSawmill.Debug($"Loading soundfonts from content directory {ContentCustomSoundfontDirectory}");
-        foreach (var file in _resourceManager.ContentFindFiles(ContentCustomSoundfontDirectory))
-        {
-            if (file.Extension != "sf2" && file.Extension != "dls" && file.Extension != "sf3") continue;
-            _midiSawmill.Debug($"Loading content soundfont {file}");
-            renderer.LoadSoundfontResource(file);
-        }
-
-        // Load every soundfont from the user data directory last, since those may override any other soundfont.
-        _midiSawmill.Debug($"Loading soundfonts from user data directory {CustomSoundfontDirectory}");
-        var enumerator = _resourceManager.UserData.Find($"{CustomSoundfontDirectory.ToRelativePath()}*").Item1;
-        foreach (var file in enumerator)
-        {
-            if (file.Extension != "sf2" && file.Extension != "dls" && file.Extension != "sf3") continue;
-            _midiSawmill.Debug($"Loading user soundfont {file}");
-            renderer.LoadSoundfontUser(file);
-        }
-    }
-
-    internal static string PrefixPath(string prefix, string value)
-    {
-        return $"{prefix}:{value}";
-    }
-
-    internal static (string prefix, string? value) SplitPrefix(string filename)
-    {
-        var filenameSplit = filename.Split(':', 2);
-        if (filenameSplit.Length == 1)
-            return (filenameSplit[0], null);
-
-        return (filenameSplit[0], filenameSplit[1]);
-    }
-
-    internal static bool IsValidPrefix(string prefix)
-    {
-        return prefix is PrefixLegacy or PrefixUser or PrefixResources;
-    }
-
-    /// <summary>
-    ///     This class is used to load soundfonts.
-    /// </summary>
-    private sealed class ResourceLoaderCallbacks : SoundFontLoaderCallbacks
-    {
-        private readonly MidiManager _parent;
-        private readonly Dictionary<int, Stream> _openStreams = new();
-        private int _nextStreamId = 1;
-
-        public ResourceLoaderCallbacks(MidiManager parent)
-        {
-            _parent = parent;
-        }
-
-        public override IntPtr Open(string filename)
-        {
-            if (string.IsNullOrEmpty(filename))
-            {
-                return IntPtr.Zero;
-            }
-
-            Stream stream;
-            try
-            {
-                stream = OpenCore(filename);
-            }
-            catch (Exception e)
-            {
-                _parent._midiSawmill.Error($"Error while opening sound font: {e}");
-                return IntPtr.Zero;
-            }
-
-            var id = _nextStreamId++;
-
-            _openStreams.Add(id, stream);
-
-            return (IntPtr) id;
-        }
-
-        private Stream OpenCore(string filename)
-        {
-            var (prefix, value) = SplitPrefix(filename);
-
-            if (!IsValidPrefix(prefix) || value == null)
-                return File.OpenRead(filename);
-
-            var resourceCache = _parent._resourceManager;
-            var resourcePath = new ResPath(value);
-
-            switch (prefix)
-            {
-                case PrefixUser:
-                    return resourceCache.UserData.OpenRead(resourcePath);
-                case PrefixResources:
-                    return resourceCache.ContentFileRead(resourcePath);
-                case PrefixLegacy:
-                    // Try resources first, then try user data.
-                    if (resourceCache.TryContentFileRead(resourcePath, out var stream))
-                        return stream;
-
-                    return resourceCache.UserData.OpenRead(resourcePath);
-                default:
-                    throw new UnreachableException("Invalid prefix specified!");
-            }
-        }
-
-        public override unsafe int Read(IntPtr buf, long count, IntPtr sfHandle)
-        {
-            var length = (int) count;
-            var span = new Span<byte>(buf.ToPointer(), length);
-            var stream = _openStreams[(int) sfHandle];
-
-            // Fluidsynth's docs state that this method should leave the buffer unmodified if it fails. (returns -1)
-            try
-            {
-                // Fluidsynth does a LOT of tiny allocations (frankly, way too much).
-                if (count < 1024)
-                {
-                    // ReSharper disable once SuggestVarOrType_Elsewhere
-                    Span<byte> buffer = stackalloc byte[(int)count];
-
-                    stream.ReadExact(buffer);
-
-                    buffer.CopyTo(span);
-                }
-                else
-                {
-                    var buffer = stream.ReadExact(length);
-
-                    buffer.CopyTo(span);
-                }
-            }
-            catch (EndOfStreamException)
-            {
-                return -1;
-            }
-
-            return 0;
-        }
-
-        public override int Seek(IntPtr sfHandle, long offset, SeekOrigin origin)
-        {
-            var stream = _openStreams[(int) sfHandle];
-
-            stream.Seek(offset, origin);
-
-            return 0;
-        }
-
-        public override long Tell(IntPtr sfHandle)
-        {
-            var stream = _openStreams[(int) sfHandle];
-
-            return (long) stream.Position;
-        }
-
-        public override int Close(IntPtr sfHandle)
-        {
-            if (!_openStreams.Remove((int) sfHandle, out var stream))
-                return -1;
-
-            stream.Dispose();
-            return 0;
-
-        }
-    }
-}

Robust.Client/Audio/Midi/MidiManager.cs

@@ -119,7 +119,7 @@ internal sealed partial class MidiManager : IMidiManager
     private const string OsxSoundfont =
         "/System/Library/Components/CoreAudio.component/Contents/Resources/gs_instruments.dls";
 
-    private static readonly ResPath FallbackSoundfont = new ResPath("/Midi/fallback.sf2");
+    private const string FallbackSoundfont = "/Midi/fallback.sf2";
 
     private const string ContentCustomSoundfontDirectory = "/Audio/MidiCustom/";
 
@@ -265,7 +265,81 @@ internal sealed partial class MidiManager : IMidiManager
 
             var renderer = new MidiRenderer(_settings!, soundfontLoader, mono, this, _audio, _taskManager, _midiSawmill);
 
-            LoadSoundFontSetup(renderer);
+            _midiSawmill.Debug($"Loading fallback soundfont {FallbackSoundfont}");
+            // Since the last loaded soundfont takes priority, we load the fallback soundfont before the soundfont.
+            renderer.LoadSoundfont(FallbackSoundfont);
+
+            // Load system-specific soundfonts.
+            if (OperatingSystem.IsLinux())
+            {
+                foreach (var filepath in LinuxSoundfonts)
+                {
+                    if (!File.Exists(filepath) || !SoundFont.IsSoundFont(filepath))
+                        continue;
+
+                    try
+                    {
+                        _midiSawmill.Debug($"Loading OS soundfont {filepath}");
+                        renderer.LoadSoundfont(filepath);
+                    }
+                    catch (Exception)
+                    {
+                        continue;
+                    }
+
+                    break;
+                }
+            }
+            else if (OperatingSystem.IsMacOS())
+            {
+                if (File.Exists(OsxSoundfont) && SoundFont.IsSoundFont(OsxSoundfont))
+                {
+                    _midiSawmill.Debug($"Loading OS soundfont {OsxSoundfont}");
+                    renderer.LoadSoundfont(OsxSoundfont);
+                }
+            }
+            else if (OperatingSystem.IsWindows())
+            {
+                if (File.Exists(WindowsSoundfont) && SoundFont.IsSoundFont(WindowsSoundfont))
+                {
+                    _midiSawmill.Debug($"Loading OS soundfont {WindowsSoundfont}");
+                    renderer.LoadSoundfont(WindowsSoundfont);
+                }
+            }
+
+            // Maybe load soundfont specified in environment variable.
+            // Load it here so it can override system soundfonts but not content or user data soundfonts.
+            if (Environment.GetEnvironmentVariable(SoundfontEnvironmentVariable) is {} soundfontOverride)
+            {
+                if (File.Exists(soundfontOverride) && SoundFont.IsSoundFont(soundfontOverride))
+                {
+                    _midiSawmill.Debug($"Loading environment variable soundfont {soundfontOverride}");
+                    renderer.LoadSoundfont(soundfontOverride);
+                }
+            }
+
+            // Load content-specific custom soundfonts, which should override the system/fallback soundfont.
+            _midiSawmill.Debug($"Loading soundfonts from content directory {ContentCustomSoundfontDirectory}");
+            foreach (var file in _resourceManager.ContentFindFiles(ContentCustomSoundfontDirectory))
+            {
+                if (file.Extension != "sf2" && file.Extension != "dls" && file.Extension != "sf3") continue;
+                _midiSawmill.Debug($"Loading content soundfont {file}");
+                renderer.LoadSoundfont(file.ToString());
+            }
+
+            var userDataPath = _resourceManager.UserData.RootDir == null
+                ? CustomSoundfontDirectory
+                : new ResPath(_resourceManager.UserData.RootDir) / CustomSoundfontDirectory.ToRelativePath();
+
+            // Load every soundfont from the user data directory last, since those may override any other soundfont.
+            _midiSawmill.Debug($"Loading soundfonts from user data directory {userDataPath}");
+            var enumerator = _resourceManager.UserData.Find($"{CustomSoundfontDirectory.ToRelativePath()}*").Item1;
+            foreach (var file in enumerator)
+            {
+                if (file.Extension != "sf2" && file.Extension != "dls" && file.Extension != "sf3") continue;
+                _midiSawmill.Debug($"Loading user soundfont {file}");
+                renderer.LoadSoundfont(file.ToString());
+            }
 
             renderer.Source.Gain = _gain;
 
@@ -498,6 +572,130 @@ internal sealed partial class MidiManager : IMidiManager
             midiEvent.Velocity);
     }
 
+    /// <summary>
+    ///     This class is used to load soundfonts.
+    /// </summary>
+    private sealed class ResourceLoaderCallbacks : SoundFontLoaderCallbacks
+    {
+        private readonly MidiManager _parent;
+        private readonly Dictionary<int, Stream> _openStreams = new();
+        private int _nextStreamId = 1;
+
+        public ResourceLoaderCallbacks(MidiManager parent)
+        {
+            _parent = parent;
+        }
+
+        public override IntPtr Open(string filename)
+        {
+            if (string.IsNullOrEmpty(filename))
+            {
+                return IntPtr.Zero;
+            }
+
+            Stream? stream;
+            var resourceCache = _parent._resourceManager;
+            var resourcePath = new ResPath(filename);
+
+            if (resourcePath.IsRooted)
+            {
+                // is it in content?
+                if (resourceCache.ContentFileExists(filename))
+                {
+                    if (!resourceCache.TryContentFileRead(filename, out stream))
+                        return IntPtr.Zero;
+                }
+                // is it in userdata?
+                else if (resourceCache.UserData.Exists(resourcePath))
+                {
+                    stream = resourceCache.UserData.OpenRead(resourcePath);
+                }
+                else if (File.Exists(filename))
+                {
+                    stream = File.OpenRead(filename);
+                }
+                else
+                {
+                    return IntPtr.Zero;
+                }
+            }
+            else if (File.Exists(filename))
+            {
+                stream = File.OpenRead(filename);
+            }
+            else
+            {
+                return IntPtr.Zero;
+            }
+
+            var id = _nextStreamId++;
+
+            _openStreams.Add(id, stream);
+
+            return (IntPtr) id;
+        }
+
+        public override unsafe int Read(IntPtr buf, long count, IntPtr sfHandle)
+        {
+            var length = (int) count;
+            var span = new Span<byte>(buf.ToPointer(), length);
+            var stream = _openStreams[(int) sfHandle];
+
+            // Fluidsynth's docs state that this method should leave the buffer unmodified if it fails. (returns -1)
+            try
+            {
+                // Fluidsynth does a LOT of tiny allocations (frankly, way too much).
+                if (count < 1024)
+                {
+                    // ReSharper disable once SuggestVarOrType_Elsewhere
+                    Span<byte> buffer = stackalloc byte[(int)count];
+
+                    stream.ReadExact(buffer);
+
+                    buffer.CopyTo(span);
+                }
+                else
+                {
+                    var buffer = stream.ReadExact(length);
+
+                    buffer.CopyTo(span);
+                }
+            }
+            catch (EndOfStreamException)
+            {
+                return -1;
+            }
+
+            return 0;
+        }
+
+        public override int Seek(IntPtr sfHandle, long offset, SeekOrigin origin)
+        {
+            var stream = _openStreams[(int) sfHandle];
+
+            stream.Seek(offset, origin);
+
+            return 0;
+        }
+
+        public override long Tell(IntPtr sfHandle)
+        {
+            var stream = _openStreams[(int) sfHandle];
+
+            return (long) stream.Position;
+        }
+
+        public override int Close(IntPtr sfHandle)
+        {
+            if (!_openStreams.Remove((int) sfHandle, out var stream))
+                return -1;
+
+            stream.Dispose();
+            return 0;
+
+        }
+    }
+
     #region Jobs
 
     private record struct MidiUpdateJob : IParallelRobustJob

Robust.Client/Audio/Midi/MidiRenderer.SoundFontLoad.cs

@@ -1,45 +0,0 @@
-using System;
-using Robust.Shared.Utility;
-
-namespace Robust.Client.Audio.Midi;
-
-internal sealed partial class MidiRenderer
-{
-    [Obsolete("Use LoadSoundfontResource or LoadSoundfontUser instead")]
-    public void LoadSoundfont(string filename, bool resetPresets = true)
-    {
-        LoadSoundfontCore(
-            MidiManager.PrefixPath(MidiManager.PrefixLegacy, filename),
-            resetPresets);
-    }
-
-    public void LoadSoundfontResource(ResPath path, bool resetPresets = false)
-    {
-        LoadSoundfontCore(
-            MidiManager.PrefixPath(MidiManager.PrefixResources, path.ToString()),
-            resetPresets);
-    }
-
-    public void LoadSoundfontUser(ResPath path, bool resetPresets = false)
-    {
-        LoadSoundfontCore(
-            MidiManager.PrefixPath(MidiManager.PrefixUser, path.ToString()),
-            resetPresets);
-    }
-
-    internal void LoadSoundfontDisk(string path, bool resetPresets = false)
-    {
-        LoadSoundfontCore(
-            path,
-            resetPresets);
-    }
-
-    private void LoadSoundfontCore(string filenameString, bool resetPresets)
-    {
-        lock (_playerStateLock)
-        {
-            _synth.LoadSoundFont(filenameString, resetPresets);
-            MidiSoundfont = 1;
-        }
-    }
-}

Robust.Client/Audio/Midi/MidiRenderer.cs

@@ -16,7 +16,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Robust.Client.Audio.Midi;
 
-internal sealed partial class MidiRenderer : IMidiRenderer
+internal sealed class MidiRenderer : IMidiRenderer
 {
     private readonly IMidiManager _midiManager;
     private readonly ITaskManager _taskManager;
@@ -226,9 +226,6 @@ internal sealed partial class MidiRenderer : IMidiRenderer
             if (value == _master)
                 return;
 
-            if (CheckMasterCycle(value))
-                throw new InvalidOperationException("Tried to set master to a child of this renderer!");
-
             if (_master is { Disposed: false })
             {
                 try
@@ -435,6 +432,15 @@ internal sealed partial class MidiRenderer : IMidiRenderer
         _sequencer.RemoveEvents(SequencerClientId.Wildcard, SequencerClientId.Wildcard, -1);
     }
 
+    public void LoadSoundfont(string filename, bool resetPresets = true)
+    {
+        lock (_playerStateLock)
+        {
+            _synth.LoadSoundFont(filename, resetPresets);
+            MidiSoundfont = 1;
+        }
+    }
+
     void IMidiRenderer.Render()
     {
         Render();
@@ -575,28 +581,18 @@ internal sealed partial class MidiRenderer : IMidiRenderer
                     case RobustMidiCommand.NoteOff:
                         _rendererState.NoteVelocities.AsSpan[midiEvent.Channel].AsSpan[midiEvent.Key] = 0;
                         _synth.NoteOff(midiEvent.Channel, midiEvent.Key);
-
                         break;
+
                     case RobustMidiCommand.NoteOn:
-                        // Velocity 0 *can* represent a NoteOff event.
-                        var velocity = midiEvent.Velocity;
-                        if (velocity == 0)
-                        {
-                            _rendererState.NoteVelocities.AsSpan[midiEvent.Channel].AsSpan[midiEvent.Key] = 0;
-                            _synth.NoteOn(midiEvent.Channel, midiEvent.Key, velocity);
-
-                            break;
-                        }
-
                         if (FilteredChannels[midiEvent.Channel])
                             break;
 
-                        velocity = VelocityOverride ?? midiEvent.Velocity;
+                        var velocity = VelocityOverride ?? midiEvent.Velocity;
 
                         _rendererState.NoteVelocities.AsSpan[midiEvent.Channel].AsSpan[midiEvent.Key] = velocity;
                         _synth.NoteOn(midiEvent.Channel, midiEvent.Key, velocity);
-
                         break;
+
                     case RobustMidiCommand.AfterTouch:
                         _rendererState.NoteVelocities.AsSpan[midiEvent.Channel].AsSpan[midiEvent.Key] = midiEvent.Value;
                         _synth.KeyPressure(midiEvent.Channel, midiEvent.Key, midiEvent.Value);
@@ -733,22 +729,4 @@ internal sealed partial class MidiRenderer : IMidiRenderer
         _synth?.Dispose();
         _player?.Dispose();
     }
-
-    /// <summary>
-    /// Check that a given renderer is not already a child of this renderer, i.e. it would introduce a cycle if set as master of this renderer.
-    /// </summary>
-    private bool CheckMasterCycle(IMidiRenderer? otherRenderer)
-    {
-        // Doesn't inside drift, cringe.
-
-        while (otherRenderer != null)
-        {
-            if (otherRenderer == this)
-                return true;
-
-            otherRenderer = otherRenderer.Master;
-        }
-
-        return false;
-    }
 }

Robust.Client/Audio/Sources/AudioSource.cs

@@ -13,7 +13,7 @@ internal sealed class AudioSource : BaseAudioSource
     /// <summary>
     /// Underlying stream to the audio.
     /// </summary>
-    internal readonly AudioStream SourceStream;
+    private readonly AudioStream _sourceStream;
 
 #if DEBUG
     private bool _didPositionWarning;
@@ -21,7 +21,7 @@ internal sealed class AudioSource : BaseAudioSource
 
     public AudioSource(AudioManager master, int sourceHandle, AudioStream sourceStream) : base(master, sourceHandle)
     {
-        SourceStream = sourceStream;
+        _sourceStream = sourceStream;
     }
 
     /// <inheritdoc />
@@ -47,13 +47,13 @@ internal sealed class AudioSource : BaseAudioSource
 #if DEBUG
             // OpenAL doesn't seem to want to play stereo positionally.
             // Log a warning if people try to.
-            if (SourceStream.ChannelCount > 1 && !_didPositionWarning)
+            if (_sourceStream.ChannelCount > 1 && !_didPositionWarning)
             {
                 _didPositionWarning = true;
                 Master.OpenALSawmill.Warning("Attempting to set position on audio source with multiple audio channels! Stream: '{0}'.  Make sure the audio is MONO, not stereo.",
-                    SourceStream.Name);
+                    _sourceStream.Name);
                 // warning isn't enough, people just ignore it :(
-                DebugTools.Assert(false, $"Attempting to set position on audio source with multiple audio channels! Stream: '{SourceStream.Name}'. Make sure the audio is MONO, not stereo.");
+                DebugTools.Assert(false, $"Attempting to set position on audio source with multiple audio channels! Stream: '{_sourceStream.Name}'. Make sure the audio is MONO, not stereo.");
             }
 #endif
 

Robust.Client/Audio/Sources/BaseAudioSource.cs

@@ -208,12 +208,6 @@ public abstract class BaseAudioSource : IAudioSource
         }
         set
         {
-            if (float.IsNaN(value))
-            {
-                Master.LogError($"Tried to set NaN gain, setting audio source to 0f: {Environment.StackTrace}");
-                value = 0f;
-            }
-
             _checkDisposed();
             var priorOcclusion = 1f;
             if (!IsEfxSupported)

Robust.Client/BaseClient.cs

@@ -88,10 +88,10 @@ namespace Robust.Client
         {
             if (GameInfo != null)
             {
-                GameInfo.TickRate = (ushort) tickrate;
+                GameInfo.TickRate = (byte) tickrate;
             }
 
-            _timing.SetTickRateAt((ushort) tickrate, info.TickChanged);
+            _timing.SetTickRateAt((byte) tickrate, info.TickChanged);
             _logger.Info($"Tickrate changed to: {tickrate} on tick {_timing.CurTick}");
         }
 
@@ -115,6 +115,10 @@ namespace Robust.Client
         /// <inheritdoc />
         public void DisconnectFromServer(string reason)
         {
+            DebugTools.Assert(RunLevel > ClientRunLevel.Initialize);
+            DebugTools.Assert(_net.IsConnected);
+            // run level changed in OnNetDisconnect()
+            // are both of these *really* needed?
             _net.ClientDisconnect(reason);
         }
 
@@ -391,6 +395,6 @@ namespace Robust.Client
         /// </summary>
         public int ServerMaxPlayers { get; set; }
 
-        public uint TickRate { get; internal set; }
+        public byte TickRate { get; internal set; }
     }
 }

Robust.Client/ClientIoC.cs

@@ -10,7 +10,6 @@ using Robust.Client.Graphics;
 using Robust.Client.Graphics.Clyde;
 using Robust.Client.HWId;
 using Robust.Client.Input;
-using Robust.Client.Localization;
 using Robust.Client.Map;
 using Robust.Client.Placement;
 using Robust.Client.Player;
@@ -37,7 +36,6 @@ using Robust.Shared.Console;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Physics;
@@ -48,7 +46,6 @@ using Robust.Shared.Replays;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 using Robust.Shared.Upload;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Client
@@ -105,9 +102,6 @@ namespace Robust.Client
             deps.Register<ProfViewManager>();
             deps.Register<IGamePrototypeLoadManager, GamePrototypeLoadManager>();
             deps.Register<NetworkResourceManager>();
-            deps.Register<IReloadManager, ReloadManager>();
-            deps.Register<ILocalizationManager, ClientLocalizationManager>();
-            deps.Register<ILocalizationManagerInternal, ClientLocalizationManager>();
 
             switch (mode)
             {
@@ -144,7 +138,6 @@ namespace Robust.Client
             deps.Register<IViewVariablesManager, ClientViewVariablesManager>();
             deps.Register<IClientViewVariablesManager, ClientViewVariablesManager>();
             deps.Register<IClientViewVariablesManagerInternal, ClientViewVariablesManager>();
-            deps.Register<IViewVariableControlFactory, ViewVariableControlFactory>();
             deps.Register<IClientConGroupController, ClientConGroupController>();
             deps.Register<IScriptClient, ScriptClient>();
             deps.Register<IRobustSerializer, ClientRobustSerializer>();

Robust.Client/ComponentTrees/SpriteTreeSystem.cs

@@ -2,7 +2,6 @@ using System.Numerics;
 using Robust.Client.GameObjects;
 using Robust.Shared.ComponentTrees;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 
@@ -10,7 +9,25 @@ namespace Robust.Client.ComponentTrees;
 
 public sealed class SpriteTreeSystem : ComponentTreeSystem<SpriteTreeComponent, SpriteComponent>
 {
-    [Dependency] private readonly SpriteSystem _sprite = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SpriteComponent, QueueSpriteTreeUpdateEvent>(OnQueueUpdate);
+    }
+
+    private void OnQueueUpdate(EntityUid uid, SpriteComponent component, ref QueueSpriteTreeUpdateEvent args)
+        => QueueTreeUpdate(uid, component, args.Xform);
+
+    // TODO remove this when finally ECSing sprite components
+    [ByRefEvent]
+    internal readonly struct QueueSpriteTreeUpdateEvent
+    {
+        public readonly TransformComponent Xform;
+        public QueueSpriteTreeUpdateEvent(TransformComponent xform)
+        {
+            Xform = xform;
+        }
+    }
 
     #region Component Tree Overrides
     protected override bool DoFrameUpdate => true;
@@ -19,11 +36,6 @@ public sealed class SpriteTreeSystem : ComponentTreeSystem<SpriteTreeComponent,
     protected override int InitialCapacity => 1024;
 
     protected override Box2 ExtractAabb(in ComponentTreeEntry<SpriteComponent> entry, Vector2 pos, Angle rot)
-    {
-        // TODO SPRITE optimize this
-        // Because the just take the BB of the rotated BB, I'm pretty sure we do a lot of unnecessary maths.
-        return _sprite.CalculateBounds((entry.Uid, entry.Component), pos, rot, default).CalcBoundingBox();
-    }
-
+        => entry.Component.CalculateRotatedBoundingBox(pos, rot, default).CalcBoundingBox();
     #endregion
 }

Robust.Client/Console/ClientConsoleHost.cs

@@ -191,16 +191,8 @@ namespace Robust.Client.Console
             var shell = new ConsoleShell(this, session ?? _player.LocalSession, session == null);
             var cmdArgs = args.ToArray();
 
-            try
-            {
-                AnyCommandExecuted?.Invoke(shell, commandName, command, cmdArgs);
-                cmd.Execute(shell, command, cmdArgs);
-            }
-            catch (Exception e)
-            {
-                _conLogger.Error($"ExecuteError - {command}:\n{e}");
-                shell.WriteError($"There was an error while executing the command: {e}");
-            }
+            AnyCommandExecuted?.Invoke(shell, commandName, command, cmdArgs);
+            cmd.Execute(shell, command, cmdArgs);
         }
 
         private bool CanExecute(string cmdName)

Robust.Client/Console/Commands/Debug.cs

@@ -173,51 +173,29 @@ namespace Robust.Client.Console.Commands
         }
     }
 
-    internal sealed class ShowPositionsCommand : LocalizedEntityCommands
+    internal sealed class ShowPositionsCommand : LocalizedCommands
     {
-        [Dependency] private readonly DebugDrawingSystem _debugDrawing = default!;
+        [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
 
         public override string Command => "showpos";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _debugDrawing.DebugPositions = !_debugDrawing.DebugPositions;
+            var mgr = _entitySystems.GetEntitySystem<DebugDrawingSystem>();
+            mgr.DebugPositions = !mgr.DebugPositions;
         }
     }
 
-    internal sealed class ShowRotationsCommand : LocalizedEntityCommands
+    internal sealed class ShowRotationsCommand : LocalizedCommands
     {
-        [Dependency] private readonly DebugDrawingSystem _debugDrawing = default!;
+        [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
 
         public override string Command => "showrot";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _debugDrawing.DebugRotations = !_debugDrawing.DebugRotations;
-        }
-    }
-
-    internal sealed class ShowVelocitiesCommand : LocalizedEntityCommands
-    {
-        [Dependency] private readonly DebugDrawingSystem _debugDrawing = default!;
-
-        public override string Command => "showvel";
-
-        public override void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            _debugDrawing.DebugVelocities = !_debugDrawing.DebugVelocities;
-        }
-    }
-
-    internal sealed class ShowAngularVelocitiesCommand : LocalizedEntityCommands
-    {
-        [Dependency] private readonly DebugDrawingSystem _debugDrawing = default!;
-
-        public override string Command => "showangvel";
-
-        public override void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            _debugDrawing.DebugAngularVelocities = !_debugDrawing.DebugAngularVelocities;
+            var mgr = _entitySystems.GetEntitySystem<DebugDrawingSystem>();
+            mgr.DebugRotations = !mgr.DebugRotations;
         }
     }
 

Robust.Client/Console/Commands/DebugAnchoredCommand.cs

@@ -1,19 +1,17 @@
 #if DEBUG
 using Robust.Client.Debugging;
 using Robust.Shared.Console;
-using Robust.Shared.IoC;
+using Robust.Shared.GameObjects;
 
 namespace Robust.Client.Console.Commands
 {
-    public sealed class DebugAnchoredCommand : LocalizedEntityCommands
+    public sealed class DebugAnchoredCommand : LocalizedCommands
     {
-        [Dependency] private readonly DebugAnchoringSystem _system = default!;
-
         public override string Command => "showanchored";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _system.Enabled ^= true;
+            EntitySystem.Get<DebugAnchoringSystem>().Enabled ^= true;
         }
     }
 }

Robust.Client/Console/Commands/LightBBCommand.cs

@@ -1,19 +1,17 @@
 #if DEBUG
 using Robust.Client.GameObjects;
 using Robust.Shared.Console;
-using Robust.Shared.IoC;
+using Robust.Shared.GameObjects;
 
 namespace Robust.Client.Console.Commands
 {
-    internal sealed class LightDebugCommand : LocalizedEntityCommands
+    internal sealed class LightDebugCommand : LocalizedCommands
     {
-        [Dependency] private readonly DebugLightTreeSystem _system = default!;
-
         public override string Command => "lightbb";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _system.Enabled ^= true;
+            EntitySystem.Get<DebugLightTreeSystem>().Enabled ^= true;
         }
     }
 }

Robust.Client/Console/Commands/LocalizationCommands.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using JetBrains.Annotations;
-using Robust.Shared.Console;
-using Robust.Shared.Localization;
-
-namespace Robust.Client.Console.Commands;
-
-[UsedImplicitly]
-internal sealed class LocalizationSetCulture : LocalizedCommands
-{
-    private const string Name = "localization_set_culture";
-    private const int ArgumentCount = 1;
-
-    public override string Command => Name;
-
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        if (args.Length != ArgumentCount)
-        {
-            shell.WriteError(Loc.GetString("cmd-invalid-arg-number-error"));
-            return;
-        }
-
-        CultureInfo culture;
-        try
-        {
-            culture = CultureInfo.GetCultureInfo(args[0], predefinedOnly: false);
-        }
-        catch (CultureNotFoundException)
-        {
-            shell.WriteError(Loc.GetString("cmd-parse-failure-cultureinfo", ("arg", args[0])));
-            return;
-        }
-
-        LocalizationManager.SetCulture(culture);
-        shell.WriteLine(LocalizationManager.GetString("cmd-localization_set_culture-changed",
-            ("code", culture.Name),
-            ("nativeName", culture.NativeName),
-            ("englishName", culture.EnglishName)));
-    }
-
-    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
-    {
-        return args.Length switch
-        {
-            1 => CompletionResult.FromHintOptions(GetCultureNames(),
-                LocalizationManager.GetString("cmd-localization_set_culture-culture-name")),
-            _ => CompletionResult.Empty
-        };
-    }
-
-    private static HashSet<string> GetCultureNames()
-    {
-        var cultureInfos = CultureInfo.GetCultures(CultureTypes.AllCultures)
-            .Where(x => !string.IsNullOrEmpty(x.Name))
-            .ToArray();
-
-        var allNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-        allNames.UnionWith(cultureInfos.Select(x => x.TwoLetterISOLanguageName));
-        allNames.UnionWith(cultureInfos.Select(x => x.Name));
-
-        return allNames;
-    }
-}

Robust.Client/Console/Commands/ShowPlayerVelocityCommand.cs

@@ -1,18 +0,0 @@
-using Robust.Client.GameObjects;
-using Robust.Shared.Console;
-using Robust.Shared.IoC;
-
-namespace Robust.Client.Console.Commands
-{
-    public sealed class ShowPlayerVelocityCommand : LocalizedEntityCommands
-    {
-        [Dependency] private readonly ShowPlayerVelocityDebugSystem _system = default!;
-
-        public override string Command => "showplayervelocity";
-
-        public override void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            _system.Enabled ^= true;
-        }
-    }
-}

Robust.Client/Console/Commands/VelocitiesCommand.cs

@@ -0,0 +1,19 @@
+using Robust.Client.GameObjects;
+using Robust.Shared.Console;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+
+namespace Robust.Client.Console.Commands
+{
+    public sealed class VelocitiesCommand : LocalizedCommands
+    {
+        [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
+
+        public override string Command => "showvelocities";
+
+        public override void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            _entitySystems.GetEntitySystem<VelocityDebugSystem>().Enabled ^= true;
+        }
+    }
+}

Robust.Client/Console/Completions.cs

@@ -85,7 +85,7 @@ namespace Robust.Client.Console
                 MouseFilter = MouseFilterMode.Stop;
                 Result = result;
                 var compl = new FormattedMessage();
-                var dim = Color.FromHsl(new Vector4(0f, 0f, 0.8f, 1f));
+                var dim = Color.FromHsl((0f, 0f, 0.8f, 1f));
 
                 // warning: ew ahead
                 string basen = "default";

Robust.Client/Debugging/DebugAnchoringSystem.cs

@@ -82,7 +82,7 @@ namespace Robust.Client.Debugging
 
             foreach (var ent in _mapSystem.GetAnchoredEntities(gridUid, grid, spot))
             {
-                if (TryComp(ent, out MetaDataComponent? meta))
+                if (EntityManager.TryGetComponent<MetaDataComponent>(ent, out var meta))
                 {
                     text.AppendLine($"uid: {ent}, {meta.EntityName}");
                 }

Robust.Client/Debugging/DebugDrawingSystem.cs

@@ -1,221 +1,140 @@
+using System.Numerics;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics.Components;
-using System.Numerics;
 
-namespace Robust.Client.Debugging;
-
-/// <summary>
-/// A collection of visual debug overlays for the client game.
-/// </summary>
-public sealed class DebugDrawingSystem : EntitySystem
+namespace Robust.Client.Debugging
 {
-    [Dependency] private readonly IOverlayManager _overlayManager = default!;
-    [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-
-    private bool _debugPositions;
-    private bool _debugRotations;
-    private bool _debugVelocities;
-    private bool _debugAngularVelocities;
-
     /// <summary>
-    /// Toggles the visual overlay of the local origin for each entity on screen.
+    /// A collection of visual debug overlays for the client game.
     /// </summary>
-    public bool DebugPositions
+    public sealed class DebugDrawingSystem : EntitySystem
     {
-        get => _debugPositions;
-        set
+        [Dependency] private readonly IOverlayManager _overlayManager = default!;
+        [Dependency] private readonly EntityLookupSystem _lookup = default!;
+        [Dependency] private readonly TransformSystem _transform = default!;
+
+
+        private bool _debugPositions;
+        private bool _debugRotations;
+
+        /// <summary>
+        /// Toggles the visual overlay of the local origin for each entity on screen.
+        /// </summary>
+        public bool DebugPositions
         {
-            if (value == DebugPositions)
+            get => _debugPositions;
+            set
             {
-                return;
-            }
+                if (value == DebugPositions)
+                {
+                    return;
+                }
 
-            _debugPositions = value;
+                _debugPositions = value;
 
-            if (value && !_overlayManager.HasOverlay<EntityPositionOverlay>())
-            {
-                _overlayManager.AddOverlay(new EntityPositionOverlay(_lookup, _transform));
-            }
-            else
-            {
-                _overlayManager.RemoveOverlay<EntityPositionOverlay>();
+                if (value && !_overlayManager.HasOverlay<EntityPositionOverlay>())
+                {
+                    _overlayManager.AddOverlay(new EntityPositionOverlay(_lookup, EntityManager, _transform));
+                }
+                else
+                {
+                    _overlayManager.RemoveOverlay<EntityPositionOverlay>();
+                }
             }
         }
-    }
 
-    /// <summary>
-    /// Toggles the visual overlay of the rotation for each entity on screen.
-    /// </summary>
-    public bool DebugRotations
-    {
-        get => _debugRotations;
-        set
+        /// <summary>
+        /// Toggles the visual overlay of the local rotation.
+        /// </summary>
+        public bool DebugRotations
         {
-            if (value == DebugRotations)
+            get => _debugRotations;
+            set
             {
-                return;
-            }
+                if (value == DebugRotations)
+                {
+                    return;
+                }
 
-            _debugRotations = value;
+                _debugRotations = value;
 
-            if (value && !_overlayManager.HasOverlay<EntityRotationOverlay>())
-            {
-                _overlayManager.AddOverlay(new EntityRotationOverlay(_lookup, _transform));
-            }
-            else
-            {
-                _overlayManager.RemoveOverlay<EntityRotationOverlay>();
+                if (value && !_overlayManager.HasOverlay<EntityRotationOverlay>())
+                {
+                    _overlayManager.AddOverlay(new EntityRotationOverlay(_lookup, EntityManager));
+                }
+                else
+                {
+                    _overlayManager.RemoveOverlay<EntityRotationOverlay>();
+                }
             }
         }
-    }
 
-    /// <summary>
-    /// Toggles the visual overlay of the local velocity for each entity on screen.
-    /// </summary>
-    public bool DebugVelocities
-    {
-        get => _debugVelocities;
-        set
+        private sealed class EntityPositionOverlay : Overlay
         {
-            if (value == DebugVelocities)
+            private readonly EntityLookupSystem _lookup;
+            private readonly IEntityManager _entityManager;
+            private readonly SharedTransformSystem _transform;
+
+            public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+            public EntityPositionOverlay(EntityLookupSystem lookup, IEntityManager entityManager, SharedTransformSystem transform)
             {
-                return;
+                _lookup = lookup;
+                _entityManager = entityManager;
+                _transform = transform;
             }
 
-            _debugVelocities = value;
+            protected internal override void Draw(in OverlayDrawArgs args)
+            {
+                const float stubLength = 0.25f;
 
-            if (value && !_overlayManager.HasOverlay<EntityVelocityOverlay>())
-            {
-                _overlayManager.AddOverlay(new EntityVelocityOverlay(EntityManager, _lookup, _transform));
-            }
-            else
-            {
-                _overlayManager.RemoveOverlay<EntityVelocityOverlay>();
+                var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
+
+                foreach (var entity in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
+                {
+                    var (center, worldRotation) = _transform.GetWorldPositionRotation(entity);
+
+                    var xLine = worldRotation.RotateVec(Vector2.UnitX);
+                    var yLine = worldRotation.RotateVec(Vector2.UnitY);
+
+                    worldHandle.DrawLine(center, center + xLine * stubLength, Color.Red);
+                    worldHandle.DrawLine(center, center + yLine * stubLength, Color.Green);
+                }
             }
         }
-    }
 
-    /// <summary>
-    /// Toggles the visual overlay of the angular velocity for each entity on screen.
-    /// </summary>
-    public bool DebugAngularVelocities
-    {
-        get => _debugAngularVelocities;
-        set
+        private sealed class EntityRotationOverlay : Overlay
         {
-            if (value == DebugAngularVelocities)
+            private readonly EntityLookupSystem _lookup;
+            private readonly IEntityManager _entityManager;
+
+            public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+            public EntityRotationOverlay(EntityLookupSystem lookup, IEntityManager entityManager)
             {
-                return;
+                _lookup = lookup;
+                _entityManager = entityManager;
             }
 
-            _debugAngularVelocities = value;
-
-            if (value && !_overlayManager.HasOverlay<EntityAngularVelocityOverlay>())
+            protected internal override void Draw(in OverlayDrawArgs args)
             {
-                _overlayManager.AddOverlay(new EntityAngularVelocityOverlay(EntityManager, _lookup, _transform));
-            }
-            else
-            {
-                _overlayManager.RemoveOverlay<EntityAngularVelocityOverlay>();
-            }
-        }
-    }
-    private sealed class EntityPositionOverlay(EntityLookupSystem _lookup, SharedTransformSystem _transform) : Overlay
-    {
-        public override OverlaySpace Space => OverlaySpace.WorldSpace;
+                const float stubLength = 0.25f;
+                var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
+                var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
 
-        protected internal override void Draw(in OverlayDrawArgs args)
-        {
-            const float stubLength = 0.25f;
+                foreach (var entity in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
+                {
+                    var (center, worldRotation) = xformQuery.GetComponent(entity).GetWorldPositionRotation();
 
-            var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
+                    var drawLine = worldRotation.RotateVec(-Vector2.UnitY);
 
-            foreach (var uid in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
-            {
-                var (center, worldRotation) = _transform.GetWorldPositionRotation(uid);
-
-                var xLine = worldRotation.RotateVec(Vector2.UnitX);
-                var yLine = worldRotation.RotateVec(Vector2.UnitY);
-
-                worldHandle.DrawLine(center, center + xLine * stubLength, Color.Red);
-                worldHandle.DrawLine(center, center + yLine * stubLength, Color.Green);
-            }
-        }
-    }
-
-    private sealed class EntityRotationOverlay(EntityLookupSystem _lookup, SharedTransformSystem _transform) : Overlay
-    {
-        public override OverlaySpace Space => OverlaySpace.WorldSpace;
-
-        protected internal override void Draw(in OverlayDrawArgs args)
-        {
-            const float stubLength = 0.25f;
-            var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
-
-            foreach (var uid in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
-            {
-                var (center, worldRotation) = _transform.GetWorldPositionRotation(uid);
-
-                var drawLine = worldRotation.RotateVec(-Vector2.UnitY);
-
-                worldHandle.DrawLine(center, center + drawLine * stubLength, Color.Red);
-            }
-        }
-    }
-
-    private sealed class EntityVelocityOverlay(IEntityManager _entityManager, EntityLookupSystem _lookup, SharedTransformSystem _transform) : Overlay
-    {
-        public override OverlaySpace Space => OverlaySpace.WorldSpace;
-
-        protected internal override void Draw(in OverlayDrawArgs args)
-        {
-            const float multiplier = 0.2f;
-
-            var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
-
-            var physicsQuery = _entityManager.GetEntityQuery<PhysicsComponent>();
-            foreach (var uid in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
-            {
-                if(!physicsQuery.TryGetComponent(uid, out var physicsComp))
-                    continue;
-
-                var center = _transform.GetWorldPosition(uid);
-                var localVelocity = physicsComp.LinearVelocity;
-
-                if (localVelocity != Vector2.Zero)
-                    worldHandle.DrawLine(center, center + localVelocity * multiplier, Color.Yellow);
-            }
-        }
-    }
-
-    private sealed class EntityAngularVelocityOverlay(IEntityManager _entityManager, EntityLookupSystem _lookup, SharedTransformSystem _transform) : Overlay
-    {
-        public override OverlaySpace Space => OverlaySpace.WorldSpace;
-
-        protected internal override void Draw(in OverlayDrawArgs args)
-        {
-            const float multiplier = (float)(0.2 / (2 * System.Math.PI));
-
-            var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
-
-            var physicsQuery = _entityManager.GetEntityQuery<PhysicsComponent>();
-            foreach (var uid in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
-            {
-                if(!physicsQuery.TryGetComponent(uid, out var physicsComp))
-                    continue;
-
-                var center = _transform.GetWorldPosition(uid);
-                var angularVelocity = physicsComp.AngularVelocity;
-
-                if (angularVelocity != 0.0f)
-                    worldHandle.DrawCircle(center, angularVelocity * multiplier, angularVelocity > 0 ? Color.Magenta : Color.Blue, false);
+                    worldHandle.DrawLine(center, center + drawLine * stubLength, Color.Red);
+                }
             }
         }
     }
 }
-

Robust.Client/Debugging/DebugPhysicsSystem.cs

@@ -413,9 +413,8 @@ namespace Robust.Client.Debugging
                     }
 
                     var body = bodyEnt.Comp;
-                    var meta = _entityManager.GetComponent<MetaDataComponent>(bodyEnt);
 
-                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {bodyEnt.Owner} ({meta.EntityName})");
+                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {bodyEnt.Owner}");
                     row++;
                     screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Layer: {Convert.ToString(body.CollisionLayer, 2)}");
                     row++;

Robust.Client/GameController/GameController.Standalone.cs

@@ -23,7 +23,6 @@ namespace Robust.Client
         private Thread? _gameThread;
         private ISawmill _logger = default!;
 
-        [STAThread]
         public static void Main(string[] args)
         {
             Start(args, new GameControllerOptions());

Robust.Client/GameController/GameController.cs

@@ -31,7 +31,6 @@ using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Exceptions;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
@@ -94,8 +93,6 @@ namespace Robust.Client
         [Dependency] private readonly IReplayPlaybackManager _replayPlayback = default!;
         [Dependency] private readonly IReplayRecordingManagerInternal _replayRecording = default!;
         [Dependency] private readonly IReflectionManager _reflectionManager = default!;
-        [Dependency] private readonly IReloadManager _reload = default!;
-        [Dependency] private readonly ILocalizationManager _loc = default!;
 
         private IWebViewManagerHook? _webViewHook;
 
@@ -160,7 +157,6 @@ namespace Robust.Client
             }
 
             _serializationManager.Initialize();
-            _loc.Initialize();
 
             // Call Init in game assemblies.
             _modLoader.BroadcastRunLevel(ModRunLevel.PreInit);
@@ -189,7 +185,6 @@ namespace Robust.Client
             // before prototype load.
             ProgramShared.FinishCheckBadFileExtensions(checkBadExtensions);
 
-            _reload.Initialize();
             _reflectionManager.Initialize();
             _prototypeManager.Initialize();
             _prototypeManager.LoadDefaultPrototypes();
@@ -387,7 +382,7 @@ namespace Robust.Client
 
             _prof.Initialize();
 
-            _resManager.Initialize(Options.LoadConfigAndUserData ? userDataDir : null);
+            _resManager.Initialize(Options.LoadConfigAndUserData ? userDataDir : null, hideUserDataDir: true);
 
             var mountOptions = _commandLineArgs != null
                 ? MountOptions.Merge(_commandLineArgs.MountOptions, Options.MountOptions)

Robust.Client/GameObjects/ClientEntityManager.Spawn.cs

@@ -1,123 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Robust.Shared.Containers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Robust.Client.GameObjects;
-
-public sealed partial class ClientEntityManager
-{
-    public override EntityUid PredictedSpawnAttachedTo(string? protoName, EntityCoordinates coordinates, ComponentRegistry? overrides = null, Angle rotation = default)
-    {
-        var ent = SpawnAttachedTo(protoName, coordinates, overrides, rotation);
-        FlagPredicted(ent);
-        return ent;
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public override EntityUid PredictedSpawn(string? protoName = null, ComponentRegistry? overrides = null, bool doMapInit = true)
-    {
-        var ent = Spawn(protoName, overrides, doMapInit);
-        FlagPredicted(ent);
-        return ent;
-    }
-
-    public override EntityUid PredictedSpawn(string? protoName, MapCoordinates coordinates, ComponentRegistry? overrides = null, Angle rotation = default!)
-    {
-        var ent = Spawn(protoName, coordinates, overrides, rotation);
-        FlagPredicted(ent);
-        return ent;
-    }
-
-    public override EntityUid PredictedSpawnAtPosition(string? protoName, EntityCoordinates coordinates, ComponentRegistry? overrides = null)
-    {
-        var ent = SpawnAtPosition(protoName, coordinates, overrides);
-        FlagPredicted(ent);
-        return ent;
-    }
-
-    public override bool PredictedTrySpawnNextTo(
-        string? protoName,
-        EntityUid target,
-        [NotNullWhen(true)] out EntityUid? uid,
-        TransformComponent? xform = null,
-        ComponentRegistry? overrides = null)
-    {
-        if (!TrySpawnNextTo(protoName, target, out uid, xform, overrides))
-            return false;
-
-        FlagPredicted(uid.Value);
-        return true;
-    }
-
-    public override bool PredictedTrySpawnInContainer(
-        string? protoName,
-        EntityUid containerUid,
-        string containerId,
-        [NotNullWhen(true)] out EntityUid? uid,
-        ContainerManagerComponent? containerComp = null,
-        ComponentRegistry? overrides = null)
-    {
-        if (!TrySpawnInContainer(protoName, containerUid, containerId, out uid, containerComp, overrides))
-            return false;
-
-        FlagPredicted(uid.Value);
-        return true;
-    }
-
-    public override EntityUid PredictedSpawnNextToOrDrop(string? protoName, EntityUid target, TransformComponent? xform = null, ComponentRegistry? overrides = null)
-    {
-        var ent = SpawnNextToOrDrop(protoName, target, xform, overrides);
-        FlagPredicted(ent);
-        return ent;
-    }
-
-    public override EntityUid PredictedSpawnInContainerOrDrop(
-        string? protoName,
-        EntityUid containerUid,
-        string containerId,
-        TransformComponent? xform = null,
-        ContainerManagerComponent? containerComp = null,
-        ComponentRegistry? overrides = null)
-    {
-        var ent = SpawnInContainerOrDrop(protoName, containerUid, containerId, xform, containerComp, overrides);
-        FlagPredicted(ent);
-        return ent;
-    }
-
-    public override EntityUid PredictedSpawnInContainerOrDrop(
-        string? protoName,
-        EntityUid containerUid,
-        string containerId,
-        out bool inserted,
-        TransformComponent? xform = null,
-        ContainerManagerComponent? containerComp = null,
-        ComponentRegistry? overrides = null)
-    {
-        var ent = SpawnInContainerOrDrop(protoName,
-            containerUid,
-            containerId,
-            out inserted,
-            xform,
-            containerComp,
-            overrides);
-
-        FlagPredicted(ent);
-        return ent;
-    }
-
-    public override void FlagPredicted(Entity<MetaDataComponent?> ent)
-    {
-        if (!MetaQuery.Resolve(ent.Owner, ref ent.Comp))
-            return;
-
-        DebugTools.Assert(IsClientSide(ent.Owner, ent.Comp));
-        EnsureComponent<PredictedSpawnComponent>(ent.Owner);
-
-        // TODO: Need to map call site or something, needs to be consistent between client and server.
-    }
-}

Robust.Client/GameObjects/ClientEntityManager.cs

@@ -101,33 +101,11 @@ namespace Robust.Client.GameObjects
         /// <inheritdoc />
         public override void Dirty<T>(Entity<T> ent, MetaDataComponent? meta = null)
         {
-            // Client only dirties during prediction
+            //  Client only dirties during prediction
             if (_gameTiming.InPrediction)
                 base.Dirty(ent, meta);
         }
 
-        public override void DirtyField<T>(EntityUid uid, T comp, string fieldName, MetaDataComponent? metadata = null)
-        {
-            // TODO Prediction
-            // does the client actually need to dirty the field?
-            // I.e., can't it just dirty the whole component to trigger a reset?
-
-            // Client only dirties during prediction
-            if (_gameTiming.InPrediction)
-                base.DirtyField(uid, comp, fieldName, metadata);
-        }
-
-        public override void DirtyFields<T>(EntityUid uid, T comp, MetaDataComponent? meta, params string[] fields)
-        {
-            // TODO Prediction
-            // does the client actually need to dirty the field?
-            // I.e., can't it just dirty the whole component to trigger a reset?
-
-            // Client only dirties during prediction
-            if (_gameTiming.InPrediction)
-                base.DirtyFields(uid, comp, meta, fields);
-        }
-
         /// <inheritdoc />
         public override void Dirty<T1, T2>(Entity<T1, T2> ent, MetaDataComponent? meta = null)
         {
@@ -291,54 +269,5 @@ namespace Robust.Client.GameObjects
             }
         }
         #endregion
-
-        /// <inheritdoc />
-        public override void PredictedDeleteEntity(Entity<MetaDataComponent?, TransformComponent?> ent)
-        {
-            if (!MetaQuery.Resolve(ent.Owner, ref ent.Comp1)
-                || ent.Comp1.EntityLifeStage >= EntityLifeStage.Terminating
-                || !TransformQuery.Resolve(ent.Owner, ref ent.Comp2))
-            {
-                return;
-            }
-
-            // So there's 3 scenarios:
-            // 1. Networked entity we just move to nullspace and rely on state handling.
-            // 2. Clientside predicted entity we delete and rely on state handling.
-            // 3. Clientside only entity that actually needs deleting here.
-
-            if (ent.Comp1.NetEntity.IsClientSide())
-            {
-                DeleteEntity(ent, ent.Comp1, ent.Comp2);
-            }
-            else
-            {
-                _xforms.DetachEntity(ent, ent.Comp2);
-            }
-        }
-
-        /// <inheritdoc />
-        public override void PredictedQueueDeleteEntity(Entity<MetaDataComponent?, TransformComponent?> ent)
-        {
-            if (IsQueuedForDeletion(ent.Owner)
-                || !MetaQuery.Resolve(ent.Owner, ref ent.Comp1)
-                || ent.Comp1.EntityLifeStage >= EntityLifeStage.Terminating
-                || !TransformQuery.Resolve(ent.Owner, ref ent.Comp2))
-            {
-                return;
-            }
-
-            if (ent.Comp1.NetEntity.IsClientSide())
-            {
-                // client-side QueueDeleteEntity re-fetches MetadataComp and checks IsClientSide().
-                // base call to skip that.
-                // TODO create override that takes in metadata comp
-                base.QueueDeleteEntity(ent);
-            }
-            else
-            {
-                _xforms.DetachEntity(ent.Owner, ent.Comp2);
-            }
-        }
     }
 }

Robust.Client/GameObjects/Components/Renderable/IRenderableComponent.cs

@@ -1,11 +1,9 @@
-using System;
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.GameObjects
 {
-    [Obsolete]
     public partial interface IRenderableComponent : IComponent
     {
         int DrawDepth { get; set; }

Robust.Client/GameObjects/Components/Renderable/ISpriteLayer.cs

@@ -1,5 +1,6 @@
 using System.Numerics;
 using Robust.Client.Graphics;
+using Robust.Shared.Graphics;
 using Robust.Shared.Graphics.RSI;
 using Robust.Shared.Maths;
 

Robust.Client/GameObjects/Components/Renderable/SpriteBoundsOverlay.cs

@@ -10,21 +10,21 @@ using Robust.Shared.Utility;
 
 namespace Robust.Client.GameObjects
 {
-    public sealed class ShowSpriteBBCommand : LocalizedEntityCommands
+    public sealed class ShowSpriteBBCommand : LocalizedCommands
     {
-        [Dependency] private readonly SpriteBoundsSystem _system = default!;
-
         public override string Command => "showspritebb";
 
         public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            _system.Enabled ^= true;
+            EntitySystem.Get<SpriteBoundsSystem>().Enabled ^= true;
         }
     }
 
     public sealed class SpriteBoundsSystem : EntitySystem
     {
+        [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IOverlayManager _overlayManager = default!;
+        [Dependency] private readonly SpriteTreeSystem _spriteTree = default!;
 
         private SpriteBoundsOverlay? _overlay;
 
@@ -40,7 +40,7 @@ namespace Robust.Client.GameObjects
                 if (_enabled)
                 {
                     DebugTools.AssertNull(_overlay);
-                    _overlay = new SpriteBoundsOverlay(EntityManager);
+                    _overlay = new SpriteBoundsOverlay(_spriteTree, _entityManager);
                     _overlayManager.AddOverlay(_overlay);
                 }
                 else
@@ -55,13 +55,18 @@ namespace Robust.Client.GameObjects
         private bool _enabled;
     }
 
-    public sealed class SpriteBoundsOverlay(IEntityManager entMan) : Overlay
+    public sealed class SpriteBoundsOverlay : Overlay
     {
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
-        private readonly SharedTransformSystem _xformSystem = entMan.System<SharedTransformSystem>();
-        private readonly SpriteSystem _spriteSystem = entMan.System<SpriteSystem>();
-        private readonly SpriteTreeSystem _renderTree = entMan.System<SpriteTreeSystem>();
+        private readonly IEntityManager _entityManager;
+        private SpriteTreeSystem _renderTree;
+
+        public SpriteBoundsOverlay(SpriteTreeSystem renderTree, IEntityManager entityManager)
+        {
+            _renderTree = renderTree;
+            _entityManager = entityManager;
+        }
 
         protected internal override void Draw(in OverlayDrawArgs args)
         {
@@ -69,11 +74,10 @@ namespace Robust.Client.GameObjects
             var currentMap = args.MapId;
             var viewport = args.WorldBounds;
 
-            foreach (var entry in _renderTree.QueryAabb(currentMap, viewport))
+            foreach (var (sprite, xform) in _renderTree.QueryAabb(currentMap, viewport))
             {
-                var (sprite, xform) = entry;
-                var (worldPos, worldRot) = _xformSystem.GetWorldPositionRotation(xform);
-                var bounds = _spriteSystem.CalculateBounds((entry.Uid, sprite), worldPos, worldRot, args.Viewport.Eye?.Rotation ?? default);
+                var (worldPos, worldRot) = xform.GetWorldPositionRotation();
+                var bounds = sprite.CalculateRotatedBoundingBox(worldPos, worldRot, args.Viewport.Eye?.Rotation ?? default);
 
                 // Get scaled down bounds used to indicate the "south" of a sprite.
                 var localBound = bounds.Box;

Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs

@@ -14,9 +14,7 @@ namespace Robust.Client.GameObjects
         private EntityQuery<AnimationPlayerComponent> _playerQuery;
         private EntityQuery<MetaDataComponent> _metaQuery;
 
-#pragma warning disable CS0414
         [Dependency] private readonly IComponentFactory _compFact = default!;
-#pragma warning restore CS0414
 
         public override void Initialize()
         {
@@ -78,7 +76,7 @@ namespace Robust.Client.GameObjects
             foreach (var key in remie)
             {
                 component.PlayingAnimations.Remove(key);
-                var completedEvent = new AnimationCompletedEvent(uid, component, key, true);
+                var completedEvent = new AnimationCompletedEvent {Uid = uid, Key = key, Finished = true};
                 EntityManager.EventBus.RaiseLocalEvent(uid, completedEvent, true);
             }
 
@@ -97,7 +95,7 @@ namespace Robust.Client.GameObjects
         [Obsolete("Use Play(EntityUid<AnimationPlayerComponent> ent, Animation animation, string key) instead")]
         public void Play(EntityUid uid, AnimationPlayerComponent? component, Animation animation, string key)
         {
-            component ??= EnsureComp<AnimationPlayerComponent>(uid);
+            component ??= EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
             Play(new Entity<AnimationPlayerComponent>(uid, component), animation, key);
         }
 
@@ -158,7 +156,7 @@ namespace Robust.Client.GameObjects
 
         public bool HasRunningAnimation(EntityUid uid, string key)
         {
-            return TryComp(uid, out AnimationPlayerComponent? component) &&
+            return EntityManager.TryGetComponent(uid, out AnimationPlayerComponent? component) &&
                    component.PlayingAnimations.ContainsKey(key);
         }
 
@@ -189,7 +187,7 @@ namespace Robust.Client.GameObjects
                 return;
             }
 
-            var completedEvent = new AnimationCompletedEvent(entity.Owner, entity.Comp, key, false);
+            var completedEvent = new AnimationCompletedEvent {Uid = entity.Owner, Key = key, Finished = false};
             EntityManager.EventBus.RaiseLocalEvent(entity.Owner, completedEvent, true);
         }
 
@@ -204,33 +202,13 @@ namespace Robust.Client.GameObjects
     /// </summary>
     public sealed class AnimationCompletedEvent : EntityEventArgs
     {
-        /// <summary>
-        /// The entity associated with the event.
-        /// </summary>
         public EntityUid Uid { get; init; }
-
-        /// <summary>
-        /// The animation player component associated with the entity this event was raised on.
-        /// </summary>
-        public AnimationPlayerComponent AnimationPlayer { get; init; }
-
-        /// <summary>
-        /// The key associated with the animation that was completed.
-        /// </summary>
         public string Key { get; init; } = string.Empty;
 
         /// <summary>
         /// If true, the animation finished by getting to its natural end.
-        /// If false, it was removed prematurely via <see cref="AnimationPlayerSystem.Stop(EntityUid,AnimationPlayerComponent,string)"/> or similar overloads.
+        /// If false, it was removed prematurely via <see cref="AnimationPlayerSystem.Stop(Robust.Client.GameObjects.AnimationPlayerComponent,string)"/> or similar overloads.
         /// </summary>
         public bool Finished { get; init; }
-
-        public AnimationCompletedEvent(EntityUid uid, AnimationPlayerComponent animationPlayer, string key, bool finished = true)
-        {
-            Uid = uid;
-            AnimationPlayer = animationPlayer;
-            Key = key;
-            Finished = finished;
-        }
     }
 }