Version: 203.0.2

Security updates (#5353 )
* Fix security bug in WritableDirProvider.OpenOsWindow() Reported by @NarryG and @nyeogmi * Sandbox updates * Update ImageSharp again (cherry picked from commit 7d778248ee) (cherry picked from commit f66cda74e95619ddba2221bda644bf4394619805) (cherry picked from commit db8ba83866c523e08e4fba0b80cd954f4f190613) (cherry picked from commit 5ea7aa07c26a499a2fb9930a09ef8d13f85494c0)
2026-02-15 11:40:52 +01:00 · 2024-08-11 18:01:33 +02:00 · 2024-08-11 18:01:33 +02:00 · 2024-03-10 20:51:23 +01:00 · 2024-03-10 20:51:23 +01:00
204 changed files with 2207 additions and 4411 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,8 +10,5 @@ charset = utf-8
 [*.{csproj,xml,yml,dll.config,targets,props}]
 indent_size = 2

-[nuget.config]
-indent_size = 2
-
 [*.gdsl]
 indent_style = tab
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,61 +0,0 @@
-<Project>
-  <ItemGroup>
-    <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
-    <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
-    <PackageVersion Include="ILReader.Core" Version="1.0.0.4" />
-    <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
-    <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.0" />
-    <PackageVersion Include="Linguini.Bundle" Version="0.1.3" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.1"/>
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit" Version="1.1.1"/>
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.8.0" />
-    <PackageVersion Include="Microsoft.CodeCoverage" Version="17.8.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24059.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.ILVerification" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
-    <PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageVersion Include="Moq" Version="4.20.70" />
-    <PackageVersion Include="NUnit" Version="4.0.1" />
-    <PackageVersion Include="NUnit.Analyzers" Version="3.10.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageVersion Include="Nett" Version="0.15.0" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
-    <PackageVersion Include="OpenTK.OpenAL" Version="4.7.7" />
-    <PackageVersion Include="OpenToolkit.Graphics" Version="4.0.0-pre9.1" />
-    <PackageVersion Include="Pidgin" Version="3.2.2" />
-    <PackageVersion Include="Robust.Natives" Version="0.1.1" />
-    <PackageVersion Include="Robust.Natives.Cef" Version="120.1.9" />
-    <PackageVersion Include="Robust.Shared.AuthLib" Version="0.1.2" />
-    <PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.7" />
-    <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.7" />
-    <PackageVersion Include="Serilog" Version="3.1.1" />
-    <PackageVersion Include="Serilog.Sinks.Loki" Version="4.0.0-beta3" />
-    <PackageVersion Include="SharpZstd.Interop" Version="1.5.2-beta2" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.2" />
-    <PackageVersion Include="SpaceWizards.HttpListener" Version="0.1.0" />
-    <PackageVersion Include="SpaceWizards.NFluidsynth" Version="0.1.1" />
-    <PackageVersion Include="SpaceWizards.SharpFont" Version="1.0.2" />
-    <PackageVersion Include="SpaceWizards.Sodium" Version="0.2.1" />
-    <PackageVersion Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageVersion Include="TerraFX.Interop.Windows" Version="10.0.22621.5" />
-    <PackageVersion Include="TerraFX.Interop.Xlib" Version="6.4.0" />
-    <PackageVersion Include="VorbisPizza" Version="1.3.0" />
-    <PackageVersion Include="YamlDotNet" Version="13.7.1" />
-    <PackageVersion Include="prometheus-net" Version="8.2.1" />
-    <PackageVersion Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
-  </ItemGroup>
-</Project>
--- a/Lidgren.Network/CursedHorrorsBeyondOurWildestImagination.cs
+++ b/Lidgren.Network/CursedHorrorsBeyondOurWildestImagination.cs
@@ -1,9 +0,0 @@
-using System.Runtime.CompilerServices;
-
-// So I wanted to mess with NetIncomingMessage and NetOutgoingMessage from tests.
-// Now.. the instructors are internal...
-// Unless...
-// I mean we have this project here from the weird way we're compiling Lidgren.
-// I could just put this in here... it wouldn't touch the main Lidgren repo at all...
-[assembly: InternalsVisibleTo("Robust.UnitTesting")]
-
--- a/Lidgren.Network/Lidgren.Network.csproj
+++ b/Lidgren.Network/Lidgren.Network.csproj
@@ -16,8 +16,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="CursedHorrorsBeyondOurWildestImagination.cs" />
-
    <Compile Include="Lidgren.Network\Lidgren.Network\**\*.cs">
     <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
    </Compile>
--- a/MSBuild/Robust.Engine.Version.props
+++ b/MSBuild/Robust.Engine.Version.props
@@ -1,4 +1,4 @@
 <Project>

-    <!-- This file automatically reset by Tools/version.py -->
+    <!-- This file automatically reset by Tools/version.py -->

--- a/MSBuild/Robust.Properties.targets
+++ b/MSBuild/Robust.Properties.targets
@@ -4,7 +4,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>

  <Import Project="Robust.Custom.targets" Condition="Exists('Robust.Custom.targets')"/>
@@ -28,5 +27,5 @@
  <Import Project="Robust.Analyzers.targets" Condition="'$(SkipRobustAnalyzer)' != 'true'" />

  <!-- serialization generator -->
-  <Import Project="Robust.Serialization.Generator.targets" Condition="'$(SkipRobustAnalyzer)' != 'true'" />
+  <Import Project="Robust.Serialization.Generator.targets" />
 </Project>
--- a/2
+++ b/2
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -54,193 +54,10 @@ END TEMPLATE-->
 *None yet*


-## 210.0.2
+## 203.0.2


-## 210.0.1
-
-### Bugfixes
-
-* Revert changes to `TextureButton` that broke style property handling.
-
-
-## 210.0.0
-
-### New features
-
-* Controls can now hook before, after, and during rendering of their children.
-* IRenderHandle is now a public API, with the caveat that it's properties and methods are unstable.
-* ButtonGroup now exposes what buttons it contains, alongside which is currently pressed.
-* OptionButton has additional styleclasses, and has a hook for modifying it's internal buttons.
-* PanelContainer.GetStyleBox() is now protected rather than private.
-* TextureButton now uses a TextureRect instead of custom drawing code.
-* TextureRect has additional style properties exposed.
-    * A new property, TextureSizeTarget, was added, which allows specifying a size in virtual pixels that the control should attempt to draw at.
-    * Stretch mode is now a style property.
-    * Scale is now a style property.
-* Avalonia.Metadata.XmlnsDefinitionAttribute is now permitted by the sandbox.
-* Add MaxDimension property to Box2 to return the higher of the Width or Height.
-* Add GetLocalPosition to convert ScreenCoordinates to coordinates relative to the control. Ignores window.
-* Add GlobalRect and GlobalPixelRect for controls to get their UIBox2i in screen terms.
-* Add dotted line drawing to DrawingHandleScreen.
-* You can use `Subs.CVar()` from an entity systems to subscribe to CVar changes. This is more convenient than `IConfigurationManager.OnValueChanged` as it automatically unsubscribes on system shutdown.
-* There is now a built-in type serializer for `DateTime`, so you can put `DateTime`s in your data fields.
-* `System.Text.Unicode.UnicodeRange` and `UnicodeRanges` are now available in the sandbox.
-
-### Bugfixes
-
-* UI drawing now properly accounts for a control's draw routine potentially mangling the current matrix.
-* UI roots now properly update when the global stylesheet is changed. They previously only did so if they had a dedicated stylesheet (which is the one case where they would be unaffected by a global sheet update.
-
-
-## 209.0.1
-
-### Bugfixes
-
-* Fix missed import from 209.0.0.
-
-
-## 209.0.0
-
-### Breaking changes
-
-* `replay.max_compressed_size` and `replay.max_uncompressed_size` CVars are now `long`.
-* Remove obsolete CoordinatesExtension for ToEntityCoordinates from GridUid / Vector2i.
-
-### New features
-
-* Add GetEntitiesOnMap / GetChildEntities to EntityLookupSystem to return components on the specified map and components with the specified parent respectively.
-* Add MaxDimension property to Box2 to return the higher of the Width or Height.
-* Add GetLocalPosition to convert ScreenCoordinates to coordinates relative to the control. Ignores window.
-* Add GlobalRect and GlobalPixelRect for controls to get their UIBox2i in screen terms.
-* Add dotted line drawing to DrawingHandleScreen.
-* `IConfigurationManager.LoadDefaultsFromTomlStream` properly does type conversions. This fixes scenarios like loading of `long` CVars.
-* Add helper methods for TileRef / Vector2i to SharedMapSystem for ToCenterCoordinates (tile center EntityCoordinates) and ToCoordinates (tile origin to EntityCoordinates).
-* Copy some of the coordinates extensions to SharedTransformSystem.
-
-### Bugfixes
-
-* Fixed integer overflows in replay max size calculation.
-* Explicitly capped `replay.replay_tick_batchSize` internally to avoid high values causing allocation failures.
-
-### Other
-
-* Important MIDI performance improvements.
-
-
-## 208.0.0
-
-### Breaking changes
-
-* Metadata flags are no longer serialized as they get rebuilt on entity startup.
-
-### Bugfixes
-
-* Log failing to load user keybinds and handle the exception.
-
-
-## 207.1.0
-
-### New features
-
-* Add the ability to merge grids via GridFixtureSystem.
-
-
-## 207.0.0
-
-### Breaking changes
-
-* Update EntityLookup internally so non-approximate queries use the GJK solver and are much more accurate. This also means the approximate flag matters much more if you don't need narrowphase checks.
-* Add shape versions of queries for both EntityLookup and MapManager.
-
-### Bugfixes
-
-* Fix PVS full state updates not clearing session entities and causing exceptions.
-
-### Other
-
-* Integration tests now run `NetMessage`s through serialization rather than passing the objects between client and server. This causes tests that missed `[NetSerializer]` attributes on any objects that need them to fail.
-
-### Internal
-
-* Remove a lot of duplicate code internally from EntityLookup and MapManager.
-
-
-## 206.0.0
-
-### Breaking changes
-
-* tpto will teleport you to physics-center instead of transform center instead.
-* Rename local EntityLookup methods to reflect they take local AABBs and not world AABBs.
-
-### New features
-
-* Add some additional EntityLookup methods for local queries.
-* Add support to PrototypeManager for parsing specific files / directories as abstract.
-
-### Bugfixes
-
-* Fix tpto short-circuiting if one of the listed entities isn't found.
-* Fix tpto not allowing grids as targets.
-
-### Other
-
-* Reduce MIDI source update rate from 10hz to 4hz.
-
-### Internal
-
-* Remove some duplicate internal code in EntityLookupSystem.
-* Skip serialization sourcegen in GLFW and Lidgren.
-
-
-## 205.0.0
-
-### Breaking changes
-
-* The unused `Robust.Physics` project has been deleted.
-* The project now uses [Central Package Management](https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management).
-* (Almost) all the NuGet packages have been updated. This causes many problems. I am so sorry.
-* Cleaned up some unused packages as well.
-
-
-## 204.1.0
-
-### New features
-
-* New `EntitySystem` subscription helper for working with Bound User Interface events. You can find them by doing `Subs.BuiEvents<>()` in a system.
-* The `EntityManager.Subscriptions` type (for building helper extension methods) now uses
-
-### Bugfixes
-
-* Avoid loading assemblies from content `/Assemblies` if Robust ships its own copy. This avoid duplicate or weird mismatching version issues.
-
-### Other
-
-* Removed glibc version check warning.
-
-
-## 204.0.0
-
-### Breaking changes
-
-* Make EntityManager abstract and make IEntityManager.EntityNetManager not nullable.
-* Make VVAccess.ReadWrite default for all Datafields instead of VVAccess.ReadOnly
-
-### New features
-
-* `TextEdit.OnTextChanged`
-* Add Pick and PickAndTake versions for System.Random for ICollections.
-
-### Bugfixes
-
-* Fix `IClipboardManager.GetText()` returning null in some cases.
-* Fix possible NRE in server-side console command completion code.
-* Fix possible NRE on DebugConsole logs.
-* Fix exception when VVing non-networked components.
-
-### Other
-
-* Remove "Do not use from content" from IComponent.
+## 203.0.1


 ## 203.0.0
@@ -256,8 +73,8 @@ END TEMPLATE-->
 ### New features

 * `RobustUnitTest` now has a `ExtraComponents` field for automatically registering additional components.
-* `IComponentFactory.RegisterIgnore()` now accepts more than one string.
-* Added `IComponentFactory.RegisterTypes` for simultaneously registering multiple components.
+* `IComponentFactory.RegisterIgnore()` now accepts more than one string. 
+* Added `IComponentFactory.RegisterTypes` for simultaneously registering multiple components. 

 ### Bugfixes

@@ -271,7 +88,7 @@ END TEMPLATE-->
 * Reverted some map/grid initialisation changes that might've been causing broadphase/physics errors.
 * Fixed PVS sometimes sending entities without first sending their children.
 * Fixed a container state handling bug caused by containers not removing expected entities when shutting down.
-* Fixed a `EnsureEntity<T>` state handling bug caused by improper handling of entity deletions.
+* Fixed a `EnsureEntity<T>` state handling bug caused by improper handling of entity deletions. 
 * Fixed a bad NetSyncEnabled debug assert.


@@ -287,7 +104,7 @@ END TEMPLATE-->
 ### Breaking changes

 * Various entity manager methods now have a new `where T : IComponent` constraint.
-* The `IComponentFactory.ComponentAdded` event has been renamed to `ComponentsAdded` and now provides an array of component registrations.
+* The `IComponentFactory.ComponentAdded` event has been renamed to `ComponentsAdded` and now provides an array of component registrations. 
 * `IComponentFactory.RegisterIgnore()` no longer supports overwriting existing registrations, components should get ignored before they are registered.

 ### New features
--- a/Resources/Locale/en-US/physics/grid_merging.ftl
+++ b/Resources/Locale/en-US/physics/grid_merging.ftl
@@ -1,8 +0,0 @@
-cmd-merge_grids-desc = Combines 2 grids into 1 grid
-cmd-merge_grids-help = merge_grids <gridUid1> <gridUid2> <offsetX> <offsetY> [angle]
-
-cmd-merge_grids-hintA = Grid A
-cmd-merge_grids-hintB = Grid B
-cmd-merge_grids-xOffset = X offset
-cmd-merge_grids-yOffset = Y offset
-cmd-merge_grids-angle = [Angle]
--- a/Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj
+++ b/Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj
@@ -1,26 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\MSBuild\Robust.Properties.targets"/>
-  <Import Project="..\MSBuild\Robust.Engine.props"/>
-
+  <Import Project="..\MSBuild\Robust.Properties.targets" />
+  <Import Project="..\MSBuild\Robust.Engine.props" />
+  
  <PropertyGroup>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
-
+  
  <ItemGroup>
-    <PackageVersion Update="NUnit" Version="3.14.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.1"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit" Version="1.1.1"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1"/>
+    <PackageReference Include="NUnit" Version="3.13.2"/>
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.15.0"/>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1"/>
+    <PackageReference Include="NUnit.Analyzers" Version="3.3.0"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"/>
-    <PackageReference Include="NUnit"/>
-    <PackageReference Include="NUnit3TestAdapter"/>
-    <PackageReference Include="NUnit.Analyzers"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk"/>
-  </ItemGroup>
-
+  
  <ItemGroup>
    <ProjectReference Include="..\Robust.Analyzers\Robust.Analyzers.csproj"/>
  </ItemGroup>
--- a/Robust.Analyzers/Robust.Analyzers.csproj
+++ b/Robust.Analyzers/Robust.Analyzers.csproj
@@ -3,20 +3,19 @@
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
    <LangVersion>10</LangVersion>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
+    <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" />
--- a/Robust.Benchmarks/Configs/DefaultSQLConfig.cs
+++ b/Robust.Benchmarks/Configs/DefaultSQLConfig.cs
@@ -1,18 +1,15 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using BenchmarkDotNet.Analysers;
 using BenchmarkDotNet.Columns;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
-using BenchmarkDotNet.EventProcessors;
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Filters;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Order;
 using BenchmarkDotNet.Reports;
-using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Validators;
 using Robust.Benchmarks.Exporters;

@@ -47,16 +44,10 @@ public sealed class DefaultSQLConfig : IConfig

    public IEnumerable<BenchmarkLogicalGroupRule> GetLogicalGroupRules() => DefaultConfig.Instance.GetLogicalGroupRules();

-    public IEnumerable<EventProcessor> GetEventProcessors() => DefaultConfig.Instance.GetEventProcessors();
-
-    public IEnumerable<IColumnHidingRule> GetColumnHidingRules() => DefaultConfig.Instance.GetColumnHidingRules();
    public IOrderer Orderer => DefaultConfig.Instance.Orderer!;
-    public ICategoryDiscoverer? CategoryDiscoverer => DefaultConfig.Instance.CategoryDiscoverer;
    public SummaryStyle SummaryStyle => DefaultConfig.Instance.SummaryStyle;
    public ConfigUnionRule UnionRule => DefaultConfig.Instance.UnionRule;
    public string ArtifactsPath => DefaultConfig.Instance.ArtifactsPath;
    public CultureInfo CultureInfo => DefaultConfig.Instance.CultureInfo!;
    public ConfigOptions Options => DefaultConfig.Instance.Options;
-    public TimeSpan BuildTimeout => DefaultConfig.Instance.BuildTimeout;
-    public IReadOnlyList<Conclusion> ConfigAnalysisConclusion => DefaultConfig.Instance.ConfigAnalysisConclusion;
 }
--- a/Robust.Benchmarks/Robust.Benchmarks.csproj
+++ b/Robust.Benchmarks/Robust.Benchmarks.csproj
@@ -13,12 +13,12 @@
    <ProjectReference Include="..\Robust.UnitTesting\Robust.UnitTesting.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
+    <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" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
  </ItemGroup>

  <Import Project="..\MSBuild\Robust.Properties.targets" />
--- a/Robust.Client.Injectors/Robust.Client.Injectors.csproj
+++ b/Robust.Client.Injectors/Robust.Client.Injectors.csproj
@@ -6,8 +6,8 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Microsoft.Build.Framework" Version="17.8.3" />
-      <PackageReference Include="Mono.Cecil" Version="0.11.5" />
+      <PackageReference Include="Microsoft.Build.Framework" Version="17.0.0" />
+      <PackageReference Include="Mono.Cecil" Version="0.11.3" />
      <PackageReference Include="Pidgin" Version="2.5.0" />
    </ItemGroup>

--- a/Robust.Client.NameGenerator/Robust.Client.NameGenerator.csproj
+++ b/Robust.Client.NameGenerator/Robust.Client.NameGenerator.csproj
@@ -2,12 +2,11 @@

    <PropertyGroup>
        <TargetFramework>netstandard2.0</TargetFramework>
-      <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
    </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
  </ItemGroup>

  <ItemGroup>
--- a/Robust.Client.WebView/Robust.Client.WebView.csproj
+++ b/Robust.Client.WebView/Robust.Client.WebView.csproj
@@ -8,8 +8,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" />
-    <PackageReference Include="Robust.Natives.Cef" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
+    <PackageReference Include="Robust.Natives.Cef" Version="120.1.9" />
  </ItemGroup>

  <ItemGroup>
--- a/Robust.Client/Audio/AudioOverlay.cs
+++ b/Robust.Client/Audio/AudioOverlay.cs
@@ -39,7 +39,7 @@ public sealed class AudioOverlay : Overlay

    protected internal override void Draw(in OverlayDrawArgs args)
    {
-        var localPlayer = _playerManager.LocalEntity;
+        var localPlayer = _playerManager.LocalPlayer?.ControlledEntity;

        if (args.ViewportControl == null || localPlayer == null)
            return;
--- a/Robust.Client/Audio/AudioSystem.cs
+++ b/Robust.Client/Audio/AudioSystem.cs
@@ -106,8 +106,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
        SubscribeNetworkEvent<PlayAudioEntityMessage>(OnEntityAudio);
        SubscribeNetworkEvent<PlayAudioPositionalMessage>(OnEntityCoordinates);

-        Subs.CVar(CfgManager, CVars.AudioAttenuation, OnAudioAttenuation, true);
-        Subs.CVar(CfgManager, CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
+        CfgManager.OnValueChanged(CVars.AudioAttenuation, OnAudioAttenuation, true);
+        CfgManager.OnValueChanged(CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
    }

    private void OnAudioState(EntityUid uid, AudioComponent component, ref AfterAutoHandleStateEvent args)
@@ -133,6 +133,13 @@ public sealed partial class AudioSystem : SharedAudioSystem
        _audio.SetMasterGain(value);
    }

+    public override void Shutdown()
+    {
+        CfgManager.UnsubValueChanged(CVars.AudioAttenuation, OnAudioAttenuation);
+        CfgManager.UnsubValueChanged(CVars.AudioRaycastLength, OnRaycastLengthChanged);
+        base.Shutdown();
+    }
+
    private void OnAudioPaused(EntityUid uid, AudioComponent component, ref EntityPausedEvent args)
    {
        component.Pause();
--- a/Robust.Client/Audio/Midi/MidiManager.cs
+++ b/Robust.Client/Audio/Midi/MidiManager.cs
@@ -72,7 +72,7 @@ internal sealed partial class MidiManager : IMidiManager

    // To avoid lock contention until some kind of MIDI refactor.
    private TimeSpan _nextUpdate;
-    private TimeSpan _updateFrequency = TimeSpan.FromSeconds(0.25f);
+    private TimeSpan _updateFrequency = TimeSpan.FromSeconds(0.1f);

    private SemaphoreSlim _updateSemaphore = new(1);

@@ -192,12 +192,7 @@ internal sealed partial class MidiManager : IMidiManager
            _settings["synth.midi-bank-select"].StringValue = "gm";
            //_settings["synth.verbose"].IntValue = 1; // Useful for debugging.

-            var midiParallel = _cfgMan.GetCVar(CVars.MidiParallelism);
-            _settings["synth.polyphony"].IntValue = Math.Clamp(1024 + (int)(Math.Log2(midiParallel) * 2048), 1, 65535);
-            _settings["synth.cpu-cores"].IntValue = Math.Clamp(midiParallel, 1, 256);
-
-            _midiSawmill.Debug($"Synth Cores: {_settings["synth.cpu-cores"].IntValue}");
-            _midiSawmill.Debug($"Synth Polyphony: {_settings["synth.polyphony"].IntValue}");
+            _parallel.AddAndInvokeParallelCountChanged(UpdateParallelCount);
        }
        catch (Exception e)
        {
@@ -206,10 +201,7 @@ internal sealed partial class MidiManager : IMidiManager
            return;
        }

-        _midiThread = new Thread(ThreadUpdate)
-        {
-            Name = "RobustToolbox MIDI Thread"
-        };
+        _midiThread = new Thread(ThreadUpdate);
        _midiThread.Start();

        _updateJob = new MidiUpdateJob()
@@ -227,6 +219,18 @@ internal sealed partial class MidiManager : IMidiManager
        FluidsynthInitialized = true;
    }

+    private void UpdateParallelCount()
+    {
+        if (_settings == null)
+            return;
+
+        _settings["synth.polyphony"].IntValue = Math.Clamp(1024 + (int)(Math.Log2(_parallel.ParallelProcessCount) * 2048), 1, 65535);
+        _settings["synth.cpu-cores"].IntValue = Math.Clamp(_parallel.ParallelProcessCount, 1, 256);
+
+        _midiSawmill.Debug($"Synth Cores: {_settings["synth.cpu-cores"].IntValue}");
+        _midiSawmill.Debug($"Synth Polyphony: {_settings["synth.polyphony"].IntValue}");
+    }
+
    private void LoggerDelegate(NFluidsynth.Logger.LogLevel level, string message, IntPtr data)
    {
        var rLevel = level switch
--- a/Robust.Client/Audio/Midi/MidiRenderer.cs
+++ b/Robust.Client/Audio/Midi/MidiRenderer.cs
@@ -38,7 +38,6 @@ internal sealed class MidiRenderer : IMidiRenderer
    private readonly Synth _synth;
    private readonly Sequencer _sequencer;
    private NFluidsynth.Player? _player;
-    private int _playerTotalTicks;
    private MidiDriver? _driver;
    private byte _midiProgram = 1;
    private byte _midiBank = 1;
@@ -145,21 +144,7 @@ internal sealed class MidiRenderer : IMidiRenderer
    public bool DisableProgramChangeEvent { get; set; } = true;

    [ViewVariables(VVAccess.ReadWrite)]
-    public int PlayerTotalTick
-    {
-        get
-        {
-            // GetTotalTicks is really expensive (has to iterate the entire file, not cached).
-            // Slight problem with caching it ourselves: the value only becomes available when the player loads the MIDI file.
-            // And that only happens after playback really starts, with the timer and synth and all that stuff.
-            // So we cache it "as soon as it's available", i.e. not 0.
-            // We don't care about playlists and such, so it shouldn't change anymore after.
-            if (_playerTotalTicks != 0)
-                return _playerTotalTicks;
-
-            return _playerTotalTicks = _player?.GetTotalTicks ?? 0;
-        }
-    }
+    public int PlayerTotalTick => _player?.GetTotalTicks ?? 0;

    [ViewVariables(VVAccess.ReadWrite)]
    public int PlayerTick
@@ -354,7 +339,6 @@ internal sealed class MidiRenderer : IMidiRenderer
                return false;
            }

-            _playerTotalTicks = 0;
            _player?.Dispose();
            _player = new NFluidsynth.Player(_synth);
            _player.SetPlaybackCallback(MidiPlayerEventHandler);
@@ -393,7 +377,6 @@ internal sealed class MidiRenderer : IMidiRenderer
            _player?.Join();
            _player?.Dispose();
            _player = null;
-            _playerTotalTicks = 0;
        }

        StopAllNotes();
