Version: 214.2.2

(cherry picked from commit 025d90d281)
(cherry picked from commit 799702b814)
(cherry picked from commit 4600ee8e5788891f1b610e2d5141fb4e1228d323)

.editorconfig

@@ -7,18 +7,6 @@ indent_size = 4
 trim_trailing_whitespace = true
 charset = utf-8
 
-max_line_length = 120
-
-# ReSharper properties
-resharper_csharp_max_line_length = 120
-resharper_csharp_wrap_after_declaration_lpar = true
-resharper_csharp_wrap_arguments_style = chop_if_long
-resharper_csharp_wrap_parameters_style = chop_if_long
-resharper_keep_existing_attribute_arrangement = true
-resharper_place_field_attribute_on_same_line = if_owner_is_single_line
-resharper_wrap_chained_binary_patterns = chop_if_long
-resharper_wrap_chained_method_calls = chop_if_long
-
 [*.{csproj,xml,yml,dll.config,targets,props}]
 indent_size = 2
 

.github/workflows/build-test.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest ] # , macos-latest] - temporarily disabled due to libfreetype.dll errors.
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     runs-on: ${{ matrix.os }}
 
@@ -27,8 +27,7 @@ jobs:
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore /p:WarningsAsErrors=nullable
-    - name: Robust.UnitTesting
+    - name: Test Engine
       run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
-    - name: Robust.Analyzers.Tests
-      run: dotnet test --no-build Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj -- NUnit.ConsoleOut=0
+
 

Directory.Packages.props

@@ -15,11 +15,10 @@
     <PackageVersion Include="ILReader.Core" Version="1.0.0.4" />
     <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
     <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.0" />
-    <PackageVersion Include="Linguini.Bundle" Version="0.8.1" />
+    <PackageVersion Include="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.CodeFix.Testing.NUnit" Version="1.1.1" />
+    <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" />
@@ -44,7 +43,7 @@
     <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="8.0.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" />
@@ -57,8 +56,8 @@
     <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.5" />
-    <PackageVersion Include="SpaceWizards.HttpListener" Version="0.1.1" />
-    <PackageVersion Include="SpaceWizards.NFluidsynth" Version="0.2.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" />

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 -->
 

Resources/EnginePrototypes/Audio/audio_entities.yml

@@ -2,7 +2,4 @@
   id: Audio
   name: Audio
   description: Audio entity used by engine
-  save: false
-  components:
-    - type: Transform
-      gridTraversal: false
+  save: false

Resources/EnginePrototypes/Debug/rotation.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: debugRotation
   abstract: true
-  categories: [ Debug ]
+  categories: [ debug ]
   components:
   - type: Sprite
     netsync: false

Resources/EnginePrototypes/entityCategory.yml

@@ -1,26 +1,17 @@
 # debug related entities
 - type: entityCategory
-  id: Debug
+  id: debug
   name: entity-category-name-debug
   description: entity-category-desc-debug
-  suffix: entity-category-suffix-debug
 
 # entities that spawn other entities
 - type: entityCategory
-  id: Spawner
+  id: spawner
   name: entity-category-name-spawner
   description: entity-category-desc-spawner
 
-# simple category that just exists to hide prototypes in spawn menus
+# entities that should be hidden from the spawn menu
 - type: entityCategory
-  id: HideSpawnMenu
+  id: hideSpawnMenu
   name: entity-category-name-hide
   description: entity-category-desc-hide
-  hideSpawnMenu: true
-  inheritable: false
-
-# Entity prototypes added by the fork. With CVar you can hide all entities without this category
-- type: entityCategory
-  id: ForkFiltered
-  name: entity-category-name-fork
-  description: entity-category-desc-fork

Resources/Locale/en-US/_engine_lib.ftl

@@ -20,15 +20,6 @@ zzzz-object-pronoun = { GENDER($ent) ->
    *[neuter] it
    }
 
-# Used internally by the DAT-OBJ() function.
-# Not used in en-US. Created for supporting other languages.
-zzzz-dat-object = { GENDER($ent) ->
-    [male] him
-    [female] her
-    [epicene] them
-   *[neuter] it
-   }
-
 # Used internally by the POSS-PRONOUN() function.
 zzzz-possessive-pronoun = { GENDER($ent) ->
     [male] his

Resources/Locale/en-US/commands.ftl

@@ -9,10 +9,8 @@ cmd-parse-failure-float = {$arg} is not a valid float.
 cmd-parse-failure-bool = {$arg} is not a valid bool.
 cmd-parse-failure-uid = {$arg} is not a valid entity UID.
 cmd-parse-failure-mapid = {$arg} is not a valid MapId.
-cmd-parse-failure-enum = {$arg} is not a {$enum} Enum.
 cmd-parse-failure-grid = {$arg} is not a valid grid.
 cmd-parse-failure-entity-exist = UID {$arg} does not correspond to an existing entity.
-cmd-parse-failure-session = There is no session with username: {$username}
 
 cmd-error-file-not-found = Could not find file: {$file}.
 cmd-error-dir-not-found = Could not find directory: {$dir}.
@@ -44,13 +42,6 @@ cmd-cvar-compl-list = List available CVars
 cmd-cvar-arg-name = <name | ?>
 cmd-cvar-value-hidden = <value hidden>
 
-## 'cvar_subs' command
-cmd-cvar_subs-desc = Lists the OnValueChanged subscriptions for a CVar.
-cmd-cvar_subs-help = Usage: cvar_subs <name>
-
-cmd-cvar_subs-invalid-args = Must provide exactly one argument.
-cmd-cvar_subs-arg-name = <name>
-
 ## 'list' command
 cmd-list-desc = Lists available commands, with optional search filter
 cmd-list-help = Usage: list [filter]
@@ -253,6 +244,9 @@ cmd-bind-arg-command = <InputCommand>
 cmd-net-draw-interp-desc = Toggles the debug drawing of the network interpolation.
 cmd-net-draw-interp-help = Usage: net_draw_interp
 
+cmd-net-draw-interp-desc = Toggles the debug drawing of the network interpolation.
+cmd-net-draw-interp-help = Usage: net_draw_interp
+
 cmd-net-watch-ent-desc = Dumps all network updates for an EntityId to the console.
 cmd-net-watch-ent-help = Usage: net_watchent <0|EntityUid>
 
@@ -304,9 +298,16 @@ cmd-savegrid-help = savegrid <gridID> <Path>
 cmd-testbed-desc = Loads a physics testbed on the specified map.
 cmd-testbed-help = testbed <mapid> <test>
 
+cmd-saveconfig-desc = Saves the client configuration to the config file.
+cmd-saveconfig-help = saveconfig
+
 ## 'flushcookies' command
 # Note: the flushcookies command is from Robust.Client.WebView, it's not in the main engine code.
 
+cmd-flushcookies-desc = Flush CEF cookie storage to disk
+cmd-flushcookies-help = This ensure cookies are properly saved to disk in the event of unclean shutdowns.
+    Note that the actual operation is asynchronous.
+
 ## 'addcomp' command
 cmd-addcomp-desc = Adds a component to an entity.
 cmd-addcomp-help = addcomp <uid> <componentName>
@@ -382,9 +383,9 @@ cmd-tp-desc = Teleports a player to any location in the round.
 cmd-tp-help = tp <x> <y> [<mapID>]
 
 cmd-tpto-desc = Teleports the current player or the specified players/entities to the location of the first player/entity.
-cmd-tpto-help = tpto <username|uid> [username|NetEntity]...
-cmd-tpto-destination-hint = destination (NetEntity or username)
-cmd-tpto-victim-hint = entity to teleport (NetEntity or username)
+cmd-tpto-help = tpto <username|uid> [username|uid]...
+cmd-tpto-destination-hint = destination (uid or username)
+cmd-tpto-victim-hint = entity to teleport (uid or username)
 cmd-tpto-parse-error = Cant resolve entity or player: {$str}
 
 cmd-listplayers-desc = Lists all players currently connected.
@@ -444,6 +445,9 @@ cmd-showanchored-help = Usage: showanchored
 cmd-dmetamem-desc = Dumps a type's members in a format suitable for the sandbox configuration file.
 cmd-dmetamem-help = Usage: dmetamem <type>
 
+cmd-dmetamem-desc = Displays chunk bounds for the purposes of rendering.
+cmd-dmetamem-help = Usage: showchunkbb <type>
+
 cmd-launchauth-desc = Load authentication tokens from launcher data to aid in testing of live servers.
 cmd-launchauth-help = Usage: launchauth <account name>
 
@@ -510,6 +514,9 @@ cmd-profsnap-help = Usage: profsnap
 cmd-devwindow-desc = Dev Window
 cmd-devwindow-help = Usage: devwindow
 
+cmd-devwindow-desc = Open file
+cmd-devwindow-help = Usage: testopenfile
+
 cmd-scene-desc = Immediately changes the UI scene/state.
 cmd-scene-help = Usage: scene <className>
 
@@ -520,11 +527,14 @@ cmd-hwid-desc = Returns the current HWID (HardWare ID).
 cmd-hwid-help = Usage: hwid
 
 cmd-vvread-desc = Retrieve a path's value using VV (View Variables).
-cmd-vvread-help = Usage: vvread <path>
+cmd-vvread-desc = Usage: vvread <path>
 
 cmd-vvwrite-desc = Modify a path's value using VV (View Variables).
 cmd-vvwrite-help = Usage: vvwrite <path>
 
+cmd-vv-desc = Opens View Variables (VV).
+cmd-vv-help = Usage: vv <path|entity ID|guihover>
+
 cmd-vvinvoke-desc = Invoke/Call a path with arguments using VV.
 cmd-vvinvoke-help = Usage: vvinvoke <path> [arguments...]
 

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

@@ -4,16 +4,9 @@ entity-spawn-window-title = Entity Spawn Panel
 entity-spawn-window-search-bar-placeholder = search
 entity-spawn-window-clear-button = Clear
 entity-spawn-window-replace-button-text = Replace
+entity-spawn-window-erase-button-text = Erase Mode
 entity-spawn-window-override-menu-tooltip = Override placement
 
-## TileSpawnWindow
-
-tile-spawn-window-title = Place Tiles
-
 ## Console
 
 console-line-edit-placeholder = Command Here
-
-## Common Used
-
-window-erase-button-text = Erase Mode

Resources/Locale/en-US/entity-category.ftl

@@ -1,12 +1,8 @@
 entity-category-name-debug = Debug
 entity-category-desc-debug = Entity prototypes intended for debugging & testing.
-entity-category-suffix-debug = Debug
 
 entity-category-name-spawner = Spawner
 entity-category-desc-spawner = Entity prototypes that spawn other entities.
 
 entity-category-name-hide = Hidden
-entity-category-desc-hide = Entity prototypes that should be hidden from entity spawn menus
-
-entity-category-name-fork = Fork Filtered
-entity-category-desc-fork = Entity prototypes added by the fork. With CVar you can hide all entities without this category
+entity-category-desc-hide = Entity prototypes that should be hidden from the spawn menu

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

@@ -219,9 +219,9 @@ command-description-MulVecCommand =
 command-description-DivVecCommand =
     Divides every element in the input by a scalar (single value).
 command-description-rng-to =
-    Returns a number between the input (inclusive) and the argument (exclusive).
+    Returns a number from its input to its argument (i.e. n..m inclusive)
 command-description-rng-from =
-    Returns a number between the argument (inclusive) and the input (exclusive))
+    Returns a number to its input from its argument (i.e. m..n inclusive)
 command-description-rng-prob =
     Returns a boolean based on the input probability/chance (from 0 to 1)
 command-description-sum =

Resources/Locale/en-US/userinterface.ftl

@@ -1,2 +0,0 @@
-popup-copy-button = Copy
-popup-title = Alert!

Resources/Locale/en-US/view-variables.ftl

@@ -10,18 +10,3 @@ view-variable-instance-entity-client-components-search-bar-placeholder = Search
 view-variable-instance-entity-server-components-search-bar-placeholder = Search
 view-variable-instance-entity-add-window-server-components = Add Component [S]
 view-variable-instance-entity-add-window-client-components = Add Component [C]
-
-
-## SoundSpecifier
-vv-sound-none = None
-vv-sound-path = Path
-vv-sound-collection = Collection
-
-vv-sound-volume = volume
-vv-sound-pitch = Pitch
-vv-sound-max-distance = Max Distance
-vv-sound-rolloff-factor = Rolloff Factor
-vv-sound-reference-distance = Reference Distance
-vv-sound-loop = Loop
-vv-sound-play-offset = Play Offset (s)
-vv-sound-variation = Pitch variation

Robust.Analyzers.Tests/AccessAnalyzer_Test.cs

@@ -20,16 +20,11 @@ public sealed class AccessAnalyzer_Test
         {
             TestState =
             {
+                AdditionalReferences = { typeof(AccessAnalyzer).Assembly },
                 Sources = { code }
             },
         };
 
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.AccessAttribute.cs",
-            "Robust.Shared.Analyzers.AccessPermissions.cs"
-        );
-
         // ExpectedDiagnostics cannot be set, so we need to AddRange here...
         test.TestState.ExpectedDiagnostics.AddRange(expected);
 

Robust.Analyzers.Tests/DataDefinitionAnalyzerTest.cs

@@ -1,91 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.DataDefinitionAnalyzer>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class DataDefinitionAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<DataDefinitionAnalyzer, NUnitVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using System;
-            using Robust.Shared.ViewVariables;
-            using Robust.Shared.Serialization.Manager.Attributes;
-
-            namespace Robust.Shared.ViewVariables
-            {
-                public sealed class ViewVariablesAttribute : Attribute
-                {
-                    public readonly VVAccess Access = VVAccess.ReadOnly;
-
-                    public ViewVariablesAttribute() { }
-
-                    public ViewVariablesAttribute(VVAccess access)
-                    {
-                        Access = access;
-                    }
-                }
-                public enum VVAccess : byte
-                {
-                    ReadOnly = 0,
-                    ReadWrite = 1,
-                }
-            }
-
-            namespace Robust.Shared.Serialization.Manager.Attributes
-            {
-                public class DataFieldBaseAttribute : Attribute;
-                public class DataFieldAttribute : DataFieldBaseAttribute;
-                public sealed class DataDefinitionAttribute : Attribute;
-            }
-
-            [DataDefinition]
-            public sealed partial class Foo
-            {
-                [DataField, ViewVariables(VVAccess.ReadWrite)]
-                public int Bad;
-
-                [DataField]
-                public int Good;
-
-                [DataField, ViewVariables]
-                public int Good2;
-
-                [DataField, ViewVariables(VVAccess.ReadOnly)]
-                public int Good3;
-
-                [ViewVariables]
-                public int Good4;
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(35,17): info RA0028: Data field Bad in data definition Foo has ViewVariables attribute with ReadWrite access, which is redundant
-            VerifyCS.Diagnostic(DataDefinitionAnalyzer.DataFieldNoVVReadWriteRule).WithSpan(35, 17, 35, 50).WithArguments("Bad", "Foo")
-        );
-    }
-}

Robust.Analyzers.Tests/DependencyAssignAnalyzerTest.cs

@@ -1,58 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.DependencyAssignAnalyzer>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class DependencyAssignAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<DependencyAssignAnalyzer, NUnitVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.IoC.DependencyAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.IoC;
-
-            public sealed class Foo
-            {
-                [Dependency]
-                private object? Field;
-
-                public Foo()
-                {
-                    Field = "A";
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(10,9): warning RA0025: Tried to assign to [Dependency] field 'Field'. Remove [Dependency] or inject it via field injection instead.
-            VerifyCS.Diagnostic().WithSpan(10, 9, 10, 20).WithArguments("Field"));
-    }
-}

Robust.Analyzers.Tests/DuplicateDependencyAnalyzerTest.cs

@@ -1,63 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.DuplicateDependencyAnalyzer>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-[TestOf(typeof(DuplicateDependencyAnalyzer))]
-public sealed class DuplicateDependencyAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<DuplicateDependencyAnalyzer, NUnitVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.IoC.DependencyAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.IoC;
-
-            public sealed class Foo
-            {
-                [Dependency]
-                private object? Field;
-
-                [Dependency]
-                private object? Field2;
-
-                [Dependency]
-                private string? DifferentField;
-
-                private string? NonDependency1;
-                private string? NonDependency2;
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(9,21): warning RA0032: Another [Dependency] field of type 'object?' already exists in this type as field 'Field'
-            VerifyCS.Diagnostic().WithSpan(9, 21, 9, 27).WithArguments("object?", "Field"));
-    }
-}

Robust.Analyzers.Tests/MustCallBaseAnalyzerTest.cs

@@ -1,92 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.MustCallBaseAnalyzer>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class MustCallBaseAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<MustCallBaseAnalyzer, NUnitVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.IoC.MustCallBaseAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class Foo
-            {
-                [MustCallBase]
-                public virtual void Function()
-                {
-
-                }
-
-                [MustCallBase(true)]
-                public virtual void Function2()
-                {
-
-                }
-            }
-
-            public class Bar : Foo
-            {
-                public override void Function()
-                {
-
-                }
-
-                public override void Function2()
-                {
-
-                }
-            }
-
-            public class Baz : Foo
-            {
-                public override void Function()
-                {
-                    base.Function();
-                }
-            }
-
-            public class Bal : Bar
-            {
-                public override void Function2()
-                {
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(20,26): warning RA0028: Overriders of this function must always call the base function
-            VerifyCS.Diagnostic().WithSpan(20, 26, 20, 34),
-            // /0/Test0.cs(41,26): warning RA0028: Overriders of this function must always call the base function
-            VerifyCS.Diagnostic().WithSpan(41, 26, 41, 35));
-    }
-}

Robust.Analyzers.Tests/NoUncachedRegexAnalyzerTest.cs

@@ -1,57 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.NoUncachedRegexAnalyzer>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class NoUncachedRegexAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<NoUncachedRegexAnalyzer, NUnitVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code }
-            },
-        };
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using System.Text.RegularExpressions;
-
-            public static class Foo
-            {
-                public static void Bad()
-                {
-                    Regex.Replace("foo", "bar", "baz");
-                }
-
-                public static void Good()
-                {
-                    var r = new Regex("bar");
-                    r.Replace("foo", "baz");
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(7,9): warning RA0026: Usage of a static Regex function that takes in a pattern string. This can cause constant re-parsing of the pattern.
-            VerifyCS.Diagnostic().WithSpan(7, 9, 7, 43)
-        );
-    }
-}

Robust.Analyzers.Tests/PreferNonGenericVariantForTest.cs

@@ -1,71 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.PreferNonGenericVariantForAnalyzer>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class PreferNonGenericVariantForTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<PreferNonGenericVariantForAnalyzer, NUnitVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.PreferNonGenericVariantForAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class Bar { };
-            public class Baz { };
-            public class Okay { };
-
-            public static class Foo
-            {
-                [PreferNonGenericVariantFor(typeof(Bar), typeof(Baz))]
-                public static void DoFoo<T>() { }
-            }
-
-            public class Test
-            {
-                public void DoBad()
-                {
-                    Foo.DoFoo<Bar>();
-                }
-
-                public void DoGood()
-                {
-                    Foo.DoFoo<Okay>();
-                }
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(17,9): warning RA0029: Use the non-generic variant of this method for type Bar
-            VerifyCS.Diagnostic().WithSpan(17, 9, 17, 25).WithArguments("Bar")
-        );
-    }
-}

Robust.Analyzers.Tests/PreferOtherTypeAnalyzerTest.cs

