Version: 136.0.2

(cherry picked from commit 24d5c26fa6)
(cherry picked from commit b89d13d39ffa53b9ca687946c6b56e86449d50bd)

.github/CODEOWNERS

@@ -1,9 +1,7 @@
 # Last match in file takes precedence.
 
 # Ping for all PRs
-* @Acruid @PJB3005 @Silvertorch5
-
-/Robust.*/Audio/Midi/ @Zumorica
+* @Acruid @PJB3005 @ZoldorfTheWizard
 
 /Robust.Client.NameGenerator @PaulRitter
 /Robust.Client.Injectors @PaulRitter

.github/workflows/build-docfx.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   docfx:
    runs-on: ubuntu-latest
-   steps: 
+   steps:
     - uses: actions/checkout@v2
       with:
         submodules: true
@@ -14,21 +14,21 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
-        
+        dotnet-version: 7.0.x
+
     - name: Install dependencies
       run: dotnet restore
-      
+
     - name: Build Project
       run: dotnet build --no-restore /p:WarningsAsErrors=nullable
 
     - name: Build DocFX
-      uses: nikeee/docfx-action@v1.0.0      
+      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 }} 
+        BUILD_DIR: Robust.Docfx/_robust-site
+        GH_PAT: ${{ secrets.GH_PAT }}

.github/workflows/build-test.yml

@@ -22,12 +22,12 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore /p:WarningsAsErrors=nullable
     - name: Test Engine
       run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
- 
+
 

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
 
     - name: Build
       run: dotnet build

.github/workflows/publish-client.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
 
     - name: Package client
       run: Tools/package_client_build.py -p windows mac linux

.github/workflows/test-content.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
     - name: Disable submodule autoupdate
       run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
 
@@ -34,7 +34,7 @@ jobs:
     - name: Install dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --configuration Release --no-restore
+      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

Avalonia.Base/Avalonia.Base.csproj

@@ -1,7 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
-    </PropertyGroup>
-
+  <Import Project="..\MSBuild\Robust.Engine.props" />
 </Project>

Lidgren.Network/Lidgren.Network.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>SpaceWizards.Lidgren.Network</AssemblyName>
 
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -9,6 +8,8 @@
     <DefaultItemExcludes>Lidgren.Network/**/*</DefaultItemExcludes>
     <DefineConstants>$(DefineConstants);USE_RELEASE_STATISTICS</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+    <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,4 +19,5 @@
     <Compile Remove="Lidgren.Network\Lidgren.Network\obj\**\*.cs" />
   </ItemGroup>
 
+  <Import Project="../MSBuild/Robust.Properties.targets" />
 </Project>

MSBuild/Robust.CompNetworkGenerator.targets

@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
+  </ItemGroup>
+</Project>

MSBuild/Robust.Configurations.props

@@ -0,0 +1,37 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Build configurations -->
+  <PropertyGroup>
+    <!-- Avoid SDK defining DEBUG/RELEASE/DEBUGOPT/TOOLS itself. -->
+    <DisableImplicitConfigurationDefines>true</DisableImplicitConfigurationDefines>
+
+    <!-- Project configurations -->
+    <Configurations>Debug;Release;Tools;DebugOpt</Configurations>
+    <Platforms>AnyCPU</Platforms>
+  </PropertyGroup>
+  <!-- Debug configuration: asserts, tools, no optimizations -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
+    <Optimize Condition="'$(Optimize)' == ''">false</Optimize>
+    <RobustToolsBuild Condition="'$(RobustToolsBuild)' == ''">true</RobustToolsBuild>
+    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <!-- DebugOpt configuration: asserts, tools, optimizations -->
+  <PropertyGroup Condition="'$(Configuration)' == 'DebugOpt'">
+    <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
+    <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
+    <RobustToolsBuild Condition="'$(RobustToolsBuild)' == ''">true</RobustToolsBuild>
+    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <!-- Tools configuration: no asserts, tools, optimizations -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Tools'">
+    <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
+    <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
+    <RobustToolsBuild Condition="'$(RobustToolsBuild)' == ''">true</RobustToolsBuild>
+  </PropertyGroup>
+  <!-- Release configuration: no asserts, no tools, optimizations -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
+    <RobustToolsBuild Condition="'$(RobustToolsBuild)' == ''">false</RobustToolsBuild>
+    <DefineConstants>RELEASE;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+</Project>

MSBuild/Robust.DefineConstants.targets

@@ -20,6 +20,9 @@
   <PropertyGroup Condition="'$(FullRelease)' == 'True'">
     <DefineConstants>$(DefineConstants);FULL_RELEASE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(FullRelease)' != 'True'">
+    <DefineConstants>$(DefineConstants);DEVELOPMENT</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <DefineConstants>$(DefineConstants);EXCEPTION_TOLERANCE</DefineConstants>
   </PropertyGroup>
@@ -29,4 +32,7 @@
   <PropertyGroup Condition="'$(UseSystemSqlite)' == 'True'">
     <DefineConstants>$(DefineConstants);USE_SYSTEM_SQLITE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(RobustToolsBuild)' == 'true'">
+    <DefineConstants>$(DefineConstants);TOOLS</DefineConstants>
+  </PropertyGroup>
 </Project>

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
-<Project>
-    <!-- This file automatically reset by Tools/version.py -->
-    <PropertyGroup><Version>0.56.0.2</Version></PropertyGroup>
-</Project>
+<Project>
+
+    <!-- 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>net6.0</TargetFramework>
-        <LangVersion>10</LangVersion>
+        <TargetFramework>net7.0</TargetFramework>
+        <LangVersion>11</LangVersion>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
     </PropertyGroup>

MSBuild/Robust.Platform.props

@@ -0,0 +1,35 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- MSBuild hurts and I can't find a foolproof way to detect platform. -->
+  <PropertyGroup>
+    <OS Condition="'$(OS)' == ''">Windows_NT</OS>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(OS)' != 'Unix'">
+      <PropertyGroup>
+        <ActualOS>Windows</ActualOS>
+      </PropertyGroup>
+    </When>
+    <!-- Folders that *probably* only exist on MacOS and not Linux. -->
+    <When Condition="Exists('/Volumes') And Exists('/System') And Exists('/Library')" >
+      <PropertyGroup>
+        <ActualOS>MacOS</ActualOS>
+      </PropertyGroup>
+    </When>
+    <When Condition="$([MSBuild]::IsOSPlatform('FreeBSD'))">
+      <PropertyGroup>
+        <ActualOS>FreeBSD</ActualOS>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <ActualOS>Linux</ActualOS>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <PropertyGroup>
+    <TargetOS Condition="'$(TargetOS)' == ''">$(ActualOS)</TargetOS>
+    <Python>python3</Python>
+    <Python Condition="'$(ActualOS)' == 'Windows'">py -3</Python>
+    <UseSystemSqlite Condition="'$(TargetOS)' == 'FreeBSD'">True</UseSystemSqlite>
+  </PropertyGroup>
+</Project>

MSBuild/Robust.Properties.targets

@@ -1,40 +1,28 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Properties for both engine and content. -->
+  <!-- Import this at the end of any project files in Robust and Content. -->
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+  </PropertyGroup>
+
   <Import Project="Robust.Custom.targets" Condition="Exists('Robust.Custom.targets')"/>
-  <!-- MSBuild hurts and I can't find a foolproof way to detect platform. -->
+
+  <!-- Configuration logic -->
+  <Import Project="Robust.Configurations.props" />
+
+  <!-- Some platform management logic -->
+  <Import Project="Robust.Platform.props" />
+
   <PropertyGroup>
-    <OS Condition="'$(OS)' == ''">Windows_NT</OS>
-  </PropertyGroup>
-  <Choose>
-    <When Condition="'$(OS)' != 'Unix'">
-      <PropertyGroup>
-        <ActualOS>Windows</ActualOS>
-      </PropertyGroup>
-    </When>
-    <!-- Folders that *probably* only exist on MacOS and not Linux. -->
-    <When Condition="Exists('/Volumes') And Exists('/System') And Exists('/Library')" >
-      <PropertyGroup>
-        <ActualOS>MacOS</ActualOS>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::IsOSPlatform('FreeBSD'))">
-      <PropertyGroup>
-        <ActualOS>FreeBSD</ActualOS>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <ActualOS>Linux</ActualOS>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <PropertyGroup>
-    <TargetOS Condition="'$(TargetOS)' == ''">$(ActualOS)</TargetOS>
-    <Python>python3</Python>
-    <Python Condition="'$(ActualOS)' == 'Windows'">py -3</Python>
-    <TargetFramework>net6.0</TargetFramework>
-    <EnableClientScripting>True</EnableClientScripting>
-    <!-- Client scripting is disabled on full release builds for security and size reasons. -->
-    <EnableClientScripting Condition="'$(FullRelease)' == 'True'">False</EnableClientScripting>
-    <UseSystemSqlite Condition="'$(TargetOS)' == 'FreeBSD'">True</UseSystemSqlite>
+    <EnableClientScripting>False</EnableClientScripting>
+    <!-- Client scripting is only enabled on tools builds for security and size reasons. -->
+    <EnableClientScripting Condition="'$(RobustToolsBuild)' == 'true'">True</EnableClientScripting>
   </PropertyGroup>
+
+  <!-- built-in define constants -->
+  <Import Project="Robust.DefineConstants.targets" />
+
+  <!-- analyzer -->
+  <Import Project="Robust.Analyzers.targets" Condition="'$(SkipRobustAnalyzer)' != 'true'" />
 </Project>