--- a/Robust.Client/BaseClient.cs
+++ b/Robust.Client/BaseClient.cs
@@ -229,7 +229,7 @@ namespace Robust.Client

            // Don't invoke PlayerLeaveServer if PlayerJoinedServer & GameStartedSetup hasn't been called yet.
            if (RunLevel > ClientRunLevel.Connecting)
-                PlayerLeaveServer?.Invoke(this, new PlayerEventArgs(_playMan.LocalSession));
+                PlayerLeaveServer?.Invoke(this, new PlayerEventArgs(_playMan.LocalPlayer?.Session));

            LastDisconnectReason = args.Reason;
            GameStoppedReset();
--- a/Robust.Client/Console/ClientConsoleHost.cs
+++ b/Robust.Client/Console/ClientConsoleHost.cs
@@ -188,7 +188,7 @@ namespace Robust.Client.Console
            }

            args.RemoveAt(0);
-            var shell = new ConsoleShell(this, session ?? _player.LocalSession, session == null);
+            var shell = new ConsoleShell(this, session ?? _player.LocalPlayer?.Session, session == null);
            var cmdArgs = args.ToArray();

            AnyCommandExecuted?.Invoke(shell, commandName, command, cmdArgs);
@@ -200,7 +200,8 @@ namespace Robust.Client.Console
            // When not connected to a server, you can run all local commands.
            // When connected to a server, you can only run commands according to the con group controller.

-            return _player.LocalSession is not { Status: > SessionStatus.Connecting }
+            return _player.LocalPlayer == null
+                   || _player.LocalPlayer.Session.Status <= SessionStatus.Connecting
                   || _conGroup.CanCommand(cmdName);
        }

--- a/Robust.Client/Console/Commands/ClientSpawnCommand.cs
+++ b/Robust.Client/Console/Commands/ClientSpawnCommand.cs
@@ -16,7 +16,8 @@ namespace Robust.Client.Console.Commands

        public override void Execute(IConsoleShell shell, string argStr, string[] args)
        {
-            if (_playerManager.LocalEntity is not { } controlled)
+            var controlled = _playerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
+            if (controlled == EntityUid.Invalid)
            {
                shell.WriteLine("You don't have an attached entity.");
                return;
--- a/Robust.Client/Console/Commands/DumpMetadataMembersCommand.cs
+++ b/Robust.Client/Console/Commands/DumpMetadataMembersCommand.cs
@@ -11,7 +11,7 @@ namespace Robust.Client.Console.Commands

        public override void Execute(IConsoleShell shell, string argStr, string[] args)
        {
-            var type = Type.GetType(args[0]);
+            var type = GetType(args[0]);

            if (type == null)
            {
@@ -25,6 +25,17 @@ namespace Robust.Client.Console.Commands
                shell.WriteLine(sig);
            }
        }
+
+        private Type? GetType(string name)
+        {
+            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                if (assembly.GetType(name) is { } type)
+                    return type;
+            }
+
+            return null;
+        }
    }
 #endif
 }
--- a/Robust.Client/Debugging/DebugPhysicsSystem.cs
+++ b/Robust.Client/Debugging/DebugPhysicsSystem.cs
@@ -420,7 +420,7 @@ namespace Robust.Client.Debugging
                if (mapPos.MapId != args.MapId)
                    return;

-                var player = _playerManager.LocalEntity;
+                var player = _playerManager.LocalPlayer?.ControlledEntity;

                if (!_entityManager.TryGetComponent<TransformComponent>(player, out var playerXform) ||
                    playerXform.MapID != args.MapId)
--- a/Robust.Client/GameController/GameController.Standalone.cs
+++ b/Robust.Client/GameController/GameController.Standalone.cs
@@ -35,6 +35,8 @@ namespace Robust.Client
                throw new InvalidOperationException("Cannot start twice!");
            }

+            GlibcBug.Check();
+
            _hasStarted = true;

            if (CommandLineArgs.TryParse(args, out var parsed))
--- a/Robust.Client/GameObjects/ClientEntityManager.Network.cs
+++ b/Robust.Client/GameObjects/ClientEntityManager.Network.cs
@@ -42,8 +42,6 @@ public sealed partial class ClientEntityManager
        var pending = PendingNetEntityStates.GetOrNew(nEntity);
        pending.Add((typeof(T), callerEntity));

-
-
        return entity.Item1;
    }

--- a/Robust.Client/GameObjects/ClientEntityManager.cs
+++ b/Robust.Client/GameObjects/ClientEntityManager.cs
@@ -221,7 +221,7 @@ namespace Robust.Client.GameObjects
        public void DispatchReceivedNetworkMsg(EntityEventArgs msg)
        {
            var sessionType = typeof(EntitySessionMessage<>).MakeGenericType(msg.GetType());
-            var sessionMsg = Activator.CreateInstance(sessionType, new EntitySessionEventArgs(_playerManager.LocalSession!), msg)!;
+            var sessionMsg = Activator.CreateInstance(sessionType, new EntitySessionEventArgs(_playerManager.LocalPlayer!.Session), msg)!;
            ReceivedSystemMessage?.Invoke(this, msg);
            ReceivedSystemMessage?.Invoke(this, sessionMsg);
        }
--- a/Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs
+++ b/Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs
@@ -27,6 +27,7 @@ internal sealed class ClientOccluderSystem : OccluderSystem
        base.Initialize();

        SubscribeLocalEvent<OccluderComponent, AnchorStateChangedEvent>(OnAnchorChanged);
+        SubscribeLocalEvent<OccluderComponent, ReAnchorEvent>(OnReAnchor);
        SubscribeLocalEvent<OccluderComponent, ComponentShutdown>(OnShutdown);
    }

@@ -89,6 +90,11 @@ internal sealed class ClientOccluderSystem : OccluderSystem
        AnchorStateChanged(uid, comp, args.Transform);
    }