@@ -1,62 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.PreferOtherTypeAnalyzer>;
-
-namespace Robust.Analyzers.Tests;
-
-[Parallelizable(ParallelScope.All | ParallelScope.Fixtures)]
-[TestFixture]
-public sealed class PreferOtherTypeAnalyzerTest
-{
-    private static Task Verifier(string code, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpAnalyzerTest<PreferOtherTypeAnalyzer, NUnitVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs"
-        );
-
-        // ExpectedDiagnostics cannot be set, so we need to AddRange here...
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class EntityPrototype { };
-            public class EntProtoId { };
-            public class ReagentPrototype { };
-
-            [PreferOtherType(typeof(EntityPrototype), typeof(EntProtoId))]
-            public class ProtoId<T> { };
-
-            public class Test
-            {
-                public ProtoId<EntityPrototype> Bad = new();
-
-                public ProtoId<ReagentPrototype> Good = new();
-            }
-            """;
-
-        await Verifier(code,
-            // /0/Test0.cs(12,12): warning RA0031: Use the specific type EntProtoId instead of ProtoId when the type argument is EntityPrototype
-            VerifyCS.Diagnostic().WithSpan(12, 12, 12, 48).WithArguments("EntProtoId", "ProtoId", "EntityPrototype")
-        );
-    }
-}

Robust.Analyzers.Tests/PreferOtherTypeFixerTest.cs

@@ -1,81 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using NUnit.Framework;
-using VerifyCS =
-    Microsoft.CodeAnalysis.CSharp.Testing.NUnit.AnalyzerVerifier<Robust.Analyzers.PreferOtherTypeAnalyzer>;
-
-namespace Robust.Analyzers.Tests;
-
-public sealed class PreferOtherTypeFixerTest
-{
-    private static Task Verifier(string code, string fixedCode, params DiagnosticResult[] expected)
-    {
-        var test = new CSharpCodeFixTest<PreferOtherTypeAnalyzer, PreferOtherTypeFixer, NUnitVerifier>()
-        {
-            TestState =
-            {
-                Sources = { code },
-            },
-            FixedState =
-            {
-                Sources = { fixedCode },
-            }
-        };
-
-        TestHelper.AddEmbeddedSources(
-            test.TestState,
-            "Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs"
-        );
-
-        TestHelper.AddEmbeddedSources(
-            test.FixedState,
-            "Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs"
-        );
-
-        test.TestState.ExpectedDiagnostics.AddRange(expected);
-
-        return test.RunAsync();
-    }
-
-    [Test]
-    public async Task Test()
-    {
-        const string code = """
-            using Robust.Shared.Analyzers;
-
-            public class EntityPrototype { };
-            public class EntProtoId { };
-            public class ReagentPrototype { };
-
-            [PreferOtherType(typeof(EntityPrototype), typeof(EntProtoId))]
-            public class ProtoId<T> { };
-
-            public class Test
-            {
-                public ProtoId<EntityPrototype> Foo = new();
-            }
-            """;
-
-        const string fixedCode = """
-            using Robust.Shared.Analyzers;
-
-            public class EntityPrototype { };
-            public class EntProtoId { };
-            public class ReagentPrototype { };
-
-            [PreferOtherType(typeof(EntityPrototype), typeof(EntProtoId))]
-            public class ProtoId<T> { };
-
-            public class Test
-            {
-                public EntProtoId Foo = new();
-            }
-            """;
-
-        await Verifier(code, fixedCode,
-        // /0/Test0.cs(12,12): error RA0031: Use the specific type EntProtoId instead of ProtoId when the type argument is EntityPrototype
-        VerifyCS.Diagnostic().WithSpan(12, 12, 12, 48).WithArguments("EntProtoId", "ProtoId", "EntityPrototype"));
-    }
-}

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

@@ -6,16 +6,6 @@
   <Import Project="..\MSBuild\Robust.Properties.targets"/>
   <Import Project="..\MSBuild\Robust.Engine.props"/>
 
-  <!-- Engine source files needed to make the tests work -->
-  <ItemGroup>
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" LogicalName="Robust.Shared.Analyzers.AccessAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" LogicalName="Robust.Shared.Analyzers.AccessPermissions.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\MustCallBaseAttribute.cs" LogicalName="Robust.Shared.IoC.MustCallBaseAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\PreferNonGenericVariantForAttribute.cs" LogicalName="Robust.Shared.Analyzers.PreferNonGenericVariantForAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\Analyzers\PreferOtherTypeAttribute.cs" LogicalName="Robust.Shared.Analyzers.PreferOtherTypeAttribute.cs" LinkBase="Implementations" />
-    <EmbeddedResource Include="..\Robust.Shared\IoC\DependencyAttribute.cs" LogicalName="Robust.Shared.IoC.DependencyAttribute.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
   <PropertyGroup>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -28,7 +18,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing"/>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit"/>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit"/>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"/>
     <PackageReference Include="NUnit"/>
     <PackageReference Include="NUnit3TestAdapter"/>

Robust.Analyzers.Tests/TestHelper.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Robust.Analyzers.Tests;
-
-public static class TestHelper
-{
-    public static void AddEmbeddedSources(SolutionState state, params string[] embeddedFiles)
-    {
-        AddEmbeddedSources(state, (IEnumerable<string>) embeddedFiles);
-    }
-
-    public static void AddEmbeddedSources(SolutionState state, IEnumerable<string> embeddedFiles)
-    {
-        foreach (var fileName in embeddedFiles)
-        {
-            using var stream = typeof(AccessAnalyzer_Test).Assembly.GetManifestResourceStream(fileName)!;
-            state.Sources.Add((fileName, SourceText.From(stream)));
-        }
-    }
-}

Robust.Analyzers/DataDefinitionAnalyzer.cs

@@ -6,8 +6,6 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Robust.Roslyn.Shared;
-using Robust.Shared.Serialization.Manager.Definition;
-using Robust.Shared.ViewVariables;
 
 namespace Robust.Analyzers;
 
@@ -17,9 +15,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
     private const string DataDefinitionNamespace = "Robust.Shared.Serialization.Manager.Attributes.DataDefinitionAttribute";
     private const string ImplicitDataDefinitionNamespace = "Robust.Shared.Serialization.Manager.Attributes.ImplicitDataDefinitionForInheritorsAttribute";
     private const string DataFieldBaseNamespace = "Robust.Shared.Serialization.Manager.Attributes.DataFieldBaseAttribute";
-    private const string ViewVariablesNamespace = "Robust.Shared.ViewVariables.ViewVariablesAttribute";
-    private const string DataFieldAttributeName = "DataField";
-    private const string ViewVariablesAttributeName = "ViewVariables";
 
     private static readonly DiagnosticDescriptor DataDefinitionPartialRule = new(
         Diagnostics.IdDataDefinitionPartial,
@@ -61,29 +56,8 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         "Make sure to add a setter."
     );
 
-    private static readonly DiagnosticDescriptor DataFieldRedundantTagRule = new(
-        Diagnostics.IdDataFieldRedundantTag,
-        "Data field has redundant tag specified",
-        "Data field {0} in data definition {1} has an explicitly set tag that matches autogenerated tag",
-        "Usage",
-        DiagnosticSeverity.Info,
-        true,
-        "Make sure to remove the tag string from the data field attribute."
-    );
-
-    public static readonly DiagnosticDescriptor DataFieldNoVVReadWriteRule = new(
-        Diagnostics.IdDataFieldNoVVReadWrite,
-        "Data field has VV ReadWrite",
-        "Data field {0} in data definition {1} has ViewVariables attribute with ReadWrite access, which is redundant",
-        "Usage",
-        DiagnosticSeverity.Info,
-        true,
-        "Make sure to remove the ViewVariables attribute."
-    );
-
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
-        DataDefinitionPartialRule, NestedDataDefinitionPartialRule, DataFieldWritableRule, DataFieldPropertyWritableRule,
-        DataFieldRedundantTagRule, DataFieldNoVVReadWriteRule
+        DataDefinitionPartialRule, NestedDataDefinitionPartialRule, DataFieldWritableRule, DataFieldPropertyWritableRule
     );
 
     public override void Initialize(AnalysisContext context)
@@ -151,18 +125,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
             {
                 context.ReportDiagnostic(Diagnostic.Create(DataFieldWritableRule, context.Node.GetLocation(), fieldSymbol.Name, type.Name));
             }
-
-            if (HasRedundantTag(fieldSymbol))
-            {
-                TryGetAttributeLocation(field, DataFieldAttributeName, out var location);
-                context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, location, fieldSymbol.Name, type.Name));
-            }
-
-            if (HasVVReadWrite(fieldSymbol))
-            {
-                TryGetAttributeLocation(field, ViewVariablesAttributeName, out var location);
-                context.ReportDiagnostic(Diagnostic.Create(DataFieldNoVVReadWriteRule, location, fieldSymbol.Name, type.Name));
-            }
         }
     }
 
@@ -187,18 +149,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         {
             context.ReportDiagnostic(Diagnostic.Create(DataFieldPropertyWritableRule, context.Node.GetLocation(), propertySymbol.Name, type.Name));
         }
-
-        if (HasRedundantTag(propertySymbol))
-        {
-            TryGetAttributeLocation(property, DataFieldAttributeName, out var location);
-            context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, location, propertySymbol.Name, type.Name));
-        }
-
-        if (HasVVReadWrite(propertySymbol))
-        {
-            TryGetAttributeLocation(property, ViewVariablesAttributeName, out var location);
-            context.ReportDiagnostic(Diagnostic.Create(DataFieldNoVVReadWriteRule, location, propertySymbol.Name, type.Name));
-        }
     }
 
     private static bool IsReadOnlyDataField(ITypeSymbol type, ISymbol field)
@@ -267,24 +217,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         return false;
     }
 
-    private static bool TryGetAttributeLocation(MemberDeclarationSyntax syntax, string attributeName, out Location location)
-    {
-        foreach (var attributeList in syntax.AttributeLists)
-        {
-            foreach (var attribute in attributeList.Attributes)
-            {
-                if (attribute.Name.ToString() != attributeName)
-                    continue;
-
-                location = attribute.GetLocation();
-                return true;
-            }
-        }
-        // Default to the declaration syntax's location
-        location = syntax.GetLocation();
-        return false;
-    }
-
     private static bool IsReadOnlyMember(ITypeSymbol type, ISymbol member)
     {
         if (member is IFieldSymbol field)
@@ -316,57 +248,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         return false;
     }
 
-    private static bool HasRedundantTag(ISymbol symbol)
-    {
-        if (!IsDataField(symbol, out var _, out var attribute))
-            return false;
-
-        // No args, no problem
-        if (attribute.ConstructorArguments.Length == 0)
-            return false;
-
-        // If a tag is explicitly specified, it will be the first argument...
-        var tagArgument = attribute.ConstructorArguments[0];
-        // ...but the first arg could also something else, since tag is optional
-        // so we make sure that it's a string
-        if (tagArgument.Value is not string explicitName)
-            return false;
-
-        // Get the name that sourcegen would provide
-        var automaticName = DataDefinitionUtility.AutoGenerateTag(symbol.Name);
-
-        // If the explicit name matches the sourcegen name, we have a redundancy
-        return explicitName == automaticName;
-    }
-
-    private static bool HasVVReadWrite(ISymbol symbol)
-    {
-        if (!IsDataField(symbol, out _, out _))
-            return false;
-
-        // Make sure it has ViewVariablesAttribute
-        AttributeData? viewVariablesAttribute = null;
-        foreach (var attr in symbol.GetAttributes())
-        {
-            if (attr.AttributeClass?.ToDisplayString() == ViewVariablesNamespace)
-            {
-                viewVariablesAttribute = attr;
-            }
-        }
-        if (viewVariablesAttribute == null)
-            return false;
-
-        // Default is ReadOnly, which is fine
-        if (viewVariablesAttribute.ConstructorArguments.Length == 0)
-            return false;
-
-        var accessArgument = viewVariablesAttribute.ConstructorArguments[0];
-        if (accessArgument.Value is not byte accessByte)
-            return false;
-
-        return (VVAccess)accessByte == VVAccess.ReadWrite;
-    }
-
     private static bool IsImplicitDataDefinition(ITypeSymbol type)
     {
         if (HasAttribute(type, ImplicitDataDefinitionNamespace))

Robust.Analyzers/DataDefinitionFixer.cs

@@ -1,5 +1,8 @@
 #nullable enable
 using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
@@ -13,13 +16,8 @@ namespace Robust.Analyzers;
 [ExportCodeFixProvider(LanguageNames.CSharp)]
 public sealed class DefinitionFixer : CodeFixProvider
 {
-    private const string DataFieldAttributeName = "DataField";
-
-    private const string ViewVariablesAttributeName = "ViewVariables";
-
     public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(
-        IdDataDefinitionPartial, IdNestedDataDefinitionPartial, IdDataFieldWritable, IdDataFieldPropertyWritable,
-        IdDataFieldRedundantTag, IdDataFieldNoVVReadWrite
+        IdDataDefinitionPartial, IdNestedDataDefinitionPartial, IdDataFieldWritable, IdDataFieldPropertyWritable
     );
 
     public override Task RegisterCodeFixesAsync(CodeFixContext context)
@@ -36,10 +34,6 @@ public sealed class DefinitionFixer : CodeFixProvider
                     return RegisterDataFieldFix(context, diagnostic);
                 case IdDataFieldPropertyWritable:
                     return RegisterDataFieldPropertyFix(context, diagnostic);
-                case IdDataFieldRedundantTag:
-                    return RegisterRedundantTagFix(context, diagnostic);
-                case IdDataFieldNoVVReadWrite:
-                    return RegisterVVReadWriteFix(context, diagnostic);
             }
         }
 
@@ -78,110 +72,6 @@ public sealed class DefinitionFixer : CodeFixProvider
         return document.WithSyntaxRoot(root);
     }
 
-    private static async Task RegisterRedundantTagFix(CodeFixContext context, Diagnostic diagnostic)
-    {
-        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
-        var span = diagnostic.Location.SourceSpan;
-        var token = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<MemberDeclarationSyntax>().First();
-
-        if (token == null)
-            return;
-
-        // Find the DataField attribute
-        AttributeSyntax? dataFieldAttribute = null;
-        foreach (var attributeList in token.AttributeLists)
-        {
-            foreach (var attribute in attributeList.Attributes)
-            {
-                if (attribute.Name.ToString() == DataFieldAttributeName)
-                {
-                    dataFieldAttribute = attribute;
-                    break;
-                }
-            }
-            if (dataFieldAttribute != null)
-                break;
-        }
-
-        if (dataFieldAttribute == null)
-            return;
-
-        context.RegisterCodeFix(CodeAction.Create(
-            "Remove explicitly set tag",
-            c => RemoveRedundantTag(context.Document, dataFieldAttribute, c),
-            "Remove explicitly set tag"
-        ), diagnostic);
-    }
-
-    private static async Task<Document> RemoveRedundantTag(Document document, AttributeSyntax syntax, CancellationToken cancellation)
-    {
-        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
-
-        if (syntax.ArgumentList == null)
-            return document;
-
-        AttributeSyntax? newSyntax;
-        if (syntax.ArgumentList.Arguments.Count == 1)
-        {
-            // If this is the only argument, delete the ArgumentList so we don't leave empty parentheses
-            newSyntax = syntax.RemoveNode(syntax.ArgumentList, SyntaxRemoveOptions.KeepNoTrivia);
-        }
-        else
-        {
-            // Remove the first argument, which is the tag
-            var newArgs = syntax.ArgumentList.Arguments.RemoveAt(0);
-            var newArgList = syntax.ArgumentList.WithArguments(newArgs);
-            // Construct a new attribute with the tag removed
-            newSyntax = syntax.WithArgumentList(newArgList);
-        }
-
-        root = root!.ReplaceNode(syntax, newSyntax!);
-
-        return document.WithSyntaxRoot(root);
-    }
-
-    private static async Task RegisterVVReadWriteFix(CodeFixContext context, Diagnostic diagnostic)
-    {
-        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
-        var span = diagnostic.Location.SourceSpan;
-        var token = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<MemberDeclarationSyntax>().First();
-
-        if (token == null)
-            return;
-
-        context.RegisterCodeFix(CodeAction.Create(
-            "Remove ViewVariables attribute",
-            c => RemoveVVAttribute(context.Document, token, c),
-            "Remove ViewVariables attribute"
-        ), diagnostic);
-    }
-
-    private static async Task<Document> RemoveVVAttribute(Document document, MemberDeclarationSyntax syntax, CancellationToken cancellation)
-    {
-        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
-
-        var newLists = new SyntaxList<AttributeListSyntax>();
-        foreach (var attributeList in syntax.AttributeLists)
-        {
-            var attributes = new SeparatedSyntaxList<AttributeSyntax>();
-            foreach (var attribute in attributeList.Attributes)
-            {
-                if (attribute.Name.ToString() != ViewVariablesAttributeName)
-                {
-                    attributes = attributes.Add(attribute);
-                }
-            }
-            // Don't add empty lists []
-            if (attributes.Count > 0)
-                newLists = newLists.Add(attributeList.WithAttributes(attributes));
-        }
-        var newSyntax = syntax.WithAttributeLists(newLists);
-
-        root = root!.ReplaceNode(syntax, newSyntax);
-
-        return document.WithSyntaxRoot(root);
-    }
-
     private static async Task RegisterDataFieldFix(CodeFixContext context, Diagnostic diagnostic)
     {
         var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);

Robust.Analyzers/DependencyAssignAnalyzer.cs

@@ -1,61 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class DependencyAssignAnalyzer : DiagnosticAnalyzer
-{
-    private const string DependencyAttributeType = "Robust.Shared.IoC.DependencyAttribute";
-
-    private static readonly DiagnosticDescriptor Rule = new (
-        Diagnostics.IdDependencyFieldAssigned,
-        "Assignment to dependency field",
-        "Tried to assign to [Dependency] field '{0}'. Remove [Dependency] or inject it via field injection instead.",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.EnableConcurrentExecution();
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.RegisterOperationAction(CheckAssignment, OperationKind.SimpleAssignment);
-    }
-
-    private static void CheckAssignment(OperationAnalysisContext context)
-    {
-        if (context.Operation is not ISimpleAssignmentOperation assignment)
-            return;
-
-        if (assignment.Target is not IFieldReferenceOperation fieldRef)
-            return;
-
-        var field = fieldRef.Field;
-        var attributes = field.GetAttributes();
-        if (attributes.Length == 0)
-            return;
-
-        var depAttribute = context.Compilation.GetTypeByMetadataName(DependencyAttributeType);
-        if (!HasAttribute(attributes, depAttribute))
-            return;
-
-        context.ReportDiagnostic(Diagnostic.Create(Rule, assignment.Syntax.GetLocation(), field.Name));
-    }
-
-    private static bool HasAttribute(ImmutableArray<AttributeData> attributes, ISymbol symbol)
-    {
-        foreach (var attribute in attributes)
-        {
-            if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, symbol))
-                return true;
-        }
-
-        return false;
-    }
-}

Robust.Analyzers/DuplicateDependencyAnalyzer.cs

@@ -1,126 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-#nullable enable
-
-/// <summary>
-/// Analyzer that detects duplicate <c>[Dependency]</c> fields inside a single type.
-/// </summary>
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class DuplicateDependencyAnalyzer : DiagnosticAnalyzer
-{
-    private const string DependencyAttributeType = "Robust.Shared.IoC.DependencyAttribute";
-
-    private static readonly DiagnosticDescriptor Rule = new(
-        Diagnostics.IdDuplicateDependency,
-        "Duplicate dependency field",
-        "Another [Dependency] field of type '{0}' already exists in this type with field '{1}'",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.EnableConcurrentExecution();
-        context.RegisterCompilationStartAction(compilationContext =>
-        {
-            var dependencyAttributeType = compilationContext.Compilation.GetTypeByMetadataName(DependencyAttributeType);
-            if (dependencyAttributeType == null)
-                return;
-
-            compilationContext.RegisterSymbolStartAction(symbolContext =>
-                {
-                    var typeSymbol = (INamedTypeSymbol)symbolContext.Symbol;
-                    // Only deal with non-static classes, doesn't make sense to have dependencies in anything else.
-                    if (typeSymbol.TypeKind != TypeKind.Class || typeSymbol.IsStatic)
-                        return;
-
-                    var state = new AnalyzerState(dependencyAttributeType);
-                    symbolContext.RegisterSyntaxNodeAction(state.AnalyzeField, SyntaxKind.FieldDeclaration);
-                    symbolContext.RegisterSymbolEndAction(state.End);
-                },
-                SymbolKind.NamedType);
-        });
-    }
-
-    private sealed class AnalyzerState(INamedTypeSymbol dependencyAttributeType)
-    {
-        private readonly Dictionary<ITypeSymbol, List<IFieldSymbol>> _dependencyFields = new(SymbolEqualityComparer.Default);
-
-        public void AnalyzeField(SyntaxNodeAnalysisContext context)
-        {
-            var field = (FieldDeclarationSyntax)context.Node;
-            if (field.AttributeLists.Count == 0)
-                return;
-
-            if (context.ContainingSymbol is not IFieldSymbol fieldSymbol)
-                return;
-
-            // Can't have [Dependency]s for non-reference types.
-            if (!fieldSymbol.Type.IsReferenceType)
-                return;
-
-            if (!IsDependency(context.ContainingSymbol))
-                return;
-
-            lock (_dependencyFields)
-            {
-                if (!_dependencyFields.TryGetValue(fieldSymbol.Type, out var dependencyFields))
-                {
-                    dependencyFields = [];
-                    _dependencyFields.Add(fieldSymbol.Type, dependencyFields);
-                }
-
-                dependencyFields.Add(fieldSymbol);
-            }
-        }
-
-        private bool IsDependency(ISymbol symbol)
-        {
-            foreach (var attributeData in symbol.GetAttributes())
-            {
-                if (SymbolEqualityComparer.Default.Equals(attributeData.AttributeClass, dependencyAttributeType))
-                    return true;
-            }
-
-            return false;
-        }
-
-        public void End(SymbolAnalysisContext context)
-        {
-            lock (_dependencyFields)
-            {
-                foreach (var pair in _dependencyFields)
-                {
-                    var fieldType = pair.Key;
-                    var fields = pair.Value;
-                    if (fields.Count <= 1)
-                        continue;
-
-                    // Sort so we can have deterministic order to skip reporting for a single field.
-                    // Whichever sorts first doesn't get reported.
-                    fields.Sort(static (a, b) => string.Compare(a.Name, b.Name, StringComparison.Ordinal));
-
-                    // Start at index 1 to skip first field.
-                    var firstField = fields[0];
-                    for (var i = 1; i < fields.Count; i++)
-                    {
-                        var field = fields[i];
-
-                        context.ReportDiagnostic(
-                            Diagnostic.Create(Rule, field.Locations[0], fieldType.ToDisplayString(), firstField.Name));
-                    }
-                }
-            }
-        }
-    }
-}

Robust.Analyzers/MustCallBaseAnalyzer.cs

@@ -1,111 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-#nullable enable
-
-/// <summary>
-/// Enforces <c>MustCallBaseAttribute</c>.
-/// </summary>
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class MustCallBaseAnalyzer : DiagnosticAnalyzer
-{
-    private const string Attribute = "Robust.Shared.Analyzers.MustCallBaseAttribute";
-
-    private static readonly DiagnosticDescriptor Rule = new(
-        Diagnostics.IdMustCallBase,
-        "No base call in overriden function",
-        "Overriders of this function must always call the base function",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        isEnabledByDefault: true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.EnableConcurrentExecution();
-        context.RegisterSymbolAction(AnalyzeSymbol, SymbolKind.Method);
-    }
-
-    private static void AnalyzeSymbol(SymbolAnalysisContext context)
-    {
-        if (context.Symbol is not IMethodSymbol { IsOverride: true } method)
-            return;
-
-        var attrSymbol = context.Compilation.GetTypeByMetadataName(Attribute);
-        if (attrSymbol == null)
-            return;
-
-        if (DoesMethodOverriderHaveAttribute(method, attrSymbol) is not { } data)
-            return;
-
-        if (data is { onlyOverrides: true, depth: < 2 })
-            return;
-
-        var syntax = (MethodDeclarationSyntax) method.DeclaringSyntaxReferences[0].GetSyntax();
-        if (HasBaseCall(syntax))
-            return;
-
-        var diag = Diagnostic.Create(Rule, syntax.Identifier.GetLocation());
-        context.ReportDiagnostic(diag);
-    }
-
-    private static (int depth, bool onlyOverrides)? DoesMethodOverriderHaveAttribute(
-        IMethodSymbol method,
-        INamedTypeSymbol attributeSymbol)
-    {
-        var depth = 0;
-        while (method.OverriddenMethod != null)
-        {
-            depth += 1;
-            method = method.OverriddenMethod;
-            if (GetAttribute(method, attributeSymbol) is not { } attribute)
-                continue;
-
-            var onlyOverrides = attribute.ConstructorArguments is [{Kind: TypedConstantKind.Primitive, Value: true}];
-            return (depth, onlyOverrides);
-        }
-
-        return null;
-    }
-
-    private static bool HasBaseCall(MethodDeclarationSyntax syntax)
-    {
-        return syntax.Accept(new BaseCallLocator());
-    }
-
-    private static AttributeData? GetAttribute(ISymbol namedTypeSymbol, INamedTypeSymbol attrSymbol)
-    {
-        return namedTypeSymbol.GetAttributes()
-            .SingleOrDefault(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, attrSymbol));
-    }
-
-    private sealed class BaseCallLocator : CSharpSyntaxVisitor<bool>
-    {
-        public override bool VisitBaseExpression(BaseExpressionSyntax node)
-        {
-            return true;
-        }
-
-        public override bool DefaultVisit(SyntaxNode node)
-        {
-            foreach (var childNode in node.ChildNodes())
-            {
-                if (childNode is not CSharpSyntaxNode cSharpSyntax)
-                    continue;
-
-                if (cSharpSyntax.Accept(this))
-                    return true;
-            }
-
-            return false;
-        }
-    }
-}

Robust.Analyzers/NoUncachedRegexAnalyzer.cs

@@ -1,66 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class NoUncachedRegexAnalyzer : DiagnosticAnalyzer
-{
-    private const string RegexTypeName = "Regex";
-    private const string RegexType = $"System.Text.RegularExpressions.{RegexTypeName}";
-
-    private static readonly DiagnosticDescriptor Rule = new (
-        Diagnostics.IdUncachedRegex,
-        "Use of uncached static Regex function",
-        "Usage of a static Regex function that takes in a pattern string. This can cause constant re-parsing of the pattern.",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true);
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
-
-    public static readonly HashSet<string> BadFunctions =
-    [
-        "Count",
-        "EnumerateMatches",
-        "IsMatch",
-        "Match",
-        "Matches",
-        "Replace",
-        "Split"
-    ];
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.EnableConcurrentExecution();
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-        context.RegisterOperationAction(CheckInvocation, OperationKind.Invocation);
-    }
-
-    private static void CheckInvocation(OperationAnalysisContext context)
-    {
-        if (context.Operation is not IInvocationOperation invocation)
-            return;
-
-        // All Regex functions we care about are static.
-        var targetMethod = invocation.TargetMethod;
-        if (!targetMethod.IsStatic)
-            return;
-
-        // Bail early.
-        if (targetMethod.ContainingType.Name != "Regex")
-            return;
-
-        var regexType = context.Compilation.GetTypeByMetadataName(RegexType);
-        if (!SymbolEqualityComparer.Default.Equals(regexType, targetMethod.ContainingType))
-            return;
-
-        if (!BadFunctions.Contains(targetMethod.Name))
-            return;
-
-        context.ReportDiagnostic(Diagnostic.Create(Rule, invocation.Syntax.GetLocation()));
-    }
-}

Robust.Analyzers/PreferNonGenericVariantForAnalyzer.cs

@@ -1,65 +0,0 @@
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class PreferNonGenericVariantForAnalyzer : DiagnosticAnalyzer
-{
-    private const string AttributeType = "Robust.Shared.Analyzers.PreferNonGenericVariantForAttribute";
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
-        UseNonGenericVariantDescriptor
-    );
-
-    private static readonly DiagnosticDescriptor UseNonGenericVariantDescriptor = new(
-        Diagnostics.IdUseNonGenericVariant,
-        "Consider using the non-generic variant of this method",
-        "Use the non-generic variant of this method for type {0}",
-        "Usage",
-        DiagnosticSeverity.Warning,
-        true,
-        "Use the generic variant of this method.");
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.ReportDiagnostics | GeneratedCodeAnalysisFlags.Analyze);
-        context.EnableConcurrentExecution();
-        context.RegisterOperationAction(CheckForNonGenericVariant, OperationKind.Invocation);
-    }
-
-    private void CheckForNonGenericVariant(OperationAnalysisContext obj)
-    {
-        if (obj.Operation is not IInvocationOperation invocationOperation) return;
-
-        var preferNonGenericAttribute = obj.Compilation.GetTypeByMetadataName(AttributeType);
-
-        HashSet<ITypeSymbol> forTypes = [];
-        foreach (var attribute in invocationOperation.TargetMethod.GetAttributes())
-        {
-            if (!SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, preferNonGenericAttribute))
-                continue;
-
-            foreach (var type in attribute.ConstructorArguments[0].Values)
-                forTypes.Add((ITypeSymbol)type.Value);
-
-            break;
-        }
-
-        if (forTypes == null)
-            return;
-
-        foreach (var typeArg in invocationOperation.TargetMethod.TypeArguments)
-        {
-            if (forTypes.Contains(typeArg))
-            {
-                obj.ReportDiagnostic(
-                Diagnostic.Create(UseNonGenericVariantDescriptor,
-                    invocationOperation.Syntax.GetLocation(), typeArg.Name));
-            }
-        }
-    }
-}

Robust.Analyzers/PreferOtherTypeAnalyzer.cs

@@ -1,75 +0,0 @@
-#nullable enable
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Robust.Roslyn.Shared;
-
-namespace Robust.Analyzers;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp)]
-public sealed class PreferOtherTypeAnalyzer : DiagnosticAnalyzer
-{
-    private const string AttributeType = "Robust.Shared.Analyzers.PreferOtherTypeAttribute";
-
-    private static readonly DiagnosticDescriptor PreferOtherTypeDescriptor = new(
-        Diagnostics.IdPreferOtherType,
-        "Use the specific type",
-        "Use the specific type {0} instead of {1} when the type argument is {2}",
-        "Usage",
-        DiagnosticSeverity.Error,
-        true,
-        "Use the specific type.");
-
-    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
-        PreferOtherTypeDescriptor
-    );
-
-    public override void Initialize(AnalysisContext context)
-    {
-        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.ReportDiagnostics | GeneratedCodeAnalysisFlags.Analyze);
-        context.EnableConcurrentExecution();
-        context.RegisterSyntaxNodeAction(AnalyzeField, SyntaxKind.VariableDeclaration);
-    }
-
-    private void AnalyzeField(SyntaxNodeAnalysisContext context)
-    {
-        if (context.Node is not VariableDeclarationSyntax node)
-            return;
-
-        // Get the type of the generic being used
-        if (node.Type is not GenericNameSyntax genericName)
-            return;
-        var genericSyntax = genericName.TypeArgumentList.Arguments[0];
-        if (context.SemanticModel.GetSymbolInfo(genericSyntax).Symbol is not { } genericType)
-            return;
-
-        // Look for the PreferOtherTypeAttribute
-        var symbolInfo = context.SemanticModel.GetSymbolInfo(node.Type);
-        if (symbolInfo.Symbol?.GetAttributes() is not { } attributes)
-            return;
-
-        var preferOtherTypeAttribute = context.Compilation.GetTypeByMetadataName(AttributeType);
-
-        foreach (var attribute in attributes)
-        {
-            if (!SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, preferOtherTypeAttribute))
-                continue;
-
-            // See if the generic type argument matches the type the attribute specifies
-            if (attribute.ConstructorArguments[0].Value is not ITypeSymbol checkedType)
-                return;
-            if (!SymbolEqualityComparer.Default.Equals(checkedType, genericType))
-                continue;
-
-            if (attribute.ConstructorArguments[1].Value is not ITypeSymbol replacementType)
-                continue;
-            context.ReportDiagnostic(Diagnostic.Create(PreferOtherTypeDescriptor,
-                context.Node.GetLocation(),
-                replacementType.Name,
-                symbolInfo.Symbol.Name,
-                genericType.Name));
-        }
-    }
-}

Robust.Analyzers/PreferOtherTypeFixer.cs

@@ -1,97 +0,0 @@
-#nullable enable
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using static Robust.Roslyn.Shared.Diagnostics;
-
-namespace Robust.Analyzers;
-
-[ExportCodeFixProvider(LanguageNames.CSharp)]
-public sealed class PreferOtherTypeFixer : CodeFixProvider
-{
-    private const string PreferOtherTypeAttributeName = "PreferOtherTypeAttribute";
-
-    public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(
-        IdPreferOtherType
-    );
-
-    public override FixAllProvider GetFixAllProvider()
-    {
-        return WellKnownFixAllProviders.BatchFixer;
-    }
-
-    public override Task RegisterCodeFixesAsync(CodeFixContext context)
-    {
-        foreach (var diagnostic in context.Diagnostics)
-        {
-            switch (diagnostic.Id)
-            {
-                case IdPreferOtherType:
-                    return RegisterReplaceType(context, diagnostic);
-            }
-        }
-
-        return Task.CompletedTask;
-    }
-
-    private static async Task RegisterReplaceType(CodeFixContext context, Diagnostic diagnostic)
-    {
-        var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);
-        var span = diagnostic.Location.SourceSpan;
-        var token = root?.FindToken(span.Start).Parent?.AncestorsAndSelf().OfType<VariableDeclarationSyntax>().First();
-
-        if (token == null)
-            return;
-
-        context.RegisterCodeFix(CodeAction.Create(
-            "Replace type",
-            c => ReplaceType(context.Document, token, c),
-            "Replace type"
-        ), diagnostic);
-    }
-
-    private static async Task<Document> ReplaceType(Document document, VariableDeclarationSyntax syntax, CancellationToken cancellation)
-    {
-        var root = (CompilationUnitSyntax?) await document.GetSyntaxRootAsync(cancellation);
-        var model = await document.GetSemanticModelAsync(cancellation);
-
-        if (model == null)
-            return document;
-
-        if (syntax.Type is not GenericNameSyntax genericNameSyntax)
-            return document;
-        var genericTypeSyntax = genericNameSyntax.TypeArgumentList.Arguments[0];
-        if (model.GetSymbolInfo(genericTypeSyntax).Symbol is not {} genericTypeSymbol)
-            return document;
-
-        var symbolInfo = model.GetSymbolInfo(syntax.Type);
-        if (symbolInfo.Symbol?.GetAttributes() is not { } attributes)
-            return document;
-
-        foreach (var attribute in attributes)
-        {
-            if (attribute.AttributeClass?.Name != PreferOtherTypeAttributeName)
-                continue;
-
-            if (attribute.ConstructorArguments[0].Value is not ITypeSymbol checkedTypeSymbol)
-                continue;
-
-            if (!SymbolEqualityComparer.Default.Equals(checkedTypeSymbol, genericTypeSymbol))
-                continue;
-
-            if (attribute.ConstructorArguments[1].Value is not ITypeSymbol replacementTypeSymbol)
-                continue;
-
-            var replacementIdentifier = SyntaxFactory.IdentifierName(replacementTypeSymbol.Name);
-            var replacementSyntax = syntax.WithType(replacementIdentifier);
-
-            root = root!.ReplaceNode(syntax, replacementSyntax);
-            return document.WithSyntaxRoot(root);
-        }
-
-        return document;
-    }
-}

Robust.Analyzers/Robust.Analyzers.csproj

@@ -2,46 +2,24 @@
 
   <ItemGroup>
     <!-- Needed for NotNullableFlagAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\NotNullableFlagAttribute.cs" LinkBase="Implementations" />
+    <Compile Include="..\Robust.Shared\Analyzers\NotNullableFlagAttribute.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- Needed for FriendAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" LinkBase="Implementations" />
-    <Compile Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" LinkBase="Implementations" />
+    <Compile Include="..\Robust.Shared\Analyzers\AccessAttribute.cs" />
+    <Compile Include="..\Robust.Shared\Analyzers\AccessPermissions.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- Needed for PreferGenericVariantAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Needed for PreferNonGenericVariantAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\PreferNonGenericVariantForAttribute.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Needed for PreferOtherTypeAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Analyzers\PreferOtherTypeAttribute.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- Needed for DataDefinitionAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Serialization\Manager\Definition\DataDefinitionUtility.cs" LinkBase="Implementations" />
-    <Compile Include="..\Robust.Shared\ViewVariables\ViewVariablesAttribute.cs" LinkBase="Implementations" />
-    <Compile Include="..\Robust.Shared\Serialization\NetSerializableAttribute.cs" LinkBase="Implementations" />
+    <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" />
   </ItemGroup>
 
   <Import Project="../Robust.Roslyn.Shared/Robust.Roslyn.Shared.props" />
 
   <PropertyGroup>
     <Nullable>disable</Nullable>
-    <!--
-    Rider seems to get really confused with hot reload if we directly compile in the above-linked classes.
-    As such, they have an #if to change their namespace in this project.
-    -->
-    <DefineConstants>$(DefineConstants);ROBUST_ANALYZERS_IMPL</DefineConstants>
   </PropertyGroup>
 
 </Project>

Robust.Benchmarks/Collections/ValueListEnumerationBenchmarks.cs

@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.Collections;
-
-namespace Robust.Benchmarks.Collections;
-
-[Virtual]
-public class ValueListEnumerationBenchmarks
-{
-    [Params(4, 16, 64)]
-    public int N { get; set; }
-
-    private sealed class Data(int i)
-    {
-        public readonly int I = i;
-    }
-
-    private ValueList<Data> _valueList;
-    private Data[] _array = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        var list = new List<Data>(N);
-        for (var i = 0; i < N; i++)
-        {
-            list.Add(new(i));
-        }
-
-        _array = list.ToArray();
-        _valueList = new(list.ToArray());
-    }
-
-    [Benchmark]
-    public int ValueList()
-    {
-        var total = 0;
-        foreach (var ev in _valueList)
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-
-    [Benchmark]
-    public int ValueListSpan()
-    {
-        var total = 0;
-        foreach (var ev in _valueList.Span)
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-
-    [Benchmark]
-    public int Array()
-    {
-        var total = 0;
-        foreach (var ev in _array)
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-
-    [Benchmark]
-    public int Span()
-    {
-        var total = 0;
-        foreach (var ev in _array.AsSpan())
-        {
-            total += ev.I;
-        }
-
-        return total;
-    }
-}

Robust.Benchmarks/Configs/DefaultSQLConfig.cs

@@ -26,8 +26,7 @@ public sealed class DefaultSQLConfig : IConfig
 
     public IEnumerable<IExporter> GetExporters()
     {
-        //yield return SQLExporter.Default;
-        yield break;
+        yield return SQLExporter.Default;
     }
 
     public IEnumerable<IColumnProvider> GetColumnProviders() => DefaultConfig.Instance.GetColumnProviders();

Robust.Benchmarks/EntityManager/AddRemoveComponentBenchmark.cs

@@ -26,8 +26,9 @@ public partial class AddRemoveComponentBenchmark
             .InitializeInstance();
 
         _entityManager = _simulation.Resolve<IEntityManager>();
-        var map = _simulation.CreateMap().Uid;
-        var coords = new EntityCoordinates(map, default);
+
+        var coords = new MapCoordinates(0, 0, new MapId(1));
+        _simulation.AddMap(coords.MapId);
 
         for (var i = 0; i < N; i++)
         {

Robust.Benchmarks/EntityManager/ComponentIteratorBenchmark.cs

@@ -29,8 +29,8 @@ public partial class ComponentIteratorBenchmark
 
         Comps = new A[N+2];
 
-        var map = _simulation.CreateMap().MapId;
-        var coords = new MapCoordinates(default, map);
+        var coords = new MapCoordinates(0, 0, new MapId(1));
+        _simulation.AddMap(coords.MapId);
 
         for (var i = 0; i < N; i++)
         {

Robust.Benchmarks/EntityManager/GetComponentBenchmark.cs

@@ -31,8 +31,8 @@ public partial class GetComponentBenchmark
 
         Comps = new A[N+2];
 
-        var map = _simulation.CreateMap().Uid;
-        var coords = new EntityCoordinates(map, default);
+        var coords = new MapCoordinates(0, 0, new MapId(1));
+        _simulation.AddMap(coords.MapId);
 
         for (var i = 0; i < N; i++)
         {

Robust.Benchmarks/EntityManager/SpawnDeleteEntityBenchmark.cs

@@ -29,9 +29,10 @@ public partial class SpawnDeleteEntityBenchmark
             .InitializeInstance();
 
         _entityManager = _simulation.Resolve<IEntityManager>();
-        var (map, mapId) = _simulation.CreateMap();
-        _mapCoords = new MapCoordinates(default, mapId);
-        _entCoords = new EntityCoordinates(map, 0, 0);
+
+        _mapCoords = new MapCoordinates(0, 0, new MapId(1));
+        var uid = _simulation.AddMap(_mapCoords.MapId);
+        _entCoords = new EntityCoordinates(uid, 0, 0);
     }
 
     [Benchmark(Baseline = true)]

Robust.Benchmarks/Exporters/SQLExporter.cs

@@ -15,10 +15,11 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using Npgsql;
 using Npgsql.Internal;
+using Npgsql.Internal.TypeHandlers;
+using Npgsql.Internal.TypeHandling;
 
 namespace Robust.Benchmarks.Exporters;
 
-/*
 public sealed class SQLExporter : IExporter
 {
     private static readonly JsonSerializerOptions JsonSerializerOptions = new JsonSerializerOptions
@@ -97,9 +98,7 @@ public sealed class SQLExporter : IExporter
 
     public string Name => "sql";
 }
-*/
 
-/*
 // https://github.com/npgsql/efcore.pg/issues/1107#issuecomment-945126627
 class JsonOverrideTypeHandlerResolverFactory : TypeHandlerResolverFactory
 {
@@ -139,7 +138,6 @@ class JsonOverrideTypeHandlerResolverFactory : TypeHandlerResolverFactory
             => null; // Let the built-in resolver do this
     }
 }
-*/
 
 public sealed class DesignTimeContextFactoryPostgres : IDesignTimeDbContextFactory<BenchmarkContext>
 {

Robust.Benchmarks/Physics/BoxStackBenchmark.cs

@@ -1,96 +0,0 @@
-using System;
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Microsoft.Extensions.Configuration;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-[MediumRunJob]
-public class PhysicsBoxStackBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 30; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    [Benchmark]
-    public void BoxStack()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 10000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-
-        var horizontal = new EdgeShape(new Vector2(-40, 0), new Vector2(40, 0));
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(horizontal, 2, 2, true), body: ground);
-
-        var vertical = new EdgeShape(new Vector2(10, 0), new Vector2(10, 10));
-        fixtures.CreateFixture(groundUid, "fix2", new Fixture(vertical, 2, 2, true), body: ground);
-
-        var xs = new[]
-        {
-            0.0f, -10.0f, -5.0f, 5.0f, 10.0f
-        };
-
-        var columnCount = 1;
-        var rowCount = 15;
-        PolygonShape shape;
-
-        for (var j = 0; j < columnCount; j++)
-        {
-            for (var i = 0; i < rowCount; i++)
-            {
-                var x = 0.0f;
-
-                var boxUid = entManager.SpawnEntity(null,
-                    new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 1.1f * i), mapId));
-                var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-
-                physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-
-                shape = new PolygonShape();
-                shape.SetAsBox(0.5f, 0.5f);
-                physics.SetFixedRotation(boxUid, false, body: box);
-                fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true), body: box);
-
-                physics.WakeBody(boxUid, body: box);
-                physics.SetSleepingAllowed(boxUid, box, false);
-            }
-        }
-
-        physics.WakeBody(groundUid, body: ground);
-    }
-}

Robust.Benchmarks/Physics/CircleStackBenchmark.cs

@@ -1,92 +0,0 @@
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-public class PhysicsCircleStackBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 30; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    [Benchmark]
-    public void CircleStack()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 10000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-
-        var horizontal = new EdgeShape(new Vector2(-40, 0), new Vector2(40, 0));
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(horizontal, 2, 2, true), body: ground);
-
-        var vertical = new EdgeShape(new Vector2(20, 0), new Vector2(20, 20));
-        fixtures.CreateFixture(groundUid, "fix2", new Fixture(vertical, 2, 2, true), body: ground);
-
-        var xs = new[]
-        {
-            0.0f, -10.0f, -5.0f, 5.0f, 10.0f
-        };
-
-        var columnCount = 1;
-        var rowCount = 15;
-        PhysShapeCircle shape;
-
-        for (var j = 0; j < columnCount; j++)
-        {
-            for (var i = 0; i < rowCount; i++)
-            {
-                var x = 0.0f;
-
-                var boxUid = entManager.SpawnEntity(null,
-                    new MapCoordinates(new Vector2(xs[j] + x, 0.55f + 2.1f * i), mapId));
-                var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-
-                physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-                shape = new PhysShapeCircle(0.5f);
-                physics.SetFixedRotation(boxUid, false, body: box);
-                // TODO: Need to detect shape and work out if we need to use fixedrotation
-
-                fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true, 5f));
-                physics.WakeBody(boxUid, body: box);
-                physics.SetSleepingAllowed(boxUid, box, false);
-            }
-        }
-
-        physics.WakeBody(groundUid, body: ground);
-    }
-}

Robust.Benchmarks/Physics/PyramidBenchmark.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-public class PhysicsPyramidBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 300; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    [Benchmark]
-    public void Pyramid()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 5000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        const byte count = 20;
-
-        // Setup ground
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-
-        var horizontal = new EdgeShape(new Vector2(40, 0), new Vector2(-40, 0));
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(horizontal, 2, 2, true), body: ground);
-        physics.WakeBody(groundUid, body: ground);
-
-        // Setup boxes
-        float a = 0.5f;
-        PolygonShape shape = new();
-        shape.SetAsBox(a, a);
-
-        var x = new Vector2(-7.0f, 0.75f);
-        Vector2 y;
-        Vector2 deltaX = new Vector2(0.5625f, 1.25f);
-        Vector2 deltaY = new Vector2(1.125f, 0.0f);
-
-        for (var i = 0; i < count; ++i)
-        {
-            y = x;
-
-            for (var j = i; j < count; ++j)
-            {
-                var boxUid = entManager.SpawnEntity(null, new MapCoordinates(y, mapId));
-                var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-                physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-
-                fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true, 5f), body: box);
-                y += deltaY;
-
-                physics.WakeBody(boxUid, body: box);
-                physics.SetSleepingAllowed(boxUid, box, false);
-            }
-
-            x += deltaX;
-        }
-    }
-}

Robust.Benchmarks/Physics/TumblerBenchmark.cs

@@ -1,105 +0,0 @@
-using System;
-using System.Numerics;
-using BenchmarkDotNet.Attributes;
-using Robust.Shared.Analyzers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Systems;
-using Robust.UnitTesting.Server;
-
-namespace Robust.Benchmarks.Physics;
-
-[Virtual]
-public class PhysicsTumblerBenchmark
-{
-    private ISimulation _sim = default!;
-
-    [GlobalSetup]
-    public void Setup()
-    {
-        _sim = RobustServerSimulation.NewSimulation().InitializeInstance();
-
-        var entManager = _sim.Resolve<IEntityManager>();
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-        entManager.System<SharedMapSystem>().CreateMap(out var mapId);
-        SetupTumbler(entManager, mapId);
-
-        for (var i = 0; i < 800; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-            var boxUid = entManager.SpawnEntity(null, new MapCoordinates(0f, 10f, mapId));
-            var box = entManager.AddComponent<PhysicsComponent>(boxUid);
-            physics.SetBodyType(boxUid, BodyType.Dynamic, body: box);
-            physics.SetFixedRotation(boxUid, false, body: box);
-            var shape = new PolygonShape();
-            shape.SetAsBox(0.125f, 0.125f);
-            fixtures.CreateFixture(boxUid, "fix1", new Fixture(shape, 2, 2, true, 0.0625f), body: box);
-            physics.WakeBody(boxUid, body: box);
-            physics.SetSleepingAllowed(boxUid, box, false);
-        }
-    }
-
-    [Benchmark]
-    public void Tumbler()
-    {
-        var entManager = _sim.Resolve<IEntityManager>();
-
-        for (var i = 0; i < 5000; i++)
-        {
-            entManager.TickUpdate(0.016f, false);
-        }
-    }
-
-    private void SetupTumbler(IEntityManager entManager, MapId mapId)
-    {
-        var physics = entManager.System<SharedPhysicsSystem>();
-        var fixtures = entManager.System<FixtureSystem>();
-        var joints = entManager.System<SharedJointSystem>();
-
-        var groundUid = entManager.SpawnEntity(null, new MapCoordinates(0f, 0f, mapId));
-        var ground = entManager.AddComponent<PhysicsComponent>(groundUid);
-        // Due to lookup changes fixtureless bodies are invalid, so
-        var cShape = new PhysShapeCircle(1f);
-        fixtures.CreateFixture(groundUid, "fix1", new Fixture(cShape, 0, 0, false));
-
-        var bodyUid = entManager.SpawnEntity(null, new MapCoordinates(0f, 10f, mapId));
-        var body = entManager.AddComponent<PhysicsComponent>(bodyUid);
-
-        physics.SetBodyType(bodyUid, BodyType.Dynamic, body: body);
-        physics.SetSleepingAllowed(bodyUid, body, false);
-        physics.SetFixedRotation(bodyUid, false, body: body);
-
-
-        // TODO: Box2D just deref, bleh shape structs someday
-        var shape1 = new PolygonShape();
-        shape1.SetAsBox(0.5f, 10.0f, new Vector2(10.0f, 0.0f), 0.0f);
-        fixtures.CreateFixture(bodyUid, "fix1", new Fixture(shape1, 2, 0, true, 20f));
-
-        var shape2 = new PolygonShape();
-        shape2.SetAsBox(0.5f, 10.0f, new Vector2(-10.0f, 0.0f), 0f);
-        fixtures.CreateFixture(bodyUid, "fix2", new Fixture(shape2, 2, 0, true, 20f));
-
-        var shape3 = new PolygonShape();
-        shape3.SetAsBox(10.0f, 0.5f, new Vector2(0.0f, 10.0f), 0f);
-        fixtures.CreateFixture(bodyUid, "fix3", new Fixture(shape3, 2, 0, true, 20f));
-
-        var shape4 = new PolygonShape();
-        shape4.SetAsBox(10.0f, 0.5f, new Vector2(0.0f, -10.0f), 0f);
-        fixtures.CreateFixture(bodyUid, "fix4", new Fixture(shape4, 2, 0, true, 20f));
-
-        physics.WakeBody(groundUid, body: ground);
-        physics.WakeBody(bodyUid, body: body);
-        var revolute = joints.CreateRevoluteJoint(groundUid, bodyUid);
-        revolute.LocalAnchorA = new Vector2(0f, 10f);
-        revolute.LocalAnchorB = new Vector2(0f, 0f);
-        revolute.ReferenceAngle = 0f;
-        revolute.MotorSpeed = 0.05f * MathF.PI;
-        revolute.MaxMotorTorque = 100000000f;
-        revolute.EnableMotor = true;
-    }
-}

Robust.Benchmarks/Transform/RecursiveMoveBenchmark.cs

@@ -91,7 +91,8 @@ public class RecursiveMoveBenchmark : RobustIntegrationTest
         // Set up map and spawn player
         server.WaitPost(() =>
         {
-            var map = server.ResolveDependency<SharedMapSystem>().CreateMap(out var mapId);
+            var mapId = mapMan.CreateMap();
+            var map = mapMan.GetMapEntityId(mapId);
             var gridComp = mapMan.CreateGridEntity(mapId);
             var grid = gridComp.Owner;
             mapSys.SetTile(grid, gridComp, Vector2i.Zero, new Tile(1));

Robust.Client.Injectors/CompileRobustXamlTask.cs

@@ -1,8 +1,8 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Microsoft.Build.Framework;
-using Robust.Xaml;
 
 namespace Robust.Build.Tasks
 {
@@ -37,12 +37,10 @@ namespace Robust.Build.Tasks
             var msg = $"CompileRobustXamlTask -> AssemblyFile:{AssemblyFile}, ProjectDirectory:{ProjectDirectory}, OutputPath:{OutputPath}";
             BuildEngine.LogMessage(msg, MessageImportance.High);
 
-            var res = XamlAotCompiler.Compile(
-                BuildEngine, input,
+            var res = XamlCompiler.Compile(BuildEngine, input,
                 File.ReadAllLines(ReferencesFilePath).Where(l => !string.IsNullOrWhiteSpace(l)).ToArray(),
-                 OutputPath,
-                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null
-            );
+                ProjectDirectory, OutputPath,
+                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null);
             if (!res.success)
                 return false;
             if (!res.writtentofile)
@@ -67,24 +65,22 @@ namespace Robust.Build.Tasks
             return true;
         }
 
-        // PYREX NOTE: This project was comically null-unsafe before I touched it. I'm just marking what it did accurately
         [Required]
-        public string ReferencesFilePath { get; set; } = null!;
+        public string ReferencesFilePath { get; set; }
 
         [Required]
-
-        public string ProjectDirectory { get; set; } = null!;
+        public string ProjectDirectory { get; set; }
 
         [Required]
-        public string AssemblyFile { get; set; } = null!;
+        public string AssemblyFile { get; set; }
 
         [Required]
-        public string? OriginalCopyPath { get; set; } = null;
+        public string OriginalCopyPath { get; set; }
 
-        public string? OutputPath { get; set; }
-        public string UpdateBuildIndicator { get; set; } = null!;
+        public string OutputPath { get; set; }
+        public string UpdateBuildIndicator { get; set; }
 
-        public string AssemblyOriginatorKeyFile { get; set; } = null!;
+        public string AssemblyOriginatorKeyFile { get; set; }
         public bool SignAssembly { get; set; }
         public bool DelaySign { get; set; }
 
@@ -99,7 +95,7 @@ namespace Robust.Build.Tasks
             return rv;
         }
 
-        public IBuildEngine BuildEngine { get; set; } = null!;
-        public ITaskHost HostObject { get; set; } = null!;
+        public IBuildEngine BuildEngine { get; set; }
+        public ITaskHost HostObject { get; set; }
     }
 }

Robust.Client.Injectors/Extensions.cs

@@ -1,11 +1,11 @@
 using Microsoft.Build.Framework;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     /// <summary>
     /// Taken from https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/Extensions.cs
     /// </summary>
-    internal static class Extensions
+    public static class Extensions
     {
         //shamefully copied from avalonia
         public static void LogMessage(this IBuildEngine engine, string message, MessageImportance imp)

Robust.Client.Injectors/MathParsing.cs

@@ -0,0 +1,37 @@
+using System.Linq;
+using Pidgin;
+using static Pidgin.Parser;
+
+
+namespace Robust.Build.Tasks
+{
+    public static class MathParsing
+    {
+        public static Parser<char, float> Single { get; } = Real.Select(c => (float) c);
+
+        public static Parser<char, float> Single1 { get; }
+            = Single.Between(SkipWhitespaces);
+
+        public static Parser<char, (float, float)> Single2 { get; }
+            = Single.Before(SkipWhitespaces).Repeat(2).Select(e =>
+            {
+                var arr = e.ToArray();
+                return (arr[0], arr[1]);
+            });
+
+        public static Parser<char, (float, float, float, float)> Single4 { get; }
+            = Single.Before(SkipWhitespaces).Repeat(4).Select(e =>
+            {
+                var arr = e.ToArray();
+                return (arr[0], arr[1], arr[2], arr[3]);
+            });
+
+        public static Parser<char, float[]> Thickness { get; }
+            = SkipWhitespaces.Then(
+                OneOf(
+                    Try(Single4.Select(c => new[] {c.Item1, c.Item2, c.Item3, c.Item4})),
+                    Try(Single2.Select(c => new[] {c.Item1, c.Item2})),
+                    Try(Single1.Select(c => new[] {c}))
+                ));
+    }
+}

Robust.Client.Injectors/Program.cs

@@ -55,11 +55,9 @@ namespace Robust.Build.Tasks
         public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties,
             IDictionary targetOutputs) => throw new NotSupportedException();
 
-        // PYREX NOTE: This project was extremely null-unsafe before I touched it. I'm just marking what it did already
-        // Here's the broken interface of IBuildEngine that we started with
-        public bool ContinueOnError => default;
-        public int LineNumberOfTaskNode => default;
-        public int ColumnNumberOfTaskNode => default;
-        public string ProjectFileOfTaskNode => null!;
+        public bool ContinueOnError { get; }
+        public int LineNumberOfTaskNode { get; }
+        public int ColumnNumberOfTaskNode { get; }
+        public string ProjectFileOfTaskNode { get; }
     }
 }

Robust.Client.Injectors/RXamlColorAstNode.cs

@@ -1,9 +1,10 @@
-using XamlX.Ast;
+using System.Reflection.Emit;
+using XamlX.Ast;
 using XamlX.Emit;
 using XamlX.IL;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     internal class RXamlColorAstNode
         : XamlAstNode, IXamlAstValueNode, IXamlAstILEmitableNode

Robust.Client.Injectors/RXamlVecLikeConstAstNode.cs

@@ -6,9 +6,9 @@ using XamlX.Emit;
 using XamlX.IL;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
-    internal abstract class RXamlVecLikeConstAstNode<T>
+    public abstract class RXamlVecLikeConstAstNode<T>
         : XamlAstNode, IXamlAstValueNode, IXamlAstILEmitableNode
         where T : unmanaged
     {
@@ -47,7 +47,7 @@ namespace Robust.Xaml
         }
     }
 
-    internal sealed class RXamlSingleVecLikeConstAstNode : RXamlVecLikeConstAstNode<float>
+    public sealed class RXamlSingleVecLikeConstAstNode : RXamlVecLikeConstAstNode<float>
     {
         public RXamlSingleVecLikeConstAstNode(
             IXamlLineInfo lineInfo,
@@ -69,7 +69,7 @@ namespace Robust.Xaml
         }
     }
 
-    internal sealed class RXamlInt32VecLikeConstAstNode : RXamlVecLikeConstAstNode<int>
+    public sealed class RXamlInt32VecLikeConstAstNode : RXamlVecLikeConstAstNode<int>
     {
         public RXamlInt32VecLikeConstAstNode(
             IXamlLineInfo lineInfo,

Robust.Client.Injectors/RXamlWellKnownTypes.cs

@@ -2,9 +2,9 @@
 using XamlX.Transform;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
-    internal class RXamlWellKnownTypes
+    class RXamlWellKnownTypes
     {
         public XamlTypeWellKnownTypes XamlIlTypes { get; }
         public IXamlType Single { get; }

Robust.Client.Injectors/Robust.Client.Injectors.csproj

@@ -1,30 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\MSBuild\Robust.Engine.props" />
 
-    <!--
-    PJB3005 (2024-08-24)
-    So the reason that Robust.Client.Injectors is NS2.0 is that Visual Studio 
-    still ships a .NET FX based MSBuild for some godforsaken reason. This means 
-    that when having Robust.Client.Injectors loaded directly by the main MSBuild 
-    process... that would break.
-
-    Except we don't do that anyways right now due to file locking issues, so maybe 
-    it's fine to give up on that. Whatever. 
-    -->
     <PropertyGroup>
-      <TargetFramework>netstandard2.0</TargetFramework>
-      <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-      <LangVersion>8.0</LangVersion>
-      <Nullable>enable</Nullable>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
 
     <ItemGroup>
       <PackageReference Include="Microsoft.Build.Framework" Version="17.8.3" />
       <PackageReference Include="Mono.Cecil" Version="0.11.5" />
+      <PackageReference Include="Pidgin" Version="2.5.0" />
     </ItemGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj" />
-      <ProjectReference Include="..\Robust.Xaml\Robust.Xaml.csproj" />
     </ItemGroup>
 </Project>

Robust.Client.Injectors/RobustXamlILCompiler.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Diagnostics;
+using System.Linq;
 using XamlX;
 using XamlX.Ast;
 using XamlX.Emit;
@@ -6,7 +7,7 @@ using XamlX.IL;
 using XamlX.Transform;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     /// <summary>
     /// Emitters & Transformers based on:
@@ -14,7 +15,7 @@ namespace Robust.Xaml
     /// - https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AddNameScopeRegistration.cs
     /// - https://github.com/AvaloniaUI/Avalonia/blob/afb8ae6f3c517dae912729511483995b16cb31af/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/IgnoredDirectivesTransformer.cs
     /// </summary>
-    internal class RobustXamlILCompiler : XamlILCompiler
+    public class RobustXamlILCompiler : XamlILCompiler
     {
         public RobustXamlILCompiler(TransformerConfiguration configuration, XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emitMappings, bool fillWithDefaults) : base(configuration, emitMappings, fillWithDefaults)
         {
@@ -40,9 +41,8 @@ namespace Robust.Xaml
                             && mg.Children.OfType<RobustNameScopeRegistrationXamlIlNode>().Any())
                             return node;
 
-                        IXamlAstValueNode? value = null;
+                        IXamlAstValueNode value = null;
                         for (var c = 0; c < pa.Values.Count; c++)
-                        {
                             if (pa.Values[c].Type.GetClrType().Equals(context.Configuration.WellKnownTypes.String))
                             {
                                 value = pa.Values[c];
@@ -57,7 +57,6 @@ namespace Robust.Xaml
 
                                 break;
                             }
-                        }
 
                         if (value != null)
                         {
@@ -85,9 +84,9 @@ namespace Robust.Xaml
             class RobustNameScopeRegistrationXamlIlNode : XamlAstNode, IXamlAstManipulationNode
             {
                 public IXamlAstValueNode Name { get; set; }
-                public IXamlType? TargetType { get; }
+                public IXamlType TargetType { get; }
 
-                public RobustNameScopeRegistrationXamlIlNode(IXamlAstValueNode name, IXamlType? targetType) : base(name)
+                public RobustNameScopeRegistrationXamlIlNode(IXamlAstValueNode name, IXamlType targetType) : base(name)
                 {
                     TargetType = targetType;
                     Name = name;
@@ -105,7 +104,7 @@ namespace Robust.Xaml
                     {
 
                         var scopeField = context.RuntimeContext.ContextType.Fields.First(f =>
-                            f.Name == XamlCustomizations.ContextNameScopeFieldName);
+                            f.Name == XamlCompiler.ContextNameScopeFieldName);
                         var namescopeRegisterFunction = context.Configuration.TypeSystem
                             .FindType("Robust.Client.UserInterface.XAML.NameScope").Methods
                             .First(m => m.Name == "Register");
@@ -129,7 +128,7 @@ namespace Robust.Xaml
 
                         return XamlILNodeEmitResult.Void(1);
                     }
-                    return default!;  // PYREX NOTE: This doesn't seem safe! But it's what we were doing before Nullable
+                    return default;
                 }
             }
         }
@@ -162,7 +161,7 @@ namespace Robust.Xaml
                 {
                     if (!(node is HandleRootObjectScopeNode))
                     {
-                        return null!;  // PYREX NOTE: This doesn't seem safe, but it predates Nullable on this file
+                        return null;
                     }
 
                     var controlType = context.Configuration.TypeSystem.FindType("Robust.Client.UserInterface.Control");
@@ -171,7 +170,7 @@ namespace Robust.Xaml
                     var dontAbsorb = codeGen.DefineLabel();
                     var end = codeGen.DefineLabel();
                     var contextScopeField = context.RuntimeContext.ContextType.Fields.First(f =>
-                        f.Name == XamlCustomizations.ContextNameScopeFieldName);
+                        f.Name == XamlCompiler.ContextNameScopeFieldName);
                     var controlNameScopeField = controlType.Fields.First(f => f.Name == "NameScope");
                     var nameScopeType = context.Configuration.TypeSystem
                         .FindType("Robust.Client.UserInterface.XAML.NameScope");

Robust.Client.Injectors/XamlCompiler.Helpers.cs

@@ -1,23 +1,33 @@
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
+using Mono.Cecil.Cil;
+using Mono.Collections.Generic;
 using XamlX.TypeSystem;
 
-namespace Robust.Xaml
+namespace Robust.Build.Tasks
 {
     /// <summary>
-    /// Helpers taken from AvaloniaUI on GitHub.
-    /// </summary>
-    /// <remarks>
+    /// Helpers taken from:
     /// - https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
     /// - https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs
-    /// </remarks>
-    internal partial class XamlAotCompiler
+    /// </summary>
+    public partial class XamlCompiler
     {
-        private static readonly string[] NameSuffixes = {".xaml", ".paml", ".axaml"};
+        static bool CheckXamlName(IResource r) => r.Name.ToLowerInvariant().EndsWith(".xaml")
+                                                  || r.Name.ToLowerInvariant().EndsWith(".paml")
+                                                  || r.Name.ToLowerInvariant().EndsWith(".axaml");
 
-        static bool CheckXamlName(IResource r) =>
-            NameSuffixes.Any(suffix => r.Name.ToLowerInvariant().EndsWith(suffix));
+        private static bool MatchThisCall(Collection<Instruction> instructions, int idx)
+        {
+            var i = instructions[idx];
+            // A "normal" way of passing `this` to a static method:
+
+            // ldarg.0
+            // call void [Avalonia.Markup.Xaml]Avalonia.Markup.Xaml.AvaloniaXamlLoader::Load(object)
+
+            return i.OpCode == OpCodes.Ldarg_0 || (i.OpCode == OpCodes.Ldarg && i.Operand?.Equals(0) == true);
+        }
 
         interface IResource : IFileSource
         {

Robust.Client.Injectors/XamlCompiler.cs

@@ -0,0 +1,388 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Build.Framework;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using Mono.Cecil.Rocks;
+using Pidgin;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+using XamlX.Parsers;
+using XamlX.Transform;
+using XamlX.TypeSystem;
+
+namespace Robust.Build.Tasks
+{
+    /// <summary>
+    /// Based on https://github.com/AvaloniaUI/Avalonia/blob/c85fa2b9977d251a31886c2534613b4730fbaeaf/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+    /// Adjusted for our UI-Framework
+    /// </summary>
+    public partial class XamlCompiler
+    {
+        public static (bool success, bool writtentofile) Compile(IBuildEngine engine, string input, string[] references,
+            string projectDirectory, string output, string strongNameKey)
+        {
+            var typeSystem = new CecilTypeSystem(references
+                .Where(r => !r.ToLowerInvariant().EndsWith("robust.build.tasks.dll"))
+                .Concat(new[] { input }), input);
+
+            var asm = typeSystem.TargetAssemblyDefinition;
+
+            if (asm.MainModule.GetType("CompiledRobustXaml", "XamlIlContext") != null)
+            {
+                // If this type exists, the assembly has already been processed by us.
+                // Do not run again, it would corrupt the file.
+                // This *shouldn't* be possible due to Inputs/Outputs dependencies in the build system,
+                // but better safe than sorry eh?
+                engine.LogWarningEvent(new BuildWarningEventArgs("XAMLIL", "", "", 0, 0, 0, 0, "Ran twice on same assembly file; ignoring.", "", ""));
+                return (true, false);
+            }
+
+            var compileRes = CompileCore(engine, typeSystem);
+            if (compileRes == null)
+                return (true, false);
+            if (compileRes == false)
+                return (false, false);
+
+            var writerParameters = new WriterParameters { WriteSymbols = asm.MainModule.HasSymbols };
+            if (!string.IsNullOrWhiteSpace(strongNameKey))
+                writerParameters.StrongNameKeyBlob = File.ReadAllBytes(strongNameKey);
+
+            asm.Write(output, writerParameters);
+
+            return (true, true);
+
+        }
+
+        static bool? CompileCore(IBuildEngine engine, CecilTypeSystem typeSystem)
+        {
+            var asm = typeSystem.TargetAssemblyDefinition;
+            var embrsc = new EmbeddedResources(asm);
+
+            if (embrsc.Resources.Count(CheckXamlName) == 0)
+                // Nothing to do
+                return null;
+
+            var xamlLanguage = new XamlLanguageTypeMappings(typeSystem)
+            {
+                XmlnsAttributes =
+                {
+                    typeSystem.GetType("Avalonia.Metadata.XmlnsDefinitionAttribute"),
+
+                },
+                ContentAttributes =
+                {
+                    typeSystem.GetType("Avalonia.Metadata.ContentAttribute")
+                },
+                UsableDuringInitializationAttributes =
+                {
+                    typeSystem.GetType("Robust.Client.UserInterface.XAML.UsableDuringInitializationAttribute")
+                },
+                DeferredContentPropertyAttributes =
+                {
+                    typeSystem.GetType("Robust.Client.UserInterface.XAML.DeferredContentAttribute")
+                },
+                RootObjectProvider = typeSystem.GetType("Robust.Client.UserInterface.XAML.ITestRootObjectProvider"),
+                UriContextProvider = typeSystem.GetType("Robust.Client.UserInterface.XAML.ITestUriContext"),
+                ProvideValueTarget = typeSystem.GetType("Robust.Client.UserInterface.XAML.ITestProvideValueTarget"),
+            };
+            var emitConfig = new XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult>
+            {
+                ContextTypeBuilderCallback = (b,c) => EmitNameScopeField(xamlLanguage, typeSystem, b, c)
+            };
+
+            var transformerconfig = new TransformerConfiguration(
+                typeSystem,
+                typeSystem.TargetAssembly,
+                xamlLanguage,
+                XamlXmlnsMappings.Resolve(typeSystem, xamlLanguage), CustomValueConverter);
+
+            var contextDef = new TypeDefinition("CompiledRobustXaml", "XamlIlContext",
+                TypeAttributes.Class, asm.MainModule.TypeSystem.Object);
+            asm.MainModule.Types.Add(contextDef);
+            var contextClass = XamlILContextDefinition.GenerateContextClass(typeSystem.CreateTypeBuilder(contextDef), typeSystem,
+                xamlLanguage, emitConfig);
+
+            var compiler =
+                new RobustXamlILCompiler(transformerconfig, emitConfig, true);
+
+            bool CompileGroup(IResourceGroup group)
+            {
+                var typeDef = new TypeDefinition("CompiledRobustXaml", "!" + group.Name, TypeAttributes.Class,
+                    asm.MainModule.TypeSystem.Object);
+
+                //typeDef.CustomAttributes.Add(new CustomAttribute(ed));
+                asm.MainModule.Types.Add(typeDef);
+                var builder = typeSystem.CreateTypeBuilder(typeDef);
+
+                foreach (var res in group.Resources.Where(CheckXamlName))
+                {
+                    try
+                    {
+                        engine.LogMessage($"XAMLIL: {res.Name} -> {res.Uri}", MessageImportance.Low);
+
+                        var xaml = new StreamReader(new MemoryStream(res.FileContents)).ReadToEnd();
+                        var parsed = XDocumentXamlParser.Parse(xaml);
+
+                        var initialRoot = (XamlAstObjectNode) parsed.Root;
+
+                        var classDirective = initialRoot.Children.OfType<XamlAstXmlDirective>()
+                            .FirstOrDefault(d => d.Namespace == XamlNamespaces.Xaml2006 && d.Name == "Class");
+                        string classname;
+                        if (classDirective != null && classDirective.Values[0] is XamlAstTextNode tn)
+                        {
+                            classname = tn.Text;
+                        }
+                        else
+                        {
+                            classname = res.Name.Replace(".xaml","");
+                        }
+
+                        var classType = typeSystem.TargetAssembly.FindType(classname);
+                        if (classType == null)
+                            throw new Exception($"Unable to find type '{classname}'");
+
+                        compiler.Transform(parsed);
+
+                        var populateName = $"Populate:{res.Name}";
+                        var buildName = $"Build:{res.Name}";
+
+                        var classTypeDefinition = typeSystem.GetTypeReference(classType).Resolve();
+
+                        var populateBuilder = typeSystem.CreateTypeBuilder(classTypeDefinition);
+
+                        compiler.Compile(parsed, contextClass,
+                            compiler.DefinePopulateMethod(populateBuilder, parsed, populateName,
+                                classTypeDefinition == null),
+                            compiler.DefineBuildMethod(builder, parsed, buildName, true),
+                            null,
+                            (closureName, closureBaseType) =>
+                                populateBuilder.DefineSubType(closureBaseType, closureName, false),
+                            res.Uri, res
+                        );
+
+                        //add compiled populate method
+                        var compiledPopulateMethod = typeSystem.GetTypeReference(populateBuilder).Resolve().Methods
+                            .First(m => m.Name == populateName);
+
+                        const string TrampolineName = "!XamlIlPopulateTrampoline";
+                        var trampoline = new MethodDefinition(TrampolineName,
+                            MethodAttributes.Static | MethodAttributes.Private, asm.MainModule.TypeSystem.Void);
+                        trampoline.Parameters.Add(new ParameterDefinition(classTypeDefinition));
+                        classTypeDefinition.Methods.Add(trampoline);
+
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Ldnull));
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Ldarg_0));
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Call, compiledPopulateMethod));
+                        trampoline.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
+
+                        var foundXamlLoader = false;
+                        // Find RobustXamlLoader.Load(this) and replace it with !XamlIlPopulateTrampoline(this)
+                        foreach (var method in classTypeDefinition.Methods
+                            .Where(m => !m.Attributes.HasFlag(MethodAttributes.Static)))
+                        {
+                            var i = method.Body.Instructions;
+                            for (var c = 1; c < i.Count; c++)
+                            {
+                                if (i[c].OpCode == OpCodes.Call)
+                                {
+                                    var op = i[c].Operand as MethodReference;
+
+                                    if (op != null
+                                        && op.Name == TrampolineName)
+                                    {
+                                        foundXamlLoader = true;
+                                        break;
+                                    }
+
+                                    if (op != null
+                                        && op.Name == "Load"
+                                        && op.Parameters.Count == 1
+                                        && op.Parameters[0].ParameterType.FullName == "System.Object"
+                                        && op.DeclaringType.FullName == "Robust.Client.UserInterface.XAML.RobustXamlLoader")
+                                    {
+                                        if (MatchThisCall(i, c - 1))
+                                        {
+                                            i[c].Operand = trampoline;
+                                            foundXamlLoader = true;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        if (!foundXamlLoader)
+                        {
+                            var ctors = classTypeDefinition.GetConstructors()
+                                .Where(c => !c.IsStatic).ToList();
+                            // We can inject xaml loader into default constructor
+                            if (ctors.Count == 1 && ctors[0].Body.Instructions.Count(o=>o.OpCode != OpCodes.Nop) == 3)
+                            {
+                                var i = ctors[0].Body.Instructions;
+                                var retIdx = i.IndexOf(i.Last(x => x.OpCode == OpCodes.Ret));
+                                i.Insert(retIdx, Instruction.Create(OpCodes.Call, trampoline));
+                                i.Insert(retIdx, Instruction.Create(OpCodes.Ldarg_0));
+                            }
+                            else
+                            {
+                                throw new InvalidProgramException(
+                                    $"No call to RobustXamlLoader.Load(this) call found anywhere in the type {classType.FullName} and type seems to have custom constructors.");
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        engine.LogErrorEvent(new BuildErrorEventArgs("XAMLIL", "", res.FilePath, 0, 0, 0, 0,
+                            $"{res.FilePath}: {e.Message}", "", "CompileRobustXaml"));
+                    }
+                }
+                return true;
+            }
+
+            if (embrsc.Resources.Count(CheckXamlName) != 0)
+            {
+                if (!CompileGroup(embrsc))
+                    return false;
+            }
+
+            return true;
+        }
+
+        private static bool CustomValueConverter(
+            AstTransformationContext context,
+            IXamlAstValueNode node,
+            IXamlType type,
+            out IXamlAstValueNode result)
+        {
+            if (!(node is XamlAstTextNode textNode))
+            {
+                result = null;
+                return false;
+            }
+
+            var text = textNode.Text;
+            var types = context.GetRobustTypes();
+
+            if (type.Equals(types.Vector2))
+            {
+                var foo = MathParsing.Single2.Parse(text);
+
+                if (!foo.Success)
+                    throw new XamlLoadException($"Unable to parse \"{text}\" as a Vector2", node);
+
+                var (x, y) = foo.Value;
+
+                result = new RXamlSingleVecLikeConstAstNode(
+                    node,
+                    types.Vector2, types.Vector2ConstructorFull,
+                    types.Single, new[] {x, y});
+                return true;
+            }
+
+            if (type.Equals(types.Thickness))
+            {
+                var foo = MathParsing.Thickness.Parse(text);
+
+                if (!foo.Success)
+                    throw new XamlLoadException($"Unable to parse \"{text}\" as a Thickness", node);
+
+                var val = foo.Value;
+                float[] full;
+                if (val.Length == 1)
+                {
+                    var u = val[0];
+                    full = new[] {u, u, u, u};
+                }
+                else if (val.Length == 2)
+                {
+                    var h = val[0];
+                    var v = val[1];
+                    full = new[] {h, v, h, v};
+                }
+                else // 4
+                {
+                    full = val;
+                }
+
+                result = new RXamlSingleVecLikeConstAstNode(
+                    node,
+                    types.Thickness, types.ThicknessConstructorFull,
+                    types.Single, full);
+                return true;
+            }
+
+            if (type.Equals(types.Thickness))
+            {
+                var foo = MathParsing.Thickness.Parse(text);
+
+                if (!foo.Success)
+                    throw new XamlLoadException($"Unable to parse \"{text}\" as a Thickness", node);
+
+                var val = foo.Value;
+                float[] full;
+                if (val.Length == 1)
+                {
+                    var u = val[0];
+                    full = new[] {u, u, u, u};
+                }
+                else if (val.Length == 2)
+                {
+                    var h = val[0];
+                    var v = val[1];
+                    full = new[] {h, v, h, v};
+                }
+                else // 4
+                {
+                    full = val;
+                }
+
+                result = new RXamlSingleVecLikeConstAstNode(
+                    node,
+                    types.Thickness, types.ThicknessConstructorFull,
+                    types.Single, full);
+                return true;
+            }
+
+            if (type.Equals(types.Color))
+            {
+                // TODO: Interpret these colors at XAML compile time instead of at runtime.
+                result = new RXamlColorAstNode(node, types, text);
+                return true;
+            }
+
+            result = null;
+            return false;
+        }
+
+        public const string ContextNameScopeFieldName = "RobustNameScope";
+
+        private static void EmitNameScopeField(XamlLanguageTypeMappings xamlLanguage, CecilTypeSystem typeSystem, IXamlTypeBuilder<IXamlILEmitter> typeBuilder, IXamlILEmitter constructor)
+        {
+            var nameScopeType = typeSystem.FindType("Robust.Client.UserInterface.XAML.NameScope");
+            var field = typeBuilder.DefineField(nameScopeType,
+                ContextNameScopeFieldName, true, false);
+            constructor
+                .Ldarg_0()
+                .Newobj(nameScopeType.GetConstructor())
+                .Stfld(field);
+        }
+    }
+
+    interface IResource : IFileSource
+    {
+        string Uri { get; }
+        string Name { get; }
+        void Remove();
+
+    }
+
+    interface IResourceGroup
+    {
+        string Name { get; }
+        IEnumerable<IResource> Resources { get; }
+    }
+}

Robust.Client.WebView/Cef/Program.cs

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

Robust.Client.WebView/Cef/WebViewManagerCef.cs

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

Robust.Client/Audio/AudioManager.Public.cs

@@ -302,7 +302,7 @@ internal partial class AudioManager
     }
 
     /// <inheritdoc/>
-    IBufferedAudioSource? IAudioInternal.CreateBufferedAudioSource(int buffers, bool floatAudio)
+    IBufferedAudioSource? IAudioInternal.CreateBufferedAudioSource(int buffers, bool floatAudio=false)
     {
         var source = AL.GenSource();
 

Robust.Client/Audio/AudioManager.cs

@@ -143,11 +143,12 @@ internal sealed partial class AudioManager : IAudioInternal
     /// <summary>
     /// Like _checkAlError but allows custom data to be passed in as relevant.
     /// </summary>
-    internal void LogALError(ALErrorInterpolatedStringHandler message, [CallerMemberName] string callerMember = "", [CallerLineNumber] int callerLineNumber = -1)
+    internal void LogALError(string message, [CallerMemberName] string callerMember = "", [CallerLineNumber] int callerLineNumber = -1)
     {
-        if (message.Error != ALError.NoError)
+        var error = AL.GetError();
+        if (error != ALError.NoError)
         {
-            OpenALSawmill.Error("[{0}:{1}] AL error: {2}, {3}. Stacktrace is {4}", callerMember, callerLineNumber, message.Error, message.ToStringAndClear(), Environment.StackTrace);
+            OpenALSawmill.Error("[{0}:{1}] AL error: {2}, {3}. Stacktrace is {4}", callerMember, callerLineNumber, error, message, Environment.StackTrace);
         }
     }
 
@@ -169,32 +170,4 @@ internal sealed partial class AudioManager : IAudioInternal
             BufferHandle = bufferHandle;
         }
     }
-
-    [InterpolatedStringHandler]
-    internal ref struct ALErrorInterpolatedStringHandler
-    {
-        private DefaultInterpolatedStringHandler _handler;
-        public ALError Error;
-
-        public ALErrorInterpolatedStringHandler(int literalLength, int formattedCount, out bool shouldAppend)
-        {
-            Error = AL.GetError();
-            if (Error == ALError.NoError)
-            {
-                shouldAppend = false;
-                _handler = default;
-            }
-            else
-            {
-                shouldAppend = true;
-                _handler = new DefaultInterpolatedStringHandler(literalLength, formattedCount);
-            }
-        }
-
-        public string ToStringAndClear() => _handler.ToStringAndClear();
-        public override string ToString() => _handler.ToString();
-        public void AppendLiteral(string value) => _handler.AppendLiteral(value);
-        public void AppendFormatted<T>(T value) => _handler.AppendFormatted(value);
-        public void AppendFormatted<T>(T value, string? format) => _handler.AppendFormatted(value, format);
-    }
 }

Robust.Client/Audio/AudioOverlay.cs

@@ -46,7 +46,7 @@ public sealed class AudioOverlay : Overlay
 
         var screenHandle = args.ScreenHandle;
         var output = new StringBuilder();
-        var listenerPos = _transform.GetMapCoordinates(_entManager.GetComponent<TransformComponent>(localPlayer.Value));
+        var listenerPos = _entManager.GetComponent<TransformComponent>(localPlayer.Value).MapPosition;
 
         if (listenerPos.MapId != args.MapId)
             return;
@@ -74,13 +74,11 @@ public sealed class AudioOverlay : Overlay
             output.Clear();
             output.AppendLine("Audio Source");
             output.AppendLine("Runtime:");
-            output.AppendLine($"- Distance: {_audio.GetAudioDistance(distance.Length()):0.00}");
             output.AppendLine($"- Occlusion: {posOcclusion:0.0000}");
             output.AppendLine("Params:");
-            output.AppendLine($"- RolloffFactor: {comp.RolloffFactor:0.0000}");
             output.AppendLine($"- Volume: {comp.Volume:0.0000}");
-            output.AppendLine($"- Reference distance: {comp.ReferenceDistance:0.00}");
-            output.AppendLine($"- Max distance: {comp.MaxDistance:0.00}");
+            output.AppendLine($"- Reference distance: {comp.ReferenceDistance}");
+            output.AppendLine($"- Max distance: {comp.MaxDistance}");
             var outputText = output.ToString().Trim();
             var dimensions = screenHandle.GetDimensions(_font, outputText, 1f);
             var buffer = new Vector2(3f, 3f);

Robust.Client/Audio/AudioSystem.cs

@@ -37,10 +37,11 @@ public sealed partial class AudioSystem : SharedAudioSystem
     [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
     [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly IResourceCache _resourceCache = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IParallelManager _parMan = default!;
     [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
     [Dependency] private readonly IAudioInternal _audio = default!;
-    [Dependency] private readonly SharedMapSystem _maps = default!;
+    [Dependency] private readonly MetaDataSystem _metadata = default!;
     [Dependency] private readonly SharedTransformSystem _xformSys = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
 
@@ -48,10 +49,9 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// Per-tick cache of relevant streams.
     /// </summary>
     private readonly List<(EntityUid Entity, AudioComponent Component, TransformComponent Xform)> _streams = new();
+    private EntityUid? _listenerGrid;
     private UpdateAudioJob _updateAudioJob;
 
-    private float _audioFrameTime;
-    private float _audioFrameTimeRemaining;
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
 
@@ -110,16 +110,9 @@ public sealed partial class AudioSystem : SharedAudioSystem
 
         Subs.CVar(CfgManager, CVars.AudioAttenuation, OnAudioAttenuation, true);
         Subs.CVar(CfgManager, CVars.AudioRaycastLength, OnRaycastLengthChanged, true);
-        Subs.CVar(CfgManager, CVars.AudioTickRate, OnAudioTickRate, true);
         InitializeLimit();
     }
 
-    private void OnAudioTickRate(int obj)
-    {
-        _audioFrameTime = 1f / obj;
-        _audioFrameTimeRemaining = MathF.Min(_audioFrameTimeRemaining, _audioFrameTime);
-    }
-
     private void OnAudioState(EntityUid uid, AudioComponent component, ref AfterAutoHandleStateEvent args)
     {
         ApplyAudioParams(component.Params, component);
@@ -133,33 +126,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
         {
             component.Source.SetAuxiliary(null);
         }
-
-        switch (component.State)
-        {
-            case AudioState.Playing:
-                component.StartPlaying();
-                break;
-            case AudioState.Paused:
-                component.Pause();
-                break;
-            case AudioState.Stopped:
-                component.StopPlaying();
-                component.PlaybackPosition = 0f;
-                break;
-        }
-
-        // If playback position changed then update it.
-        if (!string.IsNullOrEmpty(component.FileName))
-        {
-            var position = (float) ((component.PauseTime ?? Timing.CurTime) - component.AudioStart).TotalSeconds;
-            var currentPosition = component.Source.PlaybackPosition;
-            var diff = Math.Abs(position - currentPosition);
-
-            if (diff > 0.1f)
-            {
-                component.PlaybackPosition = position;
-            }
-        }
     }
 
     /// <summary>
@@ -207,7 +173,7 @@ public sealed partial class AudioSystem : SharedAudioSystem
     private void SetupSource(Entity<AudioComponent> entity, AudioResource audioResource, TimeSpan? length = null)
     {
         var component = entity.Comp;
-
+    
         if (TryAudioLimit(component.FileName))
         {
             var newSource = _audio.CreateAudioSource(audioResource);
@@ -223,6 +189,11 @@ public sealed partial class AudioSystem : SharedAudioSystem
             }
         }
 
+        if ((component.Flags & AudioFlags.GridAudio) != 0x0)
+        {
+            _metadata.SetFlag(entity.Owner, MetaDataFlags.Undetachable, true);
+        }
+
         // Need to set all initial data for first frame.
         ApplyAudioParams(component.Params, component);
         component.Source.Global = component.Global;
@@ -261,13 +232,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
 
     public override void FrameUpdate(float frameTime)
     {
-        _audioFrameTimeRemaining -= frameTime;
-
-        if (_audioFrameTimeRemaining > 0f)
-            return;
-
-        // Clamp to 0 in case we have a really long frame.
-        _audioFrameTimeRemaining = MathF.Max(0f, _audioFrameTime + _audioFrameTimeRemaining);
         var eye = _eyeManager.CurrentEye;
         var localEntity = _playerManager.LocalEntity;
         Vector2 listenerVelocity;
@@ -291,6 +255,9 @@ public sealed partial class AudioSystem : SharedAudioSystem
             _streams.Add((uid, comp, xform));
         }
 
+        _mapManager.TryFindGridAt(ourPos, out var gridUid, out _);
+        _listenerGrid = gridUid == EntityUid.Invalid ? null : gridUid;
+
         try
         {
             _updateAudioJob.OurPosition = ourPos;
@@ -342,25 +309,59 @@ public sealed partial class AudioSystem : SharedAudioSystem
         }
 
         Vector2 worldPos;
-        component.Volume = component.Params.Volume;
+        var gridUid = xform.ParentUid;
 
-        // Handle grid audio differently by using grid position.
+        // Handle grid audio differently by using nearest-edge instead of entity centre.
         if ((component.Flags & AudioFlags.GridAudio) != 0x0)
         {
-            var parentUid = xform.ParentUid;
-            worldPos = _maps.GetGridPosition(parentUid);
-        }
-        else
-        {
-            worldPos = _xformSys.GetWorldPosition(entity);
+            // It's our grid so max volume.
+            if (_listenerGrid == gridUid)
+            {
+                component.Volume = component.Params.Volume;
+                component.Occlusion = 0f;
+                component.Position = listener.Position;
+                return;
+            }
+
+            // TODO: Need a grid-optimised version because this is gonna be expensive.
+            // Just to avoid clipping on and off grid or nearestPoint changing we'll
+            // always set the sound to listener's pos, we'll just manually do gain ourselves.
+            if (_physics.TryGetNearest(gridUid, listener, out _, out var gridDistance))
+            {
+                // Out of range
+                if (gridDistance > component.MaxDistance)
+                {
+                    component.Gain = 0f;
+                    return;
+                }
+
+                var paramsGain = VolumeToGain(component.Params.Volume);
+
+                // Thought I'd never have to manually calculate gain again but this is the least
+                // unpleasant audio I could get at the moment.
+                component.Gain = paramsGain * _audio.GetAttenuationGain(
+                    gridDistance,
+                    component.Params.RolloffFactor,
+                    component.Params.ReferenceDistance,
+                    component.Params.MaxDistance);
+                component.Position = listener.Position;
+                return;
+            }
+
+            // Can't get nearest point so don't play anymore.
+            component.Gain = 0f;
+            return;
         }
 
+        worldPos = _xformSys.GetWorldPosition(entity);
+        component.Volume = component.Params.Volume;
+
         // Max distance check
         var delta = worldPos - listener.Position;
         var distance = delta.Length();
 
         // Out of range so just clip it for us.
-        if (GetAudioDistance(distance) > component.MaxDistance)
+        if (distance > component.MaxDistance)
         {
             // Still keeps the source playing, just with no volume.
             component.Gain = 0f;
@@ -375,15 +376,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
         }
 
         // Update audio occlusion
-        if ((component.Flags & AudioFlags.NoOcclusion) == AudioFlags.NoOcclusion)
-        {
-            component.Occlusion = 0f;
-        }
-        else
-        {
-            var occlusion = GetOcclusion(listener, delta, distance, entity);
-            component.Occlusion = occlusion;
-        }
+        var occlusion = GetOcclusion(listener, delta, distance, entity);
+        component.Occlusion = occlusion;
 
         // Update audio positions.
         component.Position = worldPos;
@@ -433,13 +427,13 @@ public sealed partial class AudioSystem : SharedAudioSystem
         return false;
     }
 
-    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string? filename, EntityCoordinates coordinates,
+    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string filename, EntityCoordinates coordinates,
         AudioParams? audioParams = null)
     {
         return PlayStatic(filename, Filter.Local(), coordinates, true, audioParams);
     }
 
-    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string? filename, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayPvs(string filename, EntityUid uid, AudioParams? audioParams = null)
     {
         return PlayEntity(filename, Filter.Local(), uid, true, audioParams);
     }
@@ -453,17 +447,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
         return null; // uhh Lets hope predicted audio never needs to somehow store the playing audio....
     }
 
-    /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayLocal(
-        SoundSpecifier? sound,
-        EntityUid source,
-        EntityUid? soundInitiator,
-        AudioParams? audioParams = null
-    )
-    {
-        return PlayPredicted(sound, source, soundInitiator, audioParams);
-    }
-
     public override (EntityUid Entity, AudioComponent Component)? PlayPredicted(SoundSpecifier? sound, EntityCoordinates coordinates, EntityUid? user, AudioParams? audioParams = null)
     {
         if (Timing.IsFirstTimePredicted && sound != null)
@@ -477,11 +460,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// </summary>
     /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
     /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (string.IsNullOrEmpty(filename))
-            return null;
-
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioGlobalMessage
@@ -513,11 +493,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// </summary>
     /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
     /// <param name="entity">The entity "emitting" the audio.</param>
-    private (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, EntityUid entity, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, EntityUid entity, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (string.IsNullOrEmpty(filename))
-            return null;
-
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioEntityMessage
@@ -557,11 +534,8 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// <param name="filename">The resource path to the OGG Vorbis file to play.</param>
     /// <param name="coordinates">The coordinates at which to play the audio.</param>
     /// <param name="audioParams"></param>
-    private (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, EntityCoordinates coordinates, AudioParams? audioParams = null, bool recordReplay = true)
+    private (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, EntityCoordinates coordinates, AudioParams? audioParams = null, bool recordReplay = true)
     {
-        if (string.IsNullOrEmpty(filename))
-            return null;
-
         if (recordReplay && _replayRecording.IsRecording)
         {
             _replayRecording.RecordReplayMessage(new PlayAudioPositionalMessage
@@ -595,25 +569,25 @@ public sealed partial class AudioSystem : SharedAudioSystem
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
     {
         return PlayGlobal(filename, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, Filter playerFilter, EntityUid entity, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, Filter playerFilter, EntityUid entity, bool recordReplay, AudioParams? audioParams = null)
     {
         return PlayEntity(filename, entity, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, Filter playerFilter, EntityCoordinates coordinates, bool recordReplay, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, Filter playerFilter, EntityCoordinates coordinates, bool recordReplay, AudioParams? audioParams = null)
     {
         return PlayStatic(filename, coordinates, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, ICommonSession recipient, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, ICommonSession recipient, AudioParams? audioParams = null)
     {
         return PlayGlobal(filename, audioParams);
     }
@@ -629,31 +603,31 @@ public sealed partial class AudioSystem : SharedAudioSystem
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, EntityUid recipient, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string filename, EntityUid recipient, AudioParams? audioParams = null)
     {
         return PlayGlobal(filename, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, ICommonSession recipient, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, ICommonSession recipient, EntityUid uid, AudioParams? audioParams = null)
     {
         return PlayEntity(filename, uid, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string? filename, EntityUid recipient, EntityUid uid, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayEntity(string filename, EntityUid recipient, EntityUid uid, AudioParams? audioParams = null)
     {
         return PlayEntity(filename, uid, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, ICommonSession recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, ICommonSession recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
     {
         return PlayStatic(filename, coordinates, audioParams);
     }
 
     /// <inheritdoc />
-    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string? filename, EntityUid recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
+    public override (EntityUid Entity, AudioComponent Component)? PlayStatic(string filename, EntityUid recipient, EntityCoordinates coordinates, AudioParams? audioParams = null)
     {
         return PlayStatic(filename, coordinates, audioParams);
     }
@@ -661,16 +635,15 @@ public sealed partial class AudioSystem : SharedAudioSystem
     private (EntityUid Entity, AudioComponent Component) CreateAndStartPlayingStream(AudioParams? audioParams, AudioStream stream)
     {
         var audioP = audioParams ?? AudioParams.Default;
-        var entity = SetupAudio(null, audioP, initialize: false, length: stream.Length);
-        LoadStream(entity, stream);
+        var entity = EntityManager.CreateEntityUninitialized("Audio", MapCoordinates.Nullspace);
+        var comp = SetupAudio(entity, null, audioP, stream.Length);
+        LoadStream((entity, comp), stream);
         EntityManager.InitializeAndStartEntity(entity);
-        var comp = entity.Comp;
         var source = comp.Source;
 
         // TODO clamp the offset inside of SetPlaybackPosition() itself.
         var offset = audioP.PlayOffsetSeconds;
-        var maxOffset = Math.Max((float) stream.Length.TotalSeconds - 0.01f, 0f);
-        offset = Math.Clamp(offset, 0f, maxOffset);
+        offset = Math.Clamp(offset, 0f, (float) stream.Length.TotalSeconds - 0.01f);
         source.PlaybackPosition = offset;
 
         // For server we will rely on the adjusted one but locally we will have to adjust it ourselves.

Robust.Client/Audio/Midi/IMidiRenderer.cs

@@ -33,6 +33,12 @@ public interface IMidiRenderer : IDisposable
     /// </summary>
     bool LoopMidi { get; set; }
 
+    /// <summary>
+    ///     This increases all note on velocities to 127.
+    /// </summary>
+    [Obsolete($"Use {nameof(VelocityOverride)} instead, you can set it to 127 to achieve the same effect.")]
+    bool VolumeBoost { get; set; }
+
     /// <summary>
     ///     The midi program (instrument) the renderer is using.
     /// </summary>

Robust.Client/Audio/Midi/MidiRenderer.cs

@@ -205,6 +205,14 @@ internal sealed class MidiRenderer : IMidiRenderer
         }
     }
 
+    [ViewVariables(VVAccess.ReadWrite)]
+    [Obsolete($"Use {nameof(VelocityOverride)} instead, you can set it to 127 to achieve the same effect.")]
+    public bool VolumeBoost
+    {
+        get => VelocityOverride == 127;
+        set => VelocityOverride = value ? 127 : null;
+    }
+
     [ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? TrackingEntity { get; set; } = null;
 

Robust.Client/Audio/Sources/BaseAudioSource.cs

@@ -314,8 +314,6 @@ public abstract class BaseAudioSource : IAudioSource
         set
         {
             _checkDisposed();
-
-            value = MathF.Max(value, 0f);
             AL.Source(SourceHandle, ALSourcef.SecOffset, value);
             Master._checkAlError($"Tried to set invalid playback position of {value:0.00}");
         }

Robust.Client/Audio/Sources/BufferedAudioSource.cs

@@ -1,18 +1,24 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Numerics;
 using OpenTK.Audio.OpenAL;
 using OpenTK.Audio.OpenAL.Extensions.Creative.EFX;
+using Robust.Client.Graphics;
 using Robust.Shared.Audio.Sources;
+using Robust.Shared.Maths;
 
 namespace Robust.Client.Audio.Sources;
 
 internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSource
 {
+    private int? SourceHandle = null;
     private int[] BufferHandles;
     private Dictionary<int, int> BufferMap = new();
     private readonly AudioManager _master;
     private bool _mono = true;
     private bool _float = false;
+    private int FilterHandle;
 
     public int SampleRate { get; set; } = 44100;
 
@@ -37,7 +43,7 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
         get
         {
             _checkDisposed();
-            var state = AL.GetSourceState(SourceHandle);
+            var state = AL.GetSourceState(SourceHandle!.Value);
             _master._checkAlError();
             return state == ALSourceState.Playing;
         }
@@ -47,7 +53,7 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
             {
                 _checkDisposed();
                 // IDK why this stackallocs but gonna leave it for now.
-                AL.SourcePlay(stackalloc int[] {SourceHandle});
+                AL.SourcePlay(stackalloc int[] {SourceHandle!.Value});
                 _master._checkAlError();
             }
             else
@@ -55,7 +61,7 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
                 if (_isDisposed())
                     return;
 
-                AL.SourceStop(SourceHandle);
+                AL.SourceStop(SourceHandle!.Value);
                 _master._checkAlError();
             }
         }
@@ -68,13 +74,13 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
 
     protected override void Dispose(bool disposing)
     {
-        if (SourceHandle == -1)
+        if (SourceHandle == null)
             return;
 
         if (!_master.IsMainThread())
         {
             // We can't run this code inside another thread so tell Clyde to clear it up later.
-            _master.DeleteBufferedSourceOnMainThread(SourceHandle, FilterHandle);
+            _master.DeleteBufferedSourceOnMainThread(SourceHandle.Value, FilterHandle);
 
             foreach (var handle in BufferHandles)
             {
@@ -86,21 +92,21 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
             if (FilterHandle != 0)
                 EFX.DeleteFilter(FilterHandle);
 
-            AL.DeleteSource(SourceHandle);
+            AL.DeleteSource(SourceHandle.Value);
             AL.DeleteBuffers(BufferHandles);
-            _master.RemoveBufferedAudioSource(SourceHandle);
+            _master.RemoveBufferedAudioSource(SourceHandle.Value);
             _master._checkAlError();
         }
 
         FilterHandle = 0;
-        SourceHandle = -1;
+        SourceHandle = null;
     }
 
     public int GetNumberOfBuffersProcessed()
     {
         _checkDisposed();
         // ReSharper disable once PossibleInvalidOperationException
-        AL.GetSource(SourceHandle, ALGetSourcei.BuffersProcessed, out var buffersProcessed);
+        AL.GetSource(SourceHandle!.Value, ALGetSourcei.BuffersProcessed, out var buffersProcessed);
         return buffersProcessed;
     }
 
@@ -110,7 +116,7 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
         var entries = Math.Min(Math.Min(handles.Length, BufferHandles.Length), GetNumberOfBuffersProcessed());
         fixed (int* ptr = handles)
         {
-            AL.SourceUnqueueBuffers(SourceHandle, entries, ptr);
+            AL.SourceUnqueueBuffers(SourceHandle!.Value, entries, ptr);
         }
 
         for (var i = 0; i < entries; i++)
@@ -177,7 +183,7 @@ internal sealed class BufferedAudioSource : BaseAudioSource, IBufferedAudioSourc
         fixed (int* ptr = realHandles)
             // ReSharper disable once PossibleInvalidOperationException
         {
-            AL.SourceQueueBuffers(SourceHandle, handles.Length, ptr);
+            AL.SourceQueueBuffers(SourceHandle!.Value, handles.Length, ptr);
         }
     }
 

Robust.Client/BaseClient.cs

@@ -285,7 +285,6 @@ namespace Robust.Client
     /// <summary>
     ///     Enumeration of the run levels of the BaseClient.
     /// </summary>
-    /// <seealso cref="ClientRunLevelExt"/>
     public enum ClientRunLevel : byte
     {
         Error = 0,
@@ -316,21 +315,6 @@ namespace Robust.Client
         SinglePlayerGame,
     }
 
-    /// <summary>
-    /// Helper functions for working with <see cref="ClientRunLevel"/>.
-    /// </summary>
-    public static class ClientRunLevelExt
-    {
-        /// <summary>
-        /// Check if a <see cref="ClientRunLevel"/> is <see cref="ClientRunLevel.InGame"/>
-        /// or <see cref="ClientRunLevel.SinglePlayerGame"/>.
-        /// </summary>
-        public static bool IsInGameLike(this ClientRunLevel runLevel)
-        {
-            return runLevel is ClientRunLevel.InGame or ClientRunLevel.SinglePlayerGame;
-        }
-    }
-
     /// <summary>
     ///     Event arguments for when something changed with the player.
     /// </summary>

Robust.Client/ClientIoC.cs

@@ -8,7 +8,6 @@ using Robust.Client.GameObjects;
 using Robust.Client.GameStates;
 using Robust.Client.Graphics;
 using Robust.Client.Graphics.Clyde;
-using Robust.Client.HWId;
 using Robust.Client.Input;
 using Robust.Client.Map;
 using Robust.Client.Placement;
@@ -27,7 +26,6 @@ using Robust.Client.Upload;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.RichText;
 using Robust.Client.UserInterface.Themes;
-using Robust.Client.UserInterface.XAML.Proxy;
 using Robust.Client.Utility;
 using Robust.Client.ViewVariables;
 using Robust.Shared;
@@ -148,18 +146,7 @@ namespace Robust.Client
             deps.Register<IConfigurationManagerInternal, ClientNetConfigurationManager>();
             deps.Register<IClientNetConfigurationManager, ClientNetConfigurationManager>();
             deps.Register<INetConfigurationManagerInternal, ClientNetConfigurationManager>();
-
-#if TOOLS
-            deps.Register<IXamlProxyManager, XamlProxyManager>();
-            deps.Register<IXamlHotReloadManager, XamlHotReloadManager>();
-#else
-            deps.Register<IXamlProxyManager, XamlProxyManagerStub>();
-            deps.Register<IXamlHotReloadManager, XamlHotReloadManagerStub>();
-#endif
-
-            deps.Register<IXamlProxyHelper, XamlProxyHelper>();
             deps.Register<MarkupTagManager>();
-            deps.Register<IHWId, BasicHWId>();
         }
     }
 }

Robust.Client/Console/Commands/Debug.cs

@@ -291,9 +291,10 @@ namespace Robust.Client.Console.Commands
         }
     }
 
-    internal sealed class SnapGridGetCell : LocalizedEntityCommands
+    internal sealed class SnapGridGetCell : LocalizedCommands
     {
-        [Dependency] private readonly SharedMapSystem _map = default!;
+        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IMapManager _map = default!;
 
         public override string Command => "sggcell";
 
@@ -319,10 +320,9 @@ namespace Robust.Client.Console.Commands
                 return;
             }
 
-            var gridEnt = EntityManager.GetEntity(gridNet);
-            if (EntityManager.TryGetComponent<MapGridComponent>(gridEnt, out var grid))
+            if (_map.TryGetGrid(_entManager.GetEntity(gridNet), out var grid))
             {
-                foreach (var entity in _map.GetAnchoredEntities(gridEnt, grid, new Vector2i(
+                foreach (var entity in grid.GetAnchoredEntities(new Vector2i(
                              int.Parse(indices.Split(',')[0], CultureInfo.InvariantCulture),
                              int.Parse(indices.Split(',')[1], CultureInfo.InvariantCulture))))
                 {
@@ -426,9 +426,10 @@ namespace Robust.Client.Console.Commands
         }
     }
 
-    internal sealed class GridTileCount : LocalizedEntityCommands
+    internal sealed class GridTileCount : LocalizedCommands
     {
-        [Dependency] private readonly SharedMapSystem _map = default!;
+        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IMapManager _map = default!;
 
         public override string Command => "gridtc";
 
@@ -441,15 +442,15 @@ namespace Robust.Client.Console.Commands
             }
 
             if (!NetEntity.TryParse(args[0], out var gridUidNet) ||
-                !EntityManager.TryGetEntity(gridUidNet, out var gridUid))
+                !_entManager.TryGetEntity(gridUidNet, out var gridUid))
             {
                 shell.WriteLine($"{args[0]} is not a valid entity UID.");
                 return;
             }
 
-            if (EntityManager.TryGetComponent<MapGridComponent>(gridUid, out var grid))
+            if (_map.TryGetGrid(gridUid, out var grid))
             {
-                shell.WriteLine(_map.GetAllTiles(gridUid.Value, grid).Count().ToString());
+                shell.WriteLine(grid.GetAllTiles().Count().ToString());
             }
             else
             {
@@ -554,7 +555,7 @@ namespace Robust.Client.Console.Commands
                 if (type != typeof(Control))
                     cname = $"Control > {cname}";
 
-                returnVal.GetOrNew(cname).Add((member.Name, GetMemberValue(member, control, ", ")));
+                returnVal.GetOrNew(cname).Add((member.Name, member.GetValue(control)?.ToString() ?? "null"));
             }
 
             foreach (var (attachedProperty, value) in control.AllAttachedProperties)
@@ -569,41 +570,6 @@ namespace Robust.Client.Console.Commands
             }
             return returnVal;
         }
-
-        internal static string PropertyValuesString(Control control, string key)
-        {
-            var member = GetAllMembers(control).Find(m => m.Name == key);
-            return GetMemberValue(member, control, "\n", "\"{0}\"");
-        }
-
-        private static string GetMemberValue(MemberInfo? member, Control control, string separator, string
-                wrap = "{0}")
-        {
-            object? value = null;
-            try
-            {
-                value = member?.GetValue(control);
-            }
-            catch (TargetInvocationException exception)
-            {
-                var exceptionToPrint = exception.InnerException ?? exception;
-                value = $"{exceptionToPrint.GetType()}: {exceptionToPrint.Message}";
-            }
-            catch (Exception exception)
-            {
-                value = $"{exception.GetType()}: {exception.Message}";
-            }
-            var o = value switch
-            {
-                ICollection<Control> controls => string.Join(separator,
-                    controls.Select(ctrl => $"{ctrl.Name}({ctrl.GetType()})")),
-                ICollection<string> list => string.Join(separator, list),
-                null => null,
-                _ => value.ToString()
-            };
-            // Convert to quote surrounded string or null with no quotes
-            return o is not null ? string.Format(wrap, o) : "null";
-        }
     }
 
     internal sealed class SetClipboardCommand : LocalizedCommands
@@ -694,12 +660,12 @@ namespace Robust.Client.Console.Commands
         }
     }
 
-    internal sealed class ChunkInfoCommand : LocalizedEntityCommands
+    internal sealed class ChunkInfoCommand : LocalizedCommands
     {
+        [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IMapManager _map = default!;
         [Dependency] private readonly IEyeManager _eye = default!;
         [Dependency] private readonly IInputManager _input = default!;
-        [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
         public override string Command => "chunkinfo";
 
@@ -713,8 +679,8 @@ namespace Robust.Client.Console.Commands
                 return;
             }
 
-            var mapSystem = EntityManager.System<SharedMapSystem>();
-            var chunkIndex = mapSystem.LocalToChunkIndices(gridUid, grid, _mapSystem.MapToGrid(gridUid, mousePos));
+            var mapSystem = _entManager.System<SharedMapSystem>();
+            var chunkIndex = mapSystem.LocalToChunkIndices(gridUid, grid, grid.MapToGrid(mousePos));
             var chunk = mapSystem.GetOrAddChunk(gridUid, grid, chunkIndex);
 
             shell.WriteLine($"worldBounds: {mapSystem.CalcWorldAABB(gridUid, grid, chunk)} localBounds: {chunk.CachedBounds}");

Robust.Client/Console/Commands/GridChunkBBCommand.cs

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

Robust.Client/Console/Commands/LauncherAuthCommand.cs

@@ -20,9 +20,8 @@ namespace Robust.Client.Console.Commands
         {
             var wantName = args.Length > 0 ? args[0] : null;
 
-            var basePath = UserDataDir.GetRootUserDataDir(_gameController);
-            var launcherDirName = Environment.GetEnvironmentVariable("SS14_LAUNCHER_APPDATA_NAME") ?? "launcher";
-            var dbPath = Path.Combine(basePath, launcherDirName, "settings.db");
+            var basePath = Path.GetDirectoryName(UserDataDir.GetUserDataDir(_gameController))!;
+            var dbPath = Path.Combine(basePath, "launcher", "settings.db");
 
 #if USE_SYSTEM_SQLITE
             SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3());

Robust.Client/Console/Commands/UITestCommand.cs

@@ -204,7 +204,7 @@ Suspendisse hendrerit blandit urna ut laoreet. Suspendisse ac elit at erat males
     private Control TabRichText()
     {
         var label = new RichTextLabel();
-        label.SetMessage(FormattedMessage.FromMarkupOrThrow(Lipsum));
+        label.SetMessage(FormattedMessage.FromMarkup(Lipsum));
 
         TabContainer.SetTabTitle(label, "RichText");
         return label;

Robust.Client/Credits/CreditsManager.cs

@@ -14,6 +14,15 @@ namespace Robust.Client.Credits
     /// </summary>
     public static class CreditsManager
     {
+        /// <summary>
+        ///     Gets a list of open source software used in the engine and their license.
+        /// </summary>
+        [Obsolete("Use overload that takes in an explicit resource manager instead.")]
+        public static IEnumerable<LicenseEntry> GetLicenses()
+        {
+            return GetLicenses(IoCManager.Resolve<IResourceManager>());
+        }
+
         /// <summary>
         ///     Gets a list of open source software used in the engine and their license.
         /// </summary>

Robust.Client/Debugging/DebugDrawingSystem.cs

@@ -1,5 +1,4 @@
 using System.Numerics;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
@@ -15,8 +14,6 @@ namespace Robust.Client.Debugging
     {
         [Dependency] private readonly IOverlayManager _overlayManager = default!;
         [Dependency] private readonly EntityLookupSystem _lookup = default!;
-        [Dependency] private readonly TransformSystem _transform = default!;
-
 
         private bool _debugPositions;
         private bool _debugRotations;
@@ -38,7 +35,7 @@ namespace Robust.Client.Debugging
 
                 if (value && !_overlayManager.HasOverlay<EntityPositionOverlay>())
                 {
-                    _overlayManager.AddOverlay(new EntityPositionOverlay(_lookup, EntityManager, _transform));
+                    _overlayManager.AddOverlay(new EntityPositionOverlay(_lookup, EntityManager));
                 }
                 else
                 {
@@ -77,15 +74,13 @@ namespace Robust.Client.Debugging
         {
             private readonly EntityLookupSystem _lookup;
             private readonly IEntityManager _entityManager;
-            private readonly SharedTransformSystem _transform;
 
             public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
-            public EntityPositionOverlay(EntityLookupSystem lookup, IEntityManager entityManager, SharedTransformSystem transform)
+            public EntityPositionOverlay(EntityLookupSystem lookup, IEntityManager entityManager)
             {
                 _lookup = lookup;
                 _entityManager = entityManager;
-                _transform = transform;
             }
 
             protected internal override void Draw(in OverlayDrawArgs args)
@@ -93,10 +88,11 @@ namespace Robust.Client.Debugging
                 const float stubLength = 0.25f;
 
                 var worldHandle = (DrawingHandleWorld) args.DrawingHandle;
+                var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
 
                 foreach (var entity in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldBounds))
                 {
-                    var (center, worldRotation) = _transform.GetWorldPositionRotation(entity);
+                    var (center, worldRotation) = xformQuery.GetComponent(entity).GetWorldPositionRotation();
 
                     var xLine = worldRotation.RotateVec(Vector2.UnitX);
                     var yLine = worldRotation.RotateVec(Vector2.UnitY);

Robust.Client/Debugging/DebugPhysicsSystem.cs

@@ -47,7 +47,6 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
@@ -79,14 +78,6 @@ namespace Robust.Client.Debugging
         internal int PointCount;
 
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-        [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-        [Dependency] private readonly TransformSystem _transform = default!;
-        [Dependency] private readonly IOverlayManager _overlay = default!;
-        [Dependency] private readonly IEyeManager _eye = default!;
-        [Dependency] private readonly IInputManager _input = default!;
-        [Dependency] private readonly IMapManager _map = default!;
-        [Dependency] private readonly IPlayerManager _player = default!;
-        [Dependency] private readonly IResourceCache _resourceCache = default!;
 
         internal ContactPoint[] Points = new ContactPoint[MaxContactPoints];
 
@@ -98,21 +89,20 @@ namespace Robust.Client.Debugging
                 if (value == _flags) return;
 
                 if (_flags == PhysicsDebugFlags.None)
-                    _overlay.AddOverlay(
+                    IoCManager.Resolve<IOverlayManager>().AddOverlay(
                         new PhysicsDebugOverlay(
                             EntityManager,
-                            _eye,
-                            _input,
-                            _map,
-                            _player,
-                            _resourceCache,
+                            IoCManager.Resolve<IEyeManager>(),
+                            IoCManager.Resolve<IInputManager>(),
+                            IoCManager.Resolve<IMapManager>(),
+                            IoCManager.Resolve<IPlayerManager>(),
+                            IoCManager.Resolve<IResourceCache>(),
                             this,
-                            _entityLookup,
-                            _physics,
-                            _transform));
+                            Get<EntityLookupSystem>(),
+                            Get<SharedPhysicsSystem>()));
 
                 if (value == PhysicsDebugFlags.None)
-                    _overlay.RemoveOverlay(typeof(PhysicsDebugOverlay));
+                    IoCManager.Resolve<IOverlayManager>().RemoveOverlay(typeof(PhysicsDebugOverlay));
 
                 _flags = value;
             }
@@ -208,7 +198,6 @@ namespace Robust.Client.Debugging
         private readonly DebugPhysicsSystem _debugPhysicsSystem;
         private readonly EntityLookupSystem _lookup;
         private readonly SharedPhysicsSystem _physicsSystem;
-        private readonly SharedTransformSystem _transformSystem;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace | OverlaySpace.ScreenSpace;
 
@@ -219,7 +208,7 @@ namespace Robust.Client.Debugging
         private HashSet<Joint> _drawnJoints = new();
         private List<Entity<MapGridComponent>> _grids = new();
 
-        public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem, SharedTransformSystem transformSystem)
+        public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem)
         {
             _entityManager = entityManager;
             _eyeManager = eyeManager;
@@ -229,7 +218,6 @@ namespace Robust.Client.Debugging
             _debugPhysicsSystem = system;
             _lookup = lookup;
             _physicsSystem = physicsSystem;
-            _transformSystem = transformSystem;
             _font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
         }
 
@@ -237,7 +225,7 @@ namespace Robust.Client.Debugging
         {
             var viewBounds = args.WorldBounds;
             var viewAABB = args.WorldAABB;
-            var mapId = args.MapId;
+            var mapId = _eyeManager.CurrentMap;
 
             if ((_debugPhysicsSystem.Flags & PhysicsDebugFlags.Shapes) != 0)
             {
@@ -339,7 +327,7 @@ namespace Robust.Client.Debugging
                 {
                     if (jointComponent.JointCount == 0 ||
                         !_entityManager.TryGetComponent(uid, out TransformComponent? xf1) ||
-                        !viewAABB.Contains(_transformSystem.GetWorldPosition(xf1))) continue;
+                        !viewAABB.Contains(xf1.WorldPosition)) continue;
 
                     foreach (var (_, joint) in jointComponent.Joints)
                     {
@@ -380,12 +368,12 @@ namespace Robust.Client.Debugging
             }
 
             worldHandle.UseShader(null);
-            worldHandle.SetTransform(Matrix3x2.Identity);
+            worldHandle.SetTransform(Matrix3.Identity);
         }
 
         private void DrawScreen(DrawingHandleScreen screenHandle, OverlayDrawArgs args)
         {
-            var mapId = args.MapId;
+            var mapId = _eyeManager.CurrentMap;
             var mousePos = _inputManager.MouseScreenPosition;
 
             if ((_debugPhysicsSystem.Flags & PhysicsDebugFlags.ShapeInfo) != 0x0)
@@ -455,7 +443,7 @@ namespace Robust.Client.Debugging
             }
 
             screenHandle.UseShader(null);
-            screenHandle.SetTransform(Matrix3x2.Identity);
+            screenHandle.SetTransform(Matrix3.Identity);
         }
 
         protected internal override void Draw(in OverlayDrawArgs args)
@@ -529,22 +517,22 @@ namespace Robust.Client.Debugging
             if (!_entityManager.TryGetComponent(joint.BodyAUid, out TransformComponent? xform1) ||
                 !_entityManager.TryGetComponent(joint.BodyBUid, out TransformComponent? xform2)) return;
 
-            var matrix1 = _transformSystem.GetWorldMatrix(xform1);
-            var matrix2 = _transformSystem.GetWorldMatrix(xform2);
+            var matrix1 = xform1.WorldMatrix;
+            var matrix2 = xform2.WorldMatrix;
 
-            var xf1 = new Vector2(matrix1.M31, matrix1.M32);
-            var xf2 = new Vector2(matrix2.M31, matrix2.M32);
+            var xf1 = new Vector2(matrix1.R0C2, matrix1.R1C2);
+            var xf2 = new Vector2(matrix2.R0C2, matrix2.R1C2);
 
-            var p1 = Vector2.Transform(joint.LocalAnchorA, matrix1);
-            var p2 = Vector2.Transform(joint.LocalAnchorB, matrix2);
+            var p1 = matrix1.Transform(joint.LocalAnchorA);
+            var p2 = matrix2.Transform(joint.LocalAnchorB);
 
-            var xfa = new Transform(xf1, _transformSystem.GetWorldRotation(xform1));
-            var xfb = new Transform(xf2, _transformSystem.GetWorldRotation(xform2));
+            var xfa = new Transform(xf1, xform1.WorldRotation);
+            var xfb = new Transform(xf2, xform2.WorldRotation);
 
             switch (joint)
             {
                 case DistanceJoint:
-                    worldHandle.DrawLine(p1, p2, JointColor);
+                    worldHandle.DrawLine(xf1, xf2, JointColor);
                     break;
                 case PrismaticJoint prisma:
                     var pA = Transform.Mul(xfa, joint.LocalAnchorA);

Robust.Client/GameController/GameController.cs

@@ -19,7 +19,6 @@ using Robust.Client.State;
 using Robust.Client.Upload;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.RichText;
-using Robust.Client.UserInterface.XAML.Proxy;
 using Robust.Client.Utility;
 using Robust.Client.ViewVariables;
 using Robust.Client.WebViewHook;
@@ -54,8 +53,6 @@ namespace Robust.Client
         [Dependency] private readonly IResourceCacheInternal _resourceCache = default!;
         [Dependency] private readonly IResourceManagerInternal _resManager = default!;
         [Dependency] private readonly IRobustSerializer _serializer = default!;
-        [Dependency] private readonly IXamlProxyManager _xamlProxyManager = default!;
-        [Dependency] private readonly IXamlHotReloadManager _xamlHotReloadManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientNetManager _networkManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
@@ -112,28 +109,14 @@ namespace Robust.Client
             _commandLineArgs = args;
         }
 
-        public string GameTitle()
-        {
-            return Options.DefaultWindowTitle ?? _resourceManifest!.DefaultWindowTitle ?? "RobustToolbox";
-        }
-
-        public string WindowIconSet()
-        {
-            return Options.WindowIconSet?.ToString() ?? _resourceManifest!.WindowIconSet ?? "";
-        }
-
-        public string SplashLogo()
-        {
-            return Options.SplashLogo?.ToString() ?? _resourceManifest!.SplashLogo ?? "";
-        }
-
         internal bool StartupContinue(DisplayMode displayMode)
         {
             DebugTools.AssertNotNull(_resourceManifest);
 
             _clyde.InitializePostWindowing();
             _audio.InitializePostWindowing();
-            _clyde.SetWindowTitle(GameTitle());
+            _clyde.SetWindowTitle(
+                Options.DefaultWindowTitle ?? _resourceManifest!.DefaultWindowTitle ?? "RobustToolbox");
 
             _taskManager.Initialize();
             _parallelMgr.Initialize();
@@ -188,8 +171,6 @@ namespace Robust.Client
             _reflectionManager.Initialize();
             _prototypeManager.Initialize();
             _prototypeManager.LoadDefaultPrototypes();
-            _xamlProxyManager.Initialize();
-            _xamlHotReloadManager.Initialize();
             _userInterfaceManager.Initialize();
             _eyeManager.Initialize();
             _entityManager.Initialize();
@@ -382,7 +363,7 @@ namespace Robust.Client
 
             _prof.Initialize();
 
-            _resManager.Initialize(Options.LoadConfigAndUserData ? userDataDir : null, hideUserDataDir: true);
+            _resManager.Initialize(Options.LoadConfigAndUserData ? userDataDir : null);
 
             var mountOptions = _commandLineArgs != null
                 ? MountOptions.Merge(_commandLineArgs.MountOptions, Options.MountOptions)
@@ -413,8 +394,10 @@ namespace Robust.Client
                 // Handle GameControllerOptions implicit CVar overrides.
                 _configurationManager.OverrideConVars(new[]
                 {
-                    (CVars.DisplayWindowIconSet.Name, WindowIconSet()),
-                    (CVars.DisplaySplashLogo.Name, SplashLogo())
+                    (CVars.DisplayWindowIconSet.Name,
+                        options.WindowIconSet?.ToString() ?? _resourceManifest.WindowIconSet ?? ""),
+                    (CVars.DisplaySplashLogo.Name,
+                        options.SplashLogo?.ToString() ?? _resourceManifest.SplashLogo ?? "")
                 });
             }
 
@@ -629,8 +612,6 @@ namespace Robust.Client
             {
                 _modLoader.BroadcastUpdate(ModUpdateLevel.FramePostEngine, frameEventArgs);
             }
-
-            _audio.FlushALDisposeQueues();
         }
 
         internal static void SetupLogging(

Robust.Client/GameObjects/ClientEntityManager.cs

@@ -26,9 +26,6 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IBaseClient _client = default!;
         [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
 
-        internal event Action? AfterStartup;
-        internal event Action? AfterShutdown;
-
         public override void Initialize()
         {
             SetupNetworking();
@@ -37,20 +34,6 @@ namespace Robust.Client.GameObjects
             base.Initialize();
         }
 
-        public override void Startup()
-        {
-            base.Startup();
-
-            AfterStartup?.Invoke();
-        }
-
-        public override void Shutdown()
-        {
-            base.Shutdown();
-
-            AfterShutdown?.Invoke();
-        }
-
         public override void FlushEntities()
         {
             // Server doesn't network deletions on client shutdown so we need to
@@ -65,6 +48,16 @@ namespace Robust.Client.GameObjects
             return base.CreateEntity(prototypeName, out metadata);
         }
 
+        void IClientEntityManagerInternal.InitializeEntity(EntityUid entity, MetaDataComponent? meta)
+        {
+            base.InitializeEntity(entity, meta);
+        }
+
+        void IClientEntityManagerInternal.StartEntity(EntityUid entity)
+        {
+            base.StartEntity(entity);
+        }
+
         /// <inheritdoc />
         public override void DirtyEntity(EntityUid uid, MetaDataComponent? meta = null)
         {
@@ -135,10 +128,7 @@ namespace Robust.Client.GameObjects
             var sequence = _stateMan.SystemMessageDispatched(msg);
             EntityNetManager?.SendSystemNetworkMessage(msg, sequence);
 
-            if (!_stateMan.IsPredictionEnabled && _client.RunLevel != ClientRunLevel.SinglePlayerGame)
-                return;
-
-            DebugTools.Assert(_gameTiming.InPrediction && _gameTiming.IsFirstTimePredicted || _client.RunLevel == ClientRunLevel.SinglePlayerGame);
+            DebugTools.Assert(!_stateMan.IsPredictionEnabled || _gameTiming.InPrediction && _gameTiming.IsFirstTimePredicted || _client.RunLevel != ClientRunLevel.Connected);
 
             var eventArgs = new EntitySessionEventArgs(session!);
             EventBus.RaiseEvent(EventSource.Local, msg);

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

@@ -6,12 +6,13 @@ using System.Linq;
 using System.Numerics;
 using System.Text;
 using Robust.Client.Graphics;
-using Robust.Client.Graphics.Clyde;
 using Robust.Client.ResourceManagement;
 using Robust.Client.Utility;
+using Robust.Shared;
 using Robust.Shared.Animations;
 using Robust.Shared.ComponentTrees;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Graphics;
 using Robust.Shared.Graphics.RSI;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -29,7 +30,6 @@ using static Robust.Client.ComponentTrees.SpriteTreeSystem;
 using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth;
 using static Robust.Shared.Serialization.TypeSerializers.Implementations.SpriteSpecifierSerializer;
 using Direction = Robust.Shared.Maths.Direction;
-using Vector4 = Robust.Shared.Maths.Vector4;
 
 namespace Robust.Client.GameObjects
 {
@@ -150,7 +150,7 @@ namespace Robust.Client.GameObjects
         [DataField("color")]
         private Color color = Color.White;
 
-        public Matrix3x2 LocalMatrix = Matrix3x2.Identity;
+        public Matrix3 LocalMatrix = Matrix3.Identity;
 
         [Animatable]
         [ViewVariables(VVAccess.ReadWrite)]
@@ -389,10 +389,10 @@ namespace Robust.Client.GameObjects
 
         internal void UpdateLocalMatrix()
         {
-            LocalMatrix = Matrix3Helpers.CreateTransform(in offset, in rotation, in scale);
+            LocalMatrix = Matrix3.CreateTransform(in offset, in rotation, in scale);
         }
 
-        public Matrix3x2 GetLocalMatrix()
+        public Matrix3 GetLocalMatrix()
         {
             return LocalMatrix;
         }
@@ -772,7 +772,15 @@ namespace Robust.Client.GameObjects
             {
                 foreach (var keyString in layerDatum.MapKeys)
                 {
-                    var key = ParseKey(keyString);
+                    object key;
+                    if (reflection.TryParseEnumReference(keyString, out var @enum))
+                    {
+                        key = @enum;
+                    }
+                    else
+                    {
+                        key = keyString;
+                    }
 
                     if (LayerMap.TryGetValue(key, out var mappedIndex))
                     {
@@ -798,30 +806,9 @@ namespace Robust.Client.GameObjects
             // If neither state: nor texture: were provided we assume that they want a blank invisible layer.
             layer.Visible = layerDatum.Visible ?? layer.Visible;
 
-            if (layerDatum.CopyToShaderParameters is { } copyParameters)
-            {
-                layer.CopyToShaderParameters = new CopyToShaderParameters(ParseKey(copyParameters.LayerKey))
-                {
-                    ParameterTexture = copyParameters.ParameterTexture,
-                    ParameterUV = copyParameters.ParameterUV
-                };
-            }
-            else
-            {
-                layer.CopyToShaderParameters = null;
-            }
-
             RebuildBounds();
         }
 
-        private object ParseKey(string keyString)
-        {
-            if (reflection.TryParseEnumReference(keyString, out var @enum))
-                return @enum;
-
-            return keyString;
-        }
-
         public void LayerSetData(object layerKey, PrototypeLayerData data)
         {
             if (!LayerMapTryGet(layerKey, out var layer, true))
@@ -1250,9 +1237,9 @@ namespace Robust.Client.GameObjects
         public IEnumerable<ISpriteLayer> AllLayers => Layers;
 
         // Lobby SpriteView rendering path
-        public void Render(DrawingHandleWorld drawingHandle, Angle eyeRotation, Angle worldRotation, Direction? overrideDirection = null, Vector2 position = default)
+        public void Render(DrawingHandleWorld drawingHandle, Angle eyeRotation, Angle worldRotation, Direction? overrideDirection = null)
         {
-            RenderInternal(drawingHandle, eyeRotation, worldRotation, position, overrideDirection);
+            RenderInternal(drawingHandle, eyeRotation, worldRotation, Vector2.Zero, overrideDirection);
         }
 
         [DataField("noRot")] private bool _screenLock = false;
@@ -1304,21 +1291,22 @@ namespace Robust.Client.GameObjects
 
             // worldRotation + eyeRotation should be the angle of the entity on-screen. If no-rot is enabled this is just set to zero.
             // However, at some point later the eye-matrix is applied separately, so we subtract -eye rotation for now:
-            var entityMatrix = Matrix3Helpers.CreateTransform(worldPosition, NoRotation ? -eyeRotation : worldRotation - cardinal);
+            var entityMatrix = Matrix3.CreateTransform(worldPosition, NoRotation ? -eyeRotation : worldRotation - cardinal);
 
-            var transformSprite = Matrix3x2.Multiply(LocalMatrix, entityMatrix);
+            Matrix3.Multiply(in LocalMatrix, in entityMatrix, out var transformSprite);
 
             if (GranularLayersRendering)
             {
                 //Default rendering
-                entityMatrix = Matrix3Helpers.CreateTransform(worldPosition, worldRotation);
-                var transformDefault = Matrix3x2.Multiply(LocalMatrix, entityMatrix);
+                entityMatrix = Matrix3.CreateTransform(worldPosition, worldRotation);
+                Matrix3.Multiply(in LocalMatrix, in entityMatrix, out var transformDefault);
                 //Snap to cardinals
-                entityMatrix = Matrix3Helpers.CreateTransform(worldPosition, worldRotation - angle.GetCardinalDir().ToAngle());
-                var transformSnap = Matrix3x2.Multiply(LocalMatrix, entityMatrix);
+                entityMatrix = Matrix3.CreateTransform(worldPosition, worldRotation - angle.GetCardinalDir().ToAngle());
+                Matrix3.Multiply(in LocalMatrix, in entityMatrix, out var transformSnap);
                 //No rotation
-                entityMatrix = Matrix3Helpers.CreateTransform(worldPosition, -eyeRotation);
-                var transformNoRot = Matrix3x2.Multiply(LocalMatrix, entityMatrix);
+                entityMatrix = Matrix3.CreateTransform(worldPosition, -eyeRotation);
+                Matrix3.Multiply(in LocalMatrix, in entityMatrix, out var transformNoRot);
+
 
                 foreach (var layer in Layers) {
                     switch (layer.RenderingStrategy)
@@ -1379,7 +1367,7 @@ namespace Robust.Client.GameObjects
 
             // TODO whenever sprite comp gets ECS'd , just make this a direct method call.
             var ev = new QueueSpriteTreeUpdateEvent(entities.GetComponent<TransformComponent>(Owner));
-            entities.EventBus.RaiseComponentEvent(Owner, this, ref ev);
+            entities.EventBus.RaiseComponentEvent(this, ref ev);
         }
 
         private void QueueUpdateIsInert()
@@ -1389,7 +1377,7 @@ namespace Robust.Client.GameObjects
 
             // TODO whenever sprite comp gets ECS'd , just make this a direct method call.
             var ev = new SpriteUpdateInertEvent();
-            entities.EventBus.RaiseComponentEvent(Owner, this, ref ev);
+            entities.EventBus.RaiseComponentEvent(this, ref ev);
         }
 
         [Obsolete("Use SpriteSystem instead.")]
@@ -1545,7 +1533,7 @@ namespace Robust.Client.GameObjects
             private RSI.State? _actualState;
             [ViewVariables] public RSI.State? ActualState => _actualState;
 
-            public Matrix3x2 LocalMatrix = Matrix3x2.Identity;
+            public Matrix3 LocalMatrix = Matrix3.Identity;
 
             [ViewVariables(VVAccess.ReadWrite)]
             public Vector2 Scale
@@ -1649,9 +1637,6 @@ namespace Robust.Client.GameObjects
             [ViewVariables]
             public LayerRenderingStrategy RenderingStrategy = LayerRenderingStrategy.UseSpriteStrategy;
 
-            [ViewVariables(VVAccess.ReadWrite)]
-            public CopyToShaderParameters? CopyToShaderParameters;
-
             public Layer(SpriteComponent parent)
             {
                 _parent = parent;
@@ -1680,8 +1665,6 @@ namespace Robust.Client.GameObjects
                 DirOffset = toClone.DirOffset;
                 _autoAnimated = toClone._autoAnimated;
                 RenderingStrategy = toClone.RenderingStrategy;
-                if (toClone.CopyToShaderParameters is { } copyToShaderParameters)
-                    CopyToShaderParameters = new CopyToShaderParameters(copyToShaderParameters);
             }
 
             void ISerializationHooks.AfterDeserialization()
@@ -1691,7 +1674,7 @@ namespace Robust.Client.GameObjects
 
             internal void UpdateLocalMatrix()
             {
-                LocalMatrix = Matrix3Helpers.CreateTransform(in _offset, in _rotation, in _scale);
+                LocalMatrix = Matrix3.CreateTransform(in _offset, in _rotation, in _scale);
             }
 
             RSI? ISpriteLayer.Rsi { get => RSI; set => SetRsi(value); }
@@ -1963,27 +1946,27 @@ namespace Robust.Client.GameObjects
             ///     Given the apparent rotation of an entity on screen (world + eye rotation), get layer's matrix for drawing &
             ///     relevant RSI direction.
             /// </summary>
-            public void GetLayerDrawMatrix(RsiDirection dir, out Matrix3x2 layerDrawMatrix)
+            public void GetLayerDrawMatrix(RsiDirection dir, out Matrix3 layerDrawMatrix)
             {
                 if (_parent.NoRotation || dir == RsiDirection.South)
                     layerDrawMatrix = LocalMatrix;
                 else
                 {
-                    layerDrawMatrix = Matrix3x2.Multiply(_rsiDirectionMatrices[(int)dir], LocalMatrix);
+                    Matrix3.Multiply(in _rsiDirectionMatrices[(int)dir], in LocalMatrix, out layerDrawMatrix);
                 }
             }
 
-            private static Matrix3x2[] _rsiDirectionMatrices = new Matrix3x2[]
+            private static Matrix3[] _rsiDirectionMatrices = new Matrix3[]
             {
                 // array order chosen such that this array can be indexed by casing an RSI direction to an int
-                Matrix3x2.Identity, // should probably just avoid matrix multiplication altogether if the direction is south.
-                Matrix3Helpers.CreateRotation(-Direction.North.ToAngle()),
-                Matrix3Helpers.CreateRotation(-Direction.East.ToAngle()),
-                Matrix3Helpers.CreateRotation(-Direction.West.ToAngle()),
-                Matrix3Helpers.CreateRotation(-Direction.SouthEast.ToAngle()),
-                Matrix3Helpers.CreateRotation(-Direction.SouthWest.ToAngle()),
-                Matrix3Helpers.CreateRotation(-Direction.NorthEast.ToAngle()),
-                Matrix3Helpers.CreateRotation(-Direction.NorthWest.ToAngle())
+                Matrix3.Identity, // should probably just avoid matrix multiplication altogether if the direction is south.
+                Matrix3.CreateRotation(-Direction.North.ToAngle()),
+                Matrix3.CreateRotation(-Direction.East.ToAngle()),
+                Matrix3.CreateRotation(-Direction.West.ToAngle()),
+                Matrix3.CreateRotation(-Direction.SouthEast.ToAngle()),
+                Matrix3.CreateRotation(-Direction.SouthWest.ToAngle()),
+                Matrix3.CreateRotation(-Direction.NorthEast.ToAngle()),
+                Matrix3.CreateRotation(-Direction.NorthWest.ToAngle())
             };
 
             /// <summary>
@@ -2017,7 +2000,7 @@ namespace Robust.Client.GameObjects
             /// <summary>
             ///     Render a layer. This assumes that the input angle is between 0 and 2pi.
             /// </summary>
-            internal void Render(DrawingHandleWorld drawingHandle, ref Matrix3x2 spriteMatrix, Angle angle, Direction? overrideDirection)
+            internal void Render(DrawingHandleWorld drawingHandle, ref Matrix3 spriteMatrix, Angle angle, Direction? overrideDirection)
             {
                 if (!Visible || Blank)
                     return;
@@ -2026,6 +2009,8 @@ namespace Robust.Client.GameObjects
 
                 // Set the drawing transform for this layer
                 GetLayerDrawMatrix(dir, out var layerMatrix);
+                Matrix3.Multiply(in layerMatrix, in spriteMatrix, out var transformMatrix);
+                drawingHandle.SetTransform(in transformMatrix);
 
                 // The direction used to draw the sprite can differ from the one that the angle would naively suggest,
                 // due to direction overrides or offsets.
@@ -2035,41 +2020,7 @@ namespace Robust.Client.GameObjects
 
                 // Get the correct directional texture from the state, and draw it!
                 var texture = GetRenderTexture(_actualState, dir);
-
-                if (CopyToShaderParameters == null)
-                {
-                    // Set the drawing transform for this layer
-                    var transformMatrix = Matrix3x2.Multiply(layerMatrix, spriteMatrix);
-                    drawingHandle.SetTransform(in transformMatrix);
-
-                    RenderTexture(drawingHandle, texture);
-                }
-                else
-                {
-                    // Multiple atrocities to god being committed right here.
-                    var otherLayerIdx = _parent.LayerMap[CopyToShaderParameters.LayerKey!];
-                    var otherLayer = _parent.Layers[otherLayerIdx];
-                    if (otherLayer.Shader is not { } shader)
-                    {
-                        // No shader set apparently..?
-                        return;
-                    }
-
-                    if (!shader.Mutable)
-                        otherLayer.Shader = shader = shader.Duplicate();
-
-                    var clydeTexture = Clyde.RenderHandle.ExtractTexture(texture, null, out var csr);
-                    var sr = Clyde.RenderHandle.WorldTextureBoundsToUV(clydeTexture, csr);
-
-                    if (CopyToShaderParameters.ParameterTexture is { } paramTexture)
-                        shader.SetParameter(paramTexture, clydeTexture);
-
-                    if (CopyToShaderParameters.ParameterUV is { } paramUV)
-                    {
-                        var uv = new Vector4(sr.Left, sr.Bottom, sr.Right, sr.Top);
-                        shader.SetParameter(paramUV, uv);
-                    }
-                }
+                RenderTexture(drawingHandle, texture);
             }
 
             private void RenderTexture(DrawingHandleWorld drawingHandle, Texture texture)
@@ -2147,23 +2098,6 @@ namespace Robust.Client.GameObjects
             }
         }
 
-        /// <summary>
-        /// Instantiated version of <see cref="PrototypeCopyToShaderParameters"/>.
-        /// Has <see cref="LayerKey"/> actually resolved to a a real key.
-        /// </summary>
-        public sealed class CopyToShaderParameters(object layerKey)
-        {
-            public object LayerKey = layerKey;
-            public string? ParameterTexture;
-            public string? ParameterUV;
-
-            public CopyToShaderParameters(CopyToShaderParameters toClone) : this(toClone.LayerKey)
-            {
-                ParameterTexture = toClone.ParameterTexture;
-                ParameterUV = toClone.ParameterUV;
-            }
-        }
-
         void IAnimationProperties.SetAnimatableProperty(string name, object value)
         {
             if (!name.StartsWith("layer/"))

Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs

@@ -11,7 +11,6 @@ namespace Robust.Client.GameObjects
     {
         private readonly List<Entity<AnimationPlayerComponent>> _activeAnimations = new();
 
-        private EntityQuery<AnimationPlayerComponent> _playerQuery;
         private EntityQuery<MetaDataComponent> _metaQuery;
 
         [Dependency] private readonly IComponentFactory _compFact = default!;
@@ -19,7 +18,6 @@ namespace Robust.Client.GameObjects
         public override void Initialize()
         {
             base.Initialize();
-            _playerQuery = GetEntityQuery<AnimationPlayerComponent>();
             _metaQuery = GetEntityQuery<MetaDataComponent>();
         }
 
@@ -76,8 +74,7 @@ namespace Robust.Client.GameObjects
             foreach (var key in remie)
             {
                 component.PlayingAnimations.Remove(key);
-                var completedEvent = new AnimationCompletedEvent {Uid = uid, Key = key, Finished = true};
-                EntityManager.EventBus.RaiseLocalEvent(uid, completedEvent, true);
+                EntityManager.EventBus.RaiseLocalEvent(uid, new AnimationCompletedEvent {Uid = uid, Key = key}, true);
             }
 
             return false;
@@ -99,6 +96,15 @@ namespace Robust.Client.GameObjects
             Play(new Entity<AnimationPlayerComponent>(uid, component), animation, key);
         }
 
+        /// <summary>
+        ///     Start playing an animation.
+        /// </summary>
+        [Obsolete("Use Play(EntityUid<AnimationPlayerComponent> ent, Animation animation, string key) instead")]
+        public void Play(AnimationPlayerComponent component, Animation animation, string key)
+        {
+            Play(new Entity<AnimationPlayerComponent>(component.Owner, component), animation, key);
+        }
+
         public void Play(Entity<AnimationPlayerComponent> ent, Animation animation, string key)
         {
             AddComponent(ent);
@@ -143,14 +149,6 @@ namespace Robust.Client.GameObjects
             }
 #endif
 
-            foreach (var track in animation.AnimationTracks)
-            {
-                if (track is not AnimationTrackSpriteFlick)
-                    continue;
-
-                track.AdvancePlayback(ent.Owner, 0, 0, 0f);
-            }
-
             ent.Comp.PlayingAnimations.Add(key, playback);
         }
 
@@ -173,42 +171,31 @@ namespace Robust.Client.GameObjects
             return component.PlayingAnimations.ContainsKey(key);
         }
 
-        [Obsolete]
         public void Stop(AnimationPlayerComponent component, string key)
         {
-            Stop((component.Owner, component), key);
+            component.PlayingAnimations.Remove(key);
         }
 
-        public void Stop(Entity<AnimationPlayerComponent?> entity, string key)
+        public void Stop(EntityUid uid, string key)
         {
-            if (!_playerQuery.Resolve(entity.Owner, ref entity.Comp, false) ||
-                !entity.Comp.PlayingAnimations.Remove(key))
-            {
+            if (!TryComp<AnimationPlayerComponent>(uid, out var player))
                 return;
-            }
 
-            var completedEvent = new AnimationCompletedEvent {Uid = entity.Owner, Key = key, Finished = false};
-            EntityManager.EventBus.RaiseLocalEvent(entity.Owner, completedEvent, true);
+            player.PlayingAnimations.Remove(key);
         }
 
         public void Stop(EntityUid uid, AnimationPlayerComponent? component, string key)
         {
-            Stop((uid, component), key);
+            if (!Resolve(uid, ref component, false))
+                return;
+
+            component.PlayingAnimations.Remove(key);
         }
     }
 
-    /// <summary>
-    /// Raised whenever an animation stops, either due to running its course or being stopped manually.
-    /// </summary>
     public sealed class AnimationCompletedEvent : EntityEventArgs
     {
         public EntityUid Uid { get; init; }
         public string Key { get; init; } = string.Empty;
-
-        /// <summary>
-        /// If true, the animation finished by getting to its natural end.
-        /// If false, it was removed prematurely via <see cref="AnimationPlayerSystem.Stop(Robust.Client.GameObjects.AnimationPlayerComponent,string)"/> or similar overloads.
-        /// </summary>
-        public bool Finished { get; init; }
     }
 }

Robust.Client/GameObjects/EntitySystems/AppearanceSystem.cs

@@ -2,11 +2,8 @@ using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Serialization;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
-using Robust.Shared.Serialization.Manager;
 
 namespace Robust.Client.GameObjects
 {
@@ -14,7 +11,6 @@ namespace Robust.Client.GameObjects
     public sealed class AppearanceSystem : SharedAppearanceSystem
     {
         private readonly Queue<(EntityUid uid, AppearanceComponent)> _queuedUpdates = new();
-        [Dependency] private readonly ISerializationManager _serialization = default!;
 
         public override void Initialize()
         {
@@ -78,13 +74,10 @@ namespace Robust.Client.GameObjects
 
             foreach (var (key, value) in data)
             {
-                object? serializationObject;
                 if (value.GetType().IsValueType)
                     newDict[key] = value;
                 else if (value is ICloneable cloneable)
                     newDict[key] = cloneable.Clone();
-                else if ((serializationObject = _serialization.CreateCopy(value)) != null)
-                    newDict[key] = serializationObject;
                 else
                     throw new NotSupportedException("Invalid object in appearance data dictionary. Appearance data must be cloneable");
             }

Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs

@@ -6,7 +6,6 @@ using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using System;
 using System.Collections.Generic;
-using Robust.Shared.IoC;
 using static Robust.Shared.GameObjects.OccluderComponent;
 
 namespace Robust.Client.GameObjects;
@@ -21,7 +20,6 @@ namespace Robust.Client.GameObjects;
 internal sealed class ClientOccluderSystem : OccluderSystem
 {
     private readonly HashSet<EntityUid> _dirtyEntities = new();
-    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
     /// <inheritdoc />
     public override void Initialize()
@@ -104,8 +102,7 @@ internal sealed class ClientOccluderSystem : OccluderSystem
 
         if (occluder.Enabled && xform.Anchored && TryComp(xform.GridUid, out grid))
         {
-            gridId = xform.GridUid.Value;
-            pos = _mapSystem.TileIndicesFor(gridId, grid, xform.Coordinates);
+            pos = grid.TileIndicesFor(xform.Coordinates);
             _dirtyEntities.Add(sender);
         }
         else if (occluder.LastPosition != null)
@@ -120,10 +117,10 @@ internal sealed class ClientOccluderSystem : OccluderSystem
             return;
         }
 
-        DirtyNeighbours(_mapSystem.GetAnchoredEntitiesEnumerator(gridId, grid, pos + new Vector2i(0, 1)), query);
-        DirtyNeighbours(_mapSystem.GetAnchoredEntitiesEnumerator(gridId, grid, pos + new Vector2i(0, -1)), query);
-        DirtyNeighbours(_mapSystem.GetAnchoredEntitiesEnumerator(gridId, grid, pos + new Vector2i(1, 0)), query);
-        DirtyNeighbours(_mapSystem.GetAnchoredEntitiesEnumerator(gridId, grid, pos + new Vector2i(-1, 0)), query);
+        DirtyNeighbours(grid.GetAnchoredEntitiesEnumerator(pos + new Vector2i(0, 1)), query);
+        DirtyNeighbours(grid.GetAnchoredEntitiesEnumerator(pos + new Vector2i(0, -1)), query);
+        DirtyNeighbours(grid.GetAnchoredEntitiesEnumerator(pos + new Vector2i(1, 0)), query);
+        DirtyNeighbours(grid.GetAnchoredEntitiesEnumerator(pos + new Vector2i(-1, 0)), query);
     }
 
     private void DirtyNeighbours(AnchoredEntitiesEnumerator enumerator, EntityQuery<OccluderComponent> occluderQuery)
@@ -169,7 +166,7 @@ internal sealed class ClientOccluderSystem : OccluderSystem
             return;
         }
 
-        var tile = _mapSystem.TileIndicesFor(xform.GridUid.Value, grid, xform.Coordinates);
+        var tile = grid.TileIndicesFor(xform.Coordinates);
 
         // TODO: Sub to parent changes instead or something.
         // DebugTools.Assert(occluder.LastPosition == null
@@ -178,16 +175,16 @@ internal sealed class ClientOccluderSystem : OccluderSystem
 
         // dir starts at the relative effective south direction;
         var dir = xform.LocalRotation.GetCardinalDir();
-        CheckDir(dir, OccluderDir.South, tile, occluder, xform.GridUid.Value, grid, occluders, xforms);
+        CheckDir(dir, OccluderDir.South, tile, occluder, grid, occluders, xforms);
 
         dir = dir.GetClockwise90Degrees();
-        CheckDir(dir, OccluderDir.West, tile, occluder, xform.GridUid.Value, grid, occluders, xforms);
+        CheckDir(dir, OccluderDir.West, tile, occluder, grid, occluders, xforms);
 
         dir = dir.GetClockwise90Degrees();
-        CheckDir(dir, OccluderDir.North, tile, occluder, xform.GridUid.Value, grid, occluders, xforms);
+        CheckDir(dir, OccluderDir.North, tile, occluder, grid, occluders, xforms);
 
         dir = dir.GetClockwise90Degrees();
-        CheckDir(dir, OccluderDir.East, tile, occluder, xform.GridUid.Value, grid, occluders, xforms);
+        CheckDir(dir, OccluderDir.East, tile, occluder, grid, occluders, xforms);
     }
 
     private void CheckDir(
@@ -195,7 +192,6 @@ internal sealed class ClientOccluderSystem : OccluderSystem
         OccluderDir occDir,
         Vector2i tile,
         OccluderComponent occluder,
-        EntityUid gridUid,
         MapGridComponent grid,
         EntityQuery<OccluderComponent> query,
         EntityQuery<TransformComponent> xforms)
@@ -203,7 +199,7 @@ internal sealed class ClientOccluderSystem : OccluderSystem
         if ((occluder.Occluding & occDir) != 0)
             return;
 
-        foreach (var neighbor in _mapSystem.GetAnchoredEntities(gridUid, grid, tile.Offset(dir)))
+        foreach (var neighbor in grid.GetAnchoredEntities(tile.Offset(dir)))
         {
             if (!query.TryGetComponent(neighbor, out var otherOccluder) || !otherOccluder.Enabled)
                 continue;

Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs

@@ -17,6 +17,7 @@ namespace Robust.Client.GameObjects
 {
     public sealed class ContainerSystem : SharedContainerSystem
     {
+        [Dependency] private readonly INetManager _netMan = default!;
         [Dependency] private readonly IRobustSerializer _serializer = default!;
         [Dependency] private readonly IDynamicTypeFactoryInternal _dynFactory = default!;
         [Dependency] private readonly PointLightSystem _lightSys = default!;
@@ -106,7 +107,7 @@ namespace Robust.Client.GameObjects
                 toDelete.Add(id);
             }
 
-            foreach (var dead in toDelete.Span)
+            foreach (var dead in toDelete)
             {
                 component.Containers.Remove(dead);
             }
@@ -119,7 +120,7 @@ namespace Robust.Client.GameObjects
                 {
                     var type = _serializer.FindSerializedType(typeof(BaseContainer), data.ContainerType);
                     container = _dynFactory.CreateInstanceUnchecked<BaseContainer>(type!, inject:false);
-                    container.Init(this, id, (uid, component));
+                    InitContainer(container, (uid, component), id);
                     component.Containers.Add(id, container);
                 }
 
@@ -141,7 +142,7 @@ namespace Robust.Client.GameObjects
                         toRemove.Add(entity);
                 }
 
-                foreach (var entity in toRemove.Span)
+                foreach (var entity in toRemove)
                 {
                     Remove(
                         (entity, TransformQuery.GetComponent(entity), MetaQuery.GetComponent(entity)),
@@ -161,7 +162,7 @@ namespace Robust.Client.GameObjects
                         removedExpected.Add(netEntity);
                 }
 
-                foreach (var entityUid in removedExpected.Span)
+                foreach (var entityUid in removedExpected)
                 {
                     RemoveExpectedEntity(entityUid, out _);
                 }

Robust.Client/GameObjects/EntitySystems/DebugEntityLookupSystem.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Shared.Console;
 using Robust.Shared.Containers;
@@ -119,7 +118,7 @@ public sealed class EntityLookupOverlay : Overlay
                 //DebugTools.Assert(!ent.IsInContainer(_entityManager));
                 var (entPos, entRot) = _transform.GetWorldPositionRotation(ent);
 
-                var lookupPos = Vector2.Transform(entPos, invMatrix);
+                var lookupPos = invMatrix.Transform(entPos);
                 var lookupRot = entRot - rotation;
 
                 var aabb = _lookup.GetAABB(ent, lookupPos, lookupRot, xform, _xformQuery);
@@ -128,6 +127,6 @@ public sealed class EntityLookupOverlay : Overlay
             }
         });
 
-        worldHandle.SetTransform(Matrix3x2.Identity);
+        worldHandle.SetTransform(Matrix3.Identity);
     }
 }

Robust.Client/GameObjects/EntitySystems/DebugLightTreeSystem.cs

@@ -63,7 +63,7 @@ namespace Robust.Client.GameObjects
 
             protected internal override void Draw(in OverlayDrawArgs args)
             {
-                var map = args.MapId;
+                var map = _eyeManager.CurrentMap;
                 if (map == MapId.Nullspace) return;
 
                 foreach (var (_, treeComp) in _trees.GetIntersectingTrees(map, args.WorldBounds))

Robust.Client/GameObjects/EntitySystems/GridChunkBoundsDebugSystem.cs

@@ -18,8 +18,6 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IOverlayManager _overlayManager = default!;
-        [Dependency] private readonly TransformSystem _transform = default!;
-        [Dependency] private readonly SharedMapSystem _map = default!;
 
         private GridChunkBoundsOverlay? _overlay;
 
@@ -38,9 +36,7 @@ namespace Robust.Client.GameObjects
                     _overlay = new GridChunkBoundsOverlay(
                         EntityManager,
                         _eyeManager,
-                        _mapManager,
-                        _transform,
-                        _map);
+                        _mapManager);
 
                     _overlayManager.AddOverlay(_overlay);
                 }
@@ -60,45 +56,38 @@ namespace Robust.Client.GameObjects
         private readonly IEntityManager _entityManager;
         private readonly IEyeManager _eyeManager;
         private readonly IMapManager _mapManager;
-        private readonly SharedTransformSystem _transformSystem;
-        private readonly SharedMapSystem _mapSystem;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
         private List<Entity<MapGridComponent>> _grids = new();
 
-        public GridChunkBoundsOverlay(IEntityManager entManager, IEyeManager eyeManager, IMapManager mapManager, SharedTransformSystem transformSystem, SharedMapSystem mapSystem)
+        public GridChunkBoundsOverlay(IEntityManager entManager, IEyeManager eyeManager, IMapManager mapManager)
         {
             _entityManager = entManager;
             _eyeManager = eyeManager;
             _mapManager = mapManager;
-            _transformSystem = transformSystem;
-            _mapSystem = mapSystem;
         }
 
         protected internal override void Draw(in OverlayDrawArgs args)
         {
-            var currentMap = args.MapId;
+            var currentMap = _eyeManager.CurrentMap;
             var viewport = args.WorldBounds;
             var worldHandle = args.WorldHandle;
 
-            var fixturesQuery = _entityManager.GetEntityQuery<FixturesComponent>();
             _grids.Clear();
             _mapManager.FindGridsIntersecting(currentMap, viewport, ref _grids);
             foreach (var grid in _grids)
             {
-                var worldMatrix = _transformSystem.GetWorldMatrix(grid);
+                var worldMatrix = _entityManager.GetComponent<TransformComponent>(grid).WorldMatrix;
                 worldHandle.SetTransform(worldMatrix);
                 var transform = new Transform(Vector2.Zero, Angle.Zero);
-                var fixtures = fixturesQuery.Comp(grid.Owner);
 
-                var chunkEnumerator = _mapSystem.GetMapChunks(grid.Owner, grid.Comp, viewport);
+                var chunkEnumerator = grid.Comp.GetMapChunks(viewport);
 
                 while (chunkEnumerator.MoveNext(out var chunk))
                 {
-                    foreach (var id in chunk.Fixtures)
+                    foreach (var fixture in chunk.Fixtures.Values)
                     {
-                        var fixture = fixtures.Fixtures[id];
                         var poly = (PolygonShape) fixture.Shape;
 
                         var verts = new Vector2[poly.VertexCount];
@@ -120,7 +109,7 @@ namespace Robust.Client.GameObjects
                 }
             }
 
-            worldHandle.SetTransform(Matrix3x2.Identity);
+            worldHandle.SetTransform(Matrix3.Identity);
         }
     }
 }

Robust.Client/GameObjects/EntitySystems/InputSystem.cs

@@ -26,7 +26,6 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IConsoleHost _conHost = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         private ISawmill _sawmillInputContext = default!;
 
@@ -82,35 +81,18 @@ namespace Robust.Client.GameObjects
                 }
             }
 
-            var clientMsg = message switch
+            // send it off to the server
+            var clientMsg = (ClientFullInputCmdMessage)message;
+            var fullMsg = new FullInputCmdMessage(
+                clientMsg.Tick,
+                clientMsg.SubTick,
+                (int)clientMsg.InputSequence,
+                clientMsg.InputFunctionId,
+                clientMsg.State,
+                GetNetCoordinates(clientMsg.Coordinates),
+                clientMsg.ScreenCoordinates)
             {
-                ClientFullInputCmdMessage clientInput => clientInput,
-                FullInputCmdMessage fullInput => new ClientFullInputCmdMessage(
-                    fullInput.Tick,
-                    fullInput.SubTick,
-                    fullInput.InputFunctionId,
-                    GetCoordinates(fullInput.Coordinates),
-                    fullInput.ScreenCoordinates,
-                    fullInput.State,
-                    GetEntity(fullInput.Uid)),
-
-                _ => throw new ArgumentOutOfRangeException()
-            };
-
-            var fullMsg = message switch
-            {
-                FullInputCmdMessage fullInput => fullInput,
-                ClientFullInputCmdMessage client => new FullInputCmdMessage(
-                    client.Tick,
-                    client.SubTick,
-                    client.InputFunctionId,
-                    clientMsg.State,
-                    GetNetCoordinates(client.Coordinates),
-                    clientMsg.ScreenCoordinates,
-                    GetNetEntity(clientMsg.Uid)
-                    ),
-
-                _ => throw new ArgumentOutOfRangeException()
+                Uid = GetNetEntity(clientMsg.Uid)
             };
 
             DispatchInputCommand(clientMsg, fullMsg);
@@ -148,7 +130,7 @@ namespace Robust.Client.GameObjects
 
             _conHost.RegisterCommand("incmd",
                 "Inserts an input command into the simulation",
-                "incmd <KeyFunction> <KeyState> [wxPos] [wyPos]",
+                "incmd <KeyFunction> <d|u KeyState> <wxPos> <wyPos>",
                 GenerateInputCommand);
         }
 
@@ -164,47 +146,17 @@ namespace Robust.Client.GameObjects
             if (_playerManager.LocalEntity is not { } pent)
                 return;
 
-            if (args.Length is not (2 or 4))
-            {
-                shell.WriteLine(Loc.GetString($"cmd-invalid-arg-number-error"));
-                return;
-            }
+            BoundKeyFunction keyFunction = new BoundKeyFunction(args[0]);
+            BoundKeyState state = args[1] == "u" ? BoundKeyState.Up: BoundKeyState.Down;
 
-            var keyFunction = new BoundKeyFunction(args[0]);
-            if (!Enum.TryParse<BoundKeyState>(args[1], out var state))
-            {
-                shell.WriteLine(Loc.GetString("cmd-parse-failure-enum", ("arg", args[1]), ("enum", nameof(BoundKeyState))));
-                return;
-            }
+            var pxform = Transform(pent);
+            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 wOffset = Vector2.Zero;
-            if (args.Length == 4)
-            {
-                if (!float.TryParse(args[2], out var wX))
-                {
-                    shell.WriteError(Loc.GetString("cmd-parse-failure-float", ("arg", args[2])));
-                    return;
-                }
-
-                if (!float.TryParse(args[3], out var wY))
-                {
-                    shell.WriteError(Loc.GetString("cmd-parse-failure-float", ("arg", args[3])));
-                    return;
-                }
-
-                wOffset = new Vector2(wX, wY);
-            }
-
-            var coords = _transform.ToCoordinates(pent, _transform.GetMapCoordinates(pent).Offset(wOffset));
             var funcId = _inputManager.NetworkBindMap.KeyFunctionID(keyFunction);
 
-            var message = new ClientFullInputCmdMessage(_timing.CurTick,
-                _timing.TickFraction,
-                funcId,
-                coords,
-                new ScreenCoordinates(0, 0, default),
-                state,
-                EntityUid.Invalid);
+            var message = new FullInputCmdMessage(_timing.CurTick, _timing.TickFraction, funcId, state,
+                GetNetCoordinates(coords), new ScreenCoordinates(0, 0, default), NetEntity.Invalid);
 
             HandleInputCommand(_playerManager.LocalSession, keyFunction, message);
         }

Robust.Client/GameObjects/EntitySystems/MapSystem.cs

@@ -1,9 +1,12 @@
 using Robust.Client.Graphics;
 using Robust.Client.Map;
+using Robust.Client.Physics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Dynamics;
 
 namespace Robust.Client.GameObjects;
 
@@ -13,17 +16,6 @@ public sealed class MapSystem : SharedMapSystem
     [Dependency] private readonly IResourceCache _resource = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
 
-    protected override MapId GetNextMapId()
-    {
-        // Client-side map entities use negative map Ids to avoid conflict with server-side maps.
-        var id = new MapId(--LastMapId);
-        while (MapManager.MapExists(id))
-        {
-            id = new MapId(--LastMapId);
-        }
-        return id;
-    }
-
     public override void Initialize()
     {
         base.Initialize();
@@ -35,4 +27,9 @@ public sealed class MapSystem : SharedMapSystem
         base.Shutdown();
         _overlayManager.RemoveOverlay<TileEdgeOverlay>();
     }
+
+    protected override void OnMapAdd(EntityUid uid, MapComponent component, ComponentAdd args)
+    {
+        EnsureComp<PhysicsMapComponent>(uid);
+    }
 }

Robust.Client/GameObjects/EntitySystems/SpriteSystem.Helpers.cs

@@ -1,43 +0,0 @@
-using System.Numerics;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-
-namespace Robust.Client.GameObjects;
-
-public sealed partial class SpriteSystem
-{
-    /// <summary>
-    /// Gets an entity's sprite position in world terms.
-    /// </summary>
-    public Vector2 GetSpriteWorldPosition(Entity<SpriteComponent?, TransformComponent?> entity)
-    {
-        if (!Resolve(entity, ref entity.Comp2))
-            return Vector2.Zero;
-
-        var (worldPos, worldRot) = _xforms.GetWorldPositionRotation(entity.Owner);
-
-        if (!Resolve(entity, ref entity.Comp1, false))
-        {
-            return worldPos;
-        }
-
-        if (entity.Comp1.NoRotation)
-        {
-            return worldPos + entity.Comp1.Offset;
-        }
-
-        return worldPos + worldRot.RotateVec(entity.Comp1.Rotation.RotateVec(entity.Comp1.Offset));
-    }
-
-    /// <summary>
-    /// Gets an entity's sprite position in screen coordinates.
-    /// </summary>
-    public ScreenCoordinates GetSpriteScreenCoordinates(Entity<SpriteComponent?, TransformComponent?> entity)
-    {
-        if (!Resolve(entity, ref entity.Comp2))
-            return ScreenCoordinates.Invalid;
-
-        var spriteCoords = GetSpriteWorldPosition(entity);
-        return _eye.MapToScreen(new MapCoordinates(spriteCoords, entity.Comp2.MapID));
-    }
-}

Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs

@@ -30,12 +30,10 @@ namespace Robust.Client.GameObjects
     public sealed partial class SpriteSystem : EntitySystem
     {
         [Dependency] private readonly IConfigurationManager _cfg = default!;
-        [Dependency] private readonly IEyeManager _eye = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IPrototypeManager _proto = default!;
         [Dependency] private readonly IResourceCache _resourceCache = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
-        [Dependency] private readonly SharedTransformSystem _xforms = default!;
 
         private readonly Queue<SpriteComponent> _inertUpdateQueue = new();
 
@@ -68,11 +66,6 @@ namespace Robust.Client.GameObjects
             _sawmill = _logManager.GetSawmill("sprite");
         }
 
-        public bool IsVisible(Layer layer)
-        {
-            return layer.Visible && layer.CopyToShaderParameters == null;
-        }
-
         private void OnInit(EntityUid uid, SpriteComponent component, ComponentInit args)
         {
             // I'm not 100% this is needed, but I CBF with this ATM. Somebody kill server sprite component please.
@@ -191,8 +184,7 @@ namespace Robust.Client.GameObjects
         /// <summary>
         /// Gets the specified frame for this sprite at the specified time.
         /// </summary>
-        /// <param name="loop">Should we clamp on the last frame and not loop</param>
-        public Texture GetFrame(SpriteSpecifier spriteSpec, TimeSpan curTime, bool loop = true)
+        public Texture GetFrame(SpriteSpecifier spriteSpec, TimeSpan curTime)
         {
             Texture? sprite = null;
 
@@ -204,29 +196,19 @@ namespace Robust.Client.GameObjects
                     var frames = state!.GetFrames(RsiDirection.South);
                     var delays = state.GetDelays();
                     var totalDelay = delays.Sum();
+                    var time = curTime.TotalSeconds % totalDelay;
+                    var delaySum = 0f;
 
-                    // No looping
-                    if (!loop && curTime.TotalSeconds >= totalDelay)
+                    for (var i = 0; i < delays.Length; i++)
                     {
-                        sprite = frames[^1];
-                    }
-                    // Loopable
-                    else
-                    {
-                        var time = curTime.TotalSeconds % totalDelay;
-                        var delaySum = 0f;
+                        var delay = delays[i];
+                        delaySum += delay;
 
-                        for (var i = 0; i < delays.Length; i++)
-                        {
-                            var delay = delays[i];
-                            delaySum += delay;
+                        if (time > delaySum)
+                            continue;
 
-                            if (time > delaySum)
-                                continue;
-
-                            sprite = frames[i];
-                            break;
-                        }
+                        sprite = frames[i];
+                        break;
                     }
 
                     sprite ??= Frame0(spriteSpec);

Robust.Client/GameObjects/EntitySystems/UserInterfaceSystem.cs

@@ -1,38 +1,84 @@
+using Robust.Client.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
+using Robust.Shared.IoC;
+using Robust.Shared.Reflection;
+using System;
+using UserInterfaceComponent = Robust.Shared.GameObjects.UserInterfaceComponent;
 
-namespace Robust.Client.GameObjects;
-
-public sealed class UserInterfaceSystem : SharedUserInterfaceSystem
+namespace Robust.Client.GameObjects
 {
-    public override void Initialize()
+    public sealed class UserInterfaceSystem : SharedUserInterfaceSystem
     {
-        base.Initialize();
-        ProtoManager.PrototypesReloaded += OnProtoReload;
-    }
+        [Dependency] private readonly IDynamicTypeFactory _dynamicTypeFactory = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IReflectionManager _reflectionManager = default!;
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        ProtoManager.PrototypesReloaded -= OnProtoReload;
-    }
-
-    private void OnProtoReload(PrototypesReloadedEventArgs obj)
-    {
-        var player = Player.LocalEntity;
-
-        if (!UserQuery.TryComp(player, out var userComp))
-            return;
-
-        foreach (var uid in userComp.OpenInterfaces.Keys)
+        public override void Initialize()
         {
-            if (!UIQuery.TryComp(uid, out var uiComp))
-                continue;
+            base.Initialize();
 
-            foreach (var bui in uiComp.ClientOpenInterfaces.Values)
+            SubscribeNetworkEvent<BoundUIWrapMessage>(MessageReceived);
+        }
+
+        private void MessageReceived(BoundUIWrapMessage ev)
+        {
+            var uid = GetEntity(ev.Entity);
+
+            if (!TryComp<UserInterfaceComponent>(uid, out var cmp))
+                return;
+
+            var uiKey = ev.UiKey;
+            var message = ev.Message;
+            message.Session = _playerManager.LocalSession!;
+            message.Entity = GetNetEntity(uid);
+            message.UiKey = uiKey;
+
+            // Raise as object so the correct type is used.
+            RaiseLocalEvent(uid, (object)message, true);
+
+            switch (message)
             {
-                bui.OnProtoReload(obj);
+                case OpenBoundInterfaceMessage _:
+                    TryOpenUi(uid, uiKey, cmp);
+                    break;
+
+                case CloseBoundInterfaceMessage _:
+                    TryCloseUi(message.Session, uid, uiKey, remoteCall: true, uiComp: cmp);
+                    break;
+
+                default:
+                    if (cmp.OpenInterfaces.TryGetValue(uiKey, out var bui))
+                        bui.InternalReceiveMessage(message);
+
+                    break;
             }
         }
+
+        private bool TryOpenUi(EntityUid uid, Enum uiKey, UserInterfaceComponent? uiComp = null)
+        {
+            if (!Resolve(uid, ref uiComp))
+                return false;
+
+            if (uiComp.OpenInterfaces.ContainsKey(uiKey))
+                return false;
+
+            var data = uiComp.MappedInterfaceData[uiKey];
+
+            // TODO: This type should be cached, but I'm too lazy.
+            var type = _reflectionManager.LooseGetType(data.ClientType);
+            var boundInterface =
+                (BoundUserInterface) _dynamicTypeFactory.CreateInstance(type, new object[] {uid, uiKey});
+
+            boundInterface.Open();
+            uiComp.OpenInterfaces[uiKey] = boundInterface;
+
+            if (_playerManager.LocalSession is { } playerSession)
+            {
+                uiComp.Interfaces[uiKey]._subscribedSessions.Add(playerSession);
+                RaiseLocalEvent(uid, new BoundUIOpenedEvent(uiKey, uid, playerSession), true);
+            }
+
+            return true;
+        }
     }
 }

Robust.Client/GameObjects/EntitySystems/VelocityDebugSystem.cs

@@ -14,7 +14,6 @@ namespace Robust.Client.GameObjects
     {
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly TransformSystem _transform = default!;
 
         internal bool Enabled { get; set; }
 
@@ -44,7 +43,7 @@ namespace Robust.Client.GameObjects
                 return;
             }
 
-            var screenPos = _eyeManager.WorldToScreen(_transform.GetWorldPosition(Transform(player.Value)));
+            var screenPos = _eyeManager.WorldToScreen(EntityManager.GetComponent<TransformComponent>(player.Value).WorldPosition);
             LayoutContainer.SetPosition(_label, screenPos + new Vector2(0, 50));
             _label.Visible = true;
 

Robust.Client/GameObjects/EntitySystems/ViewSubscriberSystem.cs

@@ -1,5 +0,0 @@
-using Robust.Shared.GameObjects;
-
-namespace Robust.Client.GameObjects;
-
-public sealed class ViewSubscriberSystem : SharedViewSubscriberSystem;

Robust.Client/GameObjects/IClientEntityManagerInternal.cs

@@ -7,5 +7,9 @@ namespace Robust.Client.GameObjects
         // These methods are used by the Game State Manager.
 
         EntityUid CreateEntity(string? prototypeName, out MetaDataComponent metadata);
+
+        void InitializeEntity(EntityUid entity, MetaDataComponent? meta = null);
+
+        void StartEntity(EntityUid entity);
     }
 }

Robust.Client/GameStates/ClientGameStateManager.cs

@@ -54,11 +54,11 @@ namespace Robust.Client.GameStates
         private readonly HashSet<NetEntity> _stateEnts = new();
         private readonly List<EntityUid> _toDelete = new();
         private readonly List<IComponent> _toRemove = new();
-        private readonly Dictionary<NetEntity, Dictionary<ushort, IComponentState?>> _outputData = new();
+        private readonly Dictionary<NetEntity, Dictionary<ushort, IComponentState>> _outputData = new();
         private readonly List<(EntityUid, TransformComponent)> _queuedBroadphaseUpdates = new();
 
-        private readonly ObjectPool<Dictionary<ushort, IComponentState?>> _compDataPool =
-            new DefaultObjectPool<Dictionary<ushort, IComponentState?>>(new DictPolicy<ushort, IComponentState?>(), 256);
+        private readonly ObjectPool<Dictionary<ushort, IComponentState>> _compDataPool =
+            new DefaultObjectPool<Dictionary<ushort, IComponentState>>(new DictPolicy<ushort, IComponentState>(), 256);
 
         private uint _metaCompNetId;
 
@@ -125,8 +125,6 @@ namespace Robust.Client.GameStates
 #endif
 
         private bool _resettingPredictedEntities;
-        private readonly List<EntityUid> _brokenEnts = new();
-        private readonly List<(EntityUid, NetEntity)> _toStart = new();
 
         /// <inheritdoc />
         public void Initialize()
@@ -259,7 +257,7 @@ namespace Robust.Client.GameStates
         public void UpdateFullRep(GameState state, bool cloneDelta = false)
             => _processor.UpdateFullRep(state, cloneDelta);
 
-        public Dictionary<NetEntity, Dictionary<ushort, IComponentState?>> GetFullRep()
+        public Dictionary<NetEntity, Dictionary<ushort, IComponentState>> GetFullRep()
             => _processor.GetFullRep();
 
         private void HandlePvsLeaveMessage(MsgStateLeavePvs message)
@@ -600,12 +598,8 @@ namespace Robust.Client.GameStates
                         if (_sawmill.Level <= LogLevel.Debug)
                             _sawmill.Debug($"  A component was dirtied: {comp.GetType()}");
 
-                        if (compState != null)
-                        {
-                            var handleState = new ComponentHandleState(compState, null);
-                            _entities.EventBus.RaiseComponentEvent(entity, comp, ref handleState);
-                        }
-
+                        var handleState = new ComponentHandleState(compState, null);
+                        _entities.EventBus.RaiseComponentEvent(comp, ref handleState);
                         comp.LastModifiedTick = _timing.LastRealTick;
                     }
                 }
@@ -637,12 +631,8 @@ namespace Robust.Client.GameStates
                         if (_sawmill.Level <= LogLevel.Debug)
                             _sawmill.Debug($"  A component was removed: {comp.GetType()}");
 
-                        if (state != null)
-                        {
-                            var stateEv = new ComponentHandleState(state, null);
-                            _entities.EventBus.RaiseComponentEvent(entity, comp, ref stateEv);
-                        }
-
+                        var stateEv = new ComponentHandleState(state, null);
+                        _entities.EventBus.RaiseComponentEvent(comp, ref stateEv);
                         comp.ClearCreationTick(); // don't undo the re-adding.
                         comp.LastModifiedTick = _timing.LastRealTick;
                     }
@@ -677,16 +667,7 @@ namespace Robust.Client.GameStates
 
             foreach (var netEntity in createdEntities)
             {
-#if EXCEPTION_TOLERANCE
-                if (!_entityManager.TryGetEntityData(netEntity, out _, out var meta))
-                {
-                    _sawmill.Error($"Encountered deleted entity while merging implicit data! NetEntity: {netEntity}");
-                    continue;
-                }
-#else
                 var (_, meta) = _entityManager.GetEntityData(netEntity);
-#endif
-
                 var compData = _compDataPool.Get();
                 _outputData.Add(netEntity, compData);
 
@@ -695,7 +676,7 @@ namespace Robust.Client.GameStates
                     DebugTools.Assert(component.NetSyncEnabled);
 
                     var state = _entityManager.GetComponentState(bus, component, null, GameTick.Zero);
-                    DebugTools.Assert(state is not IComponentDeltaState);
+                    DebugTools.Assert(state is not IComponentDeltaState delta || delta.FullState);
                     compData.Add(netId, state);
                 }
             }
@@ -719,7 +700,7 @@ namespace Robust.Client.GameStates
         {
             using var _ = _timing.StartStateApplicationArea();
 
-            // TODO replays optimize this.
+            // TODO repays optimize this.
             // This currently just saves game states as they are applied.
             // However this is inefficient and may have redundant data.
             // E.g., we may record states: [10 to 15] [11 to 16] *error* [0 to 18] [18 to 19] [18 to 20] ...
@@ -895,22 +876,9 @@ namespace Robust.Client.GameStates
             {
                 foreach (var (entity, data) in _toApply)
                 {
-#if EXCEPTION_TOLERANCE
-                    try
-                    {
-#endif
                     HandleEntityState(entity, data.NetEntity, data.Meta, _entities.EventBus, data.curState,
-                            data.nextState, data.LastApplied, curState.ToSequence, data.EnteringPvs);
-#if EXCEPTION_TOLERANCE
-                    }
-                    catch (Exception e)
-                    {
-                        _sawmill.Error($"Caught exception while applying entity state. Entity: {_entities.ToPrettyString(entity)}. Exception: {e}");
-                        _entityManager.DeleteEntity(entity);
-                        RequestFullState();
-                        continue;
-                    }
-#endif
+                        data.nextState, data.LastApplied, curState.ToSequence, data.EnteringPvs);
+
                     if (!data.EnteringPvs)
                         continue;
 
@@ -949,7 +917,7 @@ namespace Robust.Client.GameStates
             {
                 try
                 {
-                    ProcessDeletions(delSpan, xforms, metas, xformSys);
+                    ProcessDeletions(delSpan, xforms, xformSys);
                 }
                 catch (Exception e)
                 {
@@ -960,7 +928,7 @@ namespace Robust.Client.GameStates
 
             // Initialize and start the newly created entities.
             if (_toCreate.Count > 0)
-                InitializeAndStart(_toCreate, metas, xforms);
+                InitializeAndStart(_toCreate);
 
             _prof.WriteValue("State Size", ProfData.Int32(curSpan.Length));
             _prof.WriteValue("Entered PVS", ProfData.Int32(enteringPvs));
@@ -994,7 +962,6 @@ namespace Robust.Client.GameStates
             }
 
             var xforms = _entities.GetEntityQuery<TransformComponent>();
-            var metas = _entities.GetEntityQuery<MetaDataComponent>();
             var xformSys = _entitySystemManager.GetEntitySystem<SharedTransformSystem>();
 
             _toDelete.Clear();
@@ -1023,12 +990,12 @@ namespace Robust.Client.GameStates
 
                 // This entity is going to get deleted, but maybe some if its children won't be, so lets detach them to
                 // null. First we will detach the parent in order to reduce the number of broadphase/lookup updates.
-                xformSys.DetachEntity(ent, xform);
+                xformSys.DetachParentToNull(ent, xform);
 
                 // Then detach all children.
                 foreach (var child in xform._children)
                 {
-                    xformSys.DetachEntity(child, xforms.Get(child), metas.Get(child), xform);
+                    xformSys.DetachParentToNull(child, xforms.GetComponent(child), xform);
 
                     if (deleteClientChildren
                         && !deleteClientEntities // don't add duplicates
@@ -1047,9 +1014,9 @@ namespace Robust.Client.GameStates
             }
         }
 
-        private void ProcessDeletions(ReadOnlySpan<NetEntity> delSpan,
+        private void ProcessDeletions(
+            ReadOnlySpan<NetEntity> delSpan,
             EntityQuery<TransformComponent> xforms,
-            EntityQuery<MetaDataComponent> metas,
             SharedTransformSystem xformSys)
         {
             // Processing deletions is non-trivial, because by default deletions will also delete all child entities.
@@ -1076,13 +1043,13 @@ namespace Robust.Client.GameStates
                     continue; // Already deleted? or never sent to us?
 
                 // First, a single recursive map change
-                xformSys.DetachEntity(id.Value, xform);
+                xformSys.DetachParentToNull(id.Value, xform);
 
                 // Then detach all children.
                 var childEnumerator = xform.ChildEnumerator;
                 while (childEnumerator.MoveNext(out var child))
                 {
-                    xformSys.DetachEntity(child, xforms.Get(child), metas.Get(child), xform);
+                    xformSys.DetachParentToNull(child, xforms.GetComponent(child), xform);
                 }
 
                 // Finally, delete the entity.
@@ -1171,13 +1138,13 @@ namespace Robust.Client.GameStates
                     if ((meta.Flags & MetaDataFlags.InContainer) != 0 &&
                         metas.TryGetComponent(xform.ParentUid, out var containerMeta) &&
                         (containerMeta.Flags & MetaDataFlags.Detached) == 0 &&
-                        containerSys.TryGetContainingContainer(xform.ParentUid, ent.Value, out container))
+                        containerSys.TryGetContainingContainer(xform.ParentUid, ent.Value, out container, null, true))
                     {
                         containerSys.Remove((ent.Value, xform, meta), container, false, true);
                     }
 
                     meta._flags |= MetaDataFlags.Detached;
-                    xformSys.DetachEntity(ent.Value, xform);
+                    xformSys.DetachParentToNull(ent.Value, xform);
                     DebugTools.Assert((meta.Flags & MetaDataFlags.InContainer) == 0);
 
                     if (container != null)
@@ -1188,87 +1155,65 @@ namespace Robust.Client.GameStates
             }
         }
 
-        private void InitializeAndStart(
-            Dictionary<NetEntity, EntityState> toCreate,
-            EntityQuery<MetaDataComponent> metas,
-            EntityQuery<TransformComponent> xforms)
+        private void InitializeAndStart(Dictionary<NetEntity, EntityState> toCreate)
         {
-            _toStart.Clear();
+            var metaQuery = _entityManager.GetEntityQuery<MetaDataComponent>();
 
+#if EXCEPTION_TOLERANCE
+            var brokenEnts = new List<EntityUid>();
+#endif
             using (_prof.Group("Initialize Entity"))
             {
-                EntityUid entity = default;
                 foreach (var netEntity in toCreate.Keys)
                 {
-                    (entity, var meta) = _entityManager.GetEntityData(netEntity);
-                    InitializeRecursive(entity, meta, metas, xforms);
+                    var entity = _entityManager.GetEntity(netEntity);
+#if EXCEPTION_TOLERANCE
+                    try
+                    {
+#endif
+                    _entities.InitializeEntity(entity, metaQuery.GetComponent(entity));
+#if EXCEPTION_TOLERANCE
+                    }
+                    catch (Exception e)
+                    {
+                        _sawmill.Error($"Server entity threw in Init: ent={_entities.ToPrettyString(entity)}");
+                        _runtimeLog.LogException(e, $"{nameof(ClientGameStateManager)}.{nameof(InitializeAndStart)}");
+                        brokenEnts.Add(entity);
+                        toCreate.Remove(netEntity);
+                    }
+#endif
                 }
             }
 
             using (_prof.Group("Start Entity"))
             {
-                foreach (var (entity, netEntity) in _toStart)
+                foreach (var netEntity in toCreate.Keys)
                 {
+                    var entity = _entityManager.GetEntity(netEntity);
+#if EXCEPTION_TOLERANCE
                     try
                     {
-                        _entities.StartEntity(entity);
+#endif
+                    _entities.StartEntity(entity);
+#if EXCEPTION_TOLERANCE
                     }
                     catch (Exception e)
                     {
-                        _sawmill.Error($"Server entity threw in Start:  nent={netEntity}, ent={_entityManager.ToPrettyString(entity)}");
+                        _sawmill.Error($"Server entity threw in Start: ent={_entityManager.ToPrettyString(entity)}");
                         _runtimeLog.LogException(e, $"{nameof(ClientGameStateManager)}.{nameof(InitializeAndStart)}");
-                        _toCreate.Remove(netEntity);
-                        _brokenEnts.Add(entity);
-#if !EXCEPTION_TOLERANCE
-                        throw;
-#endif
+                        brokenEnts.Add(entity);
+                        toCreate.Remove(netEntity);
                     }
+#endif
                 }
             }
 
-            foreach (var entity in _brokenEnts)
+#if EXCEPTION_TOLERANCE
+            foreach (var entity in brokenEnts)
             {
                 _entityManager.DeleteEntity(entity);
             }
-            _brokenEnts.Clear();
-        }
-
-        private void InitializeRecursive(
-            EntityUid entity,
-            MetaDataComponent meta,
-            EntityQuery<MetaDataComponent> metas,
-            EntityQuery<TransformComponent> xforms)
-        {
-            var xform = xforms.GetComponent(entity);
-            if (xform.ParentUid is {Valid: true} parent)
-            {
-                var parentMeta = metas.GetComponent(parent);
-                if (parentMeta.EntityLifeStage < EntityLifeStage.Initialized)
-                    InitializeRecursive(parent, parentMeta, metas, xforms);
-            }
-
-            if (meta.EntityLifeStage >= EntityLifeStage.Initialized)
-            {
-                // Was probably already initialized because one of its children appeared earlier in the list.
-                DebugTools.AssertEqual(_toStart.Count(x => x.Item1 == entity), 1);
-                return;
-            }
-
-            try
-            {
-                _entities.InitializeEntity(entity, meta);
-                _toStart.Add((entity, meta.NetEntity));
-            }
-            catch (Exception e)
-            {
-                _sawmill.Error($"Server entity threw in Init: nent={meta.NetEntity}, ent={_entities.ToPrettyString(entity)}");
-                _runtimeLog.LogException(e, $"{nameof(ClientGameStateManager)}.{nameof(InitializeAndStart)}");
-                _toCreate.Remove(meta.NetEntity);
-                _brokenEnts.Add(entity);
-#if !EXCEPTION_TOLERANCE
-                throw;
 #endif
-            }
         }
 
         private void HandleEntityState(EntityUid uid, NetEntity netEntity, MetaDataComponent meta, IEventBus bus, EntityState? curState,
@@ -1384,11 +1329,23 @@ namespace Robust.Client.GameStates
 
             foreach (var (comp, cur, next) in _compStateWork.Values)
             {
-                if (cur == null && next == null)
-                    continue;
-
-                var handleState = new ComponentHandleState(cur, next);
-                bus.RaiseComponentEvent(uid, comp, ref handleState);
+                try
+                {
+                    var handleState = new ComponentHandleState(cur, next);
+                    bus.RaiseComponentEvent(comp, ref handleState);
+                }
+#pragma warning disable CS0168 // Variable is declared but never used
+                catch (Exception e)
+#pragma warning restore CS0168 // Variable is declared but never used
+                {
+#if EXCEPTION_TOLERANCE
+                    _sawmill.Error($"Failed to apply comp state: entity={_entities.ToPrettyString(uid)}, comp={comp.GetType()}");
+                    _runtimeLog.LogException(e, $"{nameof(ClientGameStateManager)}.{nameof(HandleEntityState)}");
+#else
+                    _sawmill.Error($"Failed to apply comp state: entity={_entities.ToPrettyString(uid)}, comp={comp.GetType()}");
+                    throw;
+#endif
+                }
             }
         }
 
@@ -1457,10 +1414,10 @@ namespace Robust.Client.GameStates
                     _entities.TryGetComponent(xform.ParentUid, out MetaDataComponent? containerMeta) &&
                     (containerMeta.Flags & MetaDataFlags.Detached) == 0)
                 {
-                    containerSys.TryGetContainingContainer(xform.ParentUid, uid, out container);
+                    containerSys.TryGetContainingContainer(xform.ParentUid, uid, out container, null, true);
                 }
 
-                _entities.EntitySysManager.GetEntitySystem<TransformSystem>().DetachEntity(uid, xform);
+                _entities.EntitySysManager.GetEntitySystem<TransformSystem>().DetachParentToNull(uid, xform);
 
                 if (container != null)
                     containerSys.AddExpectedEntity(_entities.GetNetEntity(uid), container);
@@ -1539,11 +1496,8 @@ namespace Robust.Client.GameStates
                     _entityManager.AddComponent(uid, comp, true, meta);
                 }
 
-                if (state == null)
-                    continue;
-
                 var handleState = new ComponentHandleState(state, null);
-                _entityManager.EventBus.RaiseComponentEvent(uid, comp, ref handleState);
+                _entityManager.EventBus.RaiseComponentEvent(comp, ref handleState);
             }
 
             // ensure we don't have any extra components

Robust.Client/GameStates/GameStateProcessor.cs

@@ -32,7 +32,7 @@ namespace Robust.Client.GameStates
         /// <summary>
         /// This dictionary stores the full most recently received server state of any entity. This is used whenever predicted entities get reset.
         /// </summary>
-        internal readonly Dictionary<NetEntity, Dictionary<ushort, IComponentState?>> _lastStateFullRep
+        internal readonly Dictionary<NetEntity, Dictionary<ushort, IComponentState>> _lastStateFullRep
             = new();
 
         /// <inheritdoc />
@@ -212,7 +212,7 @@ Had full state: {LastFullState != null}"
             {
                 if (!_lastStateFullRep.TryGetValue(entityState.NetEntity, out var compData))
                 {
-                    compData = new();
+                    compData = new Dictionary<ushort, IComponentState>();
                     _lastStateFullRep.Add(entityState.NetEntity, compData);
                 }
 
@@ -221,20 +221,21 @@ Had full state: {LastFullState != null}"
                     var compState = change.State;
 
                     if (compState is IComponentDeltaState delta
+                        && !delta.FullState
                         && compData.TryGetValue(change.NetID, out var old)) // May fail if relying on implicit data
                     {
-                        DebugTools.Assert(old is not IComponentDeltaState, "last state is not a full state");
+                        DebugTools.Assert(old is IComponentDeltaState oldDelta && oldDelta.FullState, "last state is not a full state");
 
                         if (cloneDelta)
                         {
-                            compState = delta.CreateNewFullState(old!);
+                            compState = delta.CreateNewFullState(old);
                         }
                         else
                         {
-                            delta.ApplyToFullState(old!);
+                            delta.ApplyToFullState(old);
                             compState = old;
                         }
-                        DebugTools.Assert(compState is not IComponentDeltaState, "newly constructed state is not a full state");
+                        DebugTools.Assert(compState is IComponentDeltaState newState && newState.FullState, "newly constructed state is not a full state");
                     }
 
                     compData[change.NetID] = compState;
@@ -390,7 +391,7 @@ Had full state: {LastFullState != null}"
             LastFullStateRequested = null;
         }
 
-        public void MergeImplicitData(Dictionary<NetEntity, Dictionary<ushort, IComponentState?>> implicitData)
+        public void MergeImplicitData(Dictionary<NetEntity, Dictionary<ushort, IComponentState>> implicitData)
         {
             foreach (var (netEntity, implicitEntState) in implicitData)
             {
@@ -398,7 +399,6 @@ Had full state: {LastFullState != null}"
 
                 foreach (var (netId, implicitCompState) in implicitEntState)
                 {
-                    DebugTools.Assert(implicitCompState is not IComponentDeltaState);
                     ref var serverState = ref CollectionsMarshal.GetValueRefOrAddDefault(fullRep, netId, out var exists);
 
                     if (!exists)
@@ -407,32 +407,36 @@ Had full state: {LastFullState != null}"
                         continue;
                     }
 
-                    if (serverState is not IComponentDeltaState serverDelta)
+                    if (serverState is not IComponentDeltaState serverDelta || serverDelta.FullState)
                         continue;
 
-                    DebugTools.AssertNotNull(implicitCompState);
-
                     // Server sent an initial delta state. This is fine as long as the client can infer an initial full
                     // state from the entity prototype.
-                    serverDelta.ApplyToFullState(implicitCompState!);
+                    if (implicitCompState is not IComponentDeltaState implicitDelta || !implicitDelta.FullState)
+                    {
+                        _logger.Error($"Server sent delta state and client failed to construct an implicit full state for entity {netEntity}");
+                        continue;
+                    }
+
+                    serverDelta.ApplyToFullState(implicitCompState);
                     serverState = implicitCompState;
-                    DebugTools.Assert(serverState is not IComponentDeltaState);
+                    DebugTools.Assert(implicitCompState is IComponentDeltaState d && d.FullState);
                 }
             }
         }
 
-        public Dictionary<ushort, IComponentState?> GetLastServerStates(NetEntity netEntity)
+        public Dictionary<ushort, IComponentState> GetLastServerStates(NetEntity netEntity)
         {
             return _lastStateFullRep[netEntity];
         }
 
-        public Dictionary<NetEntity, Dictionary<ushort, IComponentState?>> GetFullRep()
+        public Dictionary<NetEntity, Dictionary<ushort, IComponentState>> GetFullRep()
         {
             return _lastStateFullRep;
         }
 
         public bool TryGetLastServerStates(NetEntity entity,
-            [NotNullWhen(true)] out Dictionary<ushort, IComponentState?>? dictionary)
+            [NotNullWhen(true)] out Dictionary<ushort, IComponentState>? dictionary)
         {
             return _lastStateFullRep.TryGetValue(entity, out dictionary);
         }