MSBuild/XamlIL.targets

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Avoid MSBuild adding a None entry for XAML files because they'd show up TWICE in the project view. -->
     <DefaultItemExcludes>**/*.xaml</DefaultItemExcludes>
-    <RobustUseExternalMSBuild>false</RobustUseExternalMSBuild>
+    <RobustUseExternalMSBuild>true</RobustUseExternalMSBuild>
     <_RobustUseExternalMSBuild>$(RobustUseExternalMSBuild)</_RobustUseExternalMSBuild>
     <_RobustUseExternalMSBuild Condition="'$(_RobustForceInternalMSBuild)' == 'true'">false</_RobustUseExternalMSBuild>
   </PropertyGroup>
@@ -19,10 +19,17 @@
     <ProjectReference Include="$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\Robust.Client.Injectors.csproj" ReferenceOutputAssembly="false"/>
   </ItemGroup>
 
+  <!-- XamlIL does not make use of special Robust configurations like DebugOpt. Convert these down. -->
+  <PropertyGroup>
+    <RobustInjectorsConfiguration>$(Configuration)</RobustInjectorsConfiguration>
+    <RobustInjectorsConfiguration Condition="'$(Configuration)' == 'DebugOpt'">Debug</RobustInjectorsConfiguration>
+    <RobustInjectorsConfiguration Condition="'$(Configuration)' == 'Tools'">Release</RobustInjectorsConfiguration>
+  </PropertyGroup>
+
   <UsingTask
     Condition="'$(_RobustUseExternalMSBuild)' != 'true' And $(DesignTimeBuild) != true"
     TaskName="CompileRobustXamlTask"
-    AssemblyFile="$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\bin\$(Configuration)\netstandard2.0\Robust.Client.Injectors.dll"/>
+    AssemblyFile="$(MSBuildThisFileDirectory)\..\Robust.Client.Injectors\bin\$(RobustInjectorsConfiguration)\netstandard2.0\Robust.Client.Injectors.dll"/>
   <Target
     Name="CompileRobustXaml"
     Condition="Exists('@(IntermediateAssembly)')"

OpenToolkit.GraphicsLibraryFramework/GLFWNative.cs

@@ -25,7 +25,7 @@ namespace OpenToolkit.GraphicsLibraryFramework
                 }
 
                 string rName = null;
-                if (OperatingSystem.IsLinux()) rName = "libglfw.so.3";
+                if (OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD()) rName = "libglfw.so.3";
                 else if (OperatingSystem.IsMacOS()) rName = "libglfw.3.dylib";
 
                 if ((rName != null) && NativeLibrary.TryLoad(rName, assembly, path, out var handle))

OpenToolkit.GraphicsLibraryFramework/OpenToolkit.GraphicsLibraryFramework.csproj

@@ -1,17 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\MSBuild\Robust.Properties.targets" />
-
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>7.3</LangVersion>
+    <LangVersion>9.0</LangVersion>
+    <SkipRobustAnalyzer>true</SkipRobustAnalyzer>
   </PropertyGroup>
 
-  <Import Project="..\MSBuild\Robust.DefineConstants.targets" />
-
-  <ItemGroup>
-    <PackageReference Condition="'$(TargetFramework)' == 'net472'" Include="System.Memory" Version="4.5.3" />
-  </ItemGroup>
-
+  <Import Project="..\MSBuild\Robust.Properties.targets" />
 </Project>

README.md

@@ -18,7 +18,7 @@ We are happy to accept contributions from anybody. Get in Discord or IRC if you
 
 ## Building
 
-This repository is the **engine** part of SS14. It's the base engine all SS14 servers will be built on. As such, it does not start on its own: it needs the [content repo](https://github.com/space-wizards/space-station-14). Think of Robust Toolbox as BYOND in the context of Spacestation 13.
+This repository is the **engine** part of SS14. It's the base engine all SS14 servers will be built on. As such, it does not start on its own: it needs the [content repo](https://github.com/space-wizards/space-station-14). Think of Robust Toolbox as BYOND in the context of Space Station 13.
 
 ## Legal Info
 

Resources/EngineCredits/Libraries.yml

@@ -1546,6 +1546,31 @@
        misrepresented as being the original software.
     3. This notice may not be removed or altered from any source distribution.
 
+- name: FastNoise
+  license: |
+    MIT License
+
+    Copyright(c) 2020 Jordan Peck (jordan.me2@gmail.com)
+    Copyright(c) 2020 Contributors
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files(the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions :
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
 - name: OpenAL soft
   license: |
     GNU LIBRARY GENERAL PUBLIC LICENSE

Resources/EngineFonts/NotoSans/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Resources/EnginePrototypes/Debug/rotation.yml

@@ -0,0 +1,34 @@
+- type: entity
+  id: debugRotation
+  abstract: true
+  suffix: DEBUG
+  components:
+  - type: Sprite
+    netsync: false
+    visible: true
+    sprite: debugRotation.rsi
+    state: direction1
+
+- type: entity
+  id: debugRotation1
+  parent: debugRotation
+  name: dbg_rotation1
+  components:
+  - type: Sprite
+    state: direction1
+
+- type: entity
+  id: debugRotation4
+  parent: debugRotation
+  name: dbg_rotation4
+  components:
+  - type: Sprite
+    state: direction4
+
+- type: entity
+  id: debugRotationTex
+  parent: debugRotation
+  name: dbg_rotationTex
+  components:
+  - type: Sprite
+    state: direction1

Resources/EnginePrototypes/UserInterface/uiThemes.yml

@@ -1,3 +1,44 @@
 - type: uiTheme
   id: Default
-  path: /textures/interface/Default
+  path: /Textures/Interface/Default
+  colors:
+    # Root
+    rootBackground: "#000000"
+
+    # Windows
+    windowBackground: "#111111"
+    windowBorder: "#444444"
+    windowHeader: "#001e3d"
+
+    windowCloseButton: "#FFFFFF"
+    windowCloseButtonHover: "#FF7F7F"
+    windowCloseButtonPressed: "#FF0000"
+
+    # Scrollbars
+    scrollBarDefault: "#80808059"
+    scrollBarHovered: "#8C8C8C59"
+    scrollBarGrabbed: "#8C8C8C59"
+
+    # Buttons
+    buttonBackground: "#171717"
+    buttonBackgroundHovered: "#272727"
+    buttonBackgroundPressed: "#173717"
+    buttonBorder: "#444444"
+    buttonBorderHovered: "#444444"
+    buttonBorderPressed: "#447044"
+    buttonBackgroundDisabled: "#333333"
+    buttonBorderDisabled: "#222222"
+
+    # LineEdit
+    lineEditUneditableText: "#444444"
+    lineEditPlaceholderText: "#7d7d7d"
+    lineEditBackground: "#000000"
+    lineEditBorder: "#444444"
+
+    # TabContainer
+    tabContainerBackground: "#000000"
+    tabContainerBorder: "#444444"
+    tabContainerActiveTabBackground: "#173717"
+    tabContainerActiveTabBorder: "#447044"
+    tabContainerInactiveTabBackground: "#171717"
+    tabContainerInactiveTabBorder: "#444444"

Resources/Locale/en-US/commands.ftl

@@ -8,8 +8,13 @@ cmd-parse-failure-integer = {$arg} is not a valid integer.
 cmd-parse-failure-float = {$arg} is not a valid float.
 cmd-parse-failure-bool = {$arg} is not a valid bool.
 cmd-parse-failure-uid = {$arg} is not a valid entity UID.
+cmd-parse-failure-mapid = {$arg} is not a valid MapId.
 cmd-parse-failure-entity-exist = UID {$arg} does not correspond to an existing entity.
 
+cmd-error-file-not-found = Could not find file: {$file}.
+cmd-error-dir-not-found = Could not find directory: {$dir}.
+
+cmd-failure-no-attached-entity = There is no entity attached to this shell.
 
 ## 'help' command
 cmd-help-desc = Display general help or help text for a specific command
@@ -128,6 +133,11 @@ cmd-monitor-minus-all-hint = Hides all monitors
 cmd-monitor-plus-all-hint = Shows all monitors
 
 
+## 'setambientlight' command
+cmd-set-ambient-light-desc = Allows you to set the ambient light for the specified map, in SRGB.
+cmd-set-ambient-light-help = setambientlight [mapid] [r g b a]
+cmd-set-ambient-light-parse = Unable to parse args as a byte values for a color.
+
 ## Mapping commands
 
 cmd-savemap-desc = Serializes a map to disk. Will not save a post-init map unless forced.
@@ -159,3 +169,392 @@ cmd-hint-savebp-id = <Grid EntityID>
 cmd-flushcookies-desc = Flush CEF cookie storage to disk
 cmd-flushcookies-help = This ensure cookies are properly saved to disk in the event of unclean shutdowns.
     Note that the actual operation is asynchronous.
+
+cmd-ldrsc-desc = Pre-caches a resource.
+cmd-ldrsc-help = Usage: ldrsc <path> <type>
+
+cmd-rldrsc-desc = Reloads a resource.
+cmd-rldrsc-help = Usage: rldrsc <path> <type>
+
+cmd-gridtc-desc = Gets the tile count of a grid.
+cmd-gridtc-help = Usage: gridtc <gridId>
+
+
+# Client-side commands
+cmd-guidump-desc = Dump GUI tree to /guidump.txt in user data.
+cmd-guidump-help = Usage: guidump
+
+cmd-uitest-desc = Open a dummy UI testing window
+cmd-uitest-help = Usage: uitest
+
+## 'uitest2' command
+cmd-uitest2-desc = Opens a UI control testing OS window
+cmd-uitest2-help = Usage: uitest2 <tab>
+cmd-uitest2-arg-tab = <tab>
+cmd-uitest2-error-args = Expected at most one argument
+cmd-uitest2-error-tab = Invalid tab: '{$value}'
+cmd-uitest2-title = UITest2
+
+
+cmd-setclipboard-desc = Sets the system clipboard
+cmd-setclipboard-help = Usage: setclipboard <text>
+
+cmd-getclipboard-desc = Gets the system clipboard
+cmd-getclipboard-help = Usage: Getclipboard
+
+cmd-togglelight-desc = Toggles light rendering.
+cmd-togglelight-help = Usage: togglelight
+
+cmd-togglefov-desc = Toggles fov for client.
+cmd-togglefov-help = Usage: togglefov
+
+cmd-togglehardfov-desc = Toggles hard fov for client. (for debugging space-station-14#2353)
+cmd-togglehardfov-help = Usage: togglehardfov
+
+cmd-toggleshadows-desc = Toggles shadow rendering.
+cmd-toggleshadows-help = Usage: toggleshadows
+
+cmd-togglelightbuf-desc = Toggles lighting rendering. This includes shadows but not FOV.
+cmd-togglelightbuf-help = Usage: togglelightbuf
+
+cmd-chunkinfo-desc = Gets info about a chunk under your mouse cursor.
+cmd-chunkinfo-help = Usage: chunkinfo
+
+cmd-rldshader-desc = Reloads all shaders.
+cmd-rldshader-help = Usage: rldshader
+
+cmd-cldbglyr-desc = Toggle fov and light debug layers.
+cmd-cldbglyr-help= Usage: cldbglyr <layer>: Toggle <layer>
+    cldbglyr: Turn all Layers off
+
+cmd-key-info-desc = Keys key info for a key.
+cmd-key-info-help = Usage: keyinfo <Key>
+
+## 'bind' command
+cmd-bind-desc = Binds an input key combination to an input command.
+cmd-bind-help = Usage: bind { cmd-bind-arg-key } { cmd-bind-arg-mode } { cmd-bind-arg-command }
+    Note that this DOES NOT automatically save bindings.
+    Use the 'svbind' command to save binding configuration.
+
+cmd-bind-arg-key = <KeyName>
+cmd-bind-arg-mode = <BindMode>
+cmd-bind-arg-command = <InputCommand>
+
+cmd-net-draw-interp-desc = Toggles the debug drawing of the network interpolation.
+cmd-net-draw-interp-help = Usage: net_draw_interp
+
+cmd-net-draw-interp-desc = Toggles the debug drawing of the network interpolation.
+cmd-net-draw-interp-help = Usage: net_draw_interp
+
+cmd-net-watch-ent-desc = Dumps all network updates for an EntityId to the console.
+cmd-net-watch-ent-help = Usage: net_watchent <0|EntityUid>
+
+cmd-net-refresh-desc = Requests a full server state.
+cmd-net-refresh-help = Usage: net_refresh
+
+cmd-net-entity-report-desc = Toggles the net entity report panel.
+cmd-net-entity-report-help = Usage: net_entityreport
+
+cmd-fill-desc = Fill up the console for debugging.
+cmd-fill-help = Fills the console with some nonsense for debugging.
+
+cmd-cls-desc = Clears the console.
+cmd-cls-help = Clears the debug console of all messages.
+
+cmd-sendgarbage-desc = Sends garbage to the server.
+cmd-sendgarbage-help = The server will reply with 'no u'
+
+cmd-loadgrid-desc = Loads a grid from a file into an existing map.
+cmd-loadgrid-help = loadgrid <MapID> <Path> [x y] [rotation] [storeUids]
+
+cmd-loc-desc = Prints the absolute location of the player's entity to console.
+cmd-loc-help = loc
+
+cmd-tpgrid-desc = Teleports a grid to a new location.
+cmd-tpgrid-help = tpgrid <gridId> <X> <Y> [<MapId>]
+
+cmd-rmgrid-desc = Removes a grid from a map. You cannot remove the default grid.
+cmd-rmgrid-help = rmgrid <gridId>
+
+cmd-mapinit-desc = Runs map init on a map.
+cmd-mapinit-help = mapinit <mapID>
+
+cmd-lsmap-desc = Lists maps.
+cmd-lsmap-help = lsmap
+
+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> [initialize]
+
+cmd-rmmap-desc = Removes a map from the world. You cannot remove nullspace.
+cmd-rmmap-help = rmmap <mapId>
+
+cmd-savegrid-desc = Serializes a grid to disk.
+cmd-savegrid-help = savegrid <gridID> <Path>
+
+cmd-testbed-desc = Loads a physics testbed on the specified map.
+cmd-testbed-help = testbed <mapid> <test>
+
+cmd-saveconfig-desc = Saves the client configuration to the config file.
+cmd-saveconfig-help = saveconfig
+
+## 'flushcookies' command
+# Note: the flushcookies command is from Robust.Client.WebView, it's not in the main engine code.
+
+cmd-flushcookies-desc = Flush CEF cookie storage to disk
+cmd-flushcookies-help = This ensure cookies are properly saved to disk in the event of unclean shutdowns.
+    Note that the actual operation is asynchronous.
+
+## 'addcomp' command
+cmd-addcomp-desc = Adds a component to an entity.
+cmd-addcomp-help = addcomp <uid> <componentName>
+cmd-addcompc-desc = Adds a component to an entity on the client.
+cmd-addcompc-help = addcompc <uid> <componentName>
+
+## 'rmcomp' command
+cmd-rmcomp-desc = Removes a component from an entity.
+cmd-rmcomp-help = rmcomp <uid> <componentName>
+cmd-rmcompc-desc = Removes a component from an entity on the client.
+cmd-rmcompc-help = rmcomp <uid> <componentName>
+
+## 'addview' command
+cmd-addview-desc = Allows you to subscribe to an entity's view for debugging purposes.
+cmd-addview-help = addview <entityUid>
+cmd-addviewc-desc = Allows you to subscribe to an entity's view for debugging purposes.
+cmd-addviewc-help = addview <entityUid>
+
+## 'removeview' command
+cmd-removeview-desc = Allows you to unsubscribe to an entity's view for debugging purposes.
+cmd-removeview-help = removeview <entityUid>
+
+## 'loglevel' command
+cmd-loglevel-desc = Changes the log level for a provided sawmill.
+cmd-loglevel-help = Usage: loglevel <sawmill> <level>
+      sawmill: A label prefixing log messages. This is the one you're setting the level for.
+      level: The log level. Must match one of the values of the LogLevel enum.
+
+cmd-testlog-desc = Writes a test log to a sawmill.
+cmd-testlog-help = Usage: testlog <sawmill> <level> <message>
+    sawmill: A label prefixing the logged message.
+    level: The log level. Must match one of the values of the LogLevel enum.
+    message: The message to be logged. Wrap this in double quotes if you want to use spaces.
+
+## 'vv' command
+cmd-vv-desc = Opens View Variables.
+cmd-vv-help = Usage: vv <entity ID|IoC interface name|SIoC interface name>
+
+## 'showvelocities' command
+cmd-showvelocities-desc = Displays your angular and linear velocities.
+cmd-showvelocities-help = Usage: showvelocities
+
+## 'setinputcontext' command
+cmd-setinputcontext-desc = Sets the active input context.
+cmd-setinputcontext-help = Usage: setinputcontext <context>
+
+## 'forall' command
+cmd-forall-desc = Runs a command over all entities with a given component.
+cmd-forall-help = Usage: forall <bql query> do <command...>
+
+## 'delete' command
+cmd-delete-desc = Deletes the entity with the specified ID.
+cmd-delete-help = delete <entity UID>
+
+# System commands
+cmd-showtime-desc = Shows the server time.
+cmd-showtime-help = showtime
+
+cmd-restart-desc = Gracefully restarts the server (not just the round).
+cmd-restart-help = restart
+
+cmd-shutdown-desc = Gracefully shuts down the server.
+cmd-shutdown-help = shutdown
+
+cmd-saveconfig-desc = Saves the server configuration to the config file.
+cmd-saveconfig-help = saveconfig
+
+cmd-netaudit-desc = Prints into about NetMsg security.
+cmd-netaudit-help = netaudit
+
+# Player commands
+cmd-tp-desc = Teleports a player to any location in the round.
+cmd-tp-help = tp <x> <y> [<mapID>]
+
+cmd-tpto-desc = Teleports the current player or the specified players/entities to the location of the first player/entity.
+cmd-tpto-help = tpto <username|uid> [username|uid]...
+cmd-tpto-destination-hint = destination (uid or username)
+cmd-tpto-victim-hint = entity to teleport (uid or username)
+cmd-tpto-parse-error = Cant resolve entity or player: {$str}
+
+cmd-listplayers-desc = Lists all players currently connected.
+cmd-listplayers-help = listplayers
+
+cmd-kick-desc = Kicks a connected player out of the server, disconnecting them.
+cmd-kick-help = kick <PlayerIndex> [<Reason>]
+
+# Spin command
+cmd-spin-desc = Causes an entity to spin. Default entity is the attached player's parent.
+cmd-spin-help = spin velocity [drag] [entityUid]
+
+# Localization command
+cmd-rldloc-desc = Reloads localization (client & server).
+cmd-rldloc-help = Usage: rldloc
+
+# Debug entity controls
+cmd-spawn-desc = Spawns an entity with specific type.
+cmd-spawn-help = spawn <prototype> OR spawn <prototype> <relative entity ID> OR spawn <prototype> <x> <y>
+cmd-cspawn-desc = Spawns a client-side entity with specific type at your feet.
+cmd-cspawn-help = cspawn <entity type>
+
+cmd-scale-desc = Increases or decreases an entity's size naively.
+cmd-scale-help = scale <entityUid> <float>
+
+cmd-dumpentities-desc = Dump entity list.
+cmd-dumpentities-help = Dumps entity list of UIDs and prototype.
+
+cmd-getcomponentregistration-desc = Gets component registration information.
+cmd-getcomponentregistration-help = Usage: getcomponentregistration <componentName>
+
+cmd-showrays-desc = Toggles debug drawing of physics rays. An integer for <raylifetime> must be provided.
+cmd-showrays-help = Usage: showrays <raylifetime>
+
+cmd-disconnect-desc = Immediately disconnect from the server and go back to the main menu.
+cmd-disconnect-help = Usage: disconnect
+
+cmd-entfo-desc = Displays verbose diagnostics for an entity.
+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 = Throws an exception
+
+cmd-showpos-desc = Enables debug drawing over all entity positions in the game.
+cmd-showpos-help = Usage: showpos
+
+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>.
+
+cmd-overrideplayername-desc = Changes the name used when attempting to connect to the server.
+cmd-overrideplayername-help = Usage: overrideplayername <name>
+
+cmd-showanchored-desc = Shows anchored entities on a particular tile
+cmd-showanchored-help = Usage: showanchored
+
+cmd-dmetamem-desc = Dumps a type's members in a format suitable for the sandbox configuration file.
+cmd-dmetamem-help = Usage: dmetamem <type>
+
+cmd-dmetamem-desc = Displays chunk bounds for the purposes of rendering.
+cmd-dmetamem-help = Usage: showchunkbb <type>
+
+cmd-launchauth-desc = Load authentication tokens from launcher data to aid in testing of live servers.
+cmd-launchauth-help = Usage: launchauth <account name>
+
+cmd-lightbb-desc = Toggles whether to show light bounding boxes.
+cmd-lightbb-help = Usage: lightbb
+
+cmd-monitorinfo-desc = Monitors info
+cmd-monitorinfo-help = Usage: monitorinfo <id>
+
+cmd-setmonitor-desc = Set monitor
+cmd-setmonitor-help = Usage: setmonitor <id>
+
+cmd-physics-desc = Shows a debug physics overlay. The arg supplied specifies the overlay.
+cmd-physics-help = Usage: physics <aabbs / com / contactnormals / contactpoints / distance / joints / shapeinfo / shapes>
+
+cmd-hardquit-desc = Kills the game client instantly.
+cmd-hardquit-help = Kills the game client instantly, leaving no traces. No telling the server goodbye.
+
+cmd-quit-desc = Shuts down the game client gracefully.
+cmd-quit-help = Properly shuts down the game client, notifying the connected server and such.
+
+cmd-csi-desc = Opens a C# interactive console.
+cmd-csi-help = Usage: csi
+
+cmd-scsi-desc = Opens a C# interactive console on the server.
+cmd-scsi-help = Usage: scsi
+
+cmd-watch-desc = Opens a variable watch window.
+cmd-watch-help = Usage: watch
+
+cmd-showspritebb-desc = Toggle whether sprite bounds are shown
+cmd-showspritebb-help = Usage: showspritebb
+
+cmd-togglelookup-desc = Shows / hides entitylookup bounds via an overlay.
+cmd-togglelookup-help = Usage: togglelookup
+
+cmd-net_entityreport-desc = Toggles the net entity report panel.
+cmd-net_entityreport-help = Usage: net_entityreport
+
+cmd-net_refresh-desc = Requests a full server state.
+cmd-net_refresh-help = Usage: net_refresh
+
+cmd-net_graph-desc = Toggles the net statistics pannel.
+cmd-net_graph-help = Usage: net_graph
+
+cmd-net_watchent-desc = Dumps all network updates for an EntityId to the console.
+cmd-net_watchent-help = Usage: net_watchent <0|EntityUid>
+
+cmd-net_draw_interp-desc = Toggles the debug drawing of the network interpolation.
+cmd-net_draw_interp-help = Usage: net_draw_interp <0|EntityUid>
+
+cmd-vram-desc = Displays video memory usage statics by the game.
+cmd-vram-help = Usage: vram
+
+cmd-showislands-desc = Shows the current physics bodies involved in each physics island.
+cmd-showislands-help = Usage: showislands
+
+cmd-showgridnodes-desc = Shows the nodes for grid split purposes.
+cmd-showgridnodes-help = Usage: showgridnodes
+
+cmd-profsnap-desc = Make a profiling snapshot.
+cmd-profsnap-help = Usage: profsnap
+
+cmd-devwindow-desc = Dev Window
+cmd-devwindow-help = Usage: devwindow
+
+cmd-devwindow-desc = Open file
+cmd-devwindow-help = Usage: testopenfile
+
+cmd-scene-desc = Immediately changes the UI scene/state.
+cmd-scene-help = Usage: scene <className>
+
+cmd-szr_stats-desc = Report serializer statistics.
+cmd-szr_stats-help = Usage: szr_stats
+
+cmd-hwid-desc = Returns the current HWID (HardWare ID).
+cmd-hwid-help = Usage: hwid
+
+cmd-vvread-desc = Retrieve a path's value using VV (View Variables).
+cmd-vvread-desc = Usage: vvread <path>
+
+cmd-vvwrite-desc = Modify a path's value using VV (View Variables).
+cmd-vvwrite-help = Usage: vvwrite <path>
+
+cmd-vv-desc = Opens View Variables (VV).
+cmd-vv-help = Usage: vv <path|entity ID|guihover>
+
+cmd-vvinvoke-desc = Invoke/Call a path with arguments using VV.
+cmd-vvinvoke-help = Usage: vvinvoke <path> [arguments...]
+
+cmd-dump_dependency_injectors-desc = Dump IoCManager's dependency injector cache.
+cmd-dump_dependency_injectors-help = Usage: dump_dependency_injectors
+cmd-dump_dependency_injectors-total-count = Total count: { $total }
+
+cmd-dump_netserializer_type_map-desc = Dump NetSerializer's type map and serializer hash.
+cmd-dump_netserializer_type_map-help = Usage: dump_netserializer_type_map
+
+cmd-hub_advertise_now-desc = Immediately advertise to the master hub server
+cmd-hub_advertise_now-help = Usage: hub_advertise_now
+
+cmd-echo-desc = Echo arguments back to the console
+cmd-echo-help = Usage: echo "<message>"
+
+## 'vfs_ls' command
+cmd-vfs_ls-desc = List directory contents in the VFS.
+cmd-vfs_ls-help = Usage: vfs_list <path>
+    Example:
+    vfs_list /Assemblies
+
+cmd-vfs_ls-err-args = Need exactly 1 argument.
+cmd-vfs_ls-hint-path = <path>

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

@@ -3,6 +3,7 @@
 entity-spawn-window-title = Entity Spawn Panel
 entity-spawn-window-search-bar-placeholder = search
 entity-spawn-window-clear-button = Clear
+entity-spawn-window-replace-button-text = Replace
 entity-spawn-window-erase-button-text = Erase Mode
 entity-spawn-window-override-menu-tooltip = Override placement
 

Resources/Locale/en-US/debug-builtin-connection-screen.ftl

@@ -0,0 +1,3 @@
+debug-builtin-connection-screen-invalid-username-with-reason = The given username is invalid: {$invalidreason}
+debug-builtin-connection-screen-invalid-username = Invalid Username.
+debug-builtin-connection-screen-failed-to-connect = Failed to connect: {$reason}

Resources/Locale/en-US/discordRPC.ftl

@@ -0,0 +1,4 @@
+discord-rpc-in-main-menu = In Main Menu
+discord-rpc-character = Username: {$username}
+discord-rpc-on-server = On Server: {$servername}
+discord-rpc-players = Players: {$players}/{$maxplayers}

Resources/Locale/en-US/input.ftl

@@ -25,7 +25,22 @@ input-key-Down = Down
 input-key-Right = Right
 input-key-Space = Space
 input-key-Return = Return
-input-key-NumpadEnter = Num Enter
+input-key-NumpadEnter = Numpad Enter
+input-key-NumpadNum0 = Numpad 0
+input-key-NumpadNum1 = Numpad 1
+input-key-NumpadNum2 = Numpad 2
+input-key-NumpadNum3 = Numpad 3
+input-key-NumpadNum4 = Numpad 4
+input-key-NumpadNum5 = Numpad 5
+input-key-NumpadNum6 = Numpad 6
+input-key-NumpadNum7 = Numpad 7
+input-key-NumpadNum8 = Numpad 8
+input-key-NumpadNum9 = Numpad 9
+input-key-NumpadAdd = Numpad Add
+input-key-NumpadSubtract = Numpad Subtract
+input-key-NumpadDivide = Numpad Divide
+input-key-NumpadMultiply = Numpad Multiply
+input-key-NumpadDecimal = Numpad Decimal
 input-key-BackSpace = Backspace
 input-key-Tab = Tab
 input-key-PageUp = Page Up

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

@@ -1 +1 @@
-midi-panic-command-description = Turns off every note for every active MIDI renderer.
+cmd-midipanic-desc = Turns off every note for every active MIDI renderer.

Resources/Locale/en-US/replays.ftl

@@ -0,0 +1,59 @@
+# Playback Commands
+
+cmd-replay-play-desc = Resume replay playback.
+cmd-replay-play-help = replay_play
+
+cmd-replay-pause-desc = Pause replay playback
+cmd-replay-pause-help = replay_pause
+
+cmd-replay-toggle-desc = Resume or pause replay playback.
+cmd-replay-toggle-help = replay_toggle
+
+cmd-replay-stop-desc = Stop and unload a replay.
+cmd-replay-stop-help = replay_stop
+
+cmd-replay-load-desc = Load and start a replay.
+cmd-replay-load-help = replay_load <replay folder>
+cmd-replay-load-hint = Replay folder
+
+cmd-replay-skip-desc = Skip forwards or backwards in time.
+cmd-replay-skip-help = replay_skip <tick or timespan>
+cmd-replay-skip-hint = Ticks or timespan (HH:MM:SS).
+
+cmd-replay-set-time-desc = Jump forwards or backwards to some specific time.
+cmd-replay-set-time-help = replay_set <tick or time>
+cmd-replay-set-time-hint = Tick or timespan (HH:MM:SS), starting from 
+
+cmd-replay-error-time = "{$time}" is not an integer or timespan.
+cmd-replay-error-args = Wrong number of arguments.
+cmd-replay-error-no-replay = Not currently playing a replay.
+cmd-replay-error-already-loaded = A replay is already loaded.
+cmd-replay-error-run-level = You cannot load a replay while connected to a server.
+
+# Recording commands
+
+cmd-replay-recording-start-desc = Starts a replay recording, optionally with some time limit.
+cmd-replay-recording-start-help = Usage: replay_recording_start [name] [overwrite] [time limit] 
+cmd-replay-recording-start-success = Started recording a replay.
+cmd-replay-recording-start-already-recording = Already recording a replay.
+cmd-replay-recording-start-error = An error occurred while trying to start the recording.
+cmd-replay-recording-start-hint-time = [time limit (minutes)]
+cmd-replay-recording-start-hint-name = [name]
+cmd-replay-recording-start-hint-overwrite = [overwrite (bool)]
+
+cmd-replay-recording-stop-desc = Stops a replay recording.
+cmd-replay-recording-stop-help = Usage: replay_recording_stop
+cmd-replay-recording-stop-success = Stopped recording a replay.
+cmd-replay-recording-stop-not-recording = Not currently recording a replay.
+
+cmd-replay-recording-stats-desc = Displays information about the current replay recording.
+cmd-replay-recording-stats-help = Usage: replay_recording_stats
+cmd-replay-recording-stats-result = Duration: {$time} min, Ticks: {$ticks}, Size: {$size} mb, rate: {$rate} mb/min.
+
+
+# Time Control UI
+replay-time-box-scrubbing-label = Dynamic Scrubbing
+replay-time-box-replay-time-label = Recording Time: {$current} / {$end}  ({$percentage}%)
+replay-time-box-server-time-label = Server Time: {$current} / {$end}
+replay-time-box-index-label = Index: {$current} / {$total}
+replay-time-box-tick-label = Tick: {$current} / {$total}

Resources/Locale/en-US/uploadfolder.ftl

@@ -0,0 +1,7 @@
+uploadfolder-command-description = Uploads a folder from your UserData folder recursively to the server contentDB.
+uploadfolder-command-help = uploadfolder [folder you want to upload in userdata/UploadFolder]
+uploadfolder-command-wrong-args = Wrong number of arguments!
+uploadfolder-command-folder-not-found = Folder {$folder} not found!
+uploadfolder-command-resource-upload-disabled = Network Resource Uploading is currently disabled. check Server CVars.
+uploadfolder-command-file-too-big = File {$filename} above the current size limit! It must be smaller than {$sizeLimit} MB. skipping.
+uploadfolder-command-success = Uploaded {$fileCount} files

Resources/Locale/pt-BR/_engine_lib.ftl

@@ -0,0 +1,63 @@
+# Used internally by the THE() function.
+zzzz-the = { PROPER($ent) ->
+    *[false] a { $ent }
+     [true] { $ent }
+    }
+
+# Used internally by the SUBJECT() function.
+zzzz-subject-pronoun = { GENDER($ent) ->
+    [male] ele
+    [female] ela
+    [epicene] eles
+   *[neuter] ele
+   }
+
+# Used internally by the OBJECT() function.
+zzzz-object-pronoun = { GENDER($ent) ->
+    [male] ele
+    [female] ela
+    [epicene] eles
+   *[neuter] isso
+   }
+
+# Used internally by the POSS-PRONOUN() function.
+zzzz-possessive-pronoun = { GENDER($ent) ->
+    [male] dele
+    [female] dela
+    [epicene] deles
+   *[neuter] dele
+   }
+
+# Used internally by the POSS-ADJ() function.
+zzzz-possessive-adjective = { GENDER($ent) ->
+    [male] dele
+    [female] dela
+    [epicene] deles
+   *[neuter] dele
+   }
+
+# Used internally by the REFLEXIVE() function.
+zzzz-reflexive-pronoun = { GENDER($ent) ->
+    [male] ele mesmo
+    [female] ela mesmo
+    [epicene] eles mesmos
+   *[neuter] ele mesmo
+   }
+
+# Used internally by the CONJUGATE-BE() function.
+zzzz-conjugate-be = { GENDER($ent) ->
+    [epicene] é
+   *[other] é
+   }
+
+# Used internally by the CONJUGATE-HAVE() function.
+zzzz-conjugate-have = { GENDER($ent) ->
+    [epicene] tenho
+   *[other] tem
+   }
+
+# Used internally by the CONJUGATE-BASIC() function.
+zzzz-conjugate-basic = { GENDER($ent) ->
+    [epicene] { $first }
+   *[other] { $second }
+   }

Resources/Locale/pt-BR/client-state-commands.ftl

@@ -0,0 +1,16 @@
+# Strings Loc para vários comandos relacionados ao estado da entidade e ao PVS do lado do cliente
+
+cmd-reset-ent-help = Uso: resetent <Entity UID>
+cmd-reset-ent-desc = Redefina uma entidade para o estado do servidor recebido mais recentemente. Isso também redefinirá as entidades que foram desanexadas para espaço nulo.
+
+cmd-reset-all-ents-help = Uso: resetallents
+cmd-reset-all-ents-desc = Redefine todas as entidades para o estado do servidor recebido mais recentemente. Isso afeta apenas as entidades que não foram desanexadas ao espaço nulo.
+
+cmd-detach-ent-help = Uso: detachent <Entity UID>
+cmd-detach-ent-desc = Desanexar uma entidade para espaço nulo, como se tivesse saído do intervalo PVS.
+
+cmd-local-delete-help = Uso: localdelete <Entity UID>
+cmd-local-delete-desc = Exclui uma entidade. Ao contrário do comando delete normal, este é CLIENT-SIDE. A menos que a entidade seja uma entidade do lado do cliente, isso provavelmente causará erros.
+
+cmd-full-state-reset-help = Uso: fullstatereset
+cmd-full-state-reset-desc = Descarta qualquer informação de estado da entidade e solicita um estado completo do servidor.

Resources/Locale/pt-BR/commands.ftl

@@ -2,9 +2,13 @@
 
 ## generic
 
+cmd-invalid-arg-number-error = Número inválido de argumentos.
+
 cmd-parse-failure-integer = {$arg} não é um inteiro válido.
 cmd-parse-failure-float = {$arg} não é um float válido.
 cmd-parse-failure-bool = {$arg} não é um booleano válido.
+cmd-parse-failure-uid = {$arg} não é um UID de entidade válido.
+cmd-parse-failure-entity-exist = UID {$arg} não corresponde a uma entidade existente.
 
 
 ## 'help' command
@@ -147,6 +151,8 @@ cmd-hint-loadmap-y-position = [y-position]
 cmd-hint-loadmap-rotation = [rotation]
 cmd-hint-loadmap-uids = [float]
 
+cmd-hint-savebp-id = <Grid EntityID>
+
 ## 'flushcookies' command
 # Note: the flushcookies command is from Robust.Client.WebView, it's not in the main engine code.
 

Resources/Locale/pt-BR/midi-commands.ftl

@@ -1 +1 @@
-midi-panic-command-description = Desliga cada nota para cada renderizador MIDI ativo.
+cmd-midipanic-desc = Desliga cada nota para cada renderizador MIDI ativo.

Resources/Shaders/Internal/fov-lighting.swsl

@@ -5,6 +5,7 @@ preset raw;
 #include "/Shaders/Internal/fov_shared.swsl"
 
 const highp float g_MinVariance = 0.0;
+uniform highp vec4 occludeColor;
 
 void fragment()
 {
@@ -19,5 +20,5 @@ void fragment()
         discard;
     }
 
-    COLOR = vec4(0.0, 0.0, 0.0, 1.0 - occlusion);
+    COLOR = vec4(occludeColor.rgb, 1.0 - occlusion);
 }

Resources/Shaders/Internal/fov.swsl

@@ -5,6 +5,7 @@ preset raw;
 #include "/Shaders/Internal/fov_shared.swsl"
 
 const highp float g_MinVariance = 0.0;
+uniform highp vec4 occludeColor;
 
 void fragment()
 {
@@ -18,5 +19,5 @@ void fragment()
         discard;
     }
 
-    COLOR = vec4(0.0, 0.0, 0.0, 1.0);
+    COLOR = vec4(occludeColor.rgb, 1.0);
 }

Robust.Analyzers/AccessAnalyzer.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
@@ -12,6 +13,7 @@ namespace Robust.Analyzers
     public class AccessAnalyzer : DiagnosticAnalyzer
     {
         private const string AccessAttributeType = "Robust.Shared.Analyzers.AccessAttribute";
+        private const string RobustAutoGeneratedAttributeType = "Robust.Shared.Analyzers.RobustAutoGeneratedAttribute";
         private const string PureAttributeType = "System.Diagnostics.Contracts.PureAttribute";
 
         [SuppressMessage("ReSharper", "RS2008")]
@@ -73,11 +75,20 @@ namespace Robust.Analyzers
 
             // Get the attributes
             var friendAttribute = context.Compilation.GetTypeByMetadataName(AccessAttributeType);
+            var autoGenAttribute = context.Compilation.GetTypeByMetadataName(RobustAutoGeneratedAttributeType);
 
             // Get the type that is containing this expression, or, the type where this is happening.
             if (context.ContainingSymbol?.ContainingType is not {} accessingType)
                 return;
 
+            // Should we ignore the access attempt due to the accessing type being auto-generated?
+            if (accessingType.GetAttributes().FirstOrDefault(a =>
+                a.AttributeClass != null &&
+                a.AttributeClass.Equals(autoGenAttribute, SymbolEqualityComparer.Default)) is { } attr)
+            {
+                return;
+            }
+
             // Determine which type of access is happening here... Read, write or execute?
             var accessAttempt = DetermineAccess(context, targetAccess, operation);
 

Robust.Analyzers/ByRefEventAnalyzer.cs

@@ -0,0 +1,206 @@
+#nullable enable
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Operations;
+using static Microsoft.CodeAnalysis.SymbolEqualityComparer;
+
+namespace Robust.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
+{
+    private const string ByRefAttribute = "Robust.Shared.GameObjects.ByRefEventAttribute";
+
+    private static readonly DiagnosticDescriptor ByRefEventSubscribedByValueRule = new(
+        Diagnostics.IdByRefEventSubscribedByValue,
+        "By-ref event subscribed to by value",
+        "Tried to subscribe to a by-ref event '{0}' by value.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure that methods subscribing to a ref event have the ref keyword for the event argument."
+    );
+
+    private static readonly DiagnosticDescriptor ByValueEventSubscribedByRefRule = new(
+        Diagnostics.IdValueEventRaisedByRef,
+        "Value event subscribed to by-ref",
+        "Tried to subscribe to a value event '{0}' by-ref.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure that methods subscribing to value events do not have the ref keyword for the event argument."
+    );
+
+    private static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
+        Diagnostics.IdByRefEventRaisedByValue,
+        "By-ref event raised by value",
+        "Tried to raise a by-ref event '{0}' by value.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure to use the ref keyword when raising ref events."
+    );
+
+    private static readonly DiagnosticDescriptor ByValueEventRaisedByRefRule = new(
+        Diagnostics.IdValueEventRaisedByRef,
+        "Value event raised by-ref",
+        "Tried to raise a value event '{0}' by-ref.",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Make sure to not use the ref keyword when raising value events."
+    );
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
+        ByRefEventSubscribedByValueRule,
+        ByValueEventSubscribedByRefRule,
+        ByRefEventRaisedByValueRule,
+        ByValueEventRaisedByRefRule
+    );
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
+        context.EnableConcurrentExecution();
+        context.RegisterOperationAction(CheckEventSubscription, OperationKind.Invocation);
+        context.RegisterOperationAction(CheckEventRaise, OperationKind.Invocation);
+    }
+
+    private void CheckEventSubscription(OperationAnalysisContext context)
+    {
+        if (context.Operation is not IInvocationOperation operation)
+            return;
+
+        var subscribeMethods = context.Compilation
+            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
+            .GetMembers()
+            .Where(m => m.Name.Contains("SubscribeLocalEvent"))
+            .Cast<IMethodSymbol>();
+
+        if (subscribeMethods == null)
+            return;
+
+        if (!subscribeMethods.Any(m => m.Equals(operation.TargetMethod.OriginalDefinition, Default)))
+            return;
+
+        var typeArguments = operation.TargetMethod.TypeArguments;
+        if (typeArguments.Length < 1 || typeArguments.Length > 2)
+            return;
+
+        if (operation.Arguments.First().Value is not IDelegateCreationOperation delegateCreation)
+            return;
+
+        if (delegateCreation.Target is not IMethodReferenceOperation methodReference)
+            return;
+
+        var eventParameter = methodReference.Method.Parameters.LastOrDefault();
+        if (eventParameter == null)
+            return;
+
+        ITypeSymbol eventArgument;
+        switch (typeArguments.Length)
+        {
+            case 1:
+                eventArgument = typeArguments[0];
+                break;
+            case 2:
+                eventArgument = typeArguments[1];
+                break;
+            default:
+                return;
+        }
+
+        var byRefAttribute = context.Compilation.GetTypeByMetadataName(ByRefAttribute);
+        if (byRefAttribute == null)
+            return;
+
+        var isByRefEventType = eventArgument
+            .GetAttributes()
+            .Any(attribute => attribute.AttributeClass?.Equals(byRefAttribute, Default) ?? false);
+        var parameterIsRef = eventParameter.RefKind == RefKind.Ref;
+
+        if (isByRefEventType != parameterIsRef)
+        {
+            var descriptor = isByRefEventType ? ByRefEventSubscribedByValueRule : ByValueEventSubscribedByRefRule;
+            var diagnostic = Diagnostic.Create(descriptor, operation.Syntax.GetLocation(), eventArgument);
+            context.ReportDiagnostic(diagnostic);
+        }
+    }
+
+    private void CheckEventRaise(OperationAnalysisContext context)
+    {
+        if (context.Operation is not IInvocationOperation operation)
+            return;
+
+        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
+            // the analyzer does not run without any errors
+            // I don't know man
+            const string directedBusMethod = "Robust.Shared.GameObjects.IDirectedEventBus.RaiseLocalEvent";
+            if (!operation.TargetMethod.ToString().StartsWith(directedBusMethod))
+                return;
+        }
+
+        var arguments = operation.Arguments;
+        IArgumentOperation eventArgument;
+        switch (arguments.Length)
+        {
+            case 1:
+                eventArgument = arguments[0];
+                break;
+            case 2:
+            case 3:
+                eventArgument = arguments[1];
+                break;
+            default:
+                return;
+        }
+
+        var eventParameter = eventArgument.Parameter;
+        // TODO have a way to check generic type parameters
+        if (eventParameter == null ||
+            eventParameter.Type.SpecialType == SpecialType.System_Object ||
+            eventParameter.Type.TypeKind == TypeKind.TypeParameter)
+        {
+            return;
+        }
+
+        var byRefAttribute = context.Compilation.GetTypeByMetadataName(ByRefAttribute);
+        if (byRefAttribute == null)
+            return;
+
+        var isByRefEventType = eventParameter.Type
+            .GetAttributes()
+            .Any(attribute => attribute.AttributeClass?.Equals(byRefAttribute, Default) ?? false);
+
+        var parameterIsRef = eventParameter.RefKind == RefKind.Ref;
+
+        if (isByRefEventType != parameterIsRef)
+        {
+            var descriptor = isByRefEventType ? ByRefEventRaisedByValueRule : ByValueEventRaisedByRefRule;
+            var diagnostic = Diagnostic.Create(descriptor, eventArgument.Syntax.GetLocation(), eventParameter.Type);
+            context.ReportDiagnostic(diagnostic);
+        }
+    }
+}

Robust.Analyzers/Diagnostics.cs

@@ -9,6 +9,18 @@ public static class Diagnostics
     public const string IdAccess = "RA0002";
     public const string IdExplicitVirtual = "RA0003";
     public const string IdTaskResult = "RA0004";
+    public const string IdUseGenericVariant = "RA0005";
+    public const string IdUseGenericVariantInvalidUsage = "RA0006";
+    public const string IdUseGenericVariantAttributeValueError = "RA0007";
+    public const string IdNotNullableFlagNotSet = "RA0008";
+    public const string IdInvalidNotNullableFlagValue = "RA0009";
+    public const string IdInvalidNotNullableFlagImplementation = "RA0010";
+    public const string IdInvalidNotNullableFlagType = "RA0011";
+    public const string IdNotNullableFlagValueType = "RA0012";
+    public const string IdByRefEventSubscribedByValue = "RA0013";
+    public const string IdValueEventSubscribedByRef = "RA0014";
+    public const string IdByRefEventRaisedByValue = "RA0015";
+    public const string IdValueEventRaisedByRef = "RA0016";
 
     public static SuppressionDescriptor MeansImplicitAssignment =>
         new SuppressionDescriptor("RADC1000", "CS0649", "Marked as implicitly assigned.");

Robust.Analyzers/NotNullableFlagAnalyzer.cs

@@ -0,0 +1,171 @@
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Operations;
+
+namespace Robust.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public sealed class NotNullableFlagAnalyzer : DiagnosticAnalyzer
+{
+    private const string Attribute = "Robust.Shared.Analyzers.NotNullableFlagAttribute";
+
+    private static readonly DiagnosticDescriptor NotNullableNotSetRule = new (
+        Diagnostics.IdNotNullableFlagNotSet,
+        "Not Nullable Flag not set",
+        "Class type parameter {0} is not annotated as nullable and notNullableOverride is not set to true",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Assign true to notNullableOverride or specify the type parameter as nullable.");
+
+    private static readonly DiagnosticDescriptor InvalidNotNullableValueRule = new (
+        Diagnostics.IdInvalidNotNullableFlagValue,
+        "Not Nullable Flag wrongfully set",
+        "Class type parameter {0} is annotated as nullable but notNullableOverride is set to true",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Remove the true assignment to notNullableOverride or remove the nullable specifier of the type parameter.");
+
+    private static readonly DiagnosticDescriptor InvalidNotNullableImplementationRule = new (
+        Diagnostics.IdInvalidNotNullableFlagImplementation,
+        "Invalid NotNullable flag implementation.",
+        "NotNullable flag is either not typed as bool, or does not have a default value equaling false",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Ensure that the notNullable flag is typed bool and has false set as a default value.");
+
+    private static readonly DiagnosticDescriptor InvalidNotNullableTypeRule = new (
+        Diagnostics.IdInvalidNotNullableFlagType,
+        "Failed to resolve type parameter",
+        "Failed to resolve type parameter \"{0}\".",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Use nameof to avoid typos.");
+
+    private static readonly DiagnosticDescriptor NotNullableFlagValueTypeRule = new (
+        Diagnostics.IdNotNullableFlagValueType,
+        "NotNullable flag not supported for value types.",
+        "Value types as generic arguments are not supported for NotNullable flags",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Nullable value types are distinct at runtime when inspected with reflection. Therefore they are not supported for NotNullable flags.");
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics =>
+        ImmutableArray.Create(
+            NotNullableNotSetRule,
+            InvalidNotNullableValueRule,
+            InvalidNotNullableImplementationRule,
+            InvalidNotNullableTypeRule,
+            NotNullableFlagValueTypeRule);
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
+        context.EnableConcurrentExecution();
+        context.RegisterOperationAction(CheckNotNullableFlag, OperationKind.Invocation);
+    }
+
+    private bool TryGetTypeArgument(IMethodSymbol methodSymbol, string typeParamName, out ITypeSymbol typeArgument)
+    {
+        for (var index = 0; index < methodSymbol.TypeParameters.Length; index++)
+        {
+            if (methodSymbol.TypeParameters[index].Name != typeParamName)
+                continue;
+
+            typeArgument = methodSymbol.TypeArguments[index];
+            return true;
+        }
+
+        typeArgument = null;
+        return false;
+    }
+
+    private void CheckNotNullableFlag(OperationAnalysisContext context)
+    {
+        if (context.Operation is not IInvocationOperation invocationOperation || !invocationOperation.TargetMethod.IsGenericMethod)
+            return;
+
+        var attribute = context.Compilation.GetTypeByMetadataName(Attribute);
+        var @bool = context.Compilation.GetSpecialType(SpecialType.System_Boolean);
+
+        foreach (var argument in invocationOperation.Arguments)
+        {
+            if(argument.Parameter == null) continue;
+
+            foreach (var attributeData in argument.Parameter.GetAttributes())
+            {
+                if (!SymbolEqualityComparer.Default.Equals(attributeData.AttributeClass, attribute))
+                    continue;
+
+                if (!SymbolEqualityComparer.Default.Equals(argument.Parameter.Type, @bool) ||
+                    !argument.Parameter.HasExplicitDefaultValue ||
+                    argument.Parameter.ExplicitDefaultValue as bool? != false)
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(
+                        InvalidNotNullableImplementationRule,
+                        argument.Parameter.Locations[0]));
+                    break;
+                }
+
+                if (!TryGetTypeArgument(invocationOperation.TargetMethod,
+                        attributeData.ConstructorArguments[0].Value as string, out var typeArgument))
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(
+                        InvalidNotNullableTypeRule,
+                        argument.Parameter.Locations[0],
+                        attributeData.ConstructorArguments[0].Value as string));
+                    break;
+                }
+
+                //until i find a way to implement it sanely, generic calls are exempt from this attribute
+                if(typeArgument is ITypeParameterSymbol) break;
+
+                //dont ask me why, argument.ConstantValue just straight up doesnt work.
+                //i still kept it in here as a fallback, incase it ever starts working again lol -<paul
+                var constantValue = (argument.Value as ILiteralOperation)?.ConstantValue ?? argument.ConstantValue;
+
+                if (typeArgument.IsValueType)
+                {
+                    if (argument.ArgumentKind != ArgumentKind.DefaultValue)
+                    {
+                        //todo diagnostic only use for struct types
+                        context.ReportDiagnostic(Diagnostic.Create(
+                            NotNullableFlagValueTypeRule,
+                            argument.Syntax.GetLocation()));
+                    }
+                    break;
+                }
+
+                if (typeArgument.NullableAnnotation == NullableAnnotation.None ||
+                    (argument.ArgumentKind != ArgumentKind.DefaultValue && !constantValue.HasValue))
+                    break;
+
+                var flagValue = argument.ArgumentKind != ArgumentKind.DefaultValue ||
+                                constantValue.Value as bool? == true;
+
+                var nullable = typeArgument.NullableAnnotation == NullableAnnotation.Annotated;
+
+                if (nullable && flagValue)
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(InvalidNotNullableValueRule,
+                        argument.Syntax.GetLocation(),
+                        typeArgument));
+                }
+                else if (!nullable && !flagValue)
+                {
+                    context.ReportDiagnostic(Diagnostic.Create(NotNullableNotSetRule,
+                        argument.Syntax.GetLocation(),
+                        typeArgument));
+                }
+
+                break;
+            }
+        }
+    }
+}

Robust.Analyzers/PreferGenericVariantAnalyzer.cs

@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Operations;
+
+namespace Robust.Analyzers;
+
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+public sealed class PreferGenericVariantAnalyzer : DiagnosticAnalyzer
+{
+    private const string AttributeType = "Robust.Shared.Analyzers.PreferGenericVariantAttribute";
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
+        UseGenericVariantDescriptor, UseGenericVariantInvalidUsageDescriptor,
+        UseGenericVariantAttributeValueErrorDescriptor);
+
+    private static readonly DiagnosticDescriptor UseGenericVariantDescriptor = new(
+        Diagnostics.IdUseGenericVariant,
+        "Consider using the generic variant of this method",
+        "Consider using the generic variant of this method to avoid potential allocations",
+        "Usage",
+        DiagnosticSeverity.Warning,
+        true,
+        "Consider using the generic variant of this method to avoid potential allocations.");
+
+    private static readonly DiagnosticDescriptor UseGenericVariantInvalidUsageDescriptor = new(
+        Diagnostics.IdUseGenericVariantInvalidUsage,
+        "Invalid generic variant provided",
+        "Generic variant provided mismatches the amount of type parameters of non-generic variant",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "The non-generic variant should have at least as many type parameter at the beginning of the method as there are generic type parameters on the generic variant.");
+
+    private static readonly DiagnosticDescriptor UseGenericVariantAttributeValueErrorDescriptor = new(
+        Diagnostics.IdUseGenericVariantAttributeValueError,
+        "Failed resolving generic variant value",
+        "Failed resolving generic variant value: {0}",
+        "Usage",
+        DiagnosticSeverity.Error,
+        true,
+        "Consider using nameof to avoid any typos.");
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.ReportDiagnostics | GeneratedCodeAnalysisFlags.Analyze);
+        context.EnableConcurrentExecution();
+        context.RegisterOperationAction(CheckForGenericVariant, OperationKind.Invocation);
+    }
+
+    private void CheckForGenericVariant(OperationAnalysisContext obj)
+    {
+        if(obj.Operation is not IInvocationOperation invocationOperation) return;
+
+        var preferGenericAttribute = obj.Compilation.GetTypeByMetadataName(AttributeType);
+
+        string genericVariant = null;
+        AttributeData foundAttribute = null;
+        foreach (var attribute in invocationOperation.TargetMethod.GetAttributes())
+        {
+            if (!SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, preferGenericAttribute))
+                continue;
+
+            genericVariant = attribute.ConstructorArguments[0].Value as string ?? invocationOperation.TargetMethod.Name;
+            foundAttribute = attribute;
+            break;
+        }
+
+        if(genericVariant == null) return;
+
+        var maxTypeParams = 0;
+        var typeTypeSymbol = obj.Compilation.GetTypeByMetadataName("System.Type");
+        foreach (var parameter in invocationOperation.TargetMethod.Parameters)
+        {
+            if(!SymbolEqualityComparer.Default.Equals(parameter.Type, typeTypeSymbol)) break;
+
+            maxTypeParams++;
+        }
+
+        if (maxTypeParams == 0)
+        {
+            obj.ReportDiagnostic(
+                Diagnostic.Create(UseGenericVariantInvalidUsageDescriptor,
+                    foundAttribute.ApplicationSyntaxReference?.GetSyntax().GetLocation()));
+            return;
+        }
+
+        IMethodSymbol genericVariantMethod = null;
+        foreach (var member in invocationOperation.TargetMethod.ContainingType.GetMembers())
+        {
+            if (member is not IMethodSymbol methodSymbol
+                || methodSymbol.Name != genericVariant
+                || !methodSymbol.IsGenericMethod
+                || methodSymbol.TypeParameters.Length > maxTypeParams
+                || methodSymbol.Parameters.Length > invocationOperation.TargetMethod.Parameters.Length - methodSymbol.TypeParameters.Length
+                ) continue;
+
+            var typeParamCount = methodSymbol.TypeParameters.Length;
+            var failedParamComparison = false;
+            var objType = obj.Compilation.GetSpecialType(SpecialType.System_Object);
+            for (int i = 0; i < methodSymbol.Parameters.Length; i++)
+            {
+                if (methodSymbol.Parameters[i].Type is ITypeParameterSymbol && SymbolEqualityComparer.Default.Equals(invocationOperation.TargetMethod.Parameters[i + typeParamCount].Type, objType))
+                    continue;
+
+                if (!SymbolEqualityComparer.Default.Equals(methodSymbol.Parameters[i].Type,
+                        invocationOperation.TargetMethod.Parameters[i + typeParamCount].Type))
+                {
+                    failedParamComparison = true;
+                    break;
+                }
+            }
+
+            if(failedParamComparison) continue;
+
+            genericVariantMethod = methodSymbol;
+        }
+
+        if (genericVariantMethod == null)
+        {
+            obj.ReportDiagnostic(Diagnostic.Create(
+                UseGenericVariantAttributeValueErrorDescriptor,
+                foundAttribute.ApplicationSyntaxReference?.GetSyntax().GetLocation(),
+                genericVariant));
+            return;
+        }
+
+        var typeOperands = new string[genericVariantMethod.TypeParameters.Length];
+        for (var i = 0; i < genericVariantMethod.TypeParameters.Length; i++)
+        {
+            switch (invocationOperation.Arguments[i].Value)
+            {
+                //todo figure out if ILocalReferenceOperation, IPropertyReferenceOperation or IFieldReferenceOperation is referencing static typeof assignments
+                case ITypeOfOperation typeOfOperation:
+                    typeOperands[i] = typeOfOperation.TypeOperand.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+                    continue;
+                default:
+                    return;
+            }
+        }
+
+        obj.ReportDiagnostic(Diagnostic.Create(
+            UseGenericVariantDescriptor,
+            invocationOperation.Syntax.GetLocation(),
+            ImmutableDictionary.CreateRange(new Dictionary<string, string>()
+            {
+                {"typeOperands", string.Join(",", typeOperands)}
+            })));
+    }
+}
+
+[ExportCodeFixProvider(LanguageNames.CSharp)]
+public class PreferGenericVariantCodeFixProvider : CodeFixProvider
+{
+    private static string Title(string method, string[] types) => $"Use {method}<{string.Join(",", types)}>.";
+
+    public override FixAllProvider GetFixAllProvider()
+    {
+        return WellKnownFixAllProviders.BatchFixer;
+    }
+
+    public override async Task RegisterCodeFixesAsync(CodeFixContext context)
+    {
+        var root = await context.Document.GetSyntaxRootAsync();
+        if(root == null) return;
+
+        foreach (var diagnostic in context.Diagnostics)
+        {
+            if (!diagnostic.Properties.TryGetValue("typeOperands", out var typeOperandsRaw)
+                || typeOperandsRaw == null) continue;
+
+            var node = root.FindNode(diagnostic.Location.SourceSpan);
+            if (node is ArgumentSyntax argumentSyntax)
+                node = argumentSyntax.Expression;
+
+            if(node is not InvocationExpressionSyntax invocationExpression)
+                continue;
+
+            var typeOperands = typeOperandsRaw.Split(',');
+
+            context.RegisterCodeFix(
+                CodeAction.Create(
+                    Title(invocationExpression.Expression.ToString(), typeOperands),
+                    c => FixAsync(context.Document, invocationExpression, typeOperands, c),
+                    Title(invocationExpression.Expression.ToString(), typeOperands)),
+                diagnostic);
+        }
+    }
+
+    private async Task<Document> FixAsync(
+        Document contextDocument,
+        InvocationExpressionSyntax invocationExpression,
+        string[] typeOperands,
+        CancellationToken cancellationToken)
+    {
+        var memberAccess = (MemberAccessExpressionSyntax)invocationExpression.Expression;
+
+        var root = (CompilationUnitSyntax) await contextDocument.GetSyntaxRootAsync(cancellationToken);
+
+        var arguments = new ArgumentSyntax[invocationExpression.ArgumentList.Arguments.Count - typeOperands.Length];
+        var types = new TypeSyntax[typeOperands.Length];
+
+        for (int i = 0; i < typeOperands.Length; i++)
+        {
+            types[i] = ((TypeOfExpressionSyntax)invocationExpression.ArgumentList.Arguments[i].Expression).Type;
+        }
+
+
+
+        Array.Copy(
+            invocationExpression.ArgumentList.Arguments.ToArray(),
+            typeOperands.Length,
+            arguments,
+            0,
+            arguments.Length);
+
+        memberAccess = memberAccess.WithName(SyntaxFactory.GenericName(memberAccess.Name.Identifier,
+            SyntaxFactory.TypeArgumentList(SyntaxFactory.SeparatedList(types))));
+
+        root = root!.ReplaceNode(invocationExpression,
+            invocationExpression.WithArgumentList(invocationExpression.ArgumentList.WithArguments(SyntaxFactory.SeparatedList(arguments)))
+                .WithExpression(memberAccess));
+
+        return contextDocument.WithSyntaxRoot(root);
+    }
+
+    public override ImmutableArray<string> FixableDiagnosticIds =>
+        ImmutableArray.Create(Diagnostics.IdUseGenericVariant);
+}

Robust.Analyzers/Robust.Analyzers.csproj

@@ -11,10 +11,20 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Needed for NotNullableFlagAnalyzer. -->
+    <Compile Include="..\Robust.Shared\Analyzers\NotNullableFlagAttribute.cs" />
+  </ItemGroup>
+  
   <ItemGroup>
     <!-- Needed for FriendAnalyzer. -->
     <Compile Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" />
     <Compile Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Needed for PreferGenericVariantAnalyzer. -->
+    <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" />
+  </ItemGroup>
+
 </Project>

Robust.Benchmarks/EntityManager/ComponentPassingBenchmark.cs

@@ -0,0 +1,53 @@
+using BenchmarkDotNet.Attributes;
+using Robust.Shared.Analyzers;
+using static Robust.Benchmarks.EntityManager.ArchetypeComponentAccessBenchmark;
+
+namespace Robust.Benchmarks.EntityManager;
+
+[MemoryDiagnoser]
+[Virtual]
+public class ArrayAccessBenchmark
+{
+    [Params(new[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9})]
+    public int[] Array = default!;
+
+    [Params(5)]
+    public int Element;
+
+    [Params(500)]
+    public int Handle;
+
+    public Archetype<int, int, int, int, int, int, int, int, int, int> Archetype = default!;
+
+    [GlobalSetup]
+    public void GlobalSetup()
+    {
+        Archetype = new Archetype<int, int, int, int, int, int, int, int, int, int>(1000);
+    }
+
+    [Benchmark]
+    public int? GetArrayElement()
+    {
+        return Consume();
+    }
+
+    [Benchmark]
+    public int? GetExisting()
+    {
+        return Consume(Element);
+    }
+
+    [Benchmark]
+    public int? GetArchetype()
+    {
+        return Consume(Archetype.GetComponentUnsafeHandle<int>(Handle));
+    }
+
+    private int? Consume(int? value = null)
+    {
+        if (value == null)
+            value = Array[5];
+
+        return value;
+    }
+}

Robust.Benchmarks/Exporters/SQLExporter.cs

@@ -22,6 +22,11 @@ namespace Robust.Benchmarks.Exporters;
 
 public sealed class SQLExporter : IExporter
 {
+    private static readonly JsonSerializerOptions JsonSerializerOptions = new JsonSerializerOptions
+    {
+        NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
+    };
+
     public static readonly IExporter Default = new SQLExporter();
 
     private SQLExporter(){}
@@ -76,10 +81,7 @@ public sealed class SQLExporter : IExporter
         {
             ctx.Database.OpenConnection();
             var con = (NpgsqlConnection) ctx.Database.GetDbConnection();
-            con.TypeMapper.AddTypeResolverFactory(new JsonOverrideTypeHandlerResolverFactory(new JsonSerializerOptions
-            {
-                NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
-            }));
+            con.TypeMapper.AddTypeResolverFactory(new JsonOverrideTypeHandlerResolverFactory(JsonSerializerOptions));
 
             ctx.Database.Migrate();
             foreach (var run in BenchmarkRun.FromSummary(summary, gitHash))

Robust.Benchmarks/Migrations/20220510131430_fix-pk.Designer.cs

@@ -13,7 +13,7 @@ namespace Robust.Benchmarks.Migrations
 {
     [DbContext(typeof(BenchmarkContext))]
     [Migration("20220510131430_fix-pk")]
-    partial class fixpk
+    partial class FixPK
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {

Robust.Benchmarks/Migrations/20220510131430_fix-pk.cs

@@ -6,7 +6,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace Robust.Benchmarks.Migrations
 {
-    public partial class fixpk : Migration
+    public partial class FixPK : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {

Robust.Benchmarks/Migrations/20221009235705_db.Designer.cs

@@ -14,7 +14,7 @@ namespace Robust.Benchmarks.Migrations
 {
     [DbContext(typeof(BenchmarkContext))]
     [Migration("20221009235705_db")]
-    partial class db
+    partial class DB
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {

Robust.Benchmarks/Migrations/20221009235705_db.cs

@@ -4,7 +4,7 @@
 
 namespace Robust.Benchmarks.Migrations
 {
-    public partial class db : Migration
+    public partial class DB : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {

Robust.Benchmarks/Migrations/20221010144620_param_work.Designer.cs

@@ -14,7 +14,7 @@ namespace Robust.Benchmarks.Migrations
 {
     [DbContext(typeof(BenchmarkContext))]
     [Migration("20221010144620_param_work")]
-    partial class param_work
+    partial class ParamWork
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {

Robust.Benchmarks/Migrations/20221010144620_param_work.cs

@@ -5,7 +5,7 @@ using Robust.Benchmarks.Exporters;
 
 namespace Robust.Benchmarks.Migrations
 {
-    public partial class param_work : Migration
+    public partial class ParamWork : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {

Robust.Benchmarks/NumericsHelpers/AddBenchmark.cs

@@ -1,33 +1,32 @@
 using BenchmarkDotNet.Attributes;
 using Robust.Shared.Analyzers;
 
-namespace Robust.Benchmarks.NumericsHelpers
+namespace Robust.Benchmarks.NumericsHelpers;
+
+[Virtual]
+public class AddBenchmark
 {
-    [Virtual]
-    public class AddBenchmark
+    [Params(32, 128)]
+    public int N { get; set; }
+
+    [Params(1,2)]
+    public int T { get; set; }
+
+    private float[] _inputA = default!;
+    private float[] _inputB = default!;
+    private float[] _output = default!;
+
+    [GlobalSetup]
+    public void Setup()
     {
-        [Params(32, 128)]
-        public int N { get; set; }
+        _inputA = new float[N];
+        _inputB = new float[N];
+        _output = new float[N];
+    }
 
-        [Params(1,2)]
-        public int T { get; set; }
-
-        private float[] _inputA = default!;
-        private float[] _inputB = default!;
-        private float[] _output = default!;
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            _inputA = new float[N];
-            _inputB = new float[N];
-            _output = new float[N];
-        }
-
-        [Benchmark]
-        public void Bench()
-        {
-            Shared.Maths.NumericsHelpers.Add(_inputA, _inputB, _output);
-        }
+    [Benchmark]
+    public void Bench()
+    {
+        Shared.Maths.NumericsHelpers.Add(_inputA, _inputB, _output);
     }
 }

Robust.Benchmarks/NumericsHelpers/HorizontalAddBenchmark.cs

@@ -0,0 +1,26 @@
+using BenchmarkDotNet.Attributes;
+using Robust.Shared.Analyzers;
+
+namespace Robust.Benchmarks.NumericsHelpers;
+
+[Virtual]
+[DisassemblyDiagnoser()]
+public class HorizontalAddBenchmark
+{
+    [Params(8, 32, 128)]
+    public int N { get; set; }
+
+    private float[] _inputA = default!;
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        _inputA = new float[N];
+    }
+
+    [Benchmark]
+    public float Bench()
+    {
+        return Shared.Maths.NumericsHelpers.HorizontalAdd(_inputA);
+    }
+}

Robust.Benchmarks/Program.cs

@@ -1,8 +1,9 @@
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Running;
+#if DEBUG
+using BenchmarkDotNet.Configs;
+#endif
 using System;
+using BenchmarkDotNet.Running;
 using Robust.Benchmarks.Configs;
-using Robust.Benchmarks.Exporters;
 
 namespace Robust.Benchmarks
 {

Robust.Benchmarks/Robust.Benchmarks.csproj

@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\MSBuild\Robust.Properties.targets" />
-    <Import Project="..\MSBuild\Robust.Engine.props" />
-    <PropertyGroup>
-        <IsPackable>false</IsPackable>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <OutputPath>../bin/Benchmarks</OutputPath>
-        <OutputType>Exe</OutputType>
-        <NoWarn>RA0003</NoWarn>
-    </PropertyGroup>
-    <ItemGroup>
-      <ProjectReference Include="..\Robust.Server\Robust.Server.csproj" />
-      <ProjectReference Include="..\Robust.Shared\Robust.Shared.csproj" />
-      <ProjectReference Include="..\Robust.UnitTesting\Robust.UnitTesting.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        <PrivateAssets>all</PrivateAssets>
-      </PackageReference>
-      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
-    </ItemGroup>
-    <Import Project="..\MSBuild\Robust.Engine.targets" />
+  <Import Project="..\MSBuild\Robust.Engine.props" />
+  <PropertyGroup>
+      <IsPackable>false</IsPackable>
+      <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+      <OutputPath>../bin/Benchmarks</OutputPath>
+      <OutputType>Exe</OutputType>
+      <NoWarn>RA0003</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Robust.Server\Robust.Server.csproj" />
+    <ProjectReference Include="..\Robust.Shared\Robust.Shared.csproj" />
+    <ProjectReference Include="..\Robust.UnitTesting\Robust.UnitTesting.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
+  </ItemGroup>
+
+  <Import Project="..\MSBuild\Robust.Properties.targets" />
 </Project>

Robust.Benchmarks/Serialization/BenchmarkIntSerializer.cs

@@ -1,5 +1,6 @@
 using System.Globalization;
 using Robust.Shared.IoC;
+using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Validation;
@@ -8,7 +9,7 @@ using Robust.Shared.Serialization.TypeSerializers.Interfaces;
 
 namespace Robust.Benchmarks.Serialization
 {
-    public sealed class BenchmarkIntSerializer : ITypeSerializer<int, ValueDataNode>
+    public sealed class BenchmarkIntSerializer : ITypeSerializer<int, ValueDataNode>, ITypeCopyCreator<int>
     {
         public ValidationNode Validate(ISerializationManager serializationManager, ValueDataNode node,
             IDependencyCollection dependencies, ISerializationContext? context = null)
@@ -19,7 +20,8 @@ namespace Robust.Benchmarks.Serialization
         }
 
         public int Read(ISerializationManager serializationManager, ValueDataNode node,
-            IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null, int _ = default)
+            IDependencyCollection dependencies, SerializationHookContext hookCtx, ISerializationContext? context = null,
+            ISerializationManager.InstantiationDelegate<int>? instanceProvider = null)
         {
             return int.Parse(node.Value, CultureInfo.InvariantCulture);
         }
@@ -31,8 +33,8 @@ namespace Robust.Benchmarks.Serialization
             return new ValueDataNode(value.ToString(CultureInfo.InvariantCulture));
         }
 
-        public int Copy(ISerializationManager serializationManager, int source, int target, bool skipHook,
-            ISerializationContext? context = null)
+        public int CreateCopy(ISerializationManager serializationManager, int source,
+            IDependencyCollection dependencies, SerializationHookContext hookCtx, ISerializationContext? context = null)
         {
             return source;
         }

Robust.Benchmarks/Serialization/Copy/SerializationCopyBenchmark.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using BenchmarkDotNet.Attributes;
 using Robust.Benchmarks.Serialization.Definitions;
 using Robust.Shared.Analyzers;
-using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Sequence;
@@ -28,7 +27,7 @@ namespace Robust.Benchmarks.Serialization.Copy
 
             var seedMapping = yamlStream.Documents[0].RootNode.ToDataNodeCast<SequenceDataNode>().Cast<MappingDataNode>(0);
 
-            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping);
+            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping, notNullableOverride: true);
         }
 
         private const string String = "ABC";
@@ -46,25 +45,25 @@ namespace Robust.Benchmarks.Serialization.Copy
         [Benchmark]
         public string? CreateCopyString()
         {
-            return SerializationManager.Copy(String);
+            return SerializationManager.CreateCopy(String, notNullableOverride: true);
         }
 
         [Benchmark]
         public int? CreateCopyInteger()
         {
-            return SerializationManager.Copy(Integer);
+            return SerializationManager.CreateCopy(Integer);
         }
 
         [Benchmark]
         public DataDefinitionWithString? CreateCopyDataDefinitionWithString()
         {
-            return SerializationManager.Copy(DataDefinitionWithString);
+            return SerializationManager.CreateCopy(DataDefinitionWithString, notNullableOverride: true);
         }
 
         [Benchmark]
         public SeedDataDefinition? CreateCopySeedDataDefinition()
         {
-            return SerializationManager.Copy(Seed);
+            return SerializationManager.CreateCopy(Seed, notNullableOverride: true);
         }
 
         [Benchmark]
@@ -109,9 +108,7 @@ namespace Robust.Benchmarks.Serialization.Copy
             copy.Potency = Seed.Potency;
             copy.Ligneous = Seed.Ligneous;
 
-            copy.PlantRsi = Seed.PlantRsi == null
-                ? null!
-                : new ResourcePath(Seed.PlantRsi.ToString(), Seed.PlantRsi.Separator);
+            copy.PlantRsi = new ResPath(Seed.PlantRsi.ToString());
             copy.PlantIconState = Seed.PlantIconState;
             copy.Bioluminescent = Seed.Bioluminescent;
             copy.BioluminescentColor = Seed.BioluminescentColor;
@@ -124,30 +121,21 @@ namespace Robust.Benchmarks.Serialization.Copy
         [BenchmarkCategory("flag")]
         public object? CopyFlagZero()
         {
-            return SerializationManager.CopyWithTypeSerializer(
-                typeof(FlagSerializer<BenchmarkFlags>),
-                (int) FlagZero,
-                (int) FlagZero);
+            return SerializationManager.CreateCopy<int, FlagSerializer<BenchmarkFlags>>((int) FlagZero);
         }
 
         [Benchmark]
         [BenchmarkCategory("flag")]
         public object? CopyFlagThirtyOne()
         {
-            return SerializationManager.CopyWithTypeSerializer(
-                typeof(FlagSerializer<BenchmarkFlags>),
-                (int) FlagThirtyOne,
-                (int) FlagThirtyOne);
+            return SerializationManager.CreateCopy<int, FlagSerializer<BenchmarkFlags>>((int) FlagThirtyOne);
         }
 
         [Benchmark]
         [BenchmarkCategory("customTypeSerializer")]
         public object? CopyIntegerCustomSerializer()
         {
-            return SerializationManager.CopyWithTypeSerializer(
-                typeof(BenchmarkIntSerializer),
-                Integer,
-                Integer);
+            return SerializationManager.CreateCopy<int, BenchmarkIntSerializer>(Integer);
         }
     }
 }

Robust.Benchmarks/Serialization/Definitions/SeedDataDefinition.cs

@@ -87,7 +87,7 @@ namespace Robust.Benchmarks.Serialization.Definitions
         #endregion
 
         #region Cosmetics
-        [DataField("plantRsi", required: true)] public ResourcePath PlantRsi { get; set; } = default!;
+        [DataField("plantRsi", required: true)] public ResPath PlantRsi { get; set; } = default!;
         [DataField("plantIconState")] public string PlantIconState { get; set; } = "produce";
         [DataField("bioluminescent")] public bool Bioluminescent { get; set; }
         [DataField("bioluminescentColor")] public Color BioluminescentColor { get; set; } = Color.White;

Robust.Benchmarks/Serialization/Read/SerializationReadBenchmark.cs

@@ -43,7 +43,7 @@ namespace Robust.Benchmarks.Serialization.Read
         [Benchmark]
         public string ReadString()
         {
-            return SerializationManager.Read<string>(StringNode);
+            return SerializationManager.Read<string>(StringNode, notNullableOverride: true);
         }
 
         [Benchmark]
@@ -55,43 +55,34 @@ namespace Robust.Benchmarks.Serialization.Read
         [Benchmark]
         public DataDefinitionWithString ReadDataDefinitionWithString()
         {
-            return SerializationManager.Read<DataDefinitionWithString>(StringDataDefNode);
+            return SerializationManager.Read<DataDefinitionWithString>(StringDataDefNode, notNullableOverride: true);
         }
 
         [Benchmark]
         public SeedDataDefinition ReadSeedDataDefinition()
         {
-            return SerializationManager.Read<SeedDataDefinition>(SeedNode);
+            return SerializationManager.Read<SeedDataDefinition>(SeedNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("flag")]
         public object? ReadFlagZero()
         {
-            return SerializationManager.ReadWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagZero);
+            return SerializationManager.Read<int, ValueDataNode, FlagSerializer<BenchmarkFlags>>(FlagZero);
         }
 
         [Benchmark]
         [BenchmarkCategory("flag")]
         public object? ReadThirtyOne()
         {
-            return SerializationManager.ReadWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagThirtyOne);
+            return SerializationManager.Read<int, ValueDataNode, FlagSerializer<BenchmarkFlags>>(FlagThirtyOne);
         }
 
         [Benchmark]
         [BenchmarkCategory("customTypeSerializer")]
         public object? ReadIntegerCustomSerializer()
         {
-            return SerializationManager.ReadWithTypeSerializer(
-                typeof(int),
-                typeof(BenchmarkIntSerializer),
-                IntNode);
+            return SerializationManager.Read<int, ValueDataNode, BenchmarkIntSerializer>(IntNode);
         }
     }
 }

Robust.Benchmarks/Serialization/SerializationArrayBenchmark.cs

@@ -46,84 +46,84 @@ namespace Robust.Benchmarks.Serialization
         [BenchmarkCategory("read")]
         public string[]? ReadEmptyString()
         {
-            return SerializationManager.Read<string[]>(EmptyNode);
+            return SerializationManager.Read<string[]>(EmptyNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public string[]? ReadOneString()
         {
-            return SerializationManager.Read<string[]>(OneIntNode);
+            return SerializationManager.Read<string[]>(OneIntNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public string[]? ReadTenStrings()
         {
-            return SerializationManager.Read<string[]>(TenIntsNode);
+            return SerializationManager.Read<string[]>(TenIntsNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public int[]? ReadEmptyInt()
         {
-            return SerializationManager.Read<int[]>(EmptyNode);
+            return SerializationManager.Read<int[]>(EmptyNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public int[]? ReadOneInt()
         {
-            return SerializationManager.Read<int[]>(OneIntNode);
+            return SerializationManager.Read<int[]>(OneIntNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public int[]? ReadTenInts()
         {
-            return SerializationManager.Read<int[]>(TenIntsNode);
+            return SerializationManager.Read<int[]>(TenIntsNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public DataDefinitionWithString[]? ReadEmptyStringDataDef()
         {
-            return SerializationManager.Read<DataDefinitionWithString[]>(EmptyNode);
+            return SerializationManager.Read<DataDefinitionWithString[]>(EmptyNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public DataDefinitionWithString[]? ReadOneStringDataDef()
         {
-            return SerializationManager.Read<DataDefinitionWithString[]>(OneStringDefNode);
+            return SerializationManager.Read<DataDefinitionWithString[]>(OneStringDefNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public DataDefinitionWithString[]? ReadTenStringDataDefs()
         {
-            return SerializationManager.Read<DataDefinitionWithString[]>(TenStringDefsNode);
+            return SerializationManager.Read<DataDefinitionWithString[]>(TenStringDefsNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public SealedDataDefinitionWithString[]? ReadEmptySealedStringDataDef()
         {
-            return SerializationManager.Read<SealedDataDefinitionWithString[]>(EmptyNode);
+            return SerializationManager.Read<SealedDataDefinitionWithString[]>(EmptyNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public SealedDataDefinitionWithString[]? ReadOneSealedStringDataDef()
         {
-            return SerializationManager.Read<SealedDataDefinitionWithString[]>(OneStringDefNode);
+            return SerializationManager.Read<SealedDataDefinitionWithString[]>(OneStringDefNode, notNullableOverride: true);
         }
 
         [Benchmark]
         [BenchmarkCategory("read")]
         public SealedDataDefinitionWithString[]? ReadTenSealedStringDataDefs()
         {
-            return SerializationManager.Read<SealedDataDefinitionWithString[]>(TenStringDefsNode);
+            return SerializationManager.Read<SealedDataDefinitionWithString[]>(TenStringDefsNode, notNullableOverride: true);
         }
     }
 }

Robust.Benchmarks/Serialization/SerializationBenchmark.cs

@@ -12,9 +12,9 @@ namespace Robust.Benchmarks.Serialization
     {
         public SerializationBenchmark()
         {
-            IoCManager.InitThread();
-            ServerIoC.RegisterIoC();
-            IoCManager.BuildGraph();
+            var deps = IoCManager.InitThread();
+            ServerIoC.RegisterIoC(deps);
+            deps.BuildGraph();
 
             var assemblies = new[]
             {
@@ -25,12 +25,12 @@ namespace Robust.Benchmarks.Serialization
 
             foreach (var assembly in assemblies)
             {
-                IoCManager.Resolve<IConfigurationManagerInternal>().LoadCVarsFromAssembly(assembly);
+                deps.Resolve<IConfigurationManagerInternal>().LoadCVarsFromAssembly(assembly);
             }
 
-            IoCManager.Resolve<IReflectionManager>().LoadAssemblies(assemblies);
+            deps.Resolve<IReflectionManager>().LoadAssemblies(assemblies);
 
-            SerializationManager = IoCManager.Resolve<ISerializationManager>();
+            SerializationManager = deps.Resolve<ISerializationManager>();
         }
 
         protected ISerializationManager SerializationManager { get; }

Robust.Benchmarks/Serialization/Write/SerializationWriteBenchmark.cs

@@ -3,7 +3,6 @@ using System.IO;
 using BenchmarkDotNet.Attributes;
 using Robust.Benchmarks.Serialization.Definitions;
 using Robust.Shared.Analyzers;
-using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Sequence;
@@ -28,7 +27,7 @@ namespace Robust.Benchmarks.Serialization.Write
 
             var seedMapping = yamlStream.Documents[0].RootNode.ToDataNodeCast<SequenceDataNode>().Cast<MappingDataNode>(0);
 
-            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping);
+            Seed = SerializationManager.Read<SeedDataDefinition>(seedMapping, notNullableOverride: true);
         }
 
         private const string String = "ABC";
@@ -46,7 +45,7 @@ namespace Robust.Benchmarks.Serialization.Write
         [Benchmark]
         public DataNode WriteString()
         {
-            return SerializationManager.WriteValue(String);
+            return SerializationManager.WriteValue(String, notNullableOverride: true);
         }
 
         [Benchmark]
@@ -58,13 +57,13 @@ namespace Robust.Benchmarks.Serialization.Write
         [Benchmark]
         public DataNode WriteDataDefinitionWithString()
         {
-            return SerializationManager.WriteValue(DataDefinitionWithString);
+            return SerializationManager.WriteValue(DataDefinitionWithString, notNullableOverride: true);
         }
 
         [Benchmark]
         public DataNode WriteSeedDataDefinition()
         {
-            return SerializationManager.WriteValue(Seed);
+            return SerializationManager.WriteValue(Seed, notNullableOverride: true);
         }
 
         [Benchmark]
@@ -107,30 +106,21 @@ namespace Robust.Benchmarks.Serialization.Write
         [BenchmarkCategory("flag")]
         public DataNode WriteFlagZero()
         {
-            return SerializationManager.WriteWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagZero);
+            return SerializationManager.WriteValue<int, FlagSerializer<BenchmarkFlags>>((int)FlagZero);
         }
 
         [Benchmark]
         [BenchmarkCategory("flag")]
         public DataNode WriteThirtyOne()
         {
-            return SerializationManager.WriteWithTypeSerializer(
-                typeof(int),
-                typeof(FlagSerializer<BenchmarkFlags>),
-                FlagThirtyOne);
+            return SerializationManager.WriteValue<int, FlagSerializer<BenchmarkFlags>>((int)FlagThirtyOne);
         }
 
         [Benchmark]
         [BenchmarkCategory("customTypeSerializer")]
         public DataNode WriteIntegerCustomSerializer()
         {
-            return SerializationManager.WriteWithTypeSerializer(
-                typeof(int),
-                typeof(BenchmarkIntSerializer),
-                Integer);
+            return SerializationManager.WriteValue<int, BenchmarkIntSerializer>(Integer);
         }
     }
 }

Robust.Benchmarks/TypeMatching/TypeSwitchBenchmark.cs

@@ -0,0 +1,71 @@
+using BenchmarkDotNet.Attributes;
+using Robust.Shared.Analyzers;
+
+namespace Robust.Benchmarks.TypeMatching;
+
+[MemoryDiagnoser]
+[Virtual]
+public class TypeSwitchBenchmark
+{
+    private readonly Matcher<Struct> _matcher = new();
+
+    [Benchmark]
+    public int BenchmarkInt()
+    {
+        return _matcher.TypeToInt<int>();
+    }
+
+    [Benchmark]
+    public int BenchmarkString()
+    {
+        return _matcher.TypeToInt<string>();
+    }
+
+    [Benchmark]
+    public int BenchmarkStruct()
+    {
+        return _matcher.TypeToInt<Struct>();
+    }
+
+    [Benchmark]
+    public int BenchmarkDouble()
+    {
+        return _matcher.TypeToInt<double>();
+    }
+
+    [Benchmark]
+    public int BenchmarkFloat()
+    {
+        return _matcher.TypeToInt<float>();
+    }
+
+    [Benchmark]
+    public int BenchmarkClass()
+    {
+        return _matcher.TypeToInt<Class>();
+    }
+
+    private class Matcher<T1>
+    {
+        public int TypeToInt<T>(T val = default!)
+        {
+            return val switch
+            {
+                int => 1,
+                string => 2,
+                double => 3,
+                T1 => 4,
+                Class => 5,
+                _ => 6
+            };
+        }
+    }
+
+    private struct Struct
+    {
+    }
+
+    private class Class
+    {
+    }
+}

Robust.Benchmarks/Utility/ResourcePathBench.cs

@@ -0,0 +1,36 @@
+using BenchmarkDotNet.Attributes;
+using JetBrains.Annotations;
+using Robust.Shared.Analyzers;
+using Robust.Shared.Utility;
+
+#pragma warning disable CS0612
+namespace Robust.Benchmarks.Utility;
+
+[Virtual]
+public class ResourcePathBench
+{
+    private string _path = default!;
+
+    [UsedImplicitly]
+    [Params(10, 100, 1000)]
+    public int N;
+
+    [GlobalSetup]
+    public void GlobalSetup()
+    {
+        _path = "/a/b/c/../test";
+    }
+
+    [Benchmark]
+    public ResPath CreateWithSeparatorResPath()
+    {
+        ResPath res = default;
+        for (var i = 0; i < N; i++)
+        {
+            res = new ResPath(_path);
+        }
+        return res;
+    }
+
+}
+#pragma warning restore CS0612

Robust.Client.Injectors/RXamlWellKnownTypes.cs

@@ -25,7 +25,7 @@ namespace Robust.Build.Tasks
             Single = ts.GetType("System.Single");
             Int32 = ts.GetType("System.Int32");
 
-            (Vector2, Vector2ConstructorFull) = GetNumericTypeInfo("Robust.Shared.Maths.Vector2", Single, 2);
+            (Vector2, Vector2ConstructorFull) = GetNumericTypeInfo("System.Numerics.Vector2", Single, 2);
             (Vector2i, Vector2iConstructorFull) = GetNumericTypeInfo("Robust.Shared.Maths.Vector2i", Int32, 2);
             (Thickness, ThicknessConstructorFull) = GetNumericTypeInfo("Robust.Shared.Maths.Thickness", Single, 4);
 

Robust.Client.Injectors/XamlCompiler.cs

@@ -110,25 +110,6 @@ namespace Robust.Build.Tasks
             var compiler =
                 new RobustXamlILCompiler(transformerconfig, emitConfig, true);
 
-            var loaderDispatcherDef = new TypeDefinition("CompiledRobustXaml", "!XamlLoader",
-                TypeAttributes.Class, asm.MainModule.TypeSystem.Object);
-
-            var loaderDispatcherMethod = new MethodDefinition("TryLoad",
-                MethodAttributes.Static | MethodAttributes.Public,
-                asm.MainModule.TypeSystem.Object)
-            {
-                Parameters = {new ParameterDefinition(asm.MainModule.TypeSystem.String)}
-            };
-            loaderDispatcherDef.Methods.Add(loaderDispatcherMethod);
-            asm.MainModule.Types.Add(loaderDispatcherDef);
-
-            var stringEquals = asm.MainModule.ImportReference(asm.MainModule.TypeSystem.String.Resolve().Methods.First(
-                m =>
-                    m.IsStatic && m.Name == "Equals" && m.Parameters.Count == 2 &&
-                    m.ReturnType.FullName == "System.Boolean"
-                    && m.Parameters[0].ParameterType.FullName == "System.String"
-                    && m.Parameters[1].ParameterType.FullName == "System.String"));
-
             bool CompileGroup(IResourceGroup group)
             {
                 var typeDef = new TypeDefinition("CompiledRobustXaml", "!" + group.Name, TypeAttributes.Class,
@@ -252,31 +233,6 @@ namespace Robust.Build.Tasks
                                     $"No call to RobustXamlLoader.Load(this) call found anywhere in the type {classType.FullName} and type seems to have custom constructors.");
                             }
                         }
-
-                        //add compiled build method
-                        var compiledBuildMethod = typeSystem.GetTypeReference(builder).Resolve().Methods
-                            .First(m => m.Name == buildName);
-                        var parameterlessCtor = classTypeDefinition.GetConstructors()
-                            .FirstOrDefault(c => c.IsPublic && !c.IsStatic && !c.HasParameters);
-
-                        if (compiledBuildMethod != null && parameterlessCtor != null)
-                        {
-                            var i = loaderDispatcherMethod.Body.Instructions;
-                            var nop = Instruction.Create(OpCodes.Nop);
-                            i.Add(Instruction.Create(OpCodes.Ldarg_0));
-                            i.Add(Instruction.Create(OpCodes.Ldstr, res.Uri));
-                            i.Add(Instruction.Create(OpCodes.Call, stringEquals));
-                            i.Add(Instruction.Create(OpCodes.Brfalse, nop));
-                            if (parameterlessCtor != null)
-                                i.Add(Instruction.Create(OpCodes.Newobj, parameterlessCtor));
-                            else
-                            {
-                                i.Add(Instruction.Create(OpCodes.Call, compiledBuildMethod));
-                            }
-
-                            i.Add(Instruction.Create(OpCodes.Ret));
-                            i.Add(nop);
-                        }
                     }
                     catch (Exception e)
                     {
@@ -293,8 +249,6 @@ namespace Robust.Build.Tasks
                     return false;
             }
 
-            loaderDispatcherMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ldnull));
-            loaderDispatcherMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
             return true;
         }
 

Robust.Client.NameGenerator/XamlUiPartialClassGenerator.cs

@@ -332,7 +332,7 @@ namespace {nameSpace}
                                 "Usage",
                                 DiagnosticSeverity.Error,
                                 true),
-                            Location.None));
+                            candidateClass.GetLocation()));
                 }
             }
 

Robust.Client.WebView/Cef/Program.cs

@@ -20,7 +20,7 @@ namespace Robust.Client.WebView.Cef
             var mainArgs = new CefMainArgs(argv);
 
             // This will block executing until the subprocess is shut down.
-            var code = CefRuntime.ExecuteProcess(mainArgs, new RobustCefApp(), IntPtr.Zero);
+            var code = CefRuntime.ExecuteProcess(mainArgs, new RobustCefApp(null), IntPtr.Zero);
 
             if (code != 0)
             {

Robust.Client.WebView/Cef/RobustCefApp.cs

@@ -7,9 +7,15 @@ namespace Robust.Client.WebView.Cef
 {
     internal sealed class RobustCefApp : CefApp
     {
+        private readonly ISawmill? _sawmill;
         private readonly BrowserProcessHandler _browserProcessHandler = new();
         private readonly RenderProcessHandler _renderProcessHandler = new();
 
+        public RobustCefApp(ISawmill? sawmill)
+        {
+            _sawmill = sawmill;
+        }
+
         protected override CefBrowserProcessHandler GetBrowserProcessHandler()
         {
             return _browserProcessHandler;
@@ -39,8 +45,7 @@ namespace Robust.Client.WebView.Cef
             commandLine.AppendSwitch("disable-threaded-scrolling", "1");
             commandLine.AppendSwitch("disable-features", "TouchpadAndWheelScrollLatching,AsyncWheelEvents");
 
-            if(IoCManager.Instance != null)
-                Logger.Debug($"{commandLine}");
+            _sawmill?.Debug($"CEF command line: {commandLine}");
         }
 
         protected override void OnRegisterCustomSchemes(CefSchemeRegistrar registrar)

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

@@ -27,7 +27,7 @@ namespace Robust.Client.WebView.Cef
             var impl = new WebViewWindowImpl(this);
 
             var lifeSpanHandler = new WindowLifeSpanHandler(impl);
-            var reqHandler = new RobustRequestHandler(Logger.GetSawmill("root"));
+            var reqHandler = new RobustRequestHandler(_sawmill);
             var client = new WindowCefClient(lifeSpanHandler, reqHandler);
             var settings = new CefBrowserSettings();
 

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
@@ -143,6 +144,8 @@ namespace Robust.Client.WebView.Cef
 
             private const int ScrollSpeed = 50;
 
+            private bool _textInputActive;
+
             private readonly RobustRequestHandler _requestHandler = new(Logger.GetSawmill("root"));
             private LiveData? _data;
             private string _startUrl = "about:blank";
@@ -360,24 +363,21 @@ namespace Robust.Client.WebView.Cef
                 return modifiers;
             }
 
-            public void TextEntered(GUITextEventArgs args)
+            public void TextEntered(GUITextEnteredEventArgs args)
             {
                 if (_data == null)
                     return;
 
                 var host = _data.Browser.GetHost();
 
-                Span<char> buf = stackalloc char[2];
-                var written = args.AsRune.EncodeToUtf16(buf);
-
-                for (var i = 0; i < written; i++)
+                foreach (var chr in args.Text)
                 {
                     host.SendKeyEvent(new CefKeyEvent
                     {
                         EventType = CefKeyEventType.Char,
-                        WindowsKeyCode = buf[i],
-                        Character = buf[i],
-                        UnmodifiedCharacter = buf[i]
+                        WindowsKeyCode = chr,
+                        Character = chr,
+                        UnmodifiedCharacter = chr
                     });
                 }
             }
@@ -481,6 +481,32 @@ namespace Robust.Client.WebView.Cef
                 _requestHandler.RemoveBeforeBrowseHandler(handler);
             }
 
+            public void FocusEntered()
+            {
+                if (_textInputActive)
+                    _clyde.TextInputStart();
+            }
+
+            public void FocusExited()
+            {
+                if (_textInputActive)
+                    _clyde.TextInputStop();
+            }
+
+            public void TextInputStart()
+            {
+                _textInputActive = true;
+                if (Owner.HasKeyboardFocus())
+                    _clyde.TextInputStart();
+            }
+
+            public void TextInputStop()
+            {
+                _textInputActive = false;
+                if (Owner.HasKeyboardFocus())
+                    _clyde.TextInputStop();
+            }
+
             private sealed class LiveData
             {
                 public OwnedTexture Texture;
@@ -579,6 +605,22 @@ namespace Robust.Client.WebView.Cef
                 if (_control.Owner.Disposed)
                     return;
             }
+
+            protected override void OnVirtualKeyboardRequested(CefBrowser browser, CefTextInputMode inputMode)
+            {
+                base.OnVirtualKeyboardRequested(browser, inputMode);
+
+                // Treat virtual keyboard requests as a guide for whether we should accept text input.
+
+                if (inputMode == CefTextInputMode.None)
+                {
+                    _control.TextInputStop();
+                }
+                else
+                {
+                    _control.TextInputStart();
+                }
+            }
         }
     }
 }

Robust.Client.WebView/Cef/WebViewManagerCef.cs

@@ -26,15 +26,20 @@ namespace Robust.Client.WebView.Cef
         [Dependency] private readonly IResourceManagerInternal _resourceManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+        [Dependency] private readonly ILocalizationManager _localization = default!;
+
+        private ISawmill _sawmill = default!;
 
         public void Initialize()
         {
-            IoCManager.Instance!.InjectDependencies(this, oneOff: true);
+            _sawmill = _logManager.GetSawmill("web.cef");
 
-            _consoleHost.RegisterCommand("flushcookies", Loc.GetString("cmd-flushcookies-desc"), Loc.GetString("cmd-flushcookies-help"), (_, _, _) =>
-            {
-                CefCookieManager.GetGlobal(null).FlushStore(null);
-            });
+            _consoleHost.RegisterCommand(
+                "flushcookies",
+                _localization.GetString("cmd-flushcookies-desc"),
+                _localization.GetString("cmd-flushcookies-help"),
+                (_, _, _) => CefCookieManager.GetGlobal(null).FlushStore(null));
 
             string subProcessName;
             if (OperatingSystem.IsWindows())
@@ -46,6 +51,7 @@ namespace Robust.Client.WebView.Cef
 
             var subProcessPath = Path.Combine(BasePath, subProcessName);
             var cefResourcesPath = LocateCefResources();
+            _sawmill.Debug($"Subprocess path: {subProcessPath}, resources: {cefResourcesPath}");
 
             // System.Console.WriteLine(AppContext.GetData("NATIVE_DLL_SEARCH_DIRECTORIES"));
 
@@ -54,7 +60,7 @@ namespace Robust.Client.WebView.Cef
 
             var cachePath = "";
             if (_resourceManager.UserData is WritableDirProvider userData)
-                cachePath = userData.GetFullPath(new ResourcePath("/cef_cache"));
+                cachePath = userData.GetFullPath(new ResPath("/cef_cache"));
 
             var settings = new CefSettings()
             {
@@ -69,20 +75,28 @@ namespace Robust.Client.WebView.Cef
                 CachePath = cachePath,
             };
 
-            Logger.Info($"CEF Version: {CefRuntime.ChromeVersion}");
+            var userAgentOverride = _cfg.GetCVar(WCVars.WebUserAgentOverride);
+            if (!string.IsNullOrEmpty(userAgentOverride))
+            {
+                settings.UserAgent = userAgentOverride;
+            }
 
-            _app = new RobustCefApp();
+            _sawmill.Info($"CEF Version: {CefRuntime.ChromeVersion}");
 
-            // We pass no main arguments...
-            CefRuntime.Initialize(new CefMainArgs(null), settings, _app, IntPtr.Zero);
+            _app = new RobustCefApp(_sawmill);
 
-            // TODO CEF: After this point, debugging breaks. No, literally. My client crashes but ONLY with the debugger.
-            // I have tried using the DEBUG and RELEASE versions of libcef.so, stripped or non-stripped...
-            // And nothing seemed to work. Odd.
+            // So these arguments look like nonsense, but it turns out CEF is just *like that*.
+            // The first argument is literally nonsense, but it needs to be there as otherwise the second argument doesn't apply
+            // The second argument turns off CEF's bullshit error handling, which breaks dotnet's error handling.
+            CefRuntime.Initialize(new CefMainArgs(new string[]{"binary","--disable-in-process-stack-traces"}), settings, _app, IntPtr.Zero);
 
             if (_cfg.GetCVar(WCVars.WebResProtocol))
             {
-                var handler = new ResourceSchemeFactoryHandler(this, _resourceManager, Logger.GetSawmill("web.res"));
+                var handler = new ResourceSchemeFactoryHandler(
+                    this,
+                    _resourceManager,
+                    _logManager.GetSawmill("web.res"));
+
                 CefRuntime.RegisterSchemeHandlerFactory("res", "", handler);
             }
         }
@@ -155,10 +169,10 @@ namespace Robust.Client.WebView.Cef
 
                 _sawmill.Debug($"HANDLING: {request.Url}");
 
-                var resourcePath = new ResourcePath(uri.AbsolutePath);
-                if (_resourceManager.TryContentFileRead(resourcePath, out var stream))
+                var resPath = new ResPath(uri.AbsolutePath);
+                if (_resourceManager.TryContentFileRead(resPath, out var stream))
                 {
-                    if (!_parent.TryGetResourceMimeType(resourcePath.Extension, out var mime))
+                    if (!_parent.TryGetResourceMimeType(resPath.Extension, out var mime))
                         mime = "application/octet-stream";
 
                     return new RequestResultStream(stream, mime, HttpStatusCode.OK).MakeHandler();

Robust.Client.WebView/Headless/WebViewManagerHeadless.cs

@@ -106,7 +106,7 @@ namespace Robust.Client.WebView.Headless
                 return false;
             }
 
-            public void TextEntered(GUITextEventArgs args)
+            public void TextEntered(GUITextEnteredEventArgs args)
             {
             }
 
@@ -125,6 +125,14 @@ namespace Robust.Client.WebView.Headless
             public void RemoveBeforeBrowseHandler(Action<IBeforeBrowseContext> handler)
             {
             }
+
+            public void FocusEntered()
+            {
+            }
+
+            public void FocusExited()
+            {
+            }
         }
 
         private sealed class WebViewWindowDummy : DummyBase, IWebViewWindow

Robust.Client.WebView/IWebViewControlImpl.cs

@@ -15,10 +15,12 @@ namespace Robust.Client.WebView
         void MouseExited();
         void MouseWheel(GUIMouseWheelEventArgs args);
         bool RawKeyEvent(in GuiRawKeyEvent guiRawEvent);
-        void TextEntered(GUITextEventArgs args);
+        void TextEntered(GUITextEnteredEventArgs args);
         void Resized();
         void Draw(DrawingHandleScreen handle);
         void AddBeforeBrowseHandler(Action<IBeforeBrowseContext> handler);
         void RemoveBeforeBrowseHandler(Action<IBeforeBrowseContext> handler);
+        void FocusEntered();
+        void FocusExited();
     }
 }

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

@@ -1,17 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\MSBuild\Robust.Properties.targets" />
   <Import Project="..\MSBuild\Robust.Engine.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>WinExe</OutputType>
+    <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
   </PropertyGroup>
 
-  <Import Project="..\MSBuild\Robust.DefineConstants.targets" />
-  <Target Name="RobustAfterBuild" AfterTargets="Build" />
-  <Import Project="..\MSBuild\Robust.Engine.targets" />
-
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
     <PackageReference Include="Robust.Natives.Cef" Version="102.0.9" />
@@ -21,4 +16,6 @@
     <ProjectReference Include="..\cefglue\CefGlue\CefGlue.csproj" />
     <ProjectReference Include="..\Robust.Client\Robust.Client.csproj" />
   </ItemGroup>
+
+  <Import Project="..\MSBuild\Robust.Properties.targets" />
 </Project>

Robust.Client.WebView/WCVars.cs

@@ -14,4 +14,16 @@ public static class WCVars
     /// </summary>
     public static readonly CVarDef<bool> WebResProtocol =
         CVarDef.Create("web.res_protocol", true, CVar.CLIENTONLY);
+
+    /// <summary>
+    /// Overrides the default CEF user-agent when set to a non-empty string.
+    /// </summary>
+    public static readonly CVarDef<string> WebUserAgentOverride =
+        CVarDef.Create("web.user_agent", "", CVar.CLIENTONLY);
+
+    /// <summary>
+    /// If true, use headless WebView implementation even with graphical client (turn off CEF).
+    /// </summary>
+    public static readonly CVarDef<bool> WebHeadless =
+        CVarDef.Create("web.headless", false, CVar.CLIENTONLY);
 }

Robust.Client.WebView/WebViewControl.cs

@@ -1,7 +1,6 @@
 using System;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
-using Robust.Client.WebView.Cef;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
@@ -76,13 +75,27 @@ namespace Robust.Client.WebView
             return _controlImpl.RawKeyEvent(guiRawEvent);
         }
 
-        protected internal override void TextEntered(GUITextEventArgs args)
+        protected internal override void TextEntered(GUITextEnteredEventArgs args)
         {
             base.TextEntered(args);
 
             _controlImpl.TextEntered(args);
         }
 
+        protected internal override void KeyboardFocusEntered()
+        {
+            base.KeyboardFocusEntered();
+
+            _controlImpl.FocusEntered();
+        }
+
+        protected internal override void KeyboardFocusExited()
+        {
+            base.KeyboardFocusExited();
+
+            _controlImpl.FocusExited();
+        }
+
         protected override void Resized()
         {
             base.Resized();

Robust.Client.WebView/WebViewManager.cs

@@ -15,22 +15,29 @@ namespace Robust.Client.WebView
     {
         private IWebViewManagerImpl? _impl;
 
-        public void Initialize(GameController.DisplayMode mode)
+        public void PreInitialize(IDependencyCollection dependencies, GameController.DisplayMode mode)
         {
             DebugTools.Assert(_impl == null, "WebViewManager has already been initialized!");
 
-            var cfg = IoCManager.Resolve<IConfigurationManagerInternal>();
+            var cfg = dependencies.Resolve<IConfigurationManagerInternal>();
             cfg.LoadCVarsFromAssembly(typeof(WebViewManager).Assembly);
 
-            IoCManager.RegisterInstance<IWebViewManager>(this);
-            IoCManager.RegisterInstance<IWebViewManagerInternal>(this);
+            dependencies.RegisterInstance<IWebViewManager>(this);
+            dependencies.RegisterInstance<IWebViewManagerInternal>(this);
 
-            if (mode == GameController.DisplayMode.Headless)
+            if (mode == GameController.DisplayMode.Headless || cfg.GetCVar(WCVars.WebHeadless))
                 _impl = new WebViewManagerHeadless();
             else
                 _impl = new WebViewManagerCef();
 
-            _impl.Initialize();
+            dependencies.InjectDependencies(_impl, oneOff: true);
+        }
+
+        public void Initialize()
+        {
+            DebugTools.Assert(_impl != null, "WebViewManager has not yet been initialized!");
+
+            _impl!.Initialize();
         }
 
         public void Update()

Robust.Client/Animations/AnimationTrackProperty.cs

@@ -1,7 +1,10 @@
 using System;
 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
 {
@@ -117,7 +120,7 @@ namespace Robust.Client.Animations
             switch (a)
             {
                 case Vector2 vector2:
-                    return Vector2.InterpolateCubic((Vector2) preA, vector2, (Vector2) b, (Vector2) postB, t);
+                    return Vector2Helpers.InterpolateCubic((Vector2) preA, vector2, (Vector2) b, (Vector2) postB, t);
                 case Vector3 vector3:
                     return Vector3.InterpolateCubic((Vector3) preA, vector3, (Vector3) b, (Vector3) postB, t);
                 case Vector4 vector4:

Robust.Client/Animations/AnimationTrackSpriteFlick.cs

@@ -40,7 +40,7 @@ namespace Robust.Client.Animations
             DebugTools.AssertNotNull(LayerKey);
 
             var entity = (EntityUid) context;
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
+            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(entity);
 
             var playingTime = prevPlayingTime + frameTime;
             var keyFrameIndex = prevKeyFrameIndex;

Robust.Client/Audio/AudioStream.cs

@@ -1,21 +1,20 @@
 using System;
 using Robust.Client.Graphics;
 
-namespace Robust.Client.Audio
-{
-    public sealed class AudioStream
-    {
-        public TimeSpan Length { get; }
-        internal ClydeHandle? ClydeHandle { get; }
-        public string? Name { get; }
-        public int ChannelCount { get; }
+namespace Robust.Client.Audio;
 
-        internal AudioStream(ClydeHandle handle, TimeSpan length, int channelCount, string? name = null)
-        {
-            ClydeHandle = handle;
-            Length = length;
-            ChannelCount = channelCount;
-            Name = name;
-        }
+public sealed class AudioStream
+{
+    public TimeSpan Length { get; }
+    internal ClydeHandle? ClydeHandle { get; }
+    public string? Name { get; }
+    public int ChannelCount { get; }
+
+    internal AudioStream(ClydeHandle handle, TimeSpan length, int channelCount, string? name = null)
+    {
+        ClydeHandle = handle;
+        Length = length;
+        ChannelCount = channelCount;
+        Name = name;
     }
 }

Robust.Client/Audio/Midi/Commands/MidiPanicCommand.cs

@@ -4,15 +4,13 @@ using Robust.Shared.Localization;
 
 namespace Robust.Client.Audio.Midi.Commands;
 
-public sealed class MidiPanicCommand : IConsoleCommand
+public sealed class MidiPanicCommand : LocalizedCommands
 {
     [Dependency] private readonly IMidiManager _midiManager = default!;
 
-    public string Command => "midipanic";
-    public string Description => Loc.GetString("midi-panic-command-description");
-    public string Help => $"{Command}";
+    public override string Command => "midipanic";
 
-    public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         foreach (var renderer in _midiManager.Renderers)
         {

Robust.Client/Audio/Midi/IMidiRenderer.cs

@@ -120,6 +120,11 @@ public interface IMidiRenderer : IDisposable
     /// </summary>
     void StopAllNotes();
 
+    /// <summary>
+    /// Clears all scheduled events.
+    /// </summary>
+    void ClearAllEvents();
+
     /// <summary>
     ///     Render and play MIDI to the audio source.
     /// </summary>

Robust.Client/Audio/Midi/MidiManager.cs

@@ -24,8 +24,10 @@ namespace Robust.Client.Audio.Midi;
 
 internal sealed partial class MidiManager : IMidiManager
 {
+    public const string SoundfontEnvironmentVariable = "ROBUST_SOUNDFONT_OVERRIDE";
+
     [Dependency] private readonly IEyeManager _eyeManager = default!;
-    [Dependency] private readonly IResourceManagerInternal _resourceManager = default!;
+    [Dependency] private readonly IResourceCacheInternal _resourceManager = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IConfigurationManager _cfgMan = default!;
     [Dependency] private readonly IClydeAudio _clydeAudio = default!;
@@ -87,10 +89,12 @@ internal sealed partial class MidiManager : IMidiManager
         "/usr/share/soundfonts/default.sf2",
         "/usr/share/soundfonts/default.dls",
         "/usr/share/soundfonts/FluidR3_GM.sf2",
+        "/usr/share/soundfonts/FluidR3_GM2-2.sf2",
         "/usr/share/soundfonts/freepats-general-midi.sf2",
         "/usr/share/sounds/sf2/default.sf2",
         "/usr/share/sounds/sf2/default.dls",
         "/usr/share/sounds/sf2/FluidR3_GM.sf2",
+        "/usr/share/sounds/sf2/FluidR3_GM2-2.sf2",
         "/usr/share/sounds/sf2/TimGM6mb.sf2",
     };
 
@@ -103,21 +107,25 @@ internal sealed partial class MidiManager : IMidiManager
 
     private const string ContentCustomSoundfontDirectory = "/Audio/MidiCustom/";
 
-    private const float MaxDistanceForOcclusion = 1000;
+    private static ResPath CustomSoundfontDirectory = new("/soundfonts/");
 
-    private static ResourcePath CustomSoundfontDirectory = new ResourcePath("/soundfonts/");
-
-    private readonly ResourceLoaderCallbacks _soundfontLoaderCallbacks = new();
+    private readonly ResourceLoaderCallbacks _soundfontLoaderCallbacks;
 
     private bool FluidsynthInitialized;
     private bool _failedInitialize;
 
     private NFluidsynth.Logger.LoggerDelegate _loggerDelegate = default!;
     private ISawmill _sawmill = default!;
+    private float _maxCastLength;
 
     [ViewVariables(VVAccess.ReadWrite)]
     public int OcclusionCollisionMask { get; set; }
 
+    public MidiManager()
+    {
+        _soundfontLoaderCallbacks = new ResourceLoaderCallbacks(this);
+    }
+
     private void InitializeFluidsynth()
     {
         if (FluidsynthInitialized || _failedInitialize) return;
@@ -181,10 +189,17 @@ internal sealed partial class MidiManager : IMidiManager
         _midiThread = new Thread(ThreadUpdate);
         _midiThread.Start();
 
-        _broadPhaseSystem = EntitySystem.Get<SharedPhysicsSystem>();
+        _broadPhaseSystem = _entityManager.EntitySysManager.GetEntitySystem<SharedPhysicsSystem>();
+        _cfgMan.OnValueChanged(CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
+
         FluidsynthInitialized = true;
     }
 
+    private void OnRaycastLengthChanged(float value)
+    {
+        _maxCastLength = value;
+    }
+
     private void LoggerDelegate(NFluidsynth.Logger.LogLevel level, string message, IntPtr data)
     {
         var rLevel = level switch
@@ -227,6 +242,7 @@ internal sealed partial class MidiManager : IMidiManager
             // 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)
@@ -264,11 +280,22 @@ internal sealed partial class MidiManager : IMidiManager
                 }
             }
 
-            // Load content-specific custom soundfonts, which could override the system/fallback soundfont.
+            // 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 soundfont {soundfontOverride} from environment variable.");
+                    renderer.LoadSoundfont(soundfontOverride);
+                }
+            }
+
+            // Load content-specific custom soundfonts, which should override the system/fallback soundfont.
             _midiSawmill.Debug($"Loading soundfonts from {ContentCustomSoundfontDirectory}");
             foreach (var file in _resourceManager.ContentFindFiles(ContentCustomSoundfontDirectory))
             {
-                if (file.Extension != "sf2" && file.Extension != "dls") continue;
+                if (file.Extension != "sf2" && file.Extension != "dls" && file.Extension != "sf3") continue;
                 _midiSawmill.Debug($"Loading soundfont {file}");
                 renderer.LoadSoundfont(file.ToString());
             }
@@ -278,7 +305,7 @@ internal sealed partial class MidiManager : IMidiManager
             var enumerator = _resourceManager.UserData.Find($"{CustomSoundfontDirectory.ToRelativePath()}/*").Item1;
             foreach (var file in enumerator)
             {
-                if (file.Extension != "sf2" && file.Extension != "dls") continue;
+                if (file.Extension != "sf2" && file.Extension != "dls" && file.Extension != "sf3") continue;
                 _midiSawmill.Debug($"Loading soundfont {{USERDATA}} {file}");
                 renderer.LoadSoundfont(file.ToString());
             }
@@ -305,6 +332,8 @@ internal sealed partial class MidiManager : IMidiManager
         }
 
         // Update positions of streams every frame.
+        // This has a lot of code duplication with AudioSystem.FrameUpdate(), and they should probably be combined somehow.
+
         lock (_renderers)
         {
             foreach (var renderer in _renderers)
@@ -337,17 +366,17 @@ internal sealed partial class MidiManager : IMidiManager
                 {
                     var pos = mapPos.Value;
 
-                    var sourceRelative = _eyeManager.CurrentEye.Position.Position - pos.Position;
+                    var sourceRelative = pos.Position - _eyeManager.CurrentEye.Position.Position;
                     var occlusion = 0f;
-                    if (sourceRelative.Length > 0)
+                    if (sourceRelative.Length() > 0)
                     {
                         occlusion = _broadPhaseSystem.IntersectRayPenetration(
                             pos.MapId,
                             new CollisionRay(
-                                pos.Position,
-                                sourceRelative.Normalized,
+                                _eyeManager.CurrentEye.Position.Position,
+                                sourceRelative.Normalized(),
                                 OcclusionCollisionMask),
-                            MathF.Min(sourceRelative.Length, MaxDistanceForOcclusion),
+                            MathF.Min(sourceRelative.Length(), _maxCastLength),
                             renderer.TrackingEntity);
                     }
 
@@ -360,7 +389,8 @@ internal sealed partial class MidiManager : IMidiManager
 
                     if (trackingEntity)
                     {
-                        renderer.Source.SetVelocity(renderer.TrackingEntity!.Value.GlobalLinearVelocity());
+                        var vel = _broadPhaseSystem.GetMapLinearVelocity(renderer.TrackingEntity!.Value);
+                        renderer.Source.SetVelocity(vel);
                     }
                 }
                 else
@@ -444,9 +474,15 @@ internal sealed partial class MidiManager : IMidiManager
     /// </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))
@@ -455,8 +491,8 @@ internal sealed partial class MidiManager : IMidiManager
             }
 
             Stream? stream;
-            var resourceCache = IoCManager.Resolve<IResourceCache>();
-            var resourcePath = new ResourcePath(filename);
+            var resourceCache = _parent._resourceManager;
+            var resourcePath = new ResPath(filename);
 
             if (resourcePath.IsRooted)
             {
@@ -530,7 +566,7 @@ internal sealed partial class MidiManager : IMidiManager
             return 0;
         }
 
-        public override int Seek(IntPtr sfHandle, int offset, SeekOrigin origin)
+        public override int Seek(IntPtr sfHandle, long offset, SeekOrigin origin)
         {
             var stream = _openStreams[(int) sfHandle];
 
@@ -539,11 +575,11 @@ internal sealed partial class MidiManager : IMidiManager
             return 0;
         }
 
-        public override int Tell(IntPtr sfHandle)
+        public override long Tell(IntPtr sfHandle)
         {
             var stream = _openStreams[(int) sfHandle];
 
-            return (int) stream.Position;
+            return (long) stream.Position;
         }
 
         public override int Close(IntPtr sfHandle)

Robust.Client/Audio/Midi/MidiRenderer.cs

@@ -354,6 +354,11 @@ internal sealed class MidiRenderer : IMidiRenderer
         }
     }
 
+    public void ClearAllEvents()
+    {
+        _sequencer.RemoveEvents(SequencerClientId.Wildcard, SequencerClientId.Wildcard, -1);
+    }
+
     public void LoadSoundfont(string filename, bool resetPresets = true)
     {
         lock (_playerStateLock)

Robust.Client/BaseClient.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Linq;
 using System.Net;
+using Robust.Client.Configuration;
 using Robust.Client.Debugging;
 using Robust.Client.GameObjects;
 using Robust.Client.GameStates;
@@ -21,16 +23,17 @@ using Robust.Shared.Utility;
 namespace Robust.Client
 {
     /// <inheritdoc />
-    public sealed class BaseClient : IBaseClient
+    public sealed class BaseClient : IBaseClient, IPostInjectInit
     {
         [Dependency] private readonly IClientNetManager _net = default!;
         [Dependency] private readonly IPlayerManager _playMan = default!;
-        [Dependency] private readonly INetConfigurationManager _configManager = default!;
+        [Dependency] private readonly IClientNetConfigurationManager _configManager = default!;
         [Dependency] private readonly IClientEntityManager _entityManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IDiscordRichPresence _discord = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IClientGameStateManager _gameStates = default!;
+        [Dependency] private readonly ILogManager _logMan = default!;
 
         /// <inheritdoc />
         public ushort DefaultPort { get; } = 1212;
@@ -47,6 +50,7 @@ namespace Robust.Client
         public string? LastDisconnectReason { get; private set; }
 
         private (TimeSpan, GameTick) _timeBase;
+        private ISawmill _logger = default!;
 
         /// <inheritdoc />
         public void Initialize()
@@ -62,12 +66,20 @@ namespace Robust.Client
             _configManager.OnValueChanged(CVars.NetTickrate, TickRateChanged, invokeImmediately: true);
 
             _playMan.Initialize();
+            _playMan.PlayerListUpdated += OnPlayerListUpdated;
             Reset();
         }
 
+        private void OnPlayerListUpdated(object? sender, EventArgs e)
+        {
+            var serverPlayers = _playMan.PlayerCount;
+            if (_net.ServerChannel != null && GameInfo != null && _net.IsConnected)
+                _discord.Update(GameInfo.ServerName, _net.ServerChannel.UserName, GameInfo.ServerMaxPlayers.ToString(), serverPlayers.ToString());
+        }
+
         private void SyncTimeBase(MsgSyncTimeBase message)
         {
-            Logger.DebugS("client", $"Synchronized time base: {message.Tick}: {message.Time}");
+            _logger.Debug($"Synchronized time base: {message.Tick}: {message.Time}");
 
             if (RunLevel >= ClientRunLevel.Connected)
                 _timing.TimeBase = (message.Time, message.Tick);
@@ -83,7 +95,7 @@ namespace Robust.Client
             }
 
             _timing.SetTickRateAt((byte) tickrate, info.TickChanged);
-            Logger.InfoS("client", $"Tickrate changed to: {tickrate} on tick {_timing.CurTick}");
+            _logger.Info($"Tickrate changed to: {tickrate} on tick {_timing.CurTick}");
         }
 
         /// <inheritdoc />
@@ -166,7 +178,7 @@ namespace Robust.Client
 
             var userName = _net.ServerChannel!.UserName;
             var userId = _net.ServerChannel.UserId;
-            _discord.Update(info.ServerName, userName, info.ServerMaxPlayers.ToString());
+
             // start up player management
             _playMan.Startup();
 
@@ -174,6 +186,10 @@ namespace Robust.Client
             _playMan.LocalPlayer.Name = userName;
 
             _playMan.LocalPlayer.StatusChanged += OnLocalStatusChanged;
+
+            var serverPlayers = _playMan.PlayerCount;
+            _discord.Update(info.ServerName, userName, info.ServerMaxPlayers.ToString(), serverPlayers.ToString());
+
         }
 
         /// <summary>
@@ -238,7 +254,7 @@ namespace Robust.Client
 
         private void GameStoppedReset()
         {
-            IoCManager.Resolve<INetConfigurationManager>().FlushMessages();
+            _configManager.FlushMessages();
             _gameStates.Reset();
             _playMan.Shutdown();
             _entityManager.Shutdown();
@@ -264,11 +280,16 @@ namespace Robust.Client
 
         private void OnRunLevelChanged(ClientRunLevel newRunLevel)
         {
-            Logger.DebugS("client", $"Runlevel changed to: {newRunLevel}");
+            _logger.Debug($"Runlevel changed to: {newRunLevel}");
             var args = new RunLevelChangedEventArgs(RunLevel, newRunLevel);
             RunLevel = newRunLevel;
             RunLevelChanged?.Invoke(this, args);
         }
+
+        void IPostInjectInit.PostInject()
+        {
+            _logger = _logMan.GetSawmill("client");
+        }
     }
 
     /// <summary>

Robust.Client/ClientIoC.cs

@@ -1,5 +1,6 @@
 using System;
 using Robust.Client.Audio.Midi;
+using Robust.Client.Configuration;
 using Robust.Client.Console;
 using Robust.Client.Debugging;
 using Robust.Client.GameObjects;
@@ -14,14 +15,21 @@ using Robust.Client.Player;
 using Robust.Client.Profiling;
 using Robust.Client.Prototypes;
 using Robust.Client.Reflection;
+using Robust.Client.Replays;
+using Robust.Client.Replays.Loading;
+using Robust.Client.Replays.Playback;
 using Robust.Client.ResourceManagement;
+using Robust.Client.Serialization;
 using Robust.Client.State;
 using Robust.Client.Timing;
+using Robust.Client.Upload;
 using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.RichText;
 using Robust.Client.UserInterface.Themes;
 using Robust.Client.Utility;
 using Robust.Client.ViewVariables;
 using Robust.Shared;
+using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
@@ -32,93 +40,111 @@ using Robust.Shared.Physics;
 using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
+using Robust.Shared.Replays;
+using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
+using Robust.Shared.Upload;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Client
 {
     internal static class ClientIoC
     {
-        public static void RegisterIoC(GameController.DisplayMode mode)
+        public static void RegisterIoC(GameController.DisplayMode mode, IDependencyCollection deps)
         {
-            SharedIoC.RegisterIoC();
+            SharedIoC.RegisterIoC(deps);
+
+            deps.Register<IGameTiming, ClientGameTiming>();
+            deps.Register<IClientGameTiming, ClientGameTiming>();
+            deps.Register<IPrototypeManager, ClientPrototypeManager>();
+            deps.Register<IPrototypeManagerInternal, ClientPrototypeManager>();
+            deps.Register<IMapManager, NetworkedMapManager>();
+            deps.Register<IMapManagerInternal, NetworkedMapManager>();
+            deps.Register<INetworkedMapManager, NetworkedMapManager>();
+            deps.Register<IEntityManager, ClientEntityManager>();
+            deps.Register<IReflectionManager, ClientReflectionManager>();
+            deps.Register<IConsoleHost, ClientConsoleHost>();
+            deps.Register<IClientConsoleHost, ClientConsoleHost>();
+            deps.Register<IComponentFactory, ComponentFactory>();
+            deps.Register<ITileDefinitionManager, ClydeTileDefinitionManager>();
+            deps.Register<IClydeTileDefinitionManager, ClydeTileDefinitionManager>();
+            deps.Register<GameController, GameController>();
+            deps.Register<IGameController, GameController>();
+            deps.Register<IGameControllerInternal, GameController>();
+            deps.Register<IResourceManager, ResourceCache>();
+            deps.Register<IResourceManagerInternal, ResourceCache>();
+            deps.Register<IResourceCache, ResourceCache>();
+            deps.Register<IResourceCacheInternal, ResourceCache>();
+            deps.Register<IClientNetManager, NetManager>();
+            deps.Register<EntityManager, ClientEntityManager>();
+            deps.Register<ClientEntityManager>();
+            deps.Register<IClientEntityManager, ClientEntityManager>();
+            deps.Register<IClientEntityManagerInternal, ClientEntityManager>();
+            deps.Register<IEntityNetworkManager, ClientEntityManager>();
+            deps.Register<IReplayLoadManager, ReplayLoadManager>();
+            deps.Register<IReplayPlaybackManager, ReplayPlaybackManager>();
+            deps.Register<IReplayRecordingManager, ReplayRecordingManager>();
+            deps.Register<IClientGameStateManager, ClientGameStateManager>();
+            deps.Register<IBaseClient, BaseClient>();
+            deps.Register<IPlayerManager, PlayerManager>();
+            deps.Register<ISharedPlayerManager, PlayerManager>();
+            deps.Register<IStateManager, StateManager>();
+            deps.Register<IUserInterfaceManager, UserInterfaceManager>();
+            deps.Register<IUserInterfaceManagerInternal, UserInterfaceManager>();
+            deps.Register<ILightManager, LightManager>();
+            deps.Register<IDiscordRichPresence, DiscordRichPresence>();
+            deps.Register<IMidiManager, MidiManager>();
+            deps.Register<IAuthManager, AuthManager>();
+            deps.Register<ProfViewManager>();
+            deps.Register<IGamePrototypeLoadManager, GamePrototypeLoadManager>();
+            deps.Register<NetworkResourceManager>();
 
-            IoCManager.Register<IGameTiming, ClientGameTiming>();
-            IoCManager.Register<IClientGameTiming, ClientGameTiming>();
-            IoCManager.Register<IPrototypeManager, ClientPrototypeManager>();
-            IoCManager.Register<IMapManager, NetworkedMapManager>();
-            IoCManager.Register<IMapManagerInternal, NetworkedMapManager>();
-            IoCManager.Register<INetworkedMapManager, NetworkedMapManager>();
-            IoCManager.Register<IEntityManager, ClientEntityManager>();
-            IoCManager.Register<IReflectionManager, ClientReflectionManager>();
-            IoCManager.Register<IConsoleHost, ClientConsoleHost>();
-            IoCManager.Register<IClientConsoleHost, ClientConsoleHost>();
-            IoCManager.Register<IComponentFactory, ClientComponentFactory>();
-            IoCManager.Register<ITileDefinitionManager, ClydeTileDefinitionManager>();
-            IoCManager.Register<IClydeTileDefinitionManager, ClydeTileDefinitionManager>();
-            IoCManager.Register<GameController, GameController>();
-            IoCManager.Register<IGameController, GameController>();
-            IoCManager.Register<IGameControllerInternal, GameController>();
-            IoCManager.Register<IResourceManager, ResourceCache>();
-            IoCManager.Register<IResourceManagerInternal, ResourceCache>();
-            IoCManager.Register<IResourceCache, ResourceCache>();
-            IoCManager.Register<IResourceCacheInternal, ResourceCache>();
-            IoCManager.Register<IClientNetManager, NetManager>();
-            IoCManager.Register<EntityManager, ClientEntityManager>();
-            IoCManager.Register<ClientEntityManager>();
-            IoCManager.Register<IClientEntityManager, ClientEntityManager>();
-            IoCManager.Register<IClientEntityManagerInternal, ClientEntityManager>();
-            IoCManager.Register<IEntityNetworkManager, ClientEntityManager>();
-            IoCManager.Register<IClientGameStateManager, ClientGameStateManager>();
-            IoCManager.Register<IBaseClient, BaseClient>();
-            IoCManager.Register<IPlayerManager, PlayerManager>();
-            IoCManager.Register<ISharedPlayerManager, PlayerManager>();
-            IoCManager.Register<IStateManager, StateManager>();
-            IoCManager.Register<IUserInterfaceManager, UserInterfaceManager>();
-            IoCManager.Register<IUserInterfaceManagerInternal, UserInterfaceManager>();
-            IoCManager.Register<ILightManager, LightManager>();
-            IoCManager.Register<IDiscordRichPresence, DiscordRichPresence>();
-            IoCManager.Register<IMidiManager, MidiManager>();
-            IoCManager.Register<IAuthManager, AuthManager>();
-            IoCManager.Register<ProfViewManager>();
-            IoCManager.Register<IPhysicsManager, PhysicsManager>();
             switch (mode)
             {
                 case GameController.DisplayMode.Headless:
-                    IoCManager.Register<IClyde, ClydeHeadless>();
-                    IoCManager.Register<IClipboardManager, ClydeHeadless>();
-                    IoCManager.Register<IClydeInternal, ClydeHeadless>();
-                    IoCManager.Register<IClydeAudio, ClydeAudioHeadless>();
-                    IoCManager.Register<IClydeAudioInternal, ClydeAudioHeadless>();
-                    IoCManager.Register<IInputManager, InputManager>();
-                    IoCManager.Register<IFileDialogManager, DummyFileDialogManager>();
-                    IoCManager.Register<IUriOpener, UriOpenerDummy>();
+                    deps.Register<IClyde, ClydeHeadless>();
+                    deps.Register<IClipboardManager, ClydeHeadless>();
+                    deps.Register<IClydeInternal, ClydeHeadless>();
+                    deps.Register<IClydeAudio, ClydeAudioHeadless>();
+                    deps.Register<IClydeAudioInternal, ClydeAudioHeadless>();
+                    deps.Register<IInputManager, InputManager>();
+                    deps.Register<IFileDialogManager, DummyFileDialogManager>();
+                    deps.Register<IUriOpener, UriOpenerDummy>();
                     break;
                 case GameController.DisplayMode.Clyde:
-                    IoCManager.Register<IClyde, Clyde>();
-                    IoCManager.Register<IClipboardManager, Clyde>();
-                    IoCManager.Register<IClydeInternal, Clyde>();
-                    IoCManager.Register<IClydeAudio, FallbackProxyClydeAudio>();
-                    IoCManager.Register<IClydeAudioInternal, FallbackProxyClydeAudio>();
-                    IoCManager.Register<IInputManager, ClydeInputManager>();
-                    IoCManager.Register<IFileDialogManager, FileDialogManager>();
-                    IoCManager.Register<IUriOpener, UriOpener>();
+                    deps.Register<IClyde, Clyde>();
+                    deps.Register<IClipboardManager, Clyde>();
+                    deps.Register<IClydeInternal, Clyde>();
+                    deps.Register<IClydeAudio, FallbackProxyClydeAudio>();
+                    deps.Register<IClydeAudioInternal, FallbackProxyClydeAudio>();
+                    deps.Register<IInputManager, ClydeInputManager>();
+                    deps.Register<IFileDialogManager, FileDialogManager>();
+                    deps.Register<IUriOpener, UriOpener>();
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
 
-            IoCManager.Register<IFontManager, FontManager>();
-            IoCManager.Register<IFontManagerInternal, FontManager>();
-            IoCManager.Register<IEyeManager, EyeManager>();
-            IoCManager.Register<IPlacementManager, PlacementManager>();
-            IoCManager.Register<IOverlayManager, OverlayManager>();
-            IoCManager.Register<IOverlayManagerInternal, OverlayManager>();
-            IoCManager.Register<IViewVariablesManager, ClientViewVariablesManager>();
-            IoCManager.Register<IClientViewVariablesManager, ClientViewVariablesManager>();
-            IoCManager.Register<IClientViewVariablesManagerInternal, ClientViewVariablesManager>();
-            IoCManager.Register<IClientConGroupController, ClientConGroupController>();
-            IoCManager.Register<IScriptClient, ScriptClient>();
+            deps.Register<IFontManager, FontManager>();
+            deps.Register<IFontManagerInternal, FontManager>();
+            deps.Register<IEyeManager, EyeManager>();
+            deps.Register<IPlacementManager, PlacementManager>();
+            deps.Register<IOverlayManager, OverlayManager>();
+            deps.Register<IOverlayManagerInternal, OverlayManager>();
+            deps.Register<IViewVariablesManager, ClientViewVariablesManager>();
+            deps.Register<IClientViewVariablesManager, ClientViewVariablesManager>();
+            deps.Register<IClientViewVariablesManagerInternal, ClientViewVariablesManager>();
+            deps.Register<IClientConGroupController, ClientConGroupController>();
+            deps.Register<IScriptClient, ScriptClient>();
+            deps.Register<IRobustSerializer, ClientRobustSerializer>();
+            deps.Register<IRobustSerializerInternal, ClientRobustSerializer>();
+            deps.Register<IClientRobustSerializer, ClientRobustSerializer>();
+            deps.Register<IConfigurationManager, ClientNetConfigurationManager>();
+            deps.Register<INetConfigurationManager, ClientNetConfigurationManager>();
+            deps.Register<IConfigurationManagerInternal, ClientNetConfigurationManager>();
+            deps.Register<IClientNetConfigurationManager, ClientNetConfigurationManager>();
+            deps.Register<INetConfigurationManagerInternal, ClientNetConfigurationManager>();
+            deps.Register<MarkupTagManager>();
         }
     }
 }

Robust.Client/ClientWarmup.cs

@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+using Robust.Shared;
+using Robust.Shared.Resources;
+
+namespace Robust.Client;
+
+/// <summary>
+/// Logic for "warming up" things like slow static constructors concurrently.
+/// </summary>
+internal static class ClientWarmup
+{
+    public static void RunWarmup()
+    {
+        Task.Run(WarmupCore);
+    }
+
+    private static void WarmupCore()
+    {
+        // Get ImageSharp loaded.
+        _ = SixLabors.ImageSharp.Configuration.Default;
+
+        SharedWarmup.WarmupCore();
+
+        // Preload the JSON loading code.
+        RsiLoading.Warmup();
+    }
+}

Robust.Client/ComponentTrees/LightTreeComponent.cs

@@ -0,0 +1,12 @@
+using Robust.Client.GameObjects;
+using Robust.Shared.ComponentTrees;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Physics;
+
+namespace Robust.Client.ComponentTrees;
+
+[RegisterComponent]
+public sealed class LightTreeComponent: Component, IComponentTreeComponent<PointLightComponent>
+{
+    public DynamicTree<ComponentTreeEntry<PointLightComponent>> Tree { get; set; } = default!;
+}

Robust.Client/ComponentTrees/LightTreeSystem.cs

@@ -0,0 +1,40 @@
+using System.Numerics;
+using Robust.Client.GameObjects;
+using Robust.Shared.ComponentTrees;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Maths;
+using Robust.Shared.Physics;
+
+namespace Robust.Client.ComponentTrees;
+
+public sealed class LightTreeSystem : ComponentTreeSystem<LightTreeComponent, PointLightComponent>
+{
+    #region Component Tree Overrides
+    protected override bool DoFrameUpdate => true;
+    protected override bool DoTickUpdate => false;
+    protected override bool Recursive => true;
+    protected override int InitialCapacity => 128;
+
+    protected override Box2 ExtractAabb(in ComponentTreeEntry<PointLightComponent> entry, Vector2 pos, Angle rot)
+    {
+        // Really we should be rotating the light offset by the relative rotation. But I assume the light offset will
+        // always be relatively small, so fuck it, this is probably faster than having to compute the angle every time.
+        var radius = entry.Component.Radius + entry.Component.Offset.Length();
+        var radiusVec = new Vector2(radius, radius);
+        return new Box2(pos - radiusVec, pos + radiusVec);
+    }
+
+    protected override Box2 ExtractAabb(in ComponentTreeEntry<PointLightComponent> entry)
+    {
+        if (entry.Component.TreeUid == null)
+            return default;
+
+        var pos = XformSystem.GetRelativePosition(
+            entry.Transform,
+            entry.Component.TreeUid.Value,
+            GetEntityQuery<TransformComponent>());
+
+        return ExtractAabb(in entry, pos, default);
+    }
+    #endregion
+}

Robust.Client/ComponentTrees/SpriteTreeComponent.cs

@@ -0,0 +1,12 @@
+using Robust.Client.GameObjects;
+using Robust.Shared.ComponentTrees;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Physics;
+
+namespace Robust.Client.ComponentTrees;
+
+[RegisterComponent]
+public sealed class SpriteTreeComponent: Component, IComponentTreeComponent<SpriteComponent>
+{
+    public DynamicTree<ComponentTreeEntry<SpriteComponent>> Tree { get; set; } = default!;
+}

Robust.Client/ComponentTrees/SpriteTreeSystem.cs

@@ -0,0 +1,41 @@
+using System.Numerics;
+using Robust.Client.GameObjects;
+using Robust.Shared.ComponentTrees;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Maths;
+using Robust.Shared.Physics;
+
+namespace Robust.Client.ComponentTrees;
+
+public sealed class SpriteTreeSystem : ComponentTreeSystem<SpriteTreeComponent, SpriteComponent>
+{
+    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;
+    protected override bool DoTickUpdate => false;
+    protected override bool Recursive => true;
+    protected override int InitialCapacity => 1024;
+
+    protected override Box2 ExtractAabb(in ComponentTreeEntry<SpriteComponent> entry, Vector2 pos, Angle rot)
+        => entry.Component.CalculateRotatedBoundingBox(pos, rot, default).CalcBoundingBox();
+    #endregion
+}

Robust.Client/Configuration/ClientNetConfigurationManager.cs

@@ -0,0 +1,139 @@
+using Robust.Shared.Configuration;
+using Robust.Shared.IoC;
+using Robust.Shared.Timing;
+using System.Collections.Generic;
+using System;
+using Robust.Shared.Network.Messages;
+using Robust.Shared.Network;
+using Robust.Shared.Replays;
+using Robust.Shared.Utility;
+
+namespace Robust.Client.Configuration;
+
+internal sealed class ClientNetConfigurationManager : NetConfigurationManager, IClientNetConfigurationManager
+{
+    [Dependency] private readonly IBaseClient _client = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IReplayRecordingManager _replay = default!;
+
+    private bool _receivedInitialNwVars = false;
+
+    public event EventHandler? ReceivedInitialNwVars;
+
+    public void SyncWithServer()
+    {
+        DebugTools.Assert(NetManager.IsConnected);
+
+        Sawmill.Info("Sending client info...");
+
+        var msg = new MsgConVars();
+        msg.Tick = default;
+        msg.NetworkedVars = GetReplicatedVars();
+        NetManager.ClientSendMessage(msg);
+    }
+
+    public void ClearReceivedInitialNwVars()
+    {
+        _receivedInitialNwVars = false;
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        ReceivedInitialNwVars = null;
+        _receivedInitialNwVars = false;
+    }
+
+    /// <inheritdoc />
+    public override void SetCVar(string name, object value, bool force = false)
+    {
+        CVar flags;
+        using (Lock.ReadGuard())
+        {
+            if (!_configVars.TryGetValue(name, out var cVar) || !cVar.Registered)
+                throw new InvalidConfigurationException($"Trying to set unregistered variable '{name}'");
+
+            flags = cVar.Flags;
+            if (!force && NetManager.IsConnected && (cVar.Flags & CVar.NOT_CONNECTED) != 0)
+            {
+                Sawmill.Warning($"'{name}' can only be changed when not connected to a server.");
+                return;
+            }
+
+            if (!force && ((cVar.Flags & CVar.SERVER) != 0) && _client.RunLevel != ClientRunLevel.SinglePlayerGame)
+            {
+                Sawmill.Warning($"Only the server can change '{name}'.");
+                return;
+            }
+        }
+
+        // Actually set the CVar
+        base.SetCVar(name, value, force);
+
+        if ((flags & CVar.REPLICATED) == 0)
+            return;
+
+        var msg = new MsgConVars();
+        msg.Tick = Timing.CurTick;
+        msg.NetworkedVars = new List<(string name, object value)>
+                {
+                    (name, value)
+                };
+        NetManager.ClientSendMessage(msg);
+    }
+
+    protected override void HandleNetVarMessage(MsgConVars message)
+    {
+        if (!_receivedInitialNwVars)
+            ApplyClientNetVarChange(message.NetworkedVars, message.Tick);
+        else
+            base.HandleNetVarMessage(message);
+
+        _replay.RecordClientMessage(new ReplayMessage.CvarChangeMsg()
+        {
+            ReplicatedCvars = message.NetworkedVars,
+            TimeBase = _timing.TimeBase
+        });
+    }
+
+    protected override void ApplyNetVarChange(
+        INetChannel msgChannel,
+        List<(string name, object value)> networkedVars,
+        GameTick tick)
+    {
+        ApplyClientNetVarChange(networkedVars, tick);
+    }
+
+    private void ApplyClientNetVarChange(List<(string name, object value)> networkedVars, GameTick tick)
+    {
+        // Server sent us a CVar update.
+        Sawmill.Debug($"Handling replicated cvars...");
+
+        foreach (var (name, value) in networkedVars)
+        {
+            if (!_configVars.TryGetValue(name, out var cVar))
+            {
+                Sawmill.Warning($"Server sent an unknown replicated CVar '{name}.'");
+                continue;
+            }
+
+            if ((cVar.Flags & CVar.CLIENT) != 0)
+                continue; // ignore the server specified value.
+
+            // Actually set the CVar
+            SetCVarInternal(name, value, tick);
+
+            Sawmill.Debug($"name={name}, val={value}");
+        }
+
+        if (!_receivedInitialNwVars)
+        {
+            _receivedInitialNwVars = true;
+            ReceivedInitialNwVars?.Invoke(this, EventArgs.Empty);
+        }
+    }
+
+    /// <inheritdoc />
+    public override T GetClientCVar<T>(INetChannel channel, string name) => GetCVar<T>(name);
+}