+    private void OnReAnchor(EntityUid uid, OccluderComponent comp, ref ReAnchorEvent args)
+    {
+        AnchorStateChanged(uid, comp, args.Xform);
+    }
+
    private void QueueOccludedDirectionUpdate(EntityUid sender, OccluderComponent occluder, TransformComponent? xform = null)
    {
        if (!Resolve(sender, ref xform))
@@ -168,9 +174,8 @@ internal sealed class ClientOccluderSystem : OccluderSystem

        var tile = grid.TileIndicesFor(xform.Coordinates);

-        // TODO: Sub to parent changes instead or something.
-        // DebugTools.Assert(occluder.LastPosition == null
-            // || occluder.LastPosition.Value.Grid == xform.GridUid && occluder.LastPosition.Value.Tile == tile);
+        DebugTools.Assert(occluder.LastPosition == null
+            || occluder.LastPosition.Value.Grid == xform.GridUid && occluder.LastPosition.Value.Tile == tile);
        occluder.LastPosition = (xform.GridUid.Value, tile);

        // dir starts at the relative effective south direction;
--- a/Robust.Client/GameObjects/EntitySystems/InputSystem.cs
+++ b/Robust.Client/GameObjects/EntitySystems/InputSystem.cs
@@ -105,10 +105,12 @@ namespace Robust.Client.GameObjects
        /// <param name="inputCmd">Input command to handle as predicted.</param>
        public void PredictInputCommand(IFullInputCmdMessage inputCmd)
        {
+            DebugTools.AssertNotNull(_playerManager.LocalPlayer);
+
            var keyFunc = _inputManager.NetworkBindMap.KeyFunctionName(inputCmd.InputFunctionId);

            Predicted = true;
-            var session = _playerManager.LocalSession;
+            var session = _playerManager.LocalPlayer!.Session;
            foreach (var handler in BindRegistry.GetHandlers(keyFunc))
            {
                if (handler.HandleCmdMessage(EntityManager, session, inputCmd))
@@ -143,22 +145,27 @@ namespace Robust.Client.GameObjects

        private void GenerateInputCommand(IConsoleShell shell, string argstr, string[] args)
        {
-            if (_playerManager.LocalEntity is not { } pent)
+            var localPlayer = _playerManager.LocalPlayer;
+            if(localPlayer is null)
+                return;
+
+            var pent = localPlayer.ControlledEntity;
+            if(pent is null)
                return;

            BoundKeyFunction keyFunction = new BoundKeyFunction(args[0]);
            BoundKeyState state = args[1] == "u" ? BoundKeyState.Up: BoundKeyState.Down;

-            var pxform = Transform(pent);
+            var pxform = Transform(pent.Value);
            var wPos = pxform.WorldPosition + new Vector2(float.Parse(args[2]), float.Parse(args[3]));
-            var coords = EntityCoordinates.FromMap(EntityManager, pent, new MapCoordinates(wPos, pxform.MapID));
+            var coords = EntityCoordinates.FromMap(EntityManager, pent.Value, new MapCoordinates(wPos, pxform.MapID));

            var funcId = _inputManager.NetworkBindMap.KeyFunctionID(keyFunction);

            var message = new FullInputCmdMessage(_timing.CurTick, _timing.TickFraction, funcId, state,
                GetNetCoordinates(coords), new ScreenCoordinates(0, 0, default), NetEntity.Invalid);

-            HandleInputCommand(_playerManager.LocalSession, keyFunction, message);
+            HandleInputCommand(localPlayer.Session, keyFunction, message);
        }

        private void OnAttachedEntityChanged(LocalPlayerAttachedEvent message)
@@ -201,8 +208,11 @@ namespace Robust.Client.GameObjects
        /// </summary>
        public void SetEntityContextActive()
        {
-            if (_playerManager.LocalEntity is not { } controlled)
+            var controlled = _playerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
+            if (controlled == EntityUid.Invalid)
+            {
                return;
+            }

            SetEntityContextActive(_inputManager, controlled);
        }
--- a/Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs
+++ b/Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs
@@ -62,7 +62,7 @@ namespace Robust.Client.GameObjects
            SubscribeLocalEvent<SpriteComponent, SpriteUpdateInertEvent>(QueueUpdateInert);
            SubscribeLocalEvent<SpriteComponent, ComponentInit>(OnInit);

-            Subs.CVar(_cfg, CVars.RenderSpriteDirectionBias, OnBiasChanged, true);
+            _cfg.OnValueChanged(CVars.RenderSpriteDirectionBias, OnBiasChanged, true);
            _sawmill = _logManager.GetSawmill("sprite");
        }

@@ -72,6 +72,12 @@ namespace Robust.Client.GameObjects
            QueueUpdateInert(uid, component);
        }

+        public override void Shutdown()
+        {
+            base.Shutdown();
+            _cfg.UnsubValueChanged(CVars.RenderSpriteDirectionBias, OnBiasChanged);
+        }
+
        private void OnBiasChanged(double value)
        {
            SpriteComponent.DirectionBias = value;
--- a/Robust.Client/GameObjects/EntitySystems/UserInterfaceSystem.cs
+++ b/Robust.Client/GameObjects/EntitySystems/UserInterfaceSystem.cs
@@ -29,7 +29,10 @@ namespace Robust.Client.GameObjects

            var uiKey = ev.UiKey;
            var message = ev.Message;
-            message.Session = _playerManager.LocalSession!;
+            // This should probably not happen at this point, but better make extra sure!
+            if (_playerManager.LocalPlayer != null)
+                message.Session = _playerManager.LocalPlayer.Session;
+
            message.Entity = GetNetEntity(uid);
            message.UiKey = uiKey;

@@ -72,7 +75,8 @@ namespace Robust.Client.GameObjects
            boundInterface.Open();
            uiComp.OpenInterfaces[uiKey] = boundInterface;

-            if (_playerManager.LocalSession is { } playerSession)
+            var playerSession = _playerManager.LocalPlayer?.Session;
+            if (playerSession != null)
            {
                uiComp.Interfaces[uiKey]._subscribedSessions.Add(playerSession);
                RaiseLocalEvent(uid, new BoundUIOpenedEvent(uiKey, uid, playerSession), true);
--- a/Robust.Client/GameObjects/EntitySystems/VelocityDebugSystem.cs
+++ b/Robust.Client/GameObjects/EntitySystems/VelocityDebugSystem.cs
@@ -35,7 +35,7 @@ namespace Robust.Client.GameObjects
                return;
            }

-            var player = _playerManager.LocalEntity;
+            var player = _playerManager.LocalPlayer?.ControlledEntity;

            if (player == null || !EntityManager.TryGetComponent(player.Value, out PhysicsComponent? body))
            {
--- a/Robust.Client/GameStates/ClientGameStateManager.cs
+++ b/Robust.Client/GameStates/ClientGameStateManager.cs
@@ -232,9 +232,9 @@ namespace Robust.Client.GameStates
                return default;
            }

-            DebugTools.Assert(_players.LocalSession != null);
+            DebugTools.AssertNotNull(_players.LocalPlayer);

-            var evArgs = new EntitySessionEventArgs(_players.LocalSession);
+            var evArgs = new EntitySessionEventArgs(_players.LocalPlayer!.Session);
            _pendingSystemMessages.Enqueue((_nextInputCmdSeq, _timing.CurTick, message,
                new EntitySessionMessage<T>(evArgs, message)));

--- a/Robust.Client/GameStates/NetGraphOverlay.cs
+++ b/Robust.Client/GameStates/NetGraphOverlay.cs
@@ -313,7 +313,7 @@ namespace Robust.Client.GameStates

                if (args.Length == 0)
                {
-                    entity = _playerManager.LocalEntity ?? EntityUid.Invalid;
+                    entity = _playerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
                }
                else if (!NetEntity.TryParse(args[0], out var netEntity) || !_entManager.TryGetEntity(netEntity, out entity))
                {
--- a/Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs
+++ b/Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs
@@ -28,8 +28,6 @@ namespace Robust.Client.Graphics.Clyde
        private int _verticesPerChunk(MapChunk chunk) => chunk.ChunkSize * chunk.ChunkSize * 4;
        private int _indicesPerChunk(MapChunk chunk) => chunk.ChunkSize * chunk.ChunkSize * GetQuadBatchIndexCount();

-        private List<Entity<MapGridComponent>> _grids = new();
-
        private void _drawGrids(Viewport viewport, Box2 worldAABB, Box2Rotated worldBounds, IEye eye)
        {
            var mapId = eye.Position.MapId;
@@ -39,15 +37,14 @@ namespace Robust.Client.Graphics.Clyde
                mapId = MapId.Nullspace;
            }

-            _grids.Clear();
-            _mapManager.FindGridsIntersecting(mapId, worldBounds, ref _grids);
+            var grids = new List<Entity<MapGridComponent>>();
+            _mapManager.FindGridsIntersecting(mapId, worldBounds, ref grids);

            var requiresFlush = true;
            GLShaderProgram gridProgram = default!;
            var gridOverlays = GetOverlaysForSpace(OverlaySpace.WorldSpaceGrids);
-            var mapSystem = _entityManager.System<SharedMapSystem>();

-            foreach (var mapGrid in _grids)
+            foreach (var mapGrid in grids)
            {
                if (!_mapChunkData.TryGetValue(mapGrid, out var data))
                {
@@ -68,7 +65,7 @@ namespace Robust.Client.Graphics.Clyde

                var transform = _entityManager.GetComponent<TransformComponent>(mapGrid);
                gridProgram.SetUniform(UniIModelMatrix, transform.WorldMatrix);
-                var enumerator = mapSystem.GetMapChunks(mapGrid.Owner, mapGrid.Comp, worldBounds);
+                var enumerator = mapGrid.Comp.GetMapChunks(worldBounds);

                while (enumerator.MoveNext(out var chunk))
                {
--- a/Robust.Client/Graphics/Clyde/Clyde.Windowing.cs
+++ b/Robust.Client/Graphics/Clyde/Clyde.Windowing.cs
@@ -224,8 +224,8 @@ namespace Robust.Client.Graphics.Clyde
                    fixed (char* pCaption = "RobustToolbox: Failed to create window")
                    {
                        Windows.MessageBoxW(HWND.NULL,
-                            pText,
-                            pCaption,
+                            (ushort*) pText,
+                            (ushort*) pCaption,
                            MB.MB_OK | MB.MB_ICONERROR);
                    }
                }
--- a/Robust.Client/Graphics/Clyde/GLContext/GLContextAngle.cs
+++ b/Robust.Client/Graphics/Clyde/GLContext/GLContextAngle.cs
@@ -413,7 +413,7 @@ namespace Robust.Client.Graphics.Clyde
                    DXGI_ADAPTER_DESC1 desc;
                    ThrowIfFailed("GetDesc1", _adapter->GetDesc1(&desc));

-                    var descName = ((ReadOnlySpan<char>)desc.Description).TrimEnd('\0');
+                    var descName = new ReadOnlySpan<char>(desc.Description, 128).TrimEnd('\0');

                    Logger.DebugS("clyde.ogl.angle", "Successfully created D3D11 device!");
                    Logger.DebugS("clyde.ogl.angle", $"D3D11 Device Adapter: {descName.ToString()}");
@@ -493,7 +493,7 @@ namespace Robust.Client.Graphics.Clyde
                    DXGI_ADAPTER_DESC1 desc;
                    ThrowIfFailed("GetDesc1", adapter->GetDesc1(&desc));

-                    var descName = ((ReadOnlySpan<char>)desc.Description);
+                    var descName = new ReadOnlySpan<char>(desc.Description, 128);

                    if (descName.StartsWith(name))
                        return adapter;
--- a/Robust.Client/Graphics/Clyde/VramCommand.cs
+++ b/Robust.Client/Graphics/Clyde/VramCommand.cs
@@ -36,7 +36,7 @@ namespace Robust.Client.Graphics.Clyde
                adapter->Release();
                ThrowIfFailed("GetDesc", adapter3->GetDesc2(&desc));

-                var descString = ((ReadOnlySpan<char>)desc.Description).TrimEnd('\0');
+                var descString = new ReadOnlySpan<char>(desc.Description, 128).TrimEnd('\0');
                shell.WriteLine(descString.ToString());

                DXGI_QUERY_VIDEO_MEMORY_INFO memInfo;
--- a/Robust.Client/Graphics/Clyde/Windowing/Glfw.Windows.cs
+++ b/Robust.Client/Graphics/Clyde/Windowing/Glfw.Windows.cs
@@ -654,7 +654,7 @@ namespace Robust.Client.Graphics.Clyde

            private static void WinThreadGetClipboard(CmdGetClipboard cmd)
            {
-                var clipboard = GLFW.GetClipboardString((Window*) cmd.Window) ?? "";
+                var clipboard = GLFW.GetClipboardString((Window*) cmd.Window);
                // Don't have to care about synchronization I don't think so just fire this immediately.
                cmd.Tcs.TrySetResult(clipboard);
            }
--- a/Robust.Client/Graphics/Drawing/DrawingHandleScreen.cs
+++ b/Robust.Client/Graphics/Drawing/DrawingHandleScreen.cs
@@ -2,7 +2,6 @@ using System;
 using System.Numerics;
 using System.Text;
 using Robust.Client.GameObjects;
-using Robust.Shared.Collections;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Graphics;
 using Robust.Shared.Maths;
@@ -15,79 +14,6 @@ namespace Robust.Client.Graphics
        {
        }

-        /// <summary>
-        /// Simialr to DrawLine but has dashes interspersed.
-        /// </summary>
-        /// <param name="offset">Offset from the start of the line.</param>
-        /// <param name="dashSize">How long a dash is.</param>
-        /// <param name="gapSize">How long the gap between dashes is.</param>
-        public void DrawDottedLine(Vector2 from, Vector2 to, Color color, float offset = 0f, float dashSize = 8f, float gapSize = 2f)
-        {
-            var lineVector = to - from;
-
-            // No drawing for you.
-            if (lineVector.LengthSquared() < 10f * float.Epsilon)
-                return;
-
-            var lineAndGap = gapSize + dashSize;
-            var lines = new ValueList<Vector2>();
-
-            // Minimum distance.
-            if (lineVector.Length() < lineAndGap)
-            {
-                lines.Add(from);
-                lines.Add(to);
-            }
-            else
-            {
-                var maxLength = lineVector.Length();
-                var normalizedLine = lineVector.Normalized();
-                var dashVector = normalizedLine * dashSize;
-                var gapVector = normalizedLine * gapSize;
-
-                var position = from;
-                offset %= (dashSize + gapSize);
-                var length = offset;
-                var dashLength = dashSize;
-
-                // If offset is less than gap size then start with a gap
-                // otherwise start with a partial line
-                if (offset > 0f)
-                {
-                    if (offset < gapSize)
-                    {
-                        position += normalizedLine * offset;
-                        length += offset;
-                    }
-                    else
-                    {
-                        dashLength = (offset - gapSize);
-                    }
-                }
-
-                while (length < maxLength)
-                {
-                    lines.Add(position);
-
-                    position += normalizedLine * dashLength;
-                    var lengthFromStart = (position - from).Length();
-
-                    // if over length then cap the thing.
-                    if (lengthFromStart > maxLength)
-                    {
-                        position = to;
-                    }
-
-                    lines.Add(position);
-                    dashLength = dashVector.Length();
-                    position += gapVector;
-                    length = (position - from).Length();
-                }
-            }
-
-            DrawPrimitives(DrawPrimitiveTopology.LineList, lines.Span, color);
-        }
-
        public abstract void DrawRect(UIBox2 rect, Color color, bool filled = true);

        public abstract void DrawTextureRectRegion(Texture texture, UIBox2 rect, UIBox2? subRegion = null, Color? modulate = null);
--- a/Robust.Client/Graphics/IRenderHandle.cs
+++ b/Robust.Client/Graphics/IRenderHandle.cs
@@ -6,10 +6,7 @@ using Robust.Shared.Maths;

 namespace Robust.Client.Graphics
 {
-    /// <remarks>
-    ///     Unstable API. Likely to break hard during renderer rewrite if you rely on it.
-    /// </remarks>
-    public interface IRenderHandle
+    internal interface IRenderHandle
    {
        DrawingHandleScreen DrawingHandleScreen { get; }
        DrawingHandleWorld DrawingHandleWorld { get; }
--- a/Robust.Client/Graphics/Shaders/ShaderPrototype.cs
+++ b/Robust.Client/Graphics/Shaders/ShaderPrototype.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Numerics;
 using Robust.Client.ResourceManagement;
@@ -69,7 +69,7 @@ namespace Robust.Client.Graphics
                    ShaderBlendMode? blend = null;
                    if (_rawBlendMode != null)
                    {
-                        if (!Enum.TryParse<ShaderBlendMode>(_rawBlendMode, true, out var parsed))
+                        if (!Enum.TryParse<ShaderBlendMode>(_rawBlendMode.ToUpper(), out var parsed))
                            Logger.Error($"invalid mode: {_rawBlendMode}");
                        else
                            blend = parsed;
--- a/Robust.Client/Input/InputManager.cs
+++ b/Robust.Client/Input/InputManager.cs
@@ -124,19 +124,12 @@ namespace Robust.Client.Input
            var path = new ResPath(KeybindsPath);
            if (_resourceMan.UserData.Exists(path))
            {
-                try
-                {
-                    LoadKeyFile(path, false, true);
-                }
-                catch (Exception e)
-                {
-                    Logger.ErrorS("input", "Failed to load user keybindings: " + e);
-                }
+                LoadKeyFile(path, true);
            }

            if (_resourceMan.ContentFileExists(path))
            {
-                LoadKeyFile(path, true);
+                LoadKeyFile(path, false);
            }
        }

@@ -496,13 +489,7 @@ namespace Robust.Client.Input
            return true;
        }

-        /// <summary>
-        /// Loads a keybind file, configuring keybinds.
-        /// </summary>
-        /// <param name="file">File to load from the content package</param>
-        /// <param name="defaultRegistration">Whether or not this is a "default" keybind set. If it is, then it won't override the current configuration, only the defaults.</param>
-        /// <param name="userData">Whether or not to load from the user data directory instead of the content package.</param>
-        public void LoadKeyFile(ResPath file, bool defaultRegistration, bool userData = false)
+        private void LoadKeyFile(ResPath file, bool userData)
        {
            TextReader reader;
            if (userData)
@@ -532,7 +519,7 @@ namespace Robust.Client.Input
                        continue;
                    }

-                    if (defaultRegistration)
+                    if (!userData)
                    {
                        _defaultRegistrations.Add(reg);

@@ -544,11 +531,11 @@ namespace Robust.Client.Input
                        }
                    }

-                    RegisterBinding(reg, markModified: defaultRegistration);
+                    RegisterBinding(reg, markModified: userData);
                }
            }

-            if (!defaultRegistration && mapping.TryGet("leaveEmpty", out var node))
+            if (userData && mapping.TryGet("leaveEmpty", out var node))
            {
                var leaveEmpty = _serialization.Read<BoundKeyFunction[]>(node, notNullableOverride: true);

--- a/Robust.Client/Map/TileEdgeOverlay.cs
+++ b/Robust.Client/Map/TileEdgeOverlay.cs
@@ -37,9 +37,7 @@ public sealed class TileEdgeOverlay : GridOverlay
        var tileDimensions = new Vector2(tileSize, tileSize);
        var (_, _, worldMatrix, invMatrix) = xformSystem.GetWorldPositionRotationMatrixWithInv(Grid.Owner);
        args.WorldHandle.SetTransform(worldMatrix);
-        var bounds = args.WorldBounds;
-        bounds = new Box2Rotated(bounds.Box.Enlarged(1), bounds.Rotation, bounds.Origin);
-        var localAABB = invMatrix.TransformBox(bounds);
+        var localAABB = invMatrix.TransformBox(args.WorldBounds);

        var enumerator = mapSystem.GetLocalTilesEnumerator(Grid.Owner, Grid, localAABB, false);

--- a/Robust.Client/Physics/PhysicsSystem.Predict.cs
+++ b/Robust.Client/Physics/PhysicsSystem.Predict.cs
@@ -207,8 +207,8 @@ public sealed partial class PhysicsSystem
            var contact = contacts[i];
            var uidA = contact.EntityA;
            var uidB = contact.EntityB;
-            var bodyATransform = GetPhysicsTransform(uidA, xformQuery.GetComponent(uidA));
-            var bodyBTransform = GetPhysicsTransform(uidB, xformQuery.GetComponent(uidB));
+            var bodyATransform = GetPhysicsTransform(uidA, xformQuery.GetComponent(uidA), xformQuery);
+            var bodyBTransform = GetPhysicsTransform(uidB, xformQuery.GetComponent(uidB), xformQuery);
            contact.UpdateIsTouching(bodyATransform, bodyBTransform);
        }

--- a/Robust.Client/Placement/PlacementManager.cs
+++ b/Robust.Client/Placement/PlacementManager.cs
@@ -495,7 +495,7 @@ namespace Robust.Client.Placement
        {
            // Try to get current map.
            var map = MapId.Nullspace;
-            if (EntityManager.TryGetComponent(PlayerManager.LocalEntity, out TransformComponent? xform))
+            if (EntityManager.TryGetComponent(PlayerManager.LocalPlayer?.ControlledEntity, out TransformComponent? xform))
            {
                map = xform.MapID;
            }
@@ -512,7 +512,7 @@ namespace Robust.Client.Placement

        private bool CurrentEraserMouseCoordinates(out EntityCoordinates coordinates)
        {
-            var ent = PlayerManager.LocalEntity ?? EntityUid.Invalid;
+            var ent = PlayerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
            if (ent == EntityUid.Invalid)
            {
                coordinates = new EntityCoordinates();
@@ -640,7 +640,7 @@ namespace Robust.Client.Placement

            if (CurrentPermission is not {Range: > 0} ||
                !CurrentMode.RangeRequired ||
-                PlayerManager.LocalEntity is not {Valid: true} controlled)
+                PlayerManager.LocalPlayer?.ControlledEntity is not {Valid: true} controlled)
                return;

            var worldPos = EntityManager.GetComponent<TransformComponent>(controlled).WorldPosition;
--- a/Robust.Client/Placement/PlacementMode.cs
+++ b/Robust.Client/Placement/PlacementMode.cs
@@ -216,7 +216,7 @@ namespace Robust.Client.Placement
        {
            if (!RangeRequired)
                return true;
-            var controlled = pManager.PlayerManager.LocalEntity ?? EntityUid.Invalid;
+            var controlled = pManager.PlayerManager.LocalPlayer?.ControlledEntity ?? EntityUid.Invalid;
            if (controlled == EntityUid.Invalid)
            {
                return false;
--- a/Robust.Client/Player/FilterSystem.cs
+++ b/Robust.Client/Player/FilterSystem.cs
@@ -10,13 +10,14 @@ namespace Robust.Client.Player

        public override Filter FromEntities(Filter filter, params EntityUid[] entities)
        {
-            if (_playerManager.LocalEntity is not {Valid: true} attachedUid)
+            if (_playerManager.LocalPlayer is not { } localPlayer
+                || localPlayer.Session.AttachedEntity is not {Valid: true} attachedUid)
                return filter;

            foreach (var uid in entities)
            {
                if (uid == attachedUid)
-                    filter.AddPlayer(_playerManager.LocalSession!);
+                    filter.AddPlayer(localPlayer.Session);
            }

            return filter;
--- a/Robust.Client/Replays/ReplayRecordingManager.cs
+++ b/Robust.Client/Replays/ReplayRecordingManager.cs
@@ -36,12 +36,12 @@ internal sealed class ReplayRecordingManager : SharedReplayRecordingManager

    private void OnRecordingStarted(MappingDataNode metadata, List<object> messages)
    {
-        if (_player.LocalSession == null)
+        if (_player.LocalPlayer == null)
            return;

        // Add information about the user doing the recording. This is used to set the default replay observer position
        // when playing back the replay.
-        var guid = _player.LocalUser.ToString();
+        var guid = _player.LocalPlayer.UserId.UserId.ToString();
        metadata[ReplayConstants.MetaKeyRecordedBy] = new ValueDataNode(guid);
    }

--- a/Robust.Client/Robust.Client.csproj
+++ b/Robust.Client/Robust.Client.csproj
@@ -5,33 +5,33 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <OutputType>WinExe</OutputType>
    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <NoWarn>NU1701;CA1416</NoWarn>
+    <NoWarn>NU1701</NoWarn>
    <OutputPath>../bin/Client</OutputPath>
    <RobustILLink>true</RobustILLink>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="DiscordRichPresence" PrivateAssets="compile" />
-    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" PrivateAssets="compile" />
-    <PackageReference Include="SQLitePCLRaw.provider.sqlite3" Condition="'$(UseSystemSqlite)' == 'True'" PrivateAssets="compile" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Condition="'$(UseSystemSqlite)' != 'True'" PrivateAssets="compile" />
-    <PackageReference Include="SpaceWizards.NFluidsynth" PrivateAssets="compile" />
-    <PackageReference Include="SixLabors.ImageSharp" />
-    <PackageReference Include="OpenToolkit.Graphics" PrivateAssets="compile" />
-    <PackageReference Include="OpenTK.OpenAL" PrivateAssets="compile" />
-    <PackageReference Include="SpaceWizards.SharpFont" PrivateAssets="compile" />
-    <PackageReference Include="Robust.Natives" />
-    <PackageReference Include="System.Numerics.Vectors"  />
-    <PackageReference Include="TerraFX.Interop.Windows" PrivateAssets="compile" />
-    <PackageReference Condition="'$(FullRelease)' != 'True'" Include="JetBrains.Profiler.Api" PrivateAssets="compile" />
-    <PackageReference Include="SpaceWizards.Sodium" PrivateAssets="compile" />
-    <PackageReference Include="Microsoft.NET.ILLink.Tasks" />
-    <PackageReference Include="TerraFX.Interop.Xlib" />
+    <PackageReference Include="DiscordRichPresence" Version="1.0.175" PrivateAssets="compile" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.9" PrivateAssets="compile" />
+    <PackageReference Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.2" Condition="'$(UseSystemSqlite)' == 'True'" PrivateAssets="compile" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.2" Condition="'$(UseSystemSqlite)' != 'True'" PrivateAssets="compile" />
+    <PackageReference Include="SpaceWizards.NFluidsynth" Version="0.1.1" PrivateAssets="compile" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.9" />
+    <PackageReference Include="OpenToolkit.Graphics" Version="4.0.0-pre9.1" PrivateAssets="compile" />
+    <PackageReference Include="OpenTK.OpenAL" Version="4.7.5" PrivateAssets="compile" />
+    <PackageReference Include="SpaceWizards.SharpFont" Version="1.0.1" PrivateAssets="compile" />
+    <PackageReference Include="Robust.Natives" Version="0.1.1" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.4.0" />
+    <PackageReference Include="TerraFX.Interop.Windows" Version="10.0.20348-rc2" PrivateAssets="compile" />
+    <PackageReference Condition="'$(FullRelease)' != 'True'" Include="JetBrains.Profiler.Api" Version="1.2.0" PrivateAssets="compile" />
+    <PackageReference Include="SpaceWizards.Sodium" Version="0.2.1" PrivateAssets="compile" />
+    <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="8.0.0" />
+    <PackageReference Include="TerraFX.Interop.Xlib" Version="6.4.0" />
  </ItemGroup>
  <ItemGroup Condition="'$(EnableClientScripting)' == 'True'">
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" PrivateAssets="compile" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" PrivateAssets="compile" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="compile" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.0.1" PrivateAssets="compile" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.1" PrivateAssets="compile" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="compile" />

    <ProjectReference Include="..\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj" />
  </ItemGroup>
@@ -40,6 +40,7 @@
    <ProjectReference Include="..\Lidgren.Network\Lidgren.Network.csproj" />
    <ProjectReference Include="..\OpenToolkit.GraphicsLibraryFramework\OpenToolkit.GraphicsLibraryFramework.csproj" />
    <ProjectReference Include="..\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj" />
+    <ProjectReference Include="..\Robust.Physics\Robust.Physics.csproj" />
    <ProjectReference Include="..\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
    <ProjectReference Include="..\Robust.Shared\Robust.Shared.csproj" />
  </ItemGroup>
--- a/Robust.Client/Upload/Commands/UploadFileCommand.cs
+++ b/Robust.Client/Upload/Commands/UploadFileCommand.cs
@@ -11,17 +11,15 @@ namespace Robust.Client.Upload.Commands;

 public sealed class UploadFileCommand : IConsoleCommand
 {
-    [Dependency] private readonly IConfigurationManager _cfgManager = default!;
-    [Dependency] private readonly IFileDialogManager _dialog = default!;
-    [Dependency] private readonly INetManager _netManager = default!;
-
    public string Command => "uploadfile";
    public string Description => "Uploads a resource to the server.";
    public string Help => $"{Command} [relative path for the resource]";

    public async void Execute(IConsoleShell shell, string argStr, string[] args)
    {
-        if (!_cfgManager.GetCVar(CVars.ResourceUploadingEnabled))
+        var cfgMan = IoCManager.Resolve<IConfigurationManager>();
+
+        if (!cfgMan.GetCVar(CVars.ResourceUploadingEnabled))
        {
            shell.WriteError("Network Resource Uploading is currently disabled by the server.");
            return;
@@ -35,8 +33,10 @@ public sealed class UploadFileCommand : IConsoleCommand

        var path = new ResPath(args[0]).ToRelativePath();

+        var dialog = IoCManager.Resolve<IFileDialogManager>();
+
        var filters = new FileDialogFilters(new FileDialogFilters.Group(path.Extension));
-        await using var file = await _dialog.OpenFile(filters);
+        await using var file = await dialog.OpenFile(filters);

        if (file == null)
        {
@@ -44,7 +44,7 @@ public sealed class UploadFileCommand : IConsoleCommand
            return;
        }

-        var sizeLimit = _cfgManager.GetCVar(CVars.ResourceUploadingLimitMb);
+        var sizeLimit = cfgMan.GetCVar(CVars.ResourceUploadingLimitMb);

        if (sizeLimit > 0f && file.Length * SharedNetworkResourceManager.BytesToMegabytes > sizeLimit)
        {
@@ -54,12 +54,12 @@ public sealed class UploadFileCommand : IConsoleCommand

        var data = file.CopyToArray();

-        var msg = new NetworkResourceUploadMessage
-        {
-            RelativePath = path,
-            Data = data
-        };
+        var netManager = IoCManager.Resolve<INetManager>();
+        var msg = netManager.CreateNetMessage<NetworkResourceUploadMessage>();

-        _netManager.ClientSendMessage(msg);
+        msg.RelativePath = path;
+        msg.Data = data;
+
+        netManager.ClientSendMessage(msg);
    }
 }
--- a/Robust.Client/Upload/Commands/UploadFolderCommand.cs
+++ b/Robust.Client/Upload/Commands/UploadFolderCommand.cs
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using Robust.Shared;
 using Robust.Shared.Configuration;
@@ -14,20 +13,21 @@ namespace Robust.Client.Upload.Commands;

 public sealed class UploadFolderCommand : IConsoleCommand
 {
-    [Dependency] private IResourceManager _resourceManager = default!;
-    [Dependency] private IConfigurationManager _configManager = default!;
-    [Dependency] private INetManager _netMan = default!;
-
    public string Command => "uploadfolder";
    public string Description => Loc.GetString("uploadfolder-command-description");
    public string Help => Loc.GetString("uploadfolder-command-help");

    private static readonly ResPath BaseUploadFolderPath = new("/UploadFolder");

+    [Dependency] private IResourceManager _resourceManager = default!;
+    [Dependency] private IConfigurationManager _configManager = default!;
+    [Dependency] private INetManager _netMan = default!;
+
    public async void Execute(IConsoleShell shell, string argStr, string[] args)
    {
        var fileCount = 0;

+
        if (!_configManager.GetCVar(CVars.ResourceUploadingEnabled))
        {
            shell.WriteError( Loc.GetString("uploadfolder-command-resource-upload-disabled"));
@@ -52,7 +52,8 @@ public sealed class UploadFolderCommand : IConsoleCommand
        //Grab all files in specified folder and upload them
        foreach (var filepath in _resourceManager.UserData.Find($"{folderPath.ToRelativePath()}/").files )
        {
-            await using var filestream = _resourceManager.UserData.Open(filepath, FileMode.Open);
+
+            await using var filestream = _resourceManager.UserData.Open(filepath,FileMode.Open);
            {
                var sizeLimit = _configManager.GetCVar(CVars.ResourceUploadingLimitMb);
                if (sizeLimit > 0f && filestream.Length * SharedNetworkResourceManager.BytesToMegabytes > sizeLimit)
@@ -63,11 +64,9 @@ public sealed class UploadFolderCommand : IConsoleCommand

                var data = filestream.CopyToArray();

-                var msg = new NetworkResourceUploadMessage
-                {
-                    RelativePath = filepath.RelativeTo(BaseUploadFolderPath),
-                    Data = data
-                };
+                var msg = _netMan.CreateNetMessage<NetworkResourceUploadMessage>();
+                msg.RelativePath = filepath.RelativeTo(BaseUploadFolderPath);
+                msg.Data = data;

                _netMan.ClientSendMessage(msg);
                fileCount++;
--- a/Robust.Client/UserInterface/Control.Layout.cs
+++ b/Robust.Client/UserInterface/Control.Layout.cs
@@ -226,10 +226,6 @@ namespace Robust.Client.UserInterface
        /// <seealso cref="Rect"/>
        public UIBox2i PixelRect => UIBox2i.FromDimensions(PixelPosition, PixelSize);

-        public UIBox2 GlobalRect => UIBox2.FromDimensions(GlobalPosition, _size);
-
-        public UIBox2i GlobalPixelRect => UIBox2i.FromDimensions(GlobalPixelPosition, PixelSize);
-
        /// <summary>
        /// Horizontal alignment mode.
        /// This determines how the control should be laid out horizontally
@@ -468,14 +464,6 @@ namespace Robust.Client.UserInterface
            }
        }

-        /// <summary>
-        /// Gets the screen coordinates position relative to the control.
-        /// </summary>
-        public Vector2 GetLocalPosition(ScreenCoordinates coordinates)
-        {
-            return coordinates.Position - GlobalPixelPosition;
-        }
-
        /// <summary>
        /// Notify the layout system that this control's <see cref="Measure"/> result may have changed
        /// and must be recalculated.
--- a/Robust.Client/UserInterface/Control.cs
+++ b/Robust.Client/UserInterface/Control.cs
@@ -545,36 +545,6 @@ namespace Robust.Client.UserInterface
            Draw(renderHandle.DrawingHandleScreen);
        }

-        protected internal virtual void PreRenderChildren(ref ControlRenderArguments args)
-        {
-
-        }
-
-        protected internal virtual void PostRenderChildren(ref ControlRenderArguments args)
-        {
-
-        }
-
-        protected internal virtual void RenderChildOverride(ref ControlRenderArguments args, int childIndex, Vector2i position)
-        {
-            RenderControl(ref args, childIndex, position);
-        }
-
-        public ref struct ControlRenderArguments
-        {
-            public IRenderHandle Handle;
-            public ref int Total;
-            public Vector2i Position;
-            public Color Modulate;
-            public UIBox2i? ScissorBox;
-            public ref Matrix3 CoordinateTransform;
-        }
-
-        protected void RenderControl(ref ControlRenderArguments args, int childIndex, Vector2i position)
-        {
-            UserInterfaceManagerInternal.RenderControl(args.Handle, ref args.Total, GetChild(childIndex), position, args.Modulate, args.ScissorBox, args.CoordinateTransform);
-        }
-
        public void UpdateDraw()
        {
        }
--- a/Robust.Client/UserInterface/Controls/BaseButton.cs
+++ b/Robust.Client/UserInterface/Controls/BaseButton.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Robust.Client.Audio;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.ContentPack;
@@ -38,10 +37,8 @@ namespace Robust.Client.UserInterface.Controls
            get => _group;
            set
            {
-                if (value?.InternalButtons.Contains(this) ?? false)
-                    return; // No work to do.
                // Remove from old group.
-                _group?.InternalButtons.Remove(this);
+                _group?.Buttons.Remove(this);

                _group = value;

@@ -50,12 +47,11 @@ namespace Robust.Client.UserInterface.Controls
                    return;
                }

-                value.InternalButtons.Add(this);
+                value.Buttons.Add(this);
                ToggleMode = true;

-                // Set us to pressed if we're the first button. Doesn't go through the setter to avoid setting off our own error check.
-                _pressed = value.InternalButtons.Count == 1;
-                DrawModeChanged();
+                // Set us to pressed if we're the first button.
+                Pressed = value.Buttons.Count == 0;
            }
        }

@@ -330,7 +326,7 @@ namespace Robust.Client.UserInterface.Controls
                return;
            }

-            foreach (var button in _group.InternalButtons)
+            foreach (var button in _group.Buttons)
            {
                if (button != this && button.Pressed)
                {
@@ -444,9 +440,6 @@ namespace Robust.Client.UserInterface.Controls
    /// </remarks>
    public sealed class ButtonGroup
    {
-        internal readonly List<BaseButton> InternalButtons = new();
-        public IReadOnlyList<BaseButton> Buttons => InternalButtons;
-
-        public BaseButton? Pressed => InternalButtons.FirstOrDefault(x => x.Pressed);
+        internal readonly List<BaseButton> Buttons = new();
    }
 }
--- a/Robust.Client/UserInterface/Controls/ItemList.cs
+++ b/Robust.Client/UserInterface/Controls/ItemList.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
@@ -9,9 +9,6 @@ using Robust.Shared.Input;
 using Robust.Shared.Maths;
 using Timer = Robust.Shared.Timing.Timer;

-/// <summary>
-/// Represents a scrollable list of items in a user interface.
-/// </summary>
 namespace Robust.Client.UserInterface.Controls
 {
    [Virtual]
@@ -32,10 +29,6 @@ namespace Robust.Client.UserInterface.Controls
        public const string StylePropertySelectedItemBackground = "selected-item-background";
        public const string StylePropertyDisabledItemBackground = "disabled-item-background";

-        /// <summary>
-        /// Gets or sets the ItemSeparation of individual list items
-        /// </summary>
-        public int ItemSeparation { get; set; } = 0; // Default value is 0px
        public int Count => _itemList.Count;
        public bool IsReadOnly => false;

@@ -75,10 +68,8 @@ namespace Robust.Client.UserInterface.Controls
                itemHeight += ActualItemBackground.MinimumSize.Y * UIScale;

                _totalContentHeight += (int)Math.Ceiling(itemHeight);
-                _totalContentHeight += ItemSeparation;
            }
-            //Remove unneeded ItemSeparation on last item.
-            _totalContentHeight -= ItemSeparation;
+
            _scrollBar.MaxValue = Math.Max(_scrollBar.Page, _totalContentHeight);
            _updateScrollbarVisibility();
        }
@@ -399,9 +390,6 @@ namespace Robust.Client.UserInterface.Controls
                }

                offset += itemHeight;
-
-                // Add a ItemSeparation at the bottom of each item.
-                offset += ItemSeparation;
            }
        }

@@ -411,7 +399,7 @@ namespace Robust.Client.UserInterface.Controls

            var color = ActualFontColor;
            var offsetY = (int) (box.Height - font.GetHeight(UIScale)) / 2;
-            var baseLine = new Vector2i(5, offsetY + font.GetAscent(UIScale)) + box.TopLeft;
+            var baseLine = new Vector2i(0, offsetY + font.GetAscent(UIScale)) + box.TopLeft;

            foreach (var rune in text.EnumerateRunes())
            {
--- a/Robust.Client/UserInterface/Controls/OptionButton.cs
+++ b/Robust.Client/UserInterface/Controls/OptionButton.cs
@@ -12,7 +12,6 @@ namespace Robust.Client.UserInterface.Controls
    public class OptionButton : ContainerButton
    {
        public const string StyleClassOptionButton = "optionButton";
-        public const string StyleClassPopup = "optionButtonPopup";
        public const string StyleClassOptionTriangle = "optionTriangle";
        public readonly ScrollContainer OptionsScroll;

@@ -75,8 +74,7 @@ namespace Robust.Client.UserInterface.Controls

            _popup = new Popup()
            {
-                Children = { new PanelContainer(), OptionsScroll },
-                StyleClasses = { StyleClassPopup }
+                Children = { OptionsScroll }
            };
            _popup.OnPopupHide += OnPopupHide;

@@ -101,11 +99,6 @@ namespace Robust.Client.UserInterface.Controls
            AddItem(label, id);
        }

-        public virtual void ButtonOverride(Button button)
-        {
-
-        }
-
        public void AddItem(string label, int? id = null)
        {
            if (id == null)
@@ -139,8 +132,6 @@ namespace Robust.Client.UserInterface.Controls
            {
                Select(0);
            }
-
-            ButtonOverride(button);
        }

        private void TogglePopup(bool show)
@@ -148,8 +139,6 @@ namespace Robust.Client.UserInterface.Controls
            if (show)
            {
                var globalPos = GlobalPosition;
-                globalPos.Y += Size.Y + 1; // Place it below us, with a safety margin.
-                globalPos.Y -= Margin.SumVertical;
                OptionsScroll.Measure(Window?.Size ?? Vector2Helpers.Infinity);
                var (minX, minY) = OptionsScroll.DesiredSize;
                var box = UIBox2.FromDimensions(globalPos, new Vector2(Math.Max(minX, Width), minY));
--- a/Robust.Client/UserInterface/Controls/PanelContainer.cs
+++ b/Robust.Client/UserInterface/Controls/PanelContainer.cs
@@ -15,13 +15,13 @@ namespace Robust.Client.UserInterface.Controls
        {
            base.Draw(handle);

-            var style = GetStyleBox();
+            var style = _getStyleBox();
            style?.Draw(handle, PixelSizeBox, UIScale);
        }

        protected override Vector2 MeasureOverride(Vector2 availableSize)
        {
-            var styleSize = GetStyleBox()?.MinimumSize ?? Vector2.Zero;
+            var styleSize = _getStyleBox()?.MinimumSize ?? Vector2.Zero;
            var measureSize = Vector2.Max(availableSize - styleSize, Vector2.Zero);
            var childSize = Vector2.Zero;
            foreach (var child in Children)
@@ -36,7 +36,7 @@ namespace Robust.Client.UserInterface.Controls
        protected override Vector2 ArrangeOverride(Vector2 finalSize)
        {
            var ourSize = UIBox2.FromDimensions(Vector2.Zero, finalSize);
-            var contentBox = GetStyleBox()?.GetContentBox(ourSize, 1) ?? ourSize;
+            var contentBox = _getStyleBox()?.GetContentBox(ourSize, 1) ?? ourSize;

            foreach (var child in Children)
            {
@@ -47,7 +47,7 @@ namespace Robust.Client.UserInterface.Controls
        }

        [System.Diagnostics.Contracts.Pure]
-        protected StyleBox? GetStyleBox()
+        private StyleBox? _getStyleBox()
        {
            if (PanelOverride != null)
            {
--- a/Robust.Client/UserInterface/Controls/TextEdit.cs
+++ b/Robust.Client/UserInterface/Controls/TextEdit.cs
@@ -90,8 +90,6 @@ public sealed class TextEdit : Control
    internal bool DebugOverlay;
    private Vector2? _lastDebugMousePos;

-    public event Action<TextEditEventArgs>? OnTextChanged;
-
    public TextEdit()
    {
        IoCManager.InjectDependencies(this);
@@ -317,7 +315,7 @@ public sealed class TextEdit : Control
                if (changed)
                {
                    _selectionStart = _cursorPosition;
-                    OnTextChanged?.Invoke(new TextEditEventArgs(this, _textRope));
+                    // OnTextChanged?.Invoke(new LineEditEventArgs(this, _text));
                    // _updatePseudoClass();
                    // OnBackspace?.Invoke(new LineEditBackspaceEventArgs(oldText, _text, cursor, selectStart));
                }
@@ -351,7 +349,7 @@ public sealed class TextEdit : Control
                if (changed)
                {
                    _selectionStart = _cursorPosition;
-                    OnTextChanged?.Invoke(new TextEditEventArgs(this, _textRope));
+                    // OnTextChanged?.Invoke(new LineEditEventArgs(this, _text));
                    // _updatePseudoClass();
                }

@@ -384,10 +382,7 @@ public sealed class TextEdit : Control
                }

                if (changed)
-                {
                    _selectionStart = _cursorPosition;
-                    OnTextChanged?.Invoke(new TextEditEventArgs(this, _textRope));
-                }

                InvalidateHorizontalCursorPos();
                args.Handle();
@@ -416,10 +411,7 @@ public sealed class TextEdit : Control
                }

                if (changed)
-                {
                    _selectionStart = _cursorPosition;
-                    OnTextChanged?.Invoke(new TextEditEventArgs(this, _textRope));
-                }

                InvalidateHorizontalCursorPos();
                args.Handle();
@@ -756,7 +748,6 @@ public sealed class TextEdit : Control

            var startPos = _cursorPosition;
            TextRope = Rope.Insert(TextRope, startPos.Index, ev.Text);
-            OnTextChanged?.Invoke(new TextEditEventArgs(this, _textRope));

            _selectionStart = _cursorPosition = new CursorPos(startPos.Index + startChars, LineBreakBias.Top);
            _imeData = (startPos, ev.Text.Length);
@@ -853,7 +844,6 @@ public sealed class TextEdit : Control
        var upper = SelectionUpper.Index;

        TextRope = Rope.ReplaceSubstring(TextRope, lower, upper - lower, text);
-        OnTextChanged?.Invoke(new TextEditEventArgs(this, _textRope));

        _selectionStart = _cursorPosition = new CursorPos(lower + text.Length, LineBreakBias.Top);
        // OnTextChanged?.Invoke(new LineEditEventArgs(this, _text));
@@ -1451,12 +1441,6 @@ public sealed class TextEdit : Control
        AbortIme(delete: false);
    }

-    public sealed class TextEditEventArgs(TextEdit control, Rope.Node textRope) : EventArgs
-    {
-        public TextEdit Control { get; } = control;
-        public Rope.Node TextRope { get; } = textRope;
-    }
-
    /// <summary>
    /// Specifies which line the cursor is positioned at when on a word-wrapping break.
    /// </summary>
--- a/Robust.Client/UserInterface/CustomControls/DebugConsole.xaml.cs
+++ b/Robust.Client/UserInterface/CustomControls/DebugConsole.xaml.cs
@@ -39,7 +39,7 @@ namespace Robust.Client.UserInterface.CustomControls
    // And also if Update() stops firing due to an exception loop the console will still work.
    // (At least from the main thread, which is what's throwing the exceptions..)
    [GenerateTypedNameReferences]
-    public sealed partial class DebugConsole : Control, IDebugConsoleView
+    public sealed partial class DebugConsole : Control, IDebugConsoleView, IPostInjectInit
    {
        [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
        [Dependency] private readonly IResourceManager _resourceManager = default!;
@@ -49,7 +49,7 @@ namespace Robust.Client.UserInterface.CustomControls
        private static readonly ResPath HistoryPath = new("/debug_console_history.json");

        private readonly ConcurrentQueue<FormattedMessage> _messageQueue = new();
-        private readonly ISawmill _logger;
+        private ISawmill _logger = default!;

        public DebugConsole()
        {
@@ -57,8 +57,6 @@ namespace Robust.Client.UserInterface.CustomControls

            IoCManager.InjectDependencies(this);

-            _logger = _logMan.GetSawmill("dbgconsole");
-
            InitCompletions();

            CommandBar.OnTextChanged += OnCommandChanged;
@@ -284,5 +282,10 @@ namespace Robust.Client.UserInterface.CustomControls
                }
            });
        }
+
+        void IPostInjectInit.PostInject()
+        {
+            _logger = _logMan.GetSawmill("dbgconsole");
+        }
    }
 }
--- a/Robust.Client/UserInterface/IUserInterfaceManagerInternal.cs
+++ b/Robust.Client/UserInterface/IUserInterfaceManagerInternal.cs
@@ -61,9 +61,6 @@ namespace Robust.Client.UserInterface
        Vector2? CalcRelativeMousePositionFor(Control control, ScreenCoordinates mousePos);

        Color GetMainClearColor();
-
-        void RenderControl(IRenderHandle renderHandle, ref int total, Control control, Vector2i position, Color modulate,
-            UIBox2i? scissorBox, Matrix3 coordinateTransform);
    }
 }

--- a/Robust.Client/UserInterface/UserInterfaceManager.Layout.cs
+++ b/Robust.Client/UserInterface/UserInterfaceManager.Layout.cs
@@ -132,10 +132,9 @@ internal sealed partial class UserInterfaceManager
            try
            {
                var total = 0;
+                _render(renderHandle, ref total, root, Vector2i.Zero, Color.White, null);
                var drawingHandle = renderHandle.DrawingHandleScreen;
-                drawingHandle.SetTransform(Matrix3.Identity);
-                RenderControl(renderHandle, ref total, root, Vector2i.Zero, Color.White, null, Matrix3.Identity);
-                drawingHandle.SetTransform(Matrix3.Identity);
+                drawingHandle.SetTransform(Vector2.Zero, Angle.Zero, Vector2.One);
                OnPostDrawUIRoot?.Invoke(new PostDrawUIRootEventArgs(root, drawingHandle));

                _prof.WriteValue("Controls rendered", ProfData.Int32(total));
--- a/Robust.Client/UserInterface/UserInterfaceManager.cs
+++ b/Robust.Client/UserInterface/UserInterfaceManager.cs
@@ -75,7 +75,7 @@ namespace Robust.Client.UserInterface

                foreach (var root in _roots)
                {
-                    if (root.Stylesheet == null)
+                    if (root.Stylesheet != null)
                    {
                        root.StylesheetUpdateRecursive();
                    }
@@ -329,8 +329,8 @@ namespace Robust.Client.UserInterface
            }
        }

-        public void RenderControl(IRenderHandle renderHandle, ref int total, Control control, Vector2i position, Color modulate,
-            UIBox2i? scissorBox, Matrix3 coordinateTransform)
+        private void _render(IRenderHandle renderHandle, ref int total, Control control, Vector2i position, Color modulate,
+            UIBox2i? scissorBox)
        {
            if (!control.Visible)
            {
@@ -377,10 +377,7 @@ namespace Robust.Client.UserInterface
            total += 1;

            var handle = renderHandle.DrawingHandleScreen;
-            var oldXform = handle.GetTransform();
-            var xform = oldXform;
-            xform.Multiply(Matrix3.CreateTransform(position, Angle.Zero, Vector2.One));
-            handle.SetTransform(xform);
+            handle.SetTransform(position, Angle.Zero, Vector2.One);
            modulate *= control.Modulate;

            if (_rendering || control.AlwaysRender)
@@ -392,32 +389,16 @@ namespace Robust.Client.UserInterface
                handle.Modulate = oldMod;
                handle.UseShader(null);
            }
-            handle.SetTransform(oldXform);
-            var args = new Control.ControlRenderArguments()
-            {
-                Handle = renderHandle,
-                Total = ref total,
-                Modulate = modulate,
-                ScissorBox = scissorRegion,
-                CoordinateTransform = ref coordinateTransform
-            };
-
-            control.PreRenderChildren(ref args);

            foreach (var child in control.Children)
            {
-                var pos = position + (Vector2i) coordinateTransform.Transform(child.PixelPosition);
-                control.RenderChildOverride(ref args, child.GetPositionInParent(), pos);
+                _render(renderHandle, ref total, child, position + child.PixelPosition, modulate, scissorRegion);
            }

-            control.PostRenderChildren(ref args);
-
            if (clip)
            {
                renderHandle.SetScissor(scissorBox);
            }
-
-            handle.SetTransform(oldXform);
        }

        public Color GetMainClearColor() => RootControl.ActualBgColor;
--- a/Robust.Packaging/AssetProcessing/Passes/AssetPassPackRsis.cs
+++ b/Robust.Packaging/AssetProcessing/Passes/AssetPassPackRsis.cs
@@ -4,7 +4,6 @@ using Robust.Shared.Resources;
 using Robust.Shared.Utility;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Png;
-using SixLabors.ImageSharp.Formats.Png.Chunks;
 using SixLabors.ImageSharp.PixelFormats;

 namespace Robust.Packaging.AssetProcessing.Passes;
@@ -169,7 +168,7 @@ internal sealed class AssetPassPackRsis : AssetPass
        }

        var ms = new MemoryStream();
-        sheet.Metadata.GetPngMetadata().TextData.Add(new PngTextData("Description", metaJson, "", ""));
+        sheet.Metadata.GetPngMetadata().TextData.Add(new PngTextData("Description", metaJson, null, null));
        sheet.SaveAsPng(ms);

        sheet.Dispose();
--- a/Robust.Packaging/Robust.Packaging.csproj
+++ b/Robust.Packaging/Robust.Packaging.csproj
@@ -10,5 +10,9 @@
    <ProjectReference Include="..\Robust.Shared\Robust.Shared.csproj" />
  </ItemGroup>

+  <ItemGroup>
+    <PackageReference Include="NVorbis" Version="0.10.5" />
+  </ItemGroup>
+
  <Import Project="..\MSBuild\Robust.Properties.targets" />
 </Project>
--- a/Robust.Physics/Robust.Physics.csproj
+++ b/Robust.Physics/Robust.Physics.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\MSBuild\Robust.Engine.props" />
+  <PropertyGroup>
+
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefineConstants>TRACE;RELEASE</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\MSBuild\Robust.Properties.targets" />
+</Project>
--- a/Robust.Serialization.Generator/Robust.Serialization.Generator.csproj
+++ b/Robust.Serialization.Generator/Robust.Serialization.Generator.csproj
@@ -4,13 +4,12 @@
    <TargetFramework>netstandard2.0</TargetFramework>
    <LangVersion>11</LangVersion>
    <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.4.0" />
  </ItemGroup>

 </Project>
--- a/Robust.Server/Console/ServerConsoleHost.cs
+++ b/Robust.Server/Console/ServerConsoleHost.cs
@@ -259,9 +259,6 @@ namespace Robust.Server.Console
            }

            done:
-
-            result ??= CompletionResult.Empty;
-
            var msg = new MsgConCompletionResp
            {
                Result = result,
--- a/Robust.Server/DataMetrics/MetricsManager.MetricsServer.cs
+++ b/Robust.Server/DataMetrics/MetricsManager.MetricsServer.cs
@@ -19,15 +19,13 @@ internal sealed partial class MetricsManager
    {
        private readonly ISawmill _sawmill;
        private readonly HttpListener _listener;
-        private readonly CollectorRegistry _registry;

        public ManagedHttpListenerMetricsServer(ISawmill sawmill, string host, int port, string url = "metrics/",
-            CollectorRegistry? registry = null)
+            CollectorRegistry? registry = null) : base(registry)
        {
            _sawmill = sawmill;
            _listener = new HttpListener();
            _listener.Prefixes.Add($"http://{host}:{port}/{url}");
-            _registry = registry ?? Metrics.DefaultRegistry;
        }

        protected override Task StartServer(CancellationToken cancel)
--- a/Robust.Server/GameObjects/EntitySystems/MapSystem.cs
+++ b/Robust.Server/GameObjects/EntitySystems/MapSystem.cs
@@ -28,7 +28,7 @@ namespace Robust.Server.GameObjects
            base.Initialize();
            SubscribeLocalEvent<MapGridComponent, EmptyGridEvent>(HandleGridEmpty);

-            Subs.CVar(_cfg, CVars.GameDeleteEmptyGrids, SetGridDeletion, true);
+            _cfg.OnValueChanged(CVars.GameDeleteEmptyGrids, SetGridDeletion, true);
        }

        protected override void OnMapAdd(EntityUid uid, MapComponent component, ComponentAdd args)
@@ -64,6 +64,13 @@ namespace Robust.Server.GameObjects
            return !(grid.GetAllTiles().Any());
        }

+        public override void Shutdown()
+        {
+            base.Shutdown();
+
+            _cfg.UnsubValueChanged(CVars.GameDeleteEmptyGrids, SetGridDeletion);
+        }
+
        private void HandleGridEmpty(EntityUid uid, MapGridComponent component, EmptyGridEvent args)
        {
            if (!_deleteEmptyGrids || TerminatingOrDeleted(uid) || HasComp<MapComponent>(uid))
--- a/Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs
+++ b/Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs
@@ -20,8 +20,7 @@ namespace Robust.Server.GameObjects
        {
            base.Initialize();
            LoadMetricCVar();
-
-            Subs.CVar(_configurationManager, CVars.MetricsEnabled, _ => LoadMetricCVar());
+            _configurationManager.OnValueChanged(CVars.MetricsEnabled, _ => LoadMetricCVar());
        }

        private void LoadMetricCVar()
--- a/Robust.Server/GameStates/PvsSystem.Session.cs
+++ b/Robust.Server/GameStates/PvsSystem.Session.cs
@@ -193,6 +193,5 @@ internal sealed partial class PvsSystem

        session.PreviouslySent.Clear();
        session.LastSent = null;
-        session.Entities.Clear();
    }
 }
--- a/Robust.Server/GameStates/PvsSystem.cs
+++ b/Robust.Server/GameStates/PvsSystem.cs
@@ -126,12 +126,11 @@ internal sealed partial class PvsSystem : EntitySystem
        _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
        _transform.OnGlobalMoveEvent += OnEntityMove;

-        Subs.CVar(_configManager, CVars.NetPVS, SetPvs, true);
-        Subs.CVar(_configManager, CVars.NetMaxUpdateRange, OnViewsizeChanged, true);
-        Subs.CVar(_configManager, CVars.NetLowLodRange, OnLodChanged, true);
-        Subs.CVar(_configManager, CVars.NetForceAckThreshold, OnForceAckChanged, true);
-        Subs.CVar(_configManager, CVars.NetPvsAsync, OnAsyncChanged, true);
-        Subs.CVar(_configManager, CVars.NetPvsCompressLevel, ResetParallelism, true);
+        _configManager.OnValueChanged(CVars.NetPVS, SetPvs, true);
+        _configManager.OnValueChanged(CVars.NetMaxUpdateRange, OnViewsizeChanged, true);
+        _configManager.OnValueChanged(CVars.NetLowLodRange, OnLodChanged, true);
+        _configManager.OnValueChanged(CVars.NetForceAckThreshold, OnForceAckChanged, true);
+        _configManager.OnValueChanged(CVars.NetPvsAsync, OnAsyncChanged, true);

        _serverGameStateManager.ClientAck += OnClientAck;
        _serverGameStateManager.ClientRequestFull += OnClientRequestFull;
@@ -139,6 +138,7 @@ internal sealed partial class PvsSystem : EntitySystem
        InitializeDirty();

        _parallelMgr.ParallelCountChanged += ResetParallelism;
+        _configManager.OnValueChanged(CVars.NetPvsCompressLevel, ResetParallelism, true);
    }

    public override void Shutdown()
@@ -148,6 +148,10 @@ internal sealed partial class PvsSystem : EntitySystem
        _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
        _transform.OnGlobalMoveEvent -= OnEntityMove;

+        _configManager.UnsubValueChanged(CVars.NetPVS, SetPvs);
+        _configManager.UnsubValueChanged(CVars.NetMaxUpdateRange, OnViewsizeChanged);
+        _configManager.UnsubValueChanged(CVars.NetForceAckThreshold, OnForceAckChanged);
+        _configManager.UnsubValueChanged(CVars.NetPvsCompressLevel, ResetParallelism);
        _parallelMgr.ParallelCountChanged -= ResetParallelism;

        _serverGameStateManager.ClientAck -= OnClientAck;
--- a/Robust.Server/Log/LokiLogHandler.cs
+++ b/Robust.Server/Log/LokiLogHandler.cs
@@ -27,7 +27,7 @@ namespace Robust.Server.Log

            if (valid)
            {
-                message.AddOrUpdateProperty(sawmillProperty!);
+                message.AddOrUpdateProperty(sawmillProperty);
            }

            _sLogger.Write(message);
--- a/Robust.Server/Physics/GridFixtureSystem.Merging.cs
+++ b/Robust.Server/Physics/GridFixtureSystem.Merging.cs
@@ -1,138 +0,0 @@
-using System.Collections.Generic;
-using System.Numerics;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Maths;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Robust.Server.Physics;
-
-public sealed partial class GridFixtureSystem
-{
-    /*
-     * Something to keep in mind is that they rotate around the origin of a tile (e.g. 0,0), so a rotation of -90 degrees
-     * moves the origin to 0, -1.
-     */
-
-    /// <summary>
-    /// Merges GridB into GridA.
-    /// </summary>
-    /// <param name="offset">Origin of GridB relative to GridA</param>
-    /// <param name="rotation">Rotation to apply to GridB when being merged.
-    /// Note that the rotation is applied before the offset so the offset itself will be rotated.</param>
-    public void Merge(
-        EntityUid gridAUid,
-        EntityUid gridBUid,
-        Vector2i offset,
-        Angle rotation,
-        MapGridComponent? gridA = null,
-        MapGridComponent? gridB = null,
-        TransformComponent? xformA = null,
-        TransformComponent? xformB = null)
-    {
-        var matrix = Matrix3.CreateTransform(offset, rotation);
-        Merge(gridAUid, gridBUid, matrix, gridA, gridB, xformA, xformB);
-    }
-
-    /// <summary>
-    /// Merges GridB into GridA.
-    /// </summary>
-    /// <param name="offset">Origin of GridB relative to GridA</param>
-    /// <param name="matrix">Matrix to apply to gridB when being merged.
-    /// Note that rotation is applied first and then offset so the offset itself will be rotated.</param>
-    public void Merge(
-        EntityUid gridAUid,
-        EntityUid gridBUid,
-        Matrix3 matrix,
-        MapGridComponent? gridA = null,
-        MapGridComponent? gridB = null,
-        TransformComponent? xformA = null,
-        TransformComponent? xformB = null)
-    {
-        if (!Resolve(gridAUid, ref gridA, ref xformA))
-            return;
-
-        if (!Resolve(gridBUid, ref gridB, ref xformB))
-            return;
-
-        var sw = new Stopwatch();
-        var tiles = new List<(Vector2i Indices, Tile Tile)>();
-        var enumerator = _maps.GetAllTilesEnumerator(gridBUid, gridB);
-
-        while (enumerator.MoveNext(out var tileRef))
-        {
-            var offsetTile = matrix.Transform(new Vector2(tileRef.Value.GridIndices.X, tileRef.Value.GridIndices.Y) + gridA.TileSizeHalfVector);
-            tiles.Add((offsetTile.Floored(), tileRef.Value.Tile));
-        }
-
-        _maps.SetTiles(gridAUid, gridA, tiles);
-
-        enumerator = _maps.GetAllTilesEnumerator(gridBUid, gridB);
-        var rotationDiff = matrix.Rotation();
-
-        while (enumerator.MoveNext(out var tileRef))
-        {
-            var chunkOrigin = SharedMapSystem.GetChunkIndices(tileRef.Value.GridIndices, gridB.ChunkSize);
-
-            if (!_maps.TryGetChunk(gridBUid, gridB, chunkOrigin, out var chunk))
-            {
-                continue;
-            }
-
-            var chunkLocalTile = SharedMapSystem.GetChunkRelative(tileRef.Value.GridIndices, gridB.ChunkSize);
-            var snapgrid = chunk.GetSnapGrid((ushort) chunkLocalTile.X, (ushort) chunkLocalTile.Y);
-
-            if (snapgrid == null || snapgrid.Count == 0)
-                continue;
-
-            var offsetTile = matrix.Transform(new Vector2(tileRef.Value.GridIndices.X, tileRef.Value.GridIndices.Y) + gridA.TileSizeHalfVector);
-            var tileIndex = offsetTile.Floored();
-
-            for (var j = snapgrid.Count - 1; j >= 0; j--)
-            {
-                var ent = snapgrid[j];
-                var xform = _xformQuery.GetComponent(ent);
-                _xformSystem.ReAnchor(ent, xform,
-                    gridB, gridA,
-                    tileRef.Value.GridIndices, tileIndex,
-                    gridBUid, gridAUid,
-                    xformB, xformA,
-                    rotationDiff);
-
-                DebugTools.Assert(xform.ParentUid == gridAUid);
-            }
-
-            DebugTools.Assert(snapgrid.Count == 0);
-        }
-
-        enumerator = _maps.GetAllTilesEnumerator(gridBUid, gridB);
-
-        while (enumerator.MoveNext(out var tileRef))
-        {
-            var bounds = _lookup.GetLocalBounds(tileRef.Value.GridIndices, gridB.TileSize);
-
-            _entSet.Clear();
-            _lookup.GetLocalEntitiesIntersecting(gridBUid, bounds, _entSet, LookupFlags.All | ~LookupFlags.Contained | LookupFlags.Approximate);
-
-            foreach (var ent in _entSet)
-            {
-                // Consider centre of entity position maybe?
-                var entXform = _xformQuery.GetComponent(ent);
-
-                if (entXform.ParentUid != gridBUid ||
-                    !bounds.Contains(entXform.LocalPosition)) continue;
-
-                var newPos = matrix.Transform(entXform.LocalPosition);
-
-                _xformSystem.SetCoordinates(ent, entXform, new EntityCoordinates(gridAUid, newPos), entXform.LocalRotation + rotationDiff, oldParent: xformB, newParent: xformA);
-            }
-        }
-
-        DebugTools.Assert(xformB.ChildCount == 0);
-        Del(gridBUid);
-
-        Log.Debug($"Merged grids in {sw.Elapsed.TotalMilliseconds}ms");
-    }
-}
--- a/Robust.Server/Physics/GridFixtureSystem.cs
+++ b/Robust.Server/Physics/GridFixtureSystem.cs
@@ -23,16 +23,16 @@ namespace Robust.Server.Physics
    /// <summary>
    /// Handles generating fixtures for MapGrids.
    /// </summary>
-    public sealed partial class GridFixtureSystem : SharedGridFixtureSystem
+    public sealed class GridFixtureSystem : SharedGridFixtureSystem
    {
        [Dependency] private readonly IMapManager _mapManager = default!;
        [Dependency] private readonly IConfigurationManager _cfg = default!;
        [Dependency] private readonly IConGroupController _conGroup = default!;
        [Dependency] private readonly EntityLookupSystem _lookup = default!;
-        [Dependency] private readonly SharedMapSystem _maps = default!;
        [Dependency] private readonly SharedPhysicsSystem _physics = default!;
        [Dependency] private readonly SharedTransformSystem _xformSystem = default!;

+        private ISawmill _logger = default!;
        private readonly Dictionary<EntityUid, Dictionary<Vector2i, ChunkNodeGroup>> _nodes = new();

        /// <summary>
@@ -47,24 +47,15 @@ namespace Robust.Server.Physics

        internal bool SplitAllowed = true;

-        private HashSet<EntityUid> _entSet = new();
-
-        private EntityQuery<MapGridComponent> _gridQuery;
-        private EntityQuery<PhysicsComponent> _bodyQuery;
-        private EntityQuery<TransformComponent> _xformQuery;
-
        public override void Initialize()
        {
            base.Initialize();
-
-            _gridQuery = GetEntityQuery<MapGridComponent>();
-            _bodyQuery = GetEntityQuery<PhysicsComponent>();
-            _xformQuery = GetEntityQuery<TransformComponent>();
+            _logger = Logger.GetSawmill("gsplit");
            SubscribeLocalEvent<GridRemovalEvent>(OnGridRemoval);
            SubscribeNetworkEvent<RequestGridNodesMessage>(OnDebugRequest);
            SubscribeNetworkEvent<StopGridNodesMessage>(OnDebugStopRequest);

-            Subs.CVar(_cfg, CVars.GridSplitting, SetSplitAllowed, true);
+            _cfg.OnValueChanged(CVars.GridSplitting, SetSplitAllowed, true);
        }

        private void SetSplitAllowed(bool value) => SplitAllowed = value;
@@ -73,6 +64,7 @@ namespace Robust.Server.Physics
        {
            base.Shutdown();
            _subscribedSessions.Clear();
+            _cfg.UnsubValueChanged(CVars.GridSplitting, SetSplitAllowed);
        }

        /// <summary>
@@ -205,7 +197,7 @@ namespace Robust.Server.Physics
            }

            _isSplitting = true;
-            Log.Debug($"Started split check for {ToPrettyString(uid)}");
+            _logger.Debug($"Started split check for {ToPrettyString(uid)}");
            var splitFrontier = new Queue<ChunkSplitNode>(4);
            var grids = new List<HashSet<ChunkSplitNode>>(1);

@@ -242,7 +234,7 @@ namespace Robust.Server.Physics
            // Split time
            if (grids.Count > 1)
            {
-                Log.Info($"Splitting {ToPrettyString(uid)} into {grids.Count} grids.");
+                _logger.Info($"Splitting {ToPrettyString(uid)} into {grids.Count} grids.");
                var sw = new Stopwatch();
                sw.Start();

@@ -252,10 +244,13 @@ namespace Robust.Server.Physics
                    x.Sum(o => o.Indices.Count)
                        .CompareTo(y.Sum(o => o.Indices.Count)));

-                var oldGridXform = _xformQuery.GetComponent(oldGridUid);
-                var (gridPos, gridRot) = _xformSystem.GetWorldPositionRotation(oldGridXform);
-                var mapBody = _bodyQuery.GetComponent(oldGridUid);
-                var oldGridComp = _gridQuery.GetComponent(oldGridUid);
+                var xformQuery = GetEntityQuery<TransformComponent>();
+                var bodyQuery = GetEntityQuery<PhysicsComponent>();
+                var gridQuery = GetEntityQuery<MapGridComponent>();
+                var oldGridXform = xformQuery.GetComponent(oldGridUid);
+                var (gridPos, gridRot) = _xformSystem.GetWorldPositionRotation(oldGridXform, xformQuery);
+                var mapBody = bodyQuery.GetComponent(oldGridUid);
+                var oldGridComp = gridQuery.GetComponent(oldGridUid);
                var newGrids = new EntityUid[grids.Count - 1];
                var mapId = oldGridXform.MapID;

@@ -264,17 +259,17 @@ namespace Robust.Server.Physics
                    var group = grids[i];
                    var newGrid = _mapManager.CreateGridEntity(mapId);
                    var newGridUid = newGrid.Owner;
-                    var newGridXform = _xformQuery.GetComponent(newGridUid);
+                    var newGridXform = xformQuery.GetComponent(newGridUid);
                    newGrids[i] = newGridUid;

                    // Keep same origin / velocity etc; this makes updating a lot faster and easier.
                    _xformSystem.SetWorldPosition(newGridXform, gridPos);
-                    _xformSystem.SetWorldPositionRotation(newGridUid, gridPos, gridRot, newGridXform);
-                    var splitBody = _bodyQuery.GetComponent(newGridUid);
+                    _xformSystem.SetWorldPositionRotation(newGridXform, gridPos, gridRot);
+                    var splitBody = bodyQuery.GetComponent(newGridUid);
                    _physics.SetLinearVelocity(newGridUid, mapBody.LinearVelocity, body: splitBody);
                    _physics.SetAngularVelocity(newGridUid, mapBody.AngularVelocity, body: splitBody);

-                    var gridComp = _gridQuery.GetComponent(newGridUid);
+                    var gridComp = gridQuery.GetComponent(newGridUid);
                    var tileData = new List<(Vector2i GridIndices, Tile Tile)>(group.Sum(o => o.Indices.Count));

                    // Gather all tiles up front and set once to minimise fixture change events
@@ -289,7 +284,7 @@ namespace Robust.Server.Physics
                        }
                    }

-                    _maps.SetTiles(newGrid.Owner, newGrid.Comp, tileData);
+                    newGrid.Comp.SetTiles(tileData);
                    DebugTools.Assert(_mapManager.IsGrid(newGridUid), "A split grid had no tiles?");

                    // Set tiles on new grid + update anchored entities
@@ -308,13 +303,8 @@ namespace Robust.Server.Physics
                            for (var j = snapgrid.Count - 1; j >= 0; j--)
                            {
                                var ent = snapgrid[j];
-                                var xform = _xformQuery.GetComponent(ent);
-                                _xformSystem.ReAnchor(ent, xform,
-                                    oldGridComp, gridComp,
-                                    tilePos, tilePos,
-                                    oldGridUid, newGridUid,
-                                    oldGridXform, newGridXform,
-                                    Angle.Zero);
+                                var xform = xformQuery.GetComponent(ent);
+                                _xformSystem.ReAnchor(ent, xform, oldGridComp, gridComp, tilePos, oldGridUid, newGridUid, oldGridXform, newGridXform, xformQuery);
                                DebugTools.Assert(xform.Anchored);
                            }
                        }
@@ -327,18 +317,15 @@ namespace Robust.Server.Physics
                            var tilePos = offset + tile;
                            var bounds = _lookup.GetLocalBounds(tilePos, oldGrid.TileSize);

-                            _entSet.Clear();
-                            _lookup.GetLocalEntitiesIntersecting(oldGridUid, tilePos, _entSet, 0f, LookupFlags.All | ~LookupFlags.Uncontained | LookupFlags.Approximate);
-
-                            foreach (var ent in _entSet)
+                            foreach (var ent in _lookup.GetEntitiesIntersecting(oldGridUid, tilePos, 0f, LookupFlags.Dynamic | LookupFlags.Sundries))
                            {
                                // Consider centre of entity position maybe?
-                                var entXform = _xformQuery.GetComponent(ent);
+                                var entXform = xformQuery.GetComponent(ent);

                                if (entXform.ParentUid != oldGridUid ||
                                    !bounds.Contains(entXform.LocalPosition)) continue;

-                                _xformSystem.SetParent(ent, entXform, newGridUid, _xformQuery, newGridXform);
+                                _xformSystem.SetParent(ent, entXform, newGridUid, xformQuery, newGridXform);
                            }
                        }

@@ -378,10 +365,10 @@ namespace Robust.Server.Physics
                var ev = new GridSplitEvent(newGrids, oldGridUid);
                RaiseLocalEvent(uid, ref ev, true);

-                Log.Debug($"Split {grids.Count} grids in {sw.Elapsed}");
+                _logger.Debug($"Split {grids.Count} grids in {sw.Elapsed}");
            }

-            Log.Debug($"Stopped split check for {ToPrettyString(uid)}");
+            _logger.Debug($"Stopped split check for {ToPrettyString(uid)}");
            _isSplitting = false;
            SendNodeDebug(oldGridUid);
        }
--- a/Robust.Server/Physics/MergeGridsCommand.cs
+++ b/Robust.Server/Physics/MergeGridsCommand.cs
@@ -1,69 +0,0 @@
-using Robust.Shared.Console;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Maths;
-using Robust.Shared.Toolshed;
-
-namespace Robust.Server.Physics;
-
-public sealed class MergeGridsCommand : LocalizedCommands
-{
-    [Dependency] private readonly IEntityManager _entManager = default!;
-
-    public override string Command => "merge_grids";
-
-    public override void Execute(IConsoleShell shell, string argStr, string[] args)
-    {
-        if (args.Length < 4)
-        {
-            return;
-        }
-
-        if (!NetEntity.TryParse(args[0], out var gridANet) ||
-            !NetEntity.TryParse(args[1], out var gridBNet))
-        {
-            return;
-        }
-
-        var gridAUid = _entManager.GetEntity(gridANet);
-        var gridBUid = _entManager.GetEntity(gridBNet);
-
-        if (!_entManager.TryGetComponent<MapGridComponent>(gridAUid, out var gridA) ||
-            !_entManager.TryGetComponent<MapGridComponent>(gridBUid, out var gridB))
-        {
-            return;
-        }
-
-        if (!int.TryParse(args[2], out var x) ||
-            !int.TryParse(args[3], out var y))
-        {
-            return;
-        }
-
-        Angle rotation = Angle.Zero;
-
-        if (args.Length >= 5 && int.TryParse(args[4], out var rotationInt))
-        {
-            rotation = Angle.FromDegrees(rotationInt);
-        }
-
-        var offset = new Vector2i(x, y);
-        var fixtureSystem = _entManager.System<GridFixtureSystem>();
-        fixtureSystem.Merge(gridAUid, gridBUid, offset, rotation, gridA: gridA, gridB: gridB);
-    }
-
-    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
-    {
-        return args.Length switch
-        {
-            1 => CompletionResult.FromHintOptions(CompletionHelper.Components<MapGridComponent>(args[0], _entManager), Loc.GetString("cmd-merge_grids-hintA")),
-            2 => CompletionResult.FromHintOptions(CompletionHelper.Components<MapGridComponent>(args[1], _entManager), Loc.GetString("cmd-merge_grids-hintB")),
-            3 => CompletionResult.FromHint(Loc.GetString("cmd-merge_grids-xOffset")),
-            4 => CompletionResult.FromHint(Loc.GetString("cmd-merge_grids-yOffset")),
-            5 => CompletionResult.FromHint(Loc.GetString("cmd-merge_grids-angle")),
-            _ => CompletionResult.Empty
-        };
-    }
-}
--- a/Robust.Server/Program.cs
+++ b/Robust.Server/Program.cs
@@ -32,6 +32,8 @@ namespace Robust.Server
                throw new InvalidOperationException("Cannot start twice!");
            }

+            GlibcBug.Check();
+
            _hasStarted = true;

            if (!CommandLineArgs.TryParse(args, out var parsed))
--- a/Robust.Server/Robust.Server.csproj
+++ b/Robust.Server/Robust.Server.csproj
@@ -10,30 +10,27 @@
    <!-- Try to fix sporadic errors against Robust.Packaging, apparently?? -->
    <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
    <RobustILLink>true</RobustILLink>
-    <NoWarn>CA1416</NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="SpaceWizards.HttpListener" PrivateAssets="compile" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" />
-    <PackageReference Include="SQLitePCLRaw.provider.sqlite3" Condition="'$(UseSystemSqlite)' == 'True'" /> <!-- Cannot be private since Content.Server/Database/ServerDbManager.cs depends on SQLitePCL.raw -->
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Condition="'$(UseSystemSqlite)' != 'True'" PrivateAssets="compile" />
-    <PackageReference Include="prometheus-net" />
-    <PackageReference Include="Serilog.Sinks.Loki" PrivateAssets="compile" />
-    <PackageReference Include="Microsoft.Extensions.Primitives" />
-    <!-- Needed to pull-up the dependency from prometheus-net -->
-    <PackageReference Include="Microsoft.Extensions.Logging" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="prometheus-net.DotNetRuntime" />
-    <PackageReference Include="TerraFX.Interop.Windows" PrivateAssets="compile" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" PrivateAssets="compile" />
-    <PackageReference Include="SpaceWizards.Sodium" PrivateAssets="compile" />
-    <PackageReference Include="SharpZstd.Interop" PrivateAssets="compile" />
-    <PackageReference Condition="'$(FullRelease)' != 'True'" Include="JetBrains.Profiler.Api" />
-    <PackageReference Include="Microsoft.NET.ILLink.Tasks" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
+    <PackageReference Include="SpaceWizards.HttpListener" Version="0.1.0" PrivateAssets="compile" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.9" />
+    <PackageReference Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.4" Condition="'$(UseSystemSqlite)' == 'True'" /> <!-- Cannot be private since Content.Server/Database/ServerDbManager.cs depends on SQLitePCL.raw -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.4" Condition="'$(UseSystemSqlite)' != 'True'" PrivateAssets="compile" />
+    <PackageReference Include="prometheus-net" Version="4.1.1" />
+    <PackageReference Include="Serilog.Sinks.Loki" Version="4.0.0-beta3" PrivateAssets="compile" />
+    <PackageReference Include="Microsoft.Extensions.Primitives" Version="6.0.0" />
+    <PackageReference Include="prometheus-net.DotNetRuntime" Version="4.2.2" />
+    <PackageReference Include="TerraFX.Interop.Windows" Version="10.0.20348-rc2" PrivateAssets="compile" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="6.0.2" PrivateAssets="compile" />
+    <PackageReference Include="SpaceWizards.Sodium" Version="0.2.1" PrivateAssets="compile" />
+    <PackageReference Include="SharpZstd.Interop" Version="1.5.2-beta2" PrivateAssets="compile" />
+    <PackageReference Condition="'$(FullRelease)' != 'True'" Include="JetBrains.Profiler.Api" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="8.0.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Lidgren.Network\Lidgren.Network.csproj" />
+    <ProjectReference Include="..\Robust.Physics\Robust.Physics.csproj" />
    <ProjectReference Include="..\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
    <ProjectReference Include="..\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj" />
    <ProjectReference Include="..\Robust.Shared\Robust.Shared.csproj" />
--- a/Robust.Server/Scripting/ScriptHost.cs
+++ b/Robust.Server/Scripting/ScriptHost.cs
@@ -297,20 +297,25 @@ namespace Robust.Server.Scripting

            var results = await (CompletionService
                .GetService(document)?
-                .GetCompletionsAsync(document, message.Cursor) ?? Task.FromResult(CompletionList.Empty));
+                .GetCompletionsAsync(document, message.Cursor) ?? Task.FromResult<CompletionList?>(null));

-            var ires = ImmutableArray.CreateBuilder<LiteResult>();
-            foreach  (var r in results.ItemsList)
-                ires.Add(new LiteResult(
-                            displayText: r.DisplayText,
-                            displayTextPrefix: r.DisplayTextPrefix,
-                            displayTextSuffix: r.DisplayTextSuffix,
-                            inlineDescription: r.InlineDescription,
-                            tags: r.Tags,
-                            properties: r.Properties
-                ));
+            if (results is not null)
+            {
+                var ires = ImmutableArray.CreateBuilder<LiteResult>();
+                foreach  (var r in results.Items)
+                    ires.Add(new LiteResult(
+                                displayText: r.DisplayText,
+                                displayTextPrefix: r.DisplayTextPrefix,
+                                displayTextSuffix: r.DisplayTextSuffix,
+                                inlineDescription: r.InlineDescription,
+                                tags: r.Tags,
+                                properties: r.Properties
+                    ));

-            replyMessage.Results = ires.ToImmutable();
+                replyMessage.Results = ires.ToImmutable();
+            }
+            else
+                replyMessage.Results = ImmutableArray<LiteResult>.Empty;

            _netManager.ServerSendMessage(replyMessage, message.MsgChannel);
        }
--- a/Robust.Server/ServerStatus/StatusHost.Acz.cs
+++ b/Robust.Server/ServerStatus/StatusHost.Acz.cs
@@ -308,7 +308,7 @@ namespace Robust.Server.ServerStatus
        private static bool RequestWantsZStd(IStatusHandlerContext context)
        {
            // Yeah this isn't a good parser for Accept-Encoding but who cares.
-            return context.RequestHeaders.TryGetValue("Accept-Encoding", out var ac) && ac.Count > 0 && ac[0]?.Contains("zstd") == true;
+            return context.RequestHeaders.TryGetValue("Accept-Encoding", out var ac) && ac.Count > 0 && ac[0].Contains("zstd");
        }

        // Only call this if the download URL is not available!
--- a/Robust.Server/ViewVariables/ViewVariablesSession.cs
+++ b/Robust.Server/ViewVariables/ViewVariablesSession.cs
@@ -97,7 +97,7 @@ namespace Robust.Server.ViewVariables

            // Auto-dirty component. Only works when modifying a field that is directly on a component,
            // Does not work for nested objects.
-            if (Object is Component { NetSyncEnabled: true } comp)
+            if (Object is Component comp)
                EntityManager.Dirty(comp.Owner, comp);
        }

--- a/Robust.Shared.CompNetworkGenerator/Robust.Shared.CompNetworkGenerator.csproj
+++ b/Robust.Shared.CompNetworkGenerator/Robust.Shared.CompNetworkGenerator.csproj
@@ -3,11 +3,10 @@
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
    <LangVersion>9</LangVersion>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
  </ItemGroup>
 </Project>
--- a/Robust.Shared.Maths/Angle.cs
+++ b/Robust.Shared.Maths/Angle.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Numerics;
-using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
 using Robust.Shared.Utility;

@@ -259,24 +258,7 @@ namespace Robust.Shared.Maths
        /// <param name="degrees">The angle in degrees.</param>
        public static Angle FromDegrees(double degrees)
        {
-            // Avoid rounding issues with common use cases.
-            switch (degrees)
-            {
-                case -270:
-                    return new Angle(Math.PI * -1.5);
-                case 90:
-                    return new Angle(Math.PI / 2);
-                case -180:
-                    return new Angle(-Math.PI);
-                case 180:
-                    return new Angle(Math.PI);
-                case 270.0:
-                    return new Angle(Math.PI * 1.5);
-                case -90:
-                    return new Angle(Math.PI / -2);
-                default:
-                    return new(MathHelper.DegreesToRadians(degrees));
-            }
+            return new(MathHelper.DegreesToRadians(degrees));
        }

        /// <summary>
--- a/Robust.Shared.Maths/Box2.cs
+++ b/Robust.Shared.Maths/Box2.cs
@@ -75,15 +75,6 @@ namespace Robust.Shared.Maths
            get => new(Width, Height);
        }

-        /// <summary>
-        /// Returns the highest of width or height.
-        /// </summary>
-        public readonly float MaxDimension
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => MathF.Max(Height, Width);
-        }
-
        public readonly Vector2 Center
        {
            [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -186,13 +177,13 @@ namespace Robust.Shared.Maths
        [Pure]
        public readonly Box2 Intersect(in Box2 other)
        {
-            var ourLeftBottom = new Vector2(Left, Bottom);
-            var ourRightTop = new Vector2(Right, Top);
-            var otherLeftBottom = new Vector2(other.Left, other.Bottom);
-            var otherRightTop = new Vector2(other.Right, other.Top);
+            var ourLeftBottom = new System.Numerics.Vector2(Left, Bottom);
+            var ourRightTop = new System.Numerics.Vector2(Right, Top);
+            var otherLeftBottom = new System.Numerics.Vector2(other.Left, other.Bottom);
+            var otherRightTop = new System.Numerics.Vector2(other.Right, other.Top);

-            var max = Vector2.Max(ourLeftBottom, otherLeftBottom);
-            var min = Vector2.Min(ourRightTop, otherRightTop);
+            var max = System.Numerics.Vector2.Max(ourLeftBottom, otherLeftBottom);
+            var min = System.Numerics.Vector2.Min(ourRightTop, otherRightTop);

            if (max.X <= min.X && max.Y <= min.Y)
                return new Box2(max.X, max.Y, min.X, min.Y);
@@ -219,13 +210,13 @@ namespace Robust.Shared.Maths
        [Pure]
        public readonly Box2 Union(in Box2 other)
        {
-            var ourLeftBottom = new Vector2(Left, Bottom);
-            var otherLeftBottom = new Vector2(other.Left, other.Bottom);
-            var ourRightTop = new Vector2(Right, Top);
-            var otherRightTop = new Vector2(other.Right, other.Top);
+            var ourLeftBottom = new System.Numerics.Vector2(Left, Bottom);
+            var otherLeftBottom = new System.Numerics.Vector2(other.Left, other.Bottom);
+            var ourRightTop = new System.Numerics.Vector2(Right, Top);
+            var otherRightTop = new System.Numerics.Vector2(other.Right, other.Top);

-            var leftBottom = Vector2.Min(ourLeftBottom, otherLeftBottom);
-            var rightTop = Vector2.Max(ourRightTop, otherRightTop);
+            var leftBottom = System.Numerics.Vector2.Min(ourLeftBottom, otherLeftBottom);
+            var rightTop = System.Numerics.Vector2.Max(ourRightTop, otherRightTop);

            if (leftBottom.X <= rightTop.X && leftBottom.Y <= rightTop.Y)
                return new Box2(leftBottom.X, leftBottom.Y, rightTop.X, rightTop.Y);
@@ -405,11 +396,11 @@ namespace Robust.Shared.Maths
        [Pure]
        public static Box2 Union(in Vector2 a, in Vector2 b)
        {
-            var vecA = new Vector2(a.X, a.Y);
-            var vecB = new Vector2(b.X, b.Y);
+            var vecA = new System.Numerics.Vector2(a.X, a.Y);
+            var vecB = new System.Numerics.Vector2(b.X, b.Y);

-            var min = Vector2.Min(vecA, vecB);
-            var max = Vector2.Max(vecA, vecB);
+            var min = System.Numerics.Vector2.Min(vecA, vecB);
+            var max = System.Numerics.Vector2.Max(vecA, vecB);

            return new Box2(min.X, min.Y, max.X, max.Y);
        }
@@ -421,12 +412,12 @@ namespace Robust.Shared.Maths
        [Pure]
        public readonly Box2 ExtendToContain(Vector2 vec)
        {
-            var leftBottom = new Vector2(Left, Bottom);
-            var rightTop = new Vector2(Right, Top);
-            var vector = new Vector2(vec.X, vec.Y);
+            var leftBottom = new System.Numerics.Vector2(Left, Bottom);
+            var rightTop = new System.Numerics.Vector2(Right, Top);
+            var vector = new System.Numerics.Vector2(vec.X, vec.Y);

-            var min = Vector2.Min(vector, leftBottom);
-            var max = Vector2.Max(vector, rightTop);
+            var min = System.Numerics.Vector2.Min(vector, leftBottom);
+            var max = System.Numerics.Vector2.Max(vector, rightTop);

            return new Box2(min.X, min.Y, max.X, max.Y);
        }
--- a/Robust.Shared.Maths/Easings.cs
+++ b/Robust.Shared.Maths/Easings.cs
@@ -1,229 +1,13 @@
 using System;
-using JetBrains.Annotations;

 namespace Robust.Shared.Maths;

 // Reference: https://easings.net/

-/// <summary>
-///     A static class for computing easings for animations.
-///     The parameter "p" is the absolute progress of the animation between 0 and 1.
-/// </summary>
-[PublicAPI]
-public static class Easings
+internal static class Easings
 {
-    #region Trig
-
-    public static float InSine(float p)
-    {
-        return 1.0f - MathF.Cos(p * MathF.PI / 2.0f);
-    }
-
-    public static float OutSine(float p)
-    {
-        return MathF.Sin(p * MathF.PI / 2);
-    }
-
-    public static float InOutSine(float p)
-    {
-        return -(MathF.Cos(MathF.PI * p) - 1.0f) / 2.0f;
-    }
-
-    #endregion
-
-    #region Polynomial
-
-    public static float InQuad(float p)
-    {
-        return p * p;
-    }
-
-    public static float OutQuad(float p)
-    {
-        return 1 - (1 - p) * (1 - p);
-    }
-
-    public static float InOutQuad(float p)
-    {
-        return p < 0.5 ? 2 * p * p : 1 - MathF.Pow(-2 * p + 2, 2) / 2;
-    }
-
-    public static float InCubic(float p)
-    {
-        return p * p * p;
-    }
-
-    public static float OutCubic(float p)
-    {
-        return 1 - MathF.Pow(1 - p, 3);
-    }
-
-    public static float InOutCubic(float p)
-    {
-        return p < 0.5 ? 4 * p * p * p : 1 - MathF.Pow(-2 * p + 2, 3) / 2;
-    }
-
-    public static float InQuart(float p)
-    {
-        return p * p * p * p;
-    }
-
-    public static float OutQuart(float p)
-    {
-        return 1 - MathF.Pow(1 - p, 4);
-    }
-
-    public static float InOutQuart(float p)
-    {
-        return p < 0.5 ? 8 * p * p * p * p : 1 - MathF.Pow(-2 * p + 2, 4) / 2;
-    }
-
-    public static float InQuint(float p)
-    {
-        return p * p * p * p * p;
-    }
-
-    public static float OutQuint(float p)
-    {
-        return 1 - MathF.Pow(1 - p, 5);
-    }
-
    public static float InOutQuint(float p)
    {
-        return p < 0.5f ? 16 * p * p * p * p * p : 1 - MathF.Pow(-2 * p + 2, 5) / 2;
+        return p < 0.5f ? (16 * p * p * p * p * p) : 1 - MathF.Pow(-2 * p + 2, 5) / 2;
    }
-
-    #endregion
-
-    #region Other
-
-    public static float InExpo(float p)
-    {
-        return p == 0 ? 0 : MathF.Pow(2, 10 * p - 10);
-    }
-
-    public static float OutExpo(float p)
-    {
-        return Math.Abs(p - 1) < 0.0001f ? 1 : 1 - MathF.Pow(2, -10 * p);
-    }
-
-    public static float InOutExpo(float p)
-    {
-        return p == 0.0f
-            ? 0
-            : Math.Abs(p - 1) < 0.0001f
-                ? 1
-                : p < 0.5f
-                    ? MathF.Pow(2, 20 * p - 10) / 2
-                    : (2 - MathF.Pow(2, -20 * p + 10)) / 2;
-    }
-
-    public static float InCirc(float p)
-    {
-        return 1 - MathF.Sqrt(1 - MathF.Pow(p, 2));
-    }
-
-    public static float OutCirc(float p)
-    {
-        return MathF.Sqrt(1 - MathF.Pow(p - 1, 2));
-    }
-
-    public static float InOutCirc(float p)
-    {
-        return p < 0.5
-            ? (1 - MathF.Sqrt(1 - MathF.Pow(2 * p, 2))) / 2
-            : (MathF.Sqrt(1 - MathF.Pow(-2 * p + 2, 2)) + 1) / 2;
-    }
-
-    public static float InBack(float p)
-    {
-        var c1 = 1.70158f;
-        var c3 = c1 + 1;
-
-        return c3 * p * p * p - c1 * p * p;
-    }
-
-    public static float OutBack(float p)
-    {
-        const float c1 = 1.70158f;
-        const float c3 = c1 + 1;
-
-        return 1 + c3 * MathF.Pow(p - 1, 3) + c1 * MathF.Pow(p - 1, 2);
-    }
-
-    public static float InOutBack(float p)
-    {
-        const float c1 = 1.70158f;
-        const float c2 = c1 * 1.525f;
-
-        return p < 0.5
-            ? MathF.Pow(2 * p, 2) * ((c2 + 1) * 2 * p - c2) / 2
-            : (MathF.Pow(2 * p - 2, 2) * ((c2 + 1) * (p * 2 - 2) + c2) + 2) / 2;
-    }
-
-    /// <remarks>
-    ///     elastic in, not "inelastic"
-    /// </remarks>
-    public static float InElastic(float p)
-    {
-        const float c4 = 2 * MathF.PI / 3;
-
-        return p == 0
-            ? 0
-            : Math.Abs(p - 1) < 0.0001f
-                ? 1
-                : -MathF.Pow(2, 10 * p - 10) * MathF.Sin((p * 10 - 10.75f) * c4);
-    }
-
-    public static float OutElastic(float p)
-    {
-        const float c4 = 2.0f * MathF.PI / 3.0f;
-
-        return p == 0
-            ? 0
-            : Math.Abs(p - 1) < 0.0001f
-                ? 1
-                : MathF.Pow(2, -10 * p) * MathF.Sin((p * 10.0f - 0.75f) * c4) + 1.0f;
-    }
-
-    public static float InOutElastic(float p)
-    {
-        const float c5 = 2.0f * MathF.PI / 4.5f;
-
-        return p == 0
-            ? 0
-            : Math.Abs(p - 1) < 0.0001f
-                ? 1
-                : p < 0.5
-                    ? -(MathF.Pow(2, 20 * p - 10) * MathF.Sin((20.0f * p - 11.125f) * c5)) / 2.0f
-                    : MathF.Pow(2, -20.0f * p + 10.0f) * MathF.Sin((20.0f * p - 11.125f) * c5) / 2.0f + 1.0f;
-    }
-
-    public static float InBounce(float p)
-    {
-        return 1 - OutBounce(1 - p);
-    }
-
-    public static float OutBounce(float p)
-    {
-        const float n1 = 7.5625f;
-        const float d1 = 2.75f;
-
-        if (p < 1 / d1) return n1 * p * p;
-
-        if (p < 2 / d1) return n1 * (p -= 1.5f / d1) * p + 0.75f;
-
-        if (p < 2.5 / d1) return n1 * (p -= 2.25f / d1) * p + 0.9375f;
-
-        return n1 * (p -= 2.625f / d1) * p + 0.984375f;
-    }
-
-    public static float InOutBounce(float p)
-    {
-        return p < 0.5
-            ? (1 - OutBounce(1 - 2 * p)) / 2
-            : (1 + OutBounce(2 * p - 1)) / 2;
-    }
-
-    #endregion
 }
--- a/Robust.Shared.Maths/Robust.Shared.Maths.csproj
+++ b/Robust.Shared.Maths/Robust.Shared.Maths.csproj
@@ -6,7 +6,7 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
  </ItemGroup>

  <Import Project="..\MSBuild\Robust.Properties.targets" />
--- a/Robust.Shared.Maths/Vector2i.cs
+++ b/Robust.Shared.Maths/Vector2i.cs
@@ -109,11 +109,6 @@ namespace Robust.Shared.Maths
            }
        }

-        public Vector2i Rotate(Angle angle)
-        {
-            return (Vector2i) angle.RotateVec(this);
-        }
-
        public static Vector2i operator -(Vector2i a, Vector2i b)
        {
            return new(a.X - b.X, a.Y - b.Y);
--- a/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj
+++ b/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj
@@ -7,11 +7,11 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="ILReader.Core" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
+    <PackageReference Include="ILReader.Core" Version="1.0.0.4" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
  </ItemGroup>

  <ItemGroup>
--- a/Robust.Shared/Audio/Systems/SharedAudioSystem.cs
+++ b/Robust.Shared/Audio/Systems/SharedAudioSystem.cs
@@ -50,11 +50,17 @@ public abstract partial class SharedAudioSystem : EntitySystem
        base.Initialize();
        InitializeEffect();
        ZOffset = CfgManager.GetCVar(CVars.AudioZOffset);
-        Subs.CVar(CfgManager, CVars.AudioZOffset, SetZOffset);
+        CfgManager.OnValueChanged(CVars.AudioZOffset, SetZOffset);
        SubscribeLocalEvent<AudioComponent, ComponentGetStateAttemptEvent>(OnAudioGetStateAttempt);
        SubscribeLocalEvent<AudioComponent, EntityUnpausedEvent>(OnAudioUnpaused);
    }

+    public override void Shutdown()
+    {
+        base.Shutdown();
+        CfgManager.UnsubValueChanged(CVars.AudioZOffset, SetZOffset);
+    }
+
    protected void SetZOffset(float value)
    {
        ZOffset = value;
--- a/Robust.Shared/CVars.cs
+++ b/Robust.Shared/CVars.cs
@@ -1239,7 +1239,7 @@ namespace Robust.Shared
        /// Enable Discord rich presence integration.
        /// </summary>
        public static readonly CVarDef<bool> DiscordEnabled =
-            CVarDef.Create("discord.enabled", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+            CVarDef.Create("discord.enabled", true, CVar.CLIENTONLY);

        public static readonly CVarDef<string> DiscordRichPresenceMainIconId =
            CVarDef.Create("discord.rich_main_icon_id", "devstation", CVar.SERVER | CVar.REPLICATED);
@@ -1323,16 +1323,6 @@ namespace Robust.Shared
        public static readonly CVarDef<float> MidiVolume =
            CVarDef.Create("midi.volume", 0.50f, CVar.CLIENTONLY | CVar.ARCHIVE);

-        /// <summary>
-        /// Controls amount of CPU cores and (by extension) polyphony for Fluidsynth.
-        /// </summary>
-        /// <remarks>
-        /// You probably don't want to set this to be multithreaded, the way Fluidsynth's multithreading works is
-        /// probably worse-than-nothing for Robust's usage.
-        /// </remarks>
-        public static readonly CVarDef<int> MidiParallelism =
-            CVarDef.Create("midi.parallelism", 1, CVar.CLIENTONLY | CVar.ARCHIVE);
-
        /*
         * HUB
         * CVars related to public master server hub
@@ -1497,14 +1487,14 @@ namespace Robust.Shared
        /// <summary>
        /// Maximum compressed size of a replay recording (in kilobytes) before recording automatically stops.
        /// </summary>
-        public static readonly CVarDef<long> ReplayMaxCompressedSize = CVarDef.Create("replay.max_compressed_size",
-            1024L * 256, CVar.ARCHIVE);
+        public static readonly CVarDef<int> ReplayMaxCompressedSize = CVarDef.Create("replay.max_compressed_size",
+            1024 * 256, CVar.ARCHIVE);

        /// <summary>
        /// Maximum uncompressed size of a replay recording (in kilobytes) before recording automatically stops.
        /// </summary>
-        public static readonly CVarDef<long> ReplayMaxUncompressedSize = CVarDef.Create("replay.max_uncompressed_size",
-            1024L * 1024, CVar.ARCHIVE);
+        public static readonly CVarDef<int> ReplayMaxUncompressedSize = CVarDef.Create("replay.max_uncompressed_size",
+            1024 * 1024, CVar.ARCHIVE);

        /// <summary>
        /// Uncompressed size of individual files created by the replay (in kilobytes), where each file contains data
--- a/Robust.Shared/Configuration/ConfigurationManager.cs
+++ b/Robust.Shared/Configuration/ConfigurationManager.cs
@@ -113,46 +113,10 @@ namespace Robust.Shared.Configuration
        {
            var loaded = new HashSet<string>();

-            var callbackEvents = new ValueList<ValueChangedInvoke>();
-
-            // Ensure callbacks are raised OUTSIDE the write lock.
-            using (Lock.WriteGuard())
+            foreach (var (cvar, value) in ParseCVarValuesFromToml(stream))
            {
-                foreach (var (cVarName, value) in ParseCVarValuesFromToml(stream))
-                {
-                    if (!_configVars.TryGetValue(cVarName, out var cVar) || !cVar.Registered)
-                    {
-                        _sawmill.Error($"Trying to set unregistered variable '{cVarName}'");
-                        continue;
-                    }
-
-                    var convertedValue = value;
-                    if (!cVar.DefaultValue.GetType().IsEnum && cVar.DefaultValue.GetType() != value.GetType())
-                    {
-                        try
-                        {
-                            convertedValue = ConvertToCVarType(value, cVar.DefaultValue.GetType());
-                        }
-                        catch
-                        {
-                            _sawmill.Error($"Override TOML parsed cvar does not match registered cvar type. Name: {cVarName}. Code Type: {cVar.DefaultValue.GetType()}. Toml type: {value.GetType()}");
-                            continue;
-                        }
-                    }
-
-                    cVar.DefaultValue = value;
-
-                    if (cVar.OverrideValue == null && cVar.Value == null)
-                    {
-                        if (SetupInvokeValueChanged(cVar, convertedValue) is { } invoke)
-                            callbackEvents.Add(invoke);
-                    }
-                }
-            }
-
-            foreach (var callback in callbackEvents)
-            {
-                InvokeValueChanged(callback);
+                loaded.Add(cvar);
+                OverrideDefault(cvar, value);
            }

            return loaded;
@@ -339,7 +303,8 @@ namespace Robust.Shared.Configuration
                {
                    try
                    {
-                        cVar.Value = ConvertToCVarType(cVar.Value, type);
+                        // try convert thing like int to float.
+                        cVar.Value = Convert.ChangeType(cVar.Value, type);
                    }
                    catch
                    {
@@ -746,26 +711,6 @@ namespace Robust.Shared.Configuration
            }
        }

-        /// <summary>
-        /// Try to convert a compatible value to the actual registration type of a CVar.
-        /// </summary>
-        /// <remarks>
-        /// When CVars are parsed from TOML, their in-code type is not known.
-        /// This function does the necessary conversions from e.g. int to long.
-        /// </remarks>
-        /// <param name="value">
-        /// The value to convert.
-        /// This must be a simple type like strings or integers.
-        /// </param>
-        /// <param name="cVar">
-        /// The registration type of the CVar.
-        /// </param>
-        /// <returns></returns>
-        private static object ConvertToCVarType(object value, Type cVar)
-        {
-            return Convert.ChangeType(value, cVar);
-        }
-
        /// <summary>
        ///     Holds the data for a single configuration variable.
        /// </summary>
--- a/Robust.Shared/Console/Commands/TeleportCommands.cs
+++ b/Robust.Shared/Console/Commands/TeleportCommands.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
@@ -10,7 +9,6 @@ using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;

@@ -86,18 +84,11 @@ public sealed class TeleportToCommand : LocalizedCommands

        var target = args[0];

-        if (!TryGetTransformFromUidOrUsername(target, shell, out var targetUid, out _))
+        if (!TryGetTransformFromUidOrUsername(target, shell, out _, out var targetTransform))
            return;

        var transformSystem = _entities.System<SharedTransformSystem>();
-        var targetCoords = new EntityCoordinates(targetUid.Value, Vector2.Zero);
-
-        if (_entities.TryGetComponent(targetUid, out PhysicsComponent? targetPhysics))
-        {
-            targetCoords = targetCoords.Offset(targetPhysics.LocalCenter);
-        }
-
-        var victims = new List<(EntityUid Entity, TransformComponent Transform)>();
+        var targetCoords = targetTransform.Coordinates;

        if (args.Length == 1)
        {
@@ -109,7 +100,8 @@ public sealed class TeleportToCommand : LocalizedCommands
                return;
            }

-            victims.Add((ent.Value, playerTransform));
+            transformSystem.SetCoordinates(ent.Value, targetCoords);
+            playerTransform.AttachToGridOrMap();
        }
        else
        {
@@ -119,17 +111,12 @@ public sealed class TeleportToCommand : LocalizedCommands
                    continue;

                if (!TryGetTransformFromUidOrUsername(victim, shell, out var uid, out var victimTransform))
-                    continue;
+                    return;

-                victims.Add((uid.Value, victimTransform));
+                transformSystem.SetCoordinates(uid.Value, targetCoords);
+                victimTransform.AttachToGridOrMap();
            }
        }
-
-        foreach (var victim in victims)
-        {
-            transformSystem.SetCoordinates(victim.Entity, targetCoords);
-            transformSystem.AttachToGridOrMap(victim.Entity, victim.Transform);
-        }
    }

    private bool TryGetTransformFromUidOrUsername(
@@ -141,7 +128,8 @@ public sealed class TeleportToCommand : LocalizedCommands
        if (NetEntity.TryParse(str, out var uidNet)
            && _entities.TryGetEntity(uidNet, out var uid)
            && _entities.TryGetComponent(uid, out transform)
-            && !_entities.HasComponent<MapComponent>(uid))
+            && !_entities.HasComponent<MapComponent>(uid)
+            && !_entities.HasComponent<MapGridComponent>(uid))
        {
            victimUid = uid;
            return true;
--- a/Robust.Shared/Containers/SharedContainerSystem.cs
+++ b/Robust.Shared/Containers/SharedContainerSystem.cs
@@ -25,7 +25,6 @@ namespace Robust.Shared.Containers
        [Dependency] private readonly SharedTransformSystem _transform = default!;
        [Dependency] private readonly SharedJointSystem _joint = default!;

-        private EntityQuery<ContainerManagerComponent> _managerQuery;
        private EntityQuery<MapGridComponent> _gridQuery;
        private EntityQuery<MapComponent> _mapQuery;
        protected EntityQuery<MetaDataComponent> MetaQuery;
@@ -43,7 +42,6 @@ namespace Robust.Shared.Containers
            SubscribeLocalEvent<ContainerManagerComponent, ComponentGetState>(OnContainerGetState);
            SubscribeLocalEvent<ContainerManagerComponent, ComponentRemove>(OnContainerManagerRemove);

-            _managerQuery = GetEntityQuery<ContainerManagerComponent>();
            _gridQuery = GetEntityQuery<MapGridComponent>();
            _mapQuery = GetEntityQuery<MapComponent>();
            MetaQuery = GetEntityQuery<MetaDataComponent>();
@@ -439,7 +437,8 @@ namespace Robust.Shared.Containers
        /// </summary>
        public bool TryGetOuterContainer(EntityUid uid, TransformComponent xform, [NotNullWhen(true)] out BaseContainer? container)
        {
-            return TryGetOuterContainer(uid, xform, out container, TransformQuery);
+            var xformQuery = GetEntityQuery<TransformComponent>();
+            return TryGetOuterContainer(uid, xform, out container, xformQuery);
        }

        public bool TryGetOuterContainer(EntityUid uid, TransformComponent xform,
@@ -450,13 +449,15 @@ namespace Robust.Shared.Containers
            if (!uid.IsValid())
                return false;

+            var conQuery = GetEntityQuery<ContainerManagerComponent>();
+            var metaQuery = GetEntityQuery<MetaDataComponent>();
            var child = uid;
            var parent = xform.ParentUid;

            while (parent.IsValid())
            {
-                if (((MetaQuery.GetComponent(child).Flags & MetaDataFlags.InContainer) == MetaDataFlags.InContainer) &&
-                    _managerQuery.TryGetComponent(parent, out var conManager) &&
+                if (((metaQuery.GetComponent(child).Flags & MetaDataFlags.InContainer) == MetaDataFlags.InContainer) &&
+                    conQuery.TryGetComponent(parent, out var conManager) &&
                    TryGetContainingContainer(parent, child, out var parentContainer, conManager))
                {
                    container = parentContainer;
--- a/Robust.Shared/ContentPack/AssemblyTypeChecker.Parsing.cs
+++ b/Robust.Shared/ContentPack/AssemblyTypeChecker.Parsing.cs
@@ -32,7 +32,7 @@ namespace Robust.Shared.ContentPack
            String("short").ThenReturn(PrimitiveTypeCode.Int16);

        private static readonly Parser<char, PrimitiveTypeCode> UInt16TypeParser =
-            String("ushort").ThenReturn(PrimitiveTypeCode.UInt32);
+            String("ushort").ThenReturn(PrimitiveTypeCode.UInt16);

        private static readonly Parser<char, PrimitiveTypeCode> Int32TypeParser =
            String("int").ThenReturn(PrimitiveTypeCode.Int32);
--- a/Robust.Shared/ContentPack/AssemblyTypeChecker.cs
+++ b/Robust.Shared/ContentPack/AssemblyTypeChecker.cs
@@ -913,14 +913,9 @@ namespace Robust.Shared.ContentPack
                return null;
            }

-            public PEReader? ResolveAssembly(AssemblyName assemblyName)
+            public PEReader? Resolve(string simpleName)
            {
-                return _dictionary.GetOrAdd(assemblyName.Name!, ResolveCore);
-            }
-
-            public PEReader? ResolveModule(AssemblyName referencingAssembly, string fileName)
-            {
-                throw new NotSupportedException();
+                return _dictionary.GetOrAdd(simpleName, ResolveCore);
            }

            public void Dispose()
--- a/Robust.Shared/ContentPack/ModLoader.cs
+++ b/Robust.Shared/ContentPack/ModLoader.cs
@@ -325,23 +325,19 @@ namespace Robust.Shared.ContentPack
            {
                lock (_lock)
                {
-                    Sawmill.Verbose("ResolvingAssembly {0}", name);
+                    Sawmill.Debug("ResolvingAssembly {0}", name);

                    // Try main modules.
                    foreach (var mod in Mods)
                    {
                        if (mod.GameAssembly.FullName == name.FullName)
                        {
-                            Sawmill.Verbose($"Found assembly in modloader ALC: {mod.GameAssembly}");
                            return mod.GameAssembly;
                        }
                    }

                    if (TryLoadExtra(name) is { } asm)
-                    {
-                        Sawmill.Verbose($"Found assembly through extra loader: {asm}");
                        return asm;
-                    }

                    // Do not allow sideloading when sandboxing is enabled.
                    // Side loaded assemblies would not be checked for sandboxing currently, so we can't have that.
@@ -351,42 +347,18 @@ namespace Robust.Shared.ContentPack
                        {
                            if (assembly.FullName == name.FullName)
                            {
-                                Sawmill.Verbose($"Found assembly in existing side modules: {assembly}");
                                return assembly;
                            }
                        }

-                        // Try to resolve assemblies in the default AssemblyLoadContext.
-                        // If we don't do this manually, the sideloading code below could load assemblies from content,
-                        // even if Robust provides its own versions.
-                        // This can lead to:
-                        // * Multiple copies of the same assembly being loaded.
-                        // * Mismatching versions of dependencies being loaded.
-                        //   * e.g. Microsoft.Extensions.Primitives 6.0 with Microsoft.Extensions.DependencyInjection 7.0
-                        //
-                        // Now, to be clear, this is 100% an error in packaging. But it's also one that's really easy to make.
-                        //
-                        try
-                        {
-                            var defaultAssembly = AssemblyLoadContext.Default.LoadFromAssemblyName(new AssemblyName(name.Name!));
-                            Sawmill.Verbose($"Found assembly through default ALC (early): {defaultAssembly}");
-                            return defaultAssembly;
-                        }
-                        catch
-                        {
-                             // Assume assembly not loadable from Robust's directory, proceed with loading from content.
-                        }
-
                        if (_res.TryContentFileRead($"/Assemblies/{name.Name}.dll", out var dll))
                        {
                            var assembly = _loadContext.LoadFromStream(dll);
                            _sideModules.Add(assembly);
-                            Sawmill.Verbose($"Found assembly in NEW side module: {assembly}");
                            return assembly;
                        }
                    }

-                    Sawmill.Verbose("Did not find assembly directly. Should fall back to default ALC.");
                    return null;
                }
            }
@@ -409,7 +381,7 @@ namespace Robust.Shared.ContentPack
            // Otherwise it would load the assemblies a second time which is an amazing way to have everything break.
            if (_useLoadContext)
            {
-                Sawmill.Verbose($"RESOLVING DEFAULT: {name}");
+                Sawmill.Debug($"RESOLVING DEFAULT: {name}");
                foreach (var module in LoadedModules)
                {
                    if (module.GetName().Name == name.Name)
--- a/Robust.Shared/ContentPack/Sandbox.yml
+++ b/Robust.Shared/ContentPack/Sandbox.yml
@@ -73,9 +73,6 @@ WhitelistedNamespaces:
 # * The API is not *relevant* to content. e.g. System.Type.IsAnsiClass.
 # * I am lazy these API lists are huge dude.
 Types:
-  Avalonia.Metadata:
-    XmlnsDefinitionAttribute:
-      All: True
  NetSerializer:
    NetListAsArray`1:
      Fields:
@@ -84,12 +81,146 @@ Types:
      - "bool get_HasContents()"
  Lidgren.Network:
    NetBuffer:
-      All: True
+      Methods:
+      - "byte[] get_Data()"
+      - "void set_Data(byte[])"
+      - "int get_LengthBytes()"
+      - "void set_LengthBytes(int)"
+      - "int get_LengthBits()"
+      - "void set_LengthBits(int)"
+      - "long get_Position()"
+      - "void set_Position(long)"
+      - "int get_PositionInBytes()"
+      - "byte[] PeekDataBuffer()"
+      - "bool PeekBoolean()"
+      - "byte PeekByte()"
+      - "sbyte PeekSByte()"
+      - "byte PeekByte(int)"
+      - "System.Span`1<byte> PeekBytes(System.Span`1<byte>)"
+      - "byte[] PeekBytes(int)"
+      - "void PeekBytes(byte[], int, int)"
+      - "short PeekInt16()"
+      - "ushort PeekUInt16()"
+      - "int PeekInt32()"
+      - "int PeekInt32(int)"
+      - "uint PeekUInt32()"
+      - "uint PeekUInt32(int)"
+      - "ulong PeekUInt64()"
+      - "long PeekInt64()"
+      - "ulong PeekUInt64(int)"
+      - "long PeekInt64(int)"
+      - "float PeekFloat()"
+      - "System.Half PeekHalf()"
+      - "float PeekSingle()"
+      - "double PeekDouble()"
+      - "string PeekString()"
+      - "int PeekStringSize()"
+      - "bool ReadBoolean()"
+      - "byte ReadByte()"
+      - "bool ReadByte(ref byte)"
+      - "sbyte ReadSByte()"
+      - "byte ReadByte(int)"
+      - "System.Span`1<byte> ReadBytes(System.Span`1<byte>)"
+      - "byte[] ReadBytes(int)"
+      - "bool ReadBytes(int, ref byte[])"
+      - "bool TryReadBytes(System.Span`1<byte>)"
+      - "void ReadBytes(byte[], int, int)"
+      - "void ReadBits(System.Span`1<byte>, int)"
+      - "void ReadBits(byte[], int, int)"
+      - "short ReadInt16()"
+      - "ushort ReadUInt16()"
+      - "int ReadInt32()"
+      - "bool ReadInt32(ref int)"
+      - "int ReadInt32(int)"
+      - "uint ReadUInt32()"
+      - "bool ReadUInt32(ref uint)"
+      - "uint ReadUInt32(int)"
+      - "ulong ReadUInt64()"
+      - "long ReadInt64()"
+      - "ulong ReadUInt64(int)"
+      - "long ReadInt64(int)"
+      - "float ReadFloat()"
+      - "System.Half ReadHalf()"
+      - "float ReadSingle()"
+      - "bool ReadSingle(ref float)"
+      - "double ReadDouble()"
+      - "uint ReadVariableUInt32()"
+      - "bool ReadVariableUInt32(ref uint)"
+      - "int ReadVariableInt32()"
+      - "long ReadVariableInt64()"
+      - "ulong ReadVariableUInt64()"
+      - "float ReadSignedSingle(int)"
+      - "float ReadUnitSingle(int)"
+      - "float ReadRangedSingle(float, float, int)"
+      - "int ReadRangedInteger(int, int)"
+      - "long ReadRangedInteger(long, long)"
+      - "string ReadString()"
+      - "bool ReadString(ref string)"
+      - "double ReadTime(Lidgren.Network.NetConnection, bool)"
+      - "System.Net.IPEndPoint ReadIPEndPoint()"
+      - "void SkipPadBits()"
+      - "void ReadPadBits()"
+      - "void SkipPadBits(int)"
+      - "void EnsureBufferSize(int)"
+      - "void Write(bool)"
+      - "void Write(byte)"
+      - "void WriteAt(int, byte)"
+      - "void Write(sbyte)"
+      - "void Write(byte, int)"
+      - "void Write(byte[])"
+      - "void Write(System.ReadOnlySpan`1<byte>)"
+      - "void Write(byte[], int, int)"
+      - "void Write(ushort)"
+      - "void WriteAt(int, ushort)"
+      - "void Write(ushort, int)"
+      - "void Write(short)"
+      - "void WriteAt(int, short)"
+      - "void Write(int)"
+      - "void WriteAt(int, int)"
+      - "void Write(uint)"
+      - "void WriteAt(int, uint)"
+      - "void Write(uint, int)"
+      - "void Write(int, int)"
+      - "void Write(ulong)"
+      - "void WriteAt(int, ulong)"
+      - "void Write(ulong, int)"
+      - "void Write(long)"
+      - "void Write(long, int)"
+      - "void Write(System.Half)"
+      - "void Write(float)"
+      - "void Write(double)"
+      - "int WriteVariableUInt32(uint)"
+      - "int WriteVariableInt32(int)"
+      - "int WriteVariableInt64(long)"
+      - "int WriteVariableUInt64(ulong)"
+      - "void WriteSignedSingle(float, int)"
+      - "void WriteUnitSingle(float, int)"
+      - "void WriteRangedSingle(float, float, float, int)"
+      - "int WriteRangedInteger(int, int, int)"
+      - "int WriteRangedInteger(long, long, long)"
+      - "void Write(string)"
+      - "void Write(System.Net.IPEndPoint)"
+      - "void WriteTime(bool)"
+      - "void WriteTime(double, bool)"
+      - "void WritePadBits()"
+      - "void WritePadBits(int)"
+      - "void Write(Lidgren.Network.NetBuffer)"
+      - "void Zero(int)"
+      - "void .ctor()"
    NetDeliveryMethod: { }
    NetIncomingMessage:
-      All: True
+      Methods:
+      - "Lidgren.Network.NetIncomingMessageType get_MessageType()"
+      - "Lidgren.Network.NetDeliveryMethod get_DeliveryMethod()"
+      - "int get_SequenceChannel()"
+      - "System.Net.IPEndPoint get_SenderEndPoint()"
+      - "Lidgren.Network.NetConnection get_SenderConnection()"
+      - "double get_ReceiveTime()"
+      - "double ReadTime(bool)"
+      - "string ToString()"
    NetOutgoingMessage:
-      All: True
+      Methods:
+      - "string ToString()"
  Nett:
    CommentLocation: { } # Enum
    Toml:
@@ -629,7 +760,6 @@ Types:
      - "System.Text.Encoding get_UTF7()"
      - "System.Text.Encoding get_UTF8()"
      - "System.Text.Encoding get_UTF32()"
-      - "System.Text.Encoding GetEncoding(string)"
    NormalizationForm: { } # Enum
    Rune: { All: True }
    StringBuilder:
@@ -720,9 +850,6 @@ Types:
        ChunkEnumerator: { All: True }
        AppendInterpolatedStringHandler: { All: True }
    StringRuneEnumerator: { All: True }
-  System.Text.Unicode:
-    UnicodeRange: { All: True }
-    UnicodeRanges: { All: True }
  System.Threading.Tasks:
    Task: { All: True }
    Task`1: { All: True }
@@ -1415,7 +1542,4 @@ Types:
      # should be fine to do All: True, but this has some methods to read filestreams. So just in case this ever adds an extension method that directly opens a file:
      Methods:
      - "!!0 ParseOrThrow<>(Pidgin.Parser`2<char, !!0>, string, System.Func`3<char, Pidgin.SourcePos, Pidgin.SourcePos>)"
-      - "!!0 ParseOrThrow<>(Pidgin.Parser`2<char, !!0>, string, Pidgin.Configuration.IConfiguration`1<char>)"
    SourcePos: { }
-  Pidgin.Configuration:
-    IConfiguration`1: { All: True }
--- a/Robust.Shared/ContentPack/WritableDirProvider.cs
+++ b/Robust.Shared/ContentPack/WritableDirProvider.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Threading;
 using Robust.Shared.Utility;

 namespace Robust.Shared.ContentPack
@@ -135,11 +136,37 @@ namespace Robust.Shared.ContentPack
                path = path.Directory;

            var fullPath = GetFullPath(path);
-            Process.Start(new ProcessStartInfo
+            if (OperatingSystem.IsWindows())
            {
-                UseShellExecute = true,
-                FileName = fullPath,
-            });
+                Process.Start(new ProcessStartInfo
+                {
+                    FileName = "explorer.exe",
+                    Arguments = ".",
+                    WorkingDirectory = fullPath,
+                });
+            }
+            else if (OperatingSystem.IsMacOS())
+            {
+                Process.Start(new ProcessStartInfo
+                {
+                    FileName = "open",
+                    Arguments = ".",
+                    WorkingDirectory = fullPath,
+                });
+            }
+            else if (OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD())
+            {
+                Process.Start(new ProcessStartInfo
+                {
+                    FileName = "xdg-open",
+                    Arguments = ".",
+                    WorkingDirectory = fullPath,
+                });
+            }
+            else
+            {
+                throw new NotSupportedException("Opening OS windows not supported on this OS");
+            }
        }

        #endregion
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pieter-Jan Briers	10a4dbb676	Version: 203.0.2	2024-08-11 18:01:33 +02:00
Pieter-Jan Briers	d66b15e84f	Security updates (#5353 ) * Fix security bug in WritableDirProvider.OpenOsWindow() Reported by @NarryG and @nyeogmi * Sandbox updates * Update ImageSharp again (cherry picked from commit `7d778248ee`) (cherry picked from commit f66cda74e95619ddba2221bda644bf4394619805) (cherry picked from commit db8ba83866c523e08e4fba0b80cd954f4f190613) (cherry picked from commit 5ea7aa07c26a499a2fb9930a09ef8d13f85494c0)	2024-08-11 18:01:33 +02:00
Pieter-Jan Briers	c199d34731	Version: 203.0.1	2024-03-10 20:51:23 +01:00
Pieter-Jan Briers	de7466621d	Backport `859f150404` (cherry picked from commit `24d5c26fa6`) (cherry picked from commit 2ddfced846dc7d5eea0dcc2ca0617153eb46adc6)	2024-03-10 20:51:23 +01:00