Version: 219.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 }}
 

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

RELEASE-NOTES.md

@@ -54,269 +54,10 @@ END TEMPLATE-->
 *None yet*
 
 
-## 224.0.2
+## 219.2.2
 
 
-## 224.0.1
-
-### Bugfixes
-
-* Fixes PVS throwing exceptions when invalid entities are passed to `ExpandPvsEvent`. Now it just logs an error.
-* Fixes BUIs not properly closing, resulting in invalid entities in `UserInterfaceUserComponent.OpenInterfaces`
-* Fixes an unknown/invalid prototype exception sometimes being thrown when running ``IPrototypeManager.ResolveResults()`
-
-
-## 224.0.0
-
-### Breaking changes
-
-* `Matrix3` has been replaced with `System.Numerics.Matrix3x2`. Various Matrix related methods have been turned into extension methods in the `Matrix3Helpers` class.
-* Engine `EntityCategory` prototype IDs have been changed to use CamelCase. I.e., `hideSpawnMenu` -> `HideSpawnMenu`
-* Prototypes can now be implicitly cast `ProtoId<T>` or `EntProtoId` ID structs. The new implicit cast might cause previous function calls to be ambiguous.
-
-### New features
-
-* `Array.Clear(Array)` is now available in the sandbox.
-* BUIs now use `ExpandPvsEvent`. I.e., if a player has a UI open, then the entity associated with that UI will always get sent to the player by the PVS system.
-* Added `cvar_subs` command for listing all subscribers to cvar changes
-* Entity categories have been reworked
-  * Each category now has a `HideSpawnMenu` field. The old `HideSpawnMenu` category is now just a normal category with that field set to true.
-  * Reworked category inheritance. Inheritance can now be disabled per category using a `Inheritable` field.
-  * Entity prototypes can now be automatically added to categories based on the components that they have, either by specifying components when defining the category in yml, or by adding the EntityCategoryAttribute to the component class.
-
-### Bugfixes
-
-* Fixed client-side BUI error log spam if an unknown entity has a UI open.
-* Fixed placement manager spawning entities with incorrect rotations.
-
-### Other
-
-* Added a try-catch block to BUI constructors, to avoid clients getting stuck in error loops while applying states.
-* Attempting to play sounds on terminating entities no longer logs an error.
-
-
-## 223.3.0
-
-### New features
-
-* Better exception logging for IRobustJob.
-* Add SetGridAudio helper for SharedAudioSystem.
-
-### Bugfixes
-
-* Fix placement manager not setting entity rotation correctly.
-* Fix grid-based audio not playing correctly.
-
-
-## 223.2.0
-
-### New features
-
-* Added several new `FormattedMessage` methods for better exception tolerance when parsing markup. Several existing methods have been marked as obsolete, with new renamed methods taking their place.
-
-
-## 223.1.2
-
-### Bugfixes
-
-* `MapGridComponent.LastTileModifiedTick` is now actually networked to clients.
-
-
-## 223.1.1
-
-### Bugfixes
-
-* Fixed an exception caused by enum cvars using integer type values instead of enum values
-
-
-## 223.1.0
-
-### Other
-
-* Various `ContainerSystem` methods have been obsoleted in favour of overrides that take in an `Entity` struct instead of `EntityUid`
-* Various `EntityCoordinates` methods have been obsoleted with replacements added  to `SharedTransformSystem`
-
-
-## 223.0.0
-
-### Breaking changes
-
-* The `ComponentState` class is now abstract. Networked components that don't have state information now just return a null state.
-* The way that delta component states work has changed. It now expects there to be two different state classes, only one of which should implement `IComponentDeltaState<TFullState>`
-
-### New features
-
-* A new `replay.checkpoint_min_interval` cvar has been added. It can be used to limit the frequency at which checkpoints are generated when loading a replay.
-* Added `IConfigurationManager.OnCVarValueChanged`. This is a c# event that gets invoked whenever any cvar value changes.
-
-### Bugfixes
-
-* `IEyeManager.GetWorldViewbounds()` and `IEyeManager.GetWorldViewbounds()` should now return the correct bounds if the main viewport does not take up the whole screen.
-
-### Other
-
-* The default values of various replay related cvars have been changed to try and reduce memory usage.
-
-
-## 222.4.0
-
-### New features
-
-* Added the following types from `System.Numerics` to the sandbox: `Complex`, `Matrix3x2`, `Matrix4x4`, `Plane`, `Quaternion`, `Vector3`, `Vector4`.
-
-
-## 222.3.0
-
-### New features
-
-* `ITileDefinition.EditorHidden` allows hiding a tile from the tile spawn panel.
-* Ordered event subscriptions now take child types into account, so ordering based on a shared type will work.
-
-### Bugfixes
-
-* Cross-map BUI range checks now work.
-* Paused entities update on prototype reload.
-
-### Other
-
-* Fixed build compatibility with .NET 8.0.300 SDK, due to changes in how Central Package Management behaves.
-* Physics component has delta states to reduce network usage.
-
-
-## 222.2.0
-
-### New features
-
-* Added `EntityQuery.Comp()` (abbreviation of `GetComponent()`)
-
-### Bugfixes
-
-* Fix `SerializationManager.TryGetVariableType` checking the wrong property.
-* Fixed GrammarSystem mispredicting a character's gender
-
-### Other
-
-* User interface system now performs range checks in parallel
-
-
-## 222.1.1
-
-### Bugfixes
-
-* Fixed never setting BoundUserInterface.State.
-
-### Other
-
-* Add truncate for filesaving.
-* Add method for getting the type of a data field by name from ISerializationManager.
-
-
-## 222.1.0
-
-### New features
-
-* Added `BoundKeyEventArgs.IsRepeat`.
-* Added `net.lidgren_log_warning` and `net.lidgren_log_error` CVars.
-
-### Bugfixes
-
-* Fix assert trip when holding repeatable keybinds.
-
-### Other
-
-* Updated Lidgren to v0.3.1. This should provide performance improvements if warning/error logs are disabled.
-
-
-## 222.0.0
-
-### Breaking changes
-
-* Mark IComponentFactory argument in EntityPrototype as mandatory.
-
-### New features
-
-* Add `EntProtoId<T>` to check for components on the attached entity as well.
-
-### Bugfixes
-
-* Fix PVS iterating duplicate chunks for multiple viewsubscriptions.
-
-### Other
-
-* Defer clientside BUI opens if it's the first state that comes in.
-
-
-## 221.2.0
-
-### New features
-
-* Add SetMapAudio helper to SharedAudioSystem to setup map-wide audio entities.
-* Add SetWorldRotNoLerp method to SharedTransformSystem to avoid client lerping.
-
-### Bugfixes
-
-* `SpriteComponent.CopyFrom` now copies `CopyToShaderParameters` configuration.
-
-
-## 221.1.0
-
-
-## 221.0.0
-
-### Breaking changes
-
-* `EntParentChangedMessage.OldMapId` is now an `EntityUid` instead of `MapId`
-* `TransformSystem.DetachParentToNull()` is being renamed to `DetachEntity`
-* The order in which `MoveEvent` handlers are invoked has been changed to prioritise engine subscriptions
-
-### New features
-
-* Added `UpdateHovered()` and `SetHovered()` to `IUserInterfaceManager`, for updating or modifying the currently hovered control.
-* Add SwapPositions to TransformSystem to swap two entity's transforms.
-
-### Bugfixes
-
-* Improve client gamestate exception tolerance.
-
-### Other
-
-* If the currently hovered control is disposed, `UserInterfaceManager` will now look for a new control, rather than just setting the hovered control to null.
-
-### Internal
-
-* Use more `EntityQuery<T>` internally in EntityManager and PhysicsSystem.
-
-
-## 220.2.0
-
-### New features
-
-* RSIs can now specify load parameters, mimicking the ones from `.png.yml`. Currently only disabling sRGB is supported.
-* Added a second UV channel to Clyde's vertex format. On regular batched sprite draws, this goes 0 -> 1 across the sprite quad.
-* Added a new `CopyToShaderParameters` system for `SpriteComponent` layers.
-
-
-## 220.1.0
-
-### Bugfixes
-
-* Fix client-side replay exceptions due to dropped states when recording.
-
-### Other
-
-* Remove IP + HWId from ViewVariables.
-* Close BUIs upon disconnect.
-
-
-## 220.0.0
-
-### Breaking changes
-
-* Refactor UserInterfaceSystem.
-  - The API has been significantly cleaned up and standardised, most noticeably callers don't need to worry about TryGetUi and can rely on either HasUi, SetUiState, CloseUi, or OpenUi to handle their code as appropriate.
-  - Interface data is now stored via key rather than as a flat list which is a breaking change for YAML.
-  - BoundUserInterfaces can now be completely handled via Shared code. Existing Server-side callers will behave similarly to before.
-  - BoundUserInterfaces now properly close in many more situations, additionally they are now attached to the entity so reconnecting can re-open them and they can be serialized properly.
+## 219.2.1
 
 
 ## 219.2.0

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,20 +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

Resources/Locale/en-US/commands.ftl

@@ -43,13 +43,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]

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

@@ -1,9 +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-desc-hide = Entity prototypes that should be hidden from the spawn menu

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/DataDefinitionAnalyzer.cs

@@ -6,7 +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;
 
 namespace Robust.Analyzers;
 
@@ -57,18 +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 override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
-        DataDefinitionPartialRule, NestedDataDefinitionPartialRule, DataFieldWritableRule, DataFieldPropertyWritableRule,
-        DataFieldRedundantTagRule
+        DataDefinitionPartialRule, NestedDataDefinitionPartialRule, DataFieldWritableRule, DataFieldPropertyWritableRule
     );
 
     public override void Initialize(AnalysisContext context)
@@ -136,11 +125,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
             {
                 context.ReportDiagnostic(Diagnostic.Create(DataFieldWritableRule, context.Node.GetLocation(), fieldSymbol.Name, type.Name));
             }
-
-            if (HasRedundantTag(fieldSymbol))
-            {
-                context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, context.Node.GetLocation(), fieldSymbol.Name, type.Name));
-            }
         }
     }
 
@@ -165,11 +149,6 @@ public sealed class DataDefinitionAnalyzer : DiagnosticAnalyzer
         {
             context.ReportDiagnostic(Diagnostic.Create(DataFieldPropertyWritableRule, context.Node.GetLocation(), propertySymbol.Name, type.Name));
         }
-
-        if (HasRedundantTag(propertySymbol))
-        {
-            context.ReportDiagnostic(Diagnostic.Create(DataFieldRedundantTagRule, context.Node.GetLocation(), propertySymbol.Name, type.Name));
-        }
     }
 
     private static bool IsReadOnlyDataField(ITypeSymbol type, ISymbol field)
@@ -269,29 +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 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,11 +16,8 @@ namespace Robust.Analyzers;
 [ExportCodeFixProvider(LanguageNames.CSharp)]
 public sealed class DefinitionFixer : CodeFixProvider
 {
-    private const string DataFieldAttributeName = "DataField";
-
     public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(
-        IdDataDefinitionPartial, IdNestedDataDefinitionPartial, IdDataFieldWritable, IdDataFieldPropertyWritable,
-        IdDataFieldRedundantTag
+        IdDataDefinitionPartial, IdNestedDataDefinitionPartial, IdDataFieldWritable, IdDataFieldPropertyWritable
     );
 
     public override Task RegisterCodeFixesAsync(CodeFixContext context)
@@ -34,8 +34,6 @@ public sealed class DefinitionFixer : CodeFixProvider
                     return RegisterDataFieldFix(context, diagnostic);
                 case IdDataFieldPropertyWritable:
                     return RegisterDataFieldPropertyFix(context, diagnostic);
-                case IdDataFieldRedundantTag:
-                    return RegisterRedundantTagFix(context, diagnostic);
             }
         }
 
@@ -74,68 +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 RegisterDataFieldFix(CodeFixContext context, Diagnostic diagnostic)
     {
         var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken);

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/Robust.Analyzers.csproj

@@ -16,11 +16,6 @@
     <Compile Include="..\Robust.Shared\Analyzers\PreferGenericVariantAttribute.cs" LinkBase="Implementations" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!-- Needed for DataDefinitionAnalyzer. -->
-    <Compile Include="..\Robust.Shared\Serialization\Manager\Definition\DataDefinitionUtility.cs" LinkBase="Implementations" />
-  </ItemGroup>
-
   <Import Project="../Robust.Roslyn.Shared/Robust.Roslyn.Shared.props" />
 
   <PropertyGroup>

Robust.Client.Injectors/XamlCompiler.cs

@@ -239,7 +239,6 @@ namespace Robust.Build.Tasks
                         engine.LogErrorEvent(new BuildErrorEventArgs("XAMLIL", "", res.FilePath, 0, 0, 0, 0,
                             $"{res.FilePath}: {e.Message}", "", "CompileRobustXaml"));
                     }
-                    res.Remove();
                 }
                 return true;
             }

Robust.Client/Audio/AudioSystem.cs

@@ -41,7 +41,7 @@ public sealed partial class AudioSystem : SharedAudioSystem
     [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!;
 
@@ -216,6 +216,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;
@@ -331,22 +336,55 @@ public sealed partial class AudioSystem : SharedAudioSystem
         }
 
         Vector2 worldPos;
-        component.Volume = component.Params.Volume;
-        Vector2 delta;
+        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
-        delta = worldPos - listener.Position;
+        var delta = worldPos - listener.Position;
         var distance = delta.Length();
 
         // Out of range so just clip it for us.
@@ -365,15 +403,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;
@@ -640,10 +671,10 @@ 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.

Robust.Client/Debugging/DebugPhysicsSystem.cs

@@ -225,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)
             {
@@ -368,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)
@@ -443,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)
@@ -520,11 +520,11 @@ namespace Robust.Client.Debugging
             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, xform1.WorldRotation);
             var xfb = new Transform(xf2, xform2.WorldRotation);

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

@@ -6,7 +6,6 @@ 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.Animations;
@@ -29,7 +28,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 +148,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 +387,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 +770,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 +804,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))
@@ -1304,21 +1289,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)
@@ -1545,7 +1531,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 +1635,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 +1663,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 +1672,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 +1944,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 +1998,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 +2007,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 +2018,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 +2096,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/ContainerSystem.cs

@@ -120,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);
                 }
 

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

@@ -70,7 +70,7 @@ namespace Robust.Client.GameObjects
 
         protected internal override void Draw(in OverlayDrawArgs args)
         {
-            var currentMap = args.MapId;
+            var currentMap = _eyeManager.CurrentMap;
             var viewport = args.WorldBounds;
             var worldHandle = args.WorldHandle;
 
@@ -109,7 +109,7 @@ namespace Robust.Client.GameObjects
                 }
             }
 
-            worldHandle.SetTransform(Matrix3x2.Identity);
+            worldHandle.SetTransform(Matrix3.Identity);
         }
     }
 }

Robust.Client/GameObjects/EntitySystems/UserInterfaceSystem.cs

@@ -1,8 +1,84 @@
+using Robust.Client.Player;
 using Robust.Shared.GameObjects;
+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 sealed class UserInterfaceSystem : SharedUserInterfaceSystem
+    {
+        [Dependency] private readonly IDynamicTypeFactory _dynamicTypeFactory = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IReflectionManager _reflectionManager = default!;
 
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            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)
+            {
+                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/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(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(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);
                 }
             }
@@ -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)
                 {
@@ -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.
@@ -1177,7 +1144,7 @@ namespace Robust.Client.GameStates
                     }
 
                     meta._flags |= MetaDataFlags.Detached;
-                    xformSys.DetachEntity(ent.Value, xform);
+                    xformSys.DetachParentToNull(ent.Value, xform);
                     DebugTools.Assert((meta.Flags & MetaDataFlags.InContainer) == 0);
 
                     if (container != null)
@@ -1190,58 +1157,63 @@ namespace Robust.Client.GameStates
 
         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)
                 {
+                    var entity = _entityManager.GetEntity(netEntity);
+#if EXCEPTION_TOLERANCE
                     try
                     {
-                        (entity, var meta) = _entityManager.GetEntityData(netEntity);
-                        _entities.InitializeEntity(entity, meta);
-                        _toStart.Add((entity, netEntity));
+#endif
+                    _entities.InitializeEntity(entity, metaQuery.GetComponent(entity));
+#if EXCEPTION_TOLERANCE
                     }
                     catch (Exception e)
                     {
-                        _sawmill.Error($"Server entity threw in Init: nent={netEntity}, ent={_entities.ToPrettyString(entity)}");
+                        _sawmill.Error($"Server entity threw in Init: ent={_entities.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
                 }
             }
 
             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();
+#endif
         }
 
         private void HandleEntityState(EntityUid uid, NetEntity netEntity, MetaDataComponent meta, IEventBus bus, EntityState? curState,
@@ -1357,9 +1329,6 @@ 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(comp, ref handleState);
             }
@@ -1433,7 +1402,7 @@ namespace Robust.Client.GameStates
                     containerSys.TryGetContainingContainer(xform.ParentUid, uid, out container);
                 }
 
-                _entities.EntitySysManager.GetEntitySystem<TransformSystem>().DetachEntity(uid, xform);
+                _entities.EntitySysManager.GetEntitySystem<TransformSystem>().DetachParentToNull(uid, xform);
 
                 if (container != null)
                     containerSys.AddExpectedEntity(_entities.GetNetEntity(uid), container);
@@ -1512,9 +1481,6 @@ namespace Robust.Client.GameStates
                     _entityManager.AddComponent(uid, comp, true, meta);
                 }
 
-                if (state == null)
-                    continue;
-
                 var handleState = new ComponentHandleState(state, null);
                 _entityManager.EventBus.RaiseComponentEvent(comp, ref handleState);
             }

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);
         }

Robust.Client/GameStates/IClientGameStateManager.cs

@@ -113,7 +113,7 @@ namespace Robust.Client.GameStates
         /// <summary>
         /// Returns the full collection of cached game states that are used to reset predicted entities.
         /// </summary>
-        Dictionary<NetEntity, Dictionary<ushort, IComponentState?>> GetFullRep();
+        Dictionary<NetEntity, Dictionary<ushort, IComponentState>> GetFullRep();
 
         /// <summary>
         /// This will perform some setup in order to reset the game to an earlier state. To fully reset the state

Robust.Client/GameStates/IGameStateProcessor.cs

@@ -83,13 +83,13 @@ namespace Robust.Client.GameStates
         ///     The data to merge.
         ///     It's a dictionary of entity ID -> (component net ID -> ComponentState)
         /// </param>
-        void MergeImplicitData(Dictionary<NetEntity, Dictionary<ushort, IComponentState?>> data);
+        void MergeImplicitData(Dictionary<NetEntity, Dictionary<ushort, IComponentState>> data);
 
         /// <summary>
         ///     Get the last state data from the server for an entity.
         /// </summary>
         /// <returns>Dictionary (net ID -> ComponentState)</returns>
-        Dictionary<ushort, IComponentState?> GetLastServerStates(NetEntity entity);
+        Dictionary<ushort, IComponentState> GetLastServerStates(NetEntity entity);
 
         /// <summary>
         ///     Calculate the number of applicable states in the game state buffer from a given tick.
@@ -99,6 +99,6 @@ namespace Robust.Client.GameStates
         int GetApplicableStateCount(GameTick? fromTick);
 
         bool TryGetLastServerStates(NetEntity entity,
-            [NotNullWhen(true)] out Dictionary<ushort, IComponentState?>? dictionary);
+            [NotNullWhen(true)] out Dictionary<ushort, IComponentState>? dictionary);
     }
 }

Robust.Client/GameStates/NetInterpOverlay.cs

@@ -49,7 +49,7 @@ namespace Robust.Client.GameStates
             while (query.MoveNext(out var uid, out var transform))
             {
                 // if not on the same map, continue
-                if (transform.MapID != args.MapId || _container.IsEntityInContainer(uid))
+                if (transform.MapID != _eyeManager.CurrentMap || _container.IsEntityInContainer(uid))
                     continue;
 
                 if (transform.GridUid == uid)

Robust.Client/Graphics/ClientEye/EyeManager.cs

@@ -64,22 +64,29 @@ namespace Robust.Client.Graphics
         /// <inheritdoc />
         public Box2 GetWorldViewport()
         {
-            return GetWorldViewbounds().CalcBoundingBox();
+            var vpSize = _displayManager.ScreenSize;
+
+            var topLeft = ScreenToMap(Vector2.Zero);
+            var topRight = ScreenToMap(new Vector2(vpSize.X, 0));
+            var bottomRight = ScreenToMap(vpSize);
+            var bottomLeft = ScreenToMap(new Vector2(0, vpSize.Y));
+
+            var left = MathHelper.Min(topLeft.X, topRight.X, bottomRight.X, bottomLeft.X);
+            var bottom = MathHelper.Min(topLeft.Y, topRight.Y, bottomRight.Y, bottomLeft.Y);
+            var right = MathHelper.Max(topLeft.X, topRight.X, bottomRight.X, bottomLeft.X);
+            var top = MathHelper.Max(topLeft.Y, topRight.Y, bottomRight.Y, bottomLeft.Y);
+
+            return new Box2(left, bottom, right, top);
         }
 
         /// <inheritdoc />
         public Box2Rotated GetWorldViewbounds()
         {
-            // This is an inefficient and roundabout way of geting the viewport.
-            // But its a method that shouldn't get used much.
-
-            var vp = MainViewport as Control;
-            var vpSize = vp?.PixelSize ?? _displayManager.ScreenSize;
+            var vpSize = _displayManager.ScreenSize;
 
             var topRight = ScreenToMap(new Vector2(vpSize.X, 0)).Position;
             var bottomLeft = ScreenToMap(new Vector2(0, vpSize.Y)).Position;
 
-            // This assumes the main viewports eye and the main eye are the same.
             var rotation = new Angle(CurrentEye.Rotation);
             var center = (bottomLeft + topRight) / 2;
 
@@ -101,16 +108,18 @@ namespace Robust.Client.Graphics
         }
 
         /// <inheritdoc />
-        public void GetScreenProjectionMatrix(out Matrix3x2 projMatrix)
+        public void GetScreenProjectionMatrix(out Matrix3 projMatrix)
         {
-            Matrix3x2 result = default;
+            Matrix3 result = default;
 
-            result.M11 = PixelsPerMeter;
-            result.M22 = -PixelsPerMeter;
+            result.R0C0 = PixelsPerMeter;
+            result.R1C1 = -PixelsPerMeter;
 
             var screenSize = _displayManager.ScreenSize;
-            result.M31 = screenSize.X / 2f;
-            result.M32 = screenSize.Y / 2f;
+            result.R0C2 = screenSize.X / 2f;
+            result.R1C2 = screenSize.Y / 2f;
+
+            result.R2C2 = 1;
 
             /* column major
              Sx 0 Tx

Robust.Client/Graphics/ClientEye/IEyeManager.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Numerics;
+using System.Numerics;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Graphics;
 using Robust.Shared.Map;
@@ -14,29 +13,26 @@ namespace Robust.Client.Graphics
     public interface IEyeManager
     {
         /// <summary>
-        /// The primary eye, which is usually the eye associated with the main viewport.
+        /// The current eye that is being used to render the game.
         /// </summary>
         /// <remarks>
-        /// Generally, you should avoid using this whenever possible. E.g., when rendering overlays should use the
-        /// eye & viewbounds that gets passed to the draw method.
         /// Setting this property to null will use the default eye.
         /// </remarks>
         IEye CurrentEye { get; set; }
 
         IViewportControl MainViewport { get; set; }
 
-        [Obsolete]
+        /// <summary>
+        /// The ID of the map on which the current eye is "placed".
+        /// </summary>
         MapId CurrentMap { get; }
 
         /// <summary>
-        /// A world-space box that is at LEAST the area covered by the main viewport.
+        /// A world-space box that is at LEAST the area covered by the viewport.
         /// May be larger due to say rotation.
         /// </summary>
         Box2 GetWorldViewport();
 
-        /// <summary>
-        /// A world-space box of the area visible in the main viewport.
-        /// </summary>
         Box2Rotated GetWorldViewbounds();
 
         /// <summary>
@@ -44,10 +40,10 @@ namespace Robust.Client.Graphics
         /// to UI screen space.
         /// </summary>
         /// <param name="projMatrix"></param>
-        void GetScreenProjectionMatrix(out Matrix3x2 projMatrix);
+        void GetScreenProjectionMatrix(out Matrix3 projMatrix);
 
         /// <summary>
-        /// Projects a point from world space to UI screen space using the main viewport.
+        /// Projects a point from world space to UI screen space using the current camera.
         /// </summary>
         /// <param name="point">Point in world to transform.</param>
         /// <returns>Corresponding point in UI screen space.</returns>

Robust.Client/Graphics/Clyde/Clyde.Constants.cs

@@ -6,8 +6,7 @@ namespace Robust.Client.Graphics.Clyde
         {
             ("aPos", 0),
             ("tCoord", 1),
-            ("tCoord2", 2),
-            ("modulate", 3)
+            ("modulate", 2)
         };
 
         private const int UniIModUV = 0;

Robust.Client/Graphics/Clyde/Clyde.HLR.cs

@@ -367,7 +367,7 @@ namespace Robust.Client.Graphics.Clyde
                     _renderHandle.UseShader(entry.Sprite.PostShader);
                     CalcScreenMatrices(viewport.Size, out var proj, out var view);
                     _renderHandle.SetProjView(proj, view);
-                    _renderHandle.SetModelTransform(Matrix3x2.Identity);
+                    _renderHandle.SetModelTransform(Matrix3.Identity);
 
                     var rounded = roundedPos - entityPostRenderTarget.Size / 2;
 
@@ -480,7 +480,7 @@ namespace Robust.Client.Graphics.Clyde
                 var worldBounds = CalcWorldBounds(viewport);
                 var worldAABB = worldBounds.CalcBoundingBox();
 
-                if (eye.Position.MapId != MapId.Nullspace)
+                if (_eyeManager.CurrentMap != MapId.Nullspace)
                 {
                     using (DebugGroup("Lights"))
                     using (_prof.Group("Lights"))
@@ -530,7 +530,7 @@ namespace Robust.Client.Graphics.Clyde
                     // Because the math is wrong.
                     // So there are distortions from incorrect projection.
                     _renderHandle.UseShader(_fovDebugShaderInstance);
-                    _renderHandle.DrawingHandleScreen.SetTransform(Matrix3x2.Identity);
+                    _renderHandle.DrawingHandleScreen.SetTransform(Matrix3.Identity);
                     var pos = UIBox2.FromDimensions(viewport.Size / 2 - new Vector2(200, 200), new Vector2(400, 400));
                     _renderHandle.DrawingHandleScreen.DrawTextureRect(FovTexture, pos);
                 }
@@ -538,18 +538,15 @@ namespace Robust.Client.Graphics.Clyde
                 if (DebugLayers == ClydeDebugLayers.Light)
                 {
                     _renderHandle.UseShader(null);
-                    _renderHandle.DrawingHandleScreen.SetTransform(Matrix3x2.Identity);
+                    _renderHandle.DrawingHandleScreen.SetTransform(Matrix3.Identity);
                     _renderHandle.DrawingHandleScreen.DrawTextureRect(
                         viewport.WallBleedIntermediateRenderTarget2.Texture,
                         UIBox2.FromDimensions(Vector2.Zero, viewport.Size), new Color(1, 1, 1, 0.5f));
                 }
 
-                if (eye.Position.MapId != MapId.Nullspace)
+                using (_prof.Group("Overlays WS"))
                 {
-                    using (_prof.Group("Overlays WS"))
-                    {
-                        RenderOverlays(viewport, OverlaySpace.WorldSpace, worldAABB, worldBounds);
-                    }
+                    RenderOverlays(viewport, OverlaySpace.WorldSpace, worldAABB, worldBounds);
                 }
 
                 _currentViewport = oldVp;

Robust.Client/Graphics/Clyde/Clyde.Layout.cs

@@ -23,12 +23,9 @@ namespace Robust.Client.Graphics.Clyde
             // Texture Coords.
             GL.VertexAttribPointer(1, 2, VertexAttribPointerType.Float, false, sizeof(Vertex2D), 2 * sizeof(float));
             GL.EnableVertexAttribArray(1);
-            // Texture Coords (2).
-            GL.VertexAttribPointer(2, 2, VertexAttribPointerType.Float, false, sizeof(Vertex2D), 4 * sizeof(float));
-            GL.EnableVertexAttribArray(2);
             // Colour Modulation.
-            GL.VertexAttribPointer(3, 4, VertexAttribPointerType.Float, false, sizeof(Vertex2D), 6 * sizeof(float));
-            GL.EnableVertexAttribArray(3);
+            GL.VertexAttribPointer(2, 4, VertexAttribPointerType.Float, false, sizeof(Vertex2D), 4 * sizeof(float));
+            GL.EnableVertexAttribArray(2);
         }
 
         // NOTE: This is:
@@ -40,7 +37,6 @@ namespace Robust.Client.Graphics.Clyde
         {
             public readonly Vector2 Position;
             public readonly Vector2 TextureCoordinates;
-            public readonly Vector2 TextureCoordinates2;
             // Note that this color is in linear space.
             public readonly Color Modulate;
 
@@ -52,15 +48,6 @@ namespace Robust.Client.Graphics.Clyde
                 Modulate = modulate;
             }
 
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Vertex2D(Vector2 position, Vector2 textureCoordinates, Vector2 textureCoordinates2, Color modulate)
-            {
-                Position = position;
-                TextureCoordinates = textureCoordinates;
-                TextureCoordinates2 = textureCoordinates2;
-                Modulate = modulate;
-            }
-
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             public Vertex2D(float x, float y, float u, float v, float r, float g, float b, float a)
                 : this(new Vector2(x, y), new Vector2(u, v), new Color(r, g, b, a))
@@ -98,34 +85,28 @@ namespace Robust.Client.Graphics.Clyde
             [FieldOffset(20 * sizeof(float))] public Vector3 ViewMatrixC2;
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public ProjViewMatrices(in Matrix3x2 projMatrix, in Matrix3x2 viewMatrix)
+            public ProjViewMatrices(in Matrix3 projMatrix, in Matrix3 viewMatrix)
             {
-                // We put the rows of the input matrix into the columns of our GPU matrices
-                // this transpose is required, as in C#, we premultiply vectors with matrices
-                // (vM) while GL postmultiplies vectors with matrices (Mv); however, since
-                // the Matrix3x2 data is stored row-major, and GL uses column-major, the
-                // memory layout is the same (or would be, if Matrix3x2 didn't have an
-                // implicit column)
-                ProjMatrixC0 = new Vector3(projMatrix.M11, projMatrix.M12, 0);
-                ProjMatrixC1 = new Vector3(projMatrix.M21, projMatrix.M22, 0);
-                ProjMatrixC2 = new Vector3(projMatrix.M31, projMatrix.M32, 1);
+                ProjMatrixC0 = new Vector3(projMatrix.R0C0, projMatrix.R1C0, projMatrix.R2C0);
+                ProjMatrixC1 = new Vector3(projMatrix.R0C1, projMatrix.R1C1, projMatrix.R2C1);
+                ProjMatrixC2 = new Vector3(projMatrix.R0C2, projMatrix.R1C2, projMatrix.R2C2);
 
-                ViewMatrixC0 = new Vector3(viewMatrix.M11, viewMatrix.M12, 0);
-                ViewMatrixC1 = new Vector3(viewMatrix.M21, viewMatrix.M22, 0);
-                ViewMatrixC2 = new Vector3(viewMatrix.M31, viewMatrix.M32, 1);
+                ViewMatrixC0 = new Vector3(viewMatrix.R0C0, viewMatrix.R1C0, viewMatrix.R2C0);
+                ViewMatrixC1 = new Vector3(viewMatrix.R0C1, viewMatrix.R1C1, viewMatrix.R2C1);
+                ViewMatrixC2 = new Vector3(viewMatrix.R0C2, viewMatrix.R1C2, viewMatrix.R2C2);
             }
 
             public void Apply(Clyde clyde, GLShaderProgram program)
             {
-                program.SetUniformMaybe("projectionMatrix", new Matrix3x2(
-                    ProjMatrixC0.X, ProjMatrixC0.Y, // Implicit 0
-                    ProjMatrixC1.X, ProjMatrixC1.Y, // Implicit 0
-                    ProjMatrixC2.X, ProjMatrixC2.Y  // Implicit 1
+                program.SetUniformMaybe("projectionMatrix", new Matrix3(
+                    ProjMatrixC0.X, ProjMatrixC1.X, ProjMatrixC2.X,
+                    ProjMatrixC0.Y, ProjMatrixC1.Y, ProjMatrixC2.Y,
+                    ProjMatrixC0.Z, ProjMatrixC1.Z, ProjMatrixC2.Z
                 ));
-                program.SetUniformMaybe("viewMatrix", new Matrix3x2(
-                    ViewMatrixC0.X, ViewMatrixC0.Y, // Implicit 0
-                    ViewMatrixC1.X, ViewMatrixC1.Y, // Implicit 0
-                    ViewMatrixC2.X, ViewMatrixC2.Y  // Implicit 1
+                program.SetUniformMaybe("viewMatrix", new Matrix3(
+                    ViewMatrixC0.X, ViewMatrixC1.X, ViewMatrixC2.X,
+                    ViewMatrixC0.Y, ViewMatrixC1.Y, ViewMatrixC2.Y,
+                    ViewMatrixC0.Z, ViewMatrixC1.Z, ViewMatrixC2.Z
                 ));
             }
         }

Robust.Client/Graphics/Clyde/Clyde.LightRendering.cs

@@ -492,18 +492,18 @@ namespace Robust.Client.Graphics.Clyde
 
                     var offset = new Vector2(component.Radius, component.Radius);
 
-                    Matrix3x2 matrix;
+                    Matrix3 matrix;
                     if (mask == null)
                     {
-                        matrix = Matrix3x2.Identity;
+                        matrix = Matrix3.Identity;
                     }
                     else
                     {
                         // Only apply rotation if a mask is said, because else it doesn't matter.
-                        matrix = Matrix3Helpers.CreateRotation(rotation);
+                        matrix = Matrix3.CreateRotation(rotation);
                     }
 
-                    (matrix.M31, matrix.M32) = lightPos;
+                    (matrix.R0C2, matrix.R1C2) = lightPos;
 
                     _drawQuad(-offset, offset, matrix, lightShader);
                 }
@@ -692,7 +692,7 @@ namespace Robust.Client.Graphics.Clyde
 
                 // Blur horizontally to _wallBleedIntermediateRenderTarget1.
                 shader.SetUniformMaybe("direction", Vector2.UnitX);
-                _drawQuad(Vector2.Zero, viewport.Size, Matrix3x2.Identity, shader);
+                _drawQuad(Vector2.Zero, viewport.Size, Matrix3.Identity, shader);
 
                 SetTexture(TextureUnit.Texture0, viewport.LightBlurTarget.Texture);
 
@@ -700,7 +700,7 @@ namespace Robust.Client.Graphics.Clyde
 
                 // Blur vertically to _wallBleedIntermediateRenderTarget2.
                 shader.SetUniformMaybe("direction", Vector2.UnitY);
-                _drawQuad(Vector2.Zero, viewport.Size, Matrix3x2.Identity, shader);
+                _drawQuad(Vector2.Zero, viewport.Size, Matrix3.Identity, shader);
 
                 SetTexture(TextureUnit.Texture0, viewport.LightRenderTarget.Texture);
             }
@@ -754,14 +754,14 @@ namespace Robust.Client.Graphics.Clyde
 
                 // Blur horizontally to _wallBleedIntermediateRenderTarget1.
                 shader.SetUniformMaybe("direction", Vector2.UnitX);
-                _drawQuad(Vector2.Zero, viewport.Size, Matrix3x2.Identity, shader);
+                _drawQuad(Vector2.Zero, viewport.Size, Matrix3.Identity, shader);
 
                 SetTexture(TextureUnit.Texture0, viewport.WallBleedIntermediateRenderTarget1.Texture);
                 BindRenderTargetFull(viewport.WallBleedIntermediateRenderTarget2);
 
                 // Blur vertically to _wallBleedIntermediateRenderTarget2.
                 shader.SetUniformMaybe("direction", Vector2.UnitY);
-                _drawQuad(Vector2.Zero, viewport.Size, Matrix3x2.Identity, shader);
+                _drawQuad(Vector2.Zero, viewport.Size, Matrix3.Identity, shader);
 
                 SetTexture(TextureUnit.Texture0, viewport.WallBleedIntermediateRenderTarget2.Texture);
             }
@@ -909,13 +909,13 @@ namespace Robust.Client.Graphics.Clyde
             // Second modification is that output must be fov-centred (difference-space)
             uZero -= fovCentre;
 
-            var clipToDiff = new Matrix3x2(uX.X, uX.Y, uY.X, uY.Y, uZero.X, uZero.Y);
+            var clipToDiff = new Matrix3(in uX, in uY, in uZero);
 
             fovShader.SetUniformMaybe("clipToDiff", clipToDiff);
-            _drawQuad(Vector2.Zero, Vector2.One, Matrix3x2.Identity, fovShader);
+            _drawQuad(Vector2.Zero, Vector2.One, Matrix3.Identity, fovShader);
         }
 
-        private void UpdateOcclusionGeometry(MapId map, Box2 expandedBounds, Matrix3x2 eyeTransform)
+        private void UpdateOcclusionGeometry(MapId map, Box2 expandedBounds, Matrix3 eyeTransform)
         {
             using var _ = _prof.Group("UpdateOcclusionGeometry");
             using var _p = DebugGroup(nameof(UpdateOcclusionGeometry));
@@ -968,9 +968,9 @@ namespace Robust.Client.Graphics.Clyde
                         var worldTransform = xformSystem.GetWorldMatrix(transform, xforms);
                         var box = occluder.BoundingBox;
 
-                        var tl = Vector2.Transform(box.TopLeft, worldTransform);
-                        var tr = Vector2.Transform(box.TopRight, worldTransform);
-                        var br = Vector2.Transform(box.BottomRight, worldTransform);
+                        var tl = worldTransform.Transform(box.TopLeft);
+                        var tr = worldTransform.Transform(box.TopRight);
+                        var br = worldTransform.Transform(box.BottomRight);
                         var bl = tl + br - tr;
 
                         // Faces.
@@ -1010,9 +1010,9 @@ namespace Robust.Client.Graphics.Clyde
                         //
 
                         // Calculate delta positions from camera.
-                        var dTl = Vector2.Transform(tl, eyeTransform);
-                        var dTr = Vector2.Transform(tr, eyeTransform);
-                        var dBl = Vector2.Transform(bl, eyeTransform);
+                        var dTl = eyeTransform.Transform(tl);
+                        var dTr = eyeTransform.Transform(tr);
+                        var dBl = eyeTransform.Transform(bl);
                         var dBr = dBl + dTr - dTl;
 
                         // Get which neighbors are occluding.

Robust.Client/Graphics/Clyde/Clyde.RenderHandle.cs

@@ -15,7 +15,7 @@ namespace Robust.Client.Graphics.Clyde
     {
         private RenderHandle _renderHandle = default!;
 
-        internal sealed class RenderHandle : IRenderHandle
+        private sealed class RenderHandle : IRenderHandle
         {
             private readonly Clyde _clyde;
             private readonly IEntityManager _entities;
@@ -33,17 +33,17 @@ namespace Robust.Client.Graphics.Clyde
                 DrawingHandleWorld = new DrawingHandleWorldImpl(white, this);
             }
 
-            public void SetModelTransform(in Matrix3x2 matrix)
+            public void SetModelTransform(in Matrix3 matrix)
             {
                 _clyde.DrawSetModelTransform(matrix);
             }
 
-            public Matrix3x2 GetModelTransform()
+            public Matrix3 GetModelTransform()
             {
                 return _clyde.DrawGetModelTransform();
             }
 
-            public void SetProjView(in Matrix3x2 proj, in Matrix3x2 view)
+            public void SetProjView(in Matrix3 proj, in Matrix3 view)
             {
                 _clyde.DrawSetProjViewTransform(proj, view);
             }
@@ -88,21 +88,16 @@ namespace Robust.Client.Graphics.Clyde
             {
                 var clydeTexture = ExtractTexture(texture, in subRegion, out var csr);
 
-                var sr = WorldTextureBoundsToUV(clydeTexture, csr);
+                var (w, h) = clydeTexture.Size;
+                var sr = new Box2(csr.Left / w, (h - csr.Bottom) / h, csr.Right / w, (h - csr.Top) / h);
 
                 _clyde.DrawTexture(clydeTexture.TextureId, bl, br, tl, tr, in modulate, in sr);
             }
 
-            internal static Box2 WorldTextureBoundsToUV(ClydeTexture texture, UIBox2 csr)
-            {
-                var (w, h) = texture.Size;
-                return new Box2(csr.Left / w, (h - csr.Bottom) / h, csr.Right / w, (h - csr.Top) / h);
-            }
-
             /// <summary>
             /// Converts a subRegion (px) into texture coords (0-1) of a given texture (cells of the textureAtlas).
             /// </summary>
-            internal static ClydeTexture ExtractTexture(Texture texture, in UIBox2? subRegion, out UIBox2 sr)
+            private static ClydeTexture ExtractTexture(Texture texture, in UIBox2? subRegion, out UIBox2 sr)
             {
                 if (texture is AtlasTexture atlas)
                 {
@@ -177,9 +172,9 @@ namespace Robust.Client.Graphics.Clyde
                 var oldModel = _clyde._currentMatrixModel;
 
                 var newModel = oldModel;
-                position += new Vector2(oldModel.M31, oldModel.M32);
-                newModel.M31 = 0;
-                newModel.M32 = 0;
+                position += new Vector2(oldModel.R0C2, oldModel.R1C2);
+                newModel.R0C2 = 0;
+                newModel.R1C2 = 0;
                 SetModelTransform(newModel);
 
                 // Switch rendering to pseudo-world space.
@@ -194,7 +189,7 @@ namespace Robust.Client.Graphics.Clyde
                     // Maaaaybe this is meant to have a minus sign.
                     var rot = -(float) eyeRot.Theta;
 
-                    var view = Matrix3Helpers.CreateTransform(ofsX, ofsY, rot, scale.X, scale.Y);
+                    var view = Matrix3.CreateTransform(ofsX, ofsY, rot, scale.X, scale.Y);
                     SetProjView(proj, view);
                 }
 
@@ -297,12 +292,12 @@ namespace Robust.Client.Graphics.Clyde
                     _renderHandle = renderHandle;
                 }
 
-                public override void SetTransform(in Matrix3x2 matrix)
+                public override void SetTransform(in Matrix3 matrix)
                 {
                     _renderHandle.SetModelTransform(matrix);
                 }
 
-                public override Matrix3x2 GetTransform()
+                public override Matrix3 GetTransform()
                 {
                     return _renderHandle.GetModelTransform();
                 }
@@ -402,12 +397,12 @@ namespace Robust.Client.Graphics.Clyde
                     _renderHandle = renderHandle;
                 }
 
-                public override void SetTransform(in Matrix3x2 matrix)
+                public override void SetTransform(in Matrix3 matrix)
                 {
                     _renderHandle.SetModelTransform(matrix);
                 }
 
-                public override Matrix3x2 GetTransform()
+                public override Matrix3 GetTransform()
                 {
                     return _renderHandle.GetModelTransform();
                 }

Robust.Client/Graphics/Clyde/Clyde.Rendering.cs

@@ -62,7 +62,7 @@ namespace Robust.Client.Graphics.Clyde
         // This matrix is applied to most normal geometry coming in.
         // Some is applied while the batch is being created (e.g. simple texture draw calls).
         // For DrawPrimitives OTOH the model matrix is passed along with the render command so is applied in the shader.
-        private Matrix3x2 _currentMatrixModel = Matrix3x2.Identity;
+        private Matrix3 _currentMatrixModel = Matrix3.Identity;
 
         // Buffers and data for the batching system. Written into during (queue) and processed during (submit).
         private readonly Vertex2D[] BatchVertexData = new Vertex2D[MaxBatchQuads * 4];
@@ -84,8 +84,8 @@ namespace Robust.Client.Graphics.Clyde
 
         // Current projection & view matrices that are being used ot render.
         // This gets updated to keep track during (queue) and (misc), but not during (submit).
-        private Matrix3x2 _currentMatrixProj;
-        private Matrix3x2 _currentMatrixView;
+        private Matrix3 _currentMatrixProj;
+        private Matrix3 _currentMatrixView;
 
         // (queue) and (misc), current state of the scissor test. Null if disabled.
         private UIBox2i? _currentScissorState;
@@ -110,25 +110,25 @@ namespace Robust.Client.Graphics.Clyde
             UniformConstantsUBO.Reallocate(constants);
         }
 
-        private void CalcScreenMatrices(in Vector2i screenSize, out Matrix3x2 proj, out Matrix3x2 view)
+        private void CalcScreenMatrices(in Vector2i screenSize, out Matrix3 proj, out Matrix3 view)
         {
-            proj = Matrix3x2.Identity;
-            proj.M11 = 2f / screenSize.X;
-            proj.M22 = -2f / screenSize.Y;
-            proj.M31 = -1;
-            proj.M32 = 1;
+            proj = Matrix3.Identity;
+            proj.R0C0 = 2f / screenSize.X;
+            proj.R1C1 = -2f / screenSize.Y;
+            proj.R0C2 = -1;
+            proj.R1C2 = 1;
 
             if (_currentRenderTarget.FlipY)
             {
-                proj.M22 *= -1;
-                proj.M32 *= -1;
+                proj.R1C1 *= -1;
+                proj.R1C2 *= -1;
             }
 
-            view = Matrix3x2.Identity;
+            view = Matrix3.Identity;
         }
 
         private void CalcWorldMatrices(in Vector2i screenSize, in Vector2 renderScale, IEye eye,
-            out Matrix3x2 proj, out Matrix3x2 view)
+            out Matrix3 proj, out Matrix3 view)
         {
             eye.GetViewMatrix(out view, renderScale);
 
@@ -136,20 +136,20 @@ namespace Robust.Client.Graphics.Clyde
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CalcWorldProjMatrix(in Vector2i screenSize, out Matrix3x2 proj)
+        private void CalcWorldProjMatrix(in Vector2i screenSize, out Matrix3 proj)
         {
-            proj = Matrix3x2.Identity;
-            proj.M11 = EyeManager.PixelsPerMeter * 2f / screenSize.X;
-            proj.M22 = EyeManager.PixelsPerMeter * 2f / screenSize.Y;
+            proj = Matrix3.Identity;
+            proj.R0C0 = EyeManager.PixelsPerMeter * 2f / screenSize.X;
+            proj.R1C1 = EyeManager.PixelsPerMeter * 2f / screenSize.Y;
 
             if (_currentRenderTarget.FlipY)
             {
-                proj.M22 *= -1;
-                proj.M32 *= -1;
+                proj.R1C1 *= -1;
+                proj.R1C2 *= -1;
             }
         }
 
-        private void SetProjViewBuffer(in Matrix3x2 proj, in Matrix3x2 view)
+        private void SetProjViewBuffer(in Matrix3 proj, in Matrix3 view)
         {
             // TODO: Fix perf here.
             // This immediately causes a glBufferData() call every time this is changed.
@@ -160,7 +160,7 @@ namespace Robust.Client.Graphics.Clyde
             ProjViewUBO.Reallocate(combined);
         }
 
-        private void SetProjViewFull(in Matrix3x2 proj, in Matrix3x2 view)
+        private void SetProjViewFull(in Matrix3 proj, in Matrix3 view)
         {
             _currentMatrixProj = proj;
             _currentMatrixView = view;
@@ -285,21 +285,21 @@ namespace Robust.Client.Graphics.Clyde
             };
         }
 
-        private void _drawQuad(Vector2 a, Vector2 b, in Matrix3x2 modelMatrix, GLShaderProgram program)
+        private void _drawQuad(Vector2 a, Vector2 b, in Matrix3 modelMatrix, GLShaderProgram program)
         {
             DrawQuadWithVao(QuadVAO, a, b, modelMatrix, program);
         }
 
-        private void DrawQuadWithVao(GLHandle vao, Vector2 a, Vector2 b, in Matrix3x2 modelMatrix,
+        private void DrawQuadWithVao(GLHandle vao, Vector2 a, Vector2 b, in Matrix3 modelMatrix,
             GLShaderProgram program)
         {
             BindVertexArray(vao.Handle);
             CheckGlError();
 
-            var rectTransform = Matrix3x2.Identity;
-            (rectTransform.M11, rectTransform.M22) = b - a;
-            (rectTransform.M31, rectTransform.M32) = a;
-            rectTransform = rectTransform * modelMatrix;
+            var rectTransform = Matrix3.Identity;
+            (rectTransform.R0C0, rectTransform.R1C1) = b - a;
+            (rectTransform.R0C2, rectTransform.R1C2) = a;
+            rectTransform.Multiply(modelMatrix);
             program.SetUniformMaybe(UniIModelMatrix, rectTransform);
 
             _debugStats.LastGLDrawCalls += 1;
@@ -315,7 +315,7 @@ namespace Robust.Client.Graphics.Clyde
             FlushBatchQueue();
 
             // Reset renderer state.
-            _currentMatrixModel = Matrix3x2.Identity;
+            _currentMatrixModel = Matrix3.Identity;
             _queuedShaderInstance = _defaultShader;
             SetScissorFull(null);
         }
@@ -496,7 +496,7 @@ namespace Robust.Client.Graphics.Clyde
                     case bool b:
                         program.SetUniform(name, b ? 1 : 0);
                         break;
-                    case Matrix3x2 matrix3:
+                    case Matrix3 matrix3:
                         program.SetUniform(name, matrix3);
                         break;
                     case Matrix4 matrix4:
@@ -532,17 +532,17 @@ namespace Robust.Client.Graphics.Clyde
             return ref command;
         }
 
-        private void DrawSetModelTransform(in Matrix3x2 matrix)
+        private void DrawSetModelTransform(in Matrix3 matrix)
         {
             _currentMatrixModel = matrix;
         }
 
-        private Matrix3x2 DrawGetModelTransform()
+        private Matrix3 DrawGetModelTransform()
         {
             return _currentMatrixModel;
         }
 
-        private void DrawSetProjViewTransform(in Matrix3x2 proj, in Matrix3x2 view)
+        private void DrawSetProjViewTransform(in Matrix3 proj, in Matrix3 view)
         {
             BreakBatch();
 
@@ -571,17 +571,17 @@ namespace Robust.Client.Graphics.Clyde
             EnsureBatchSpaceAvailable(4, GetQuadBatchIndexCount());
             EnsureBatchState(texture, true, GetQuadBatchPrimitiveType(), _queuedShader);
 
-            bl = Vector2.Transform(bl, _currentMatrixModel);
-            br = Vector2.Transform(br, _currentMatrixModel);
-            tr = Vector2.Transform(tr, _currentMatrixModel);
+            bl = _currentMatrixModel.Transform(bl);
+            br = _currentMatrixModel.Transform(br);
+            tr = _currentMatrixModel.Transform(tr);
             tl = tr + bl - br;
 
             // TODO: split batch if necessary.
             var vIdx = BatchVertexIndex;
-            BatchVertexData[vIdx + 0] = new Vertex2D(bl, texCoords.BottomLeft, new Vector2(0, 0), modulate);
-            BatchVertexData[vIdx + 1] = new Vertex2D(br, texCoords.BottomRight, new Vector2(1, 0), modulate);
-            BatchVertexData[vIdx + 2] = new Vertex2D(tr, texCoords.TopRight, new Vector2(1, 1), modulate);
-            BatchVertexData[vIdx + 3] = new Vertex2D(tl, texCoords.TopLeft, new Vector2(0, 1), modulate);
+            BatchVertexData[vIdx + 0] = new Vertex2D(bl, texCoords.BottomLeft, modulate);
+            BatchVertexData[vIdx + 1] = new Vertex2D(br, texCoords.BottomRight, modulate);
+            BatchVertexData[vIdx + 2] = new Vertex2D(tr, texCoords.TopRight, modulate);
+            BatchVertexData[vIdx + 3] = new Vertex2D(tl, texCoords.TopLeft, modulate);
             BatchVertexIndex += 4;
             QuadBatchIndexWrite(BatchIndexData, ref BatchIndexIndex, (ushort) vIdx);
 
@@ -676,8 +676,8 @@ namespace Robust.Client.Graphics.Clyde
             EnsureBatchSpaceAvailable(2, 0);
             EnsureBatchState(_stockTextureWhite.TextureId, false, BatchPrimitiveType.LineList, _queuedShader);
 
-            a = Vector2.Transform(a, _currentMatrixModel);
-            b = Vector2.Transform(b, _currentMatrixModel);
+            a = _currentMatrixModel.Transform(a);
+            b = _currentMatrixModel.Transform(b);
 
             // TODO: split batch if necessary.
             var vIdx = BatchVertexIndex;
@@ -807,7 +807,7 @@ namespace Robust.Client.Graphics.Clyde
             command.DrawBatch.ShaderInstance = metaData.ShaderInstance;
 
             command.DrawBatch.Count = currentIndex - metaData.StartIndex;
-            command.DrawBatch.ModelMatrix = Matrix3x2.Identity;
+            command.DrawBatch.ModelMatrix = Matrix3.Identity;
 
             _debugStats.LastBatches += 1;
         }
@@ -882,7 +882,7 @@ namespace Robust.Client.Graphics.Clyde
             _queuedRenderCommands.Clear();
             _currentViewport = null;
             _lightingReady = false;
-            _currentMatrixModel = Matrix3x2.Identity;
+            _currentMatrixModel = Matrix3.Identity;
             SetScissorFull(null);
             BindRenderTargetFull(_mainWindow!.RenderTarget);
             _batchMetaData = null;
@@ -961,13 +961,13 @@ namespace Robust.Client.Graphics.Clyde
             public BatchPrimitiveType PrimitiveType;
 
             // TODO: this makes the render commands so much more large please remove.
-            public Matrix3x2 ModelMatrix;
+            public Matrix3 ModelMatrix;
         }
 
         private struct RenderCommandProjViewMatrix
         {
-            public Matrix3x2 ProjMatrix;
-            public Matrix3x2 ViewMatrix;
+            public Matrix3 ProjMatrix;
+            public Matrix3 ViewMatrix;
         }
 
         private struct RenderCommandScissor
@@ -1056,11 +1056,11 @@ namespace Robust.Client.Graphics.Clyde
 
         private readonly struct FullStoredRendererState
         {
-            public readonly Matrix3x2 ProjMatrix;
-            public readonly Matrix3x2 ViewMatrix;
+            public readonly Matrix3 ProjMatrix;
+            public readonly Matrix3 ViewMatrix;
             public readonly LoadedRenderTarget RenderTarget;
 
-            public FullStoredRendererState(in Matrix3x2 projMatrix, in Matrix3x2 viewMatrix,
+            public FullStoredRendererState(in Matrix3 projMatrix, in Matrix3 viewMatrix,
                 LoadedRenderTarget renderTarget)
             {
                 ProjMatrix = projMatrix;

Robust.Client/Graphics/Clyde/Clyde.Shaders.cs

@@ -506,7 +506,7 @@ namespace Robust.Client.Graphics.Clyde
                 data.Parameters[name] = value;
             }
 
-            private protected override void SetParameterImpl(string name, in Matrix3x2 value)
+            private protected override void SetParameterImpl(string name, in Matrix3 value)
             {
                 var data = Parent._shaderInstances[Handle];
                 data.ParametersDirty = true;

Robust.Client/Graphics/Clyde/Clyde.Textures.cs

@@ -601,7 +601,7 @@ namespace Robust.Client.Graphics.Clyde
             }
         }
 
-        internal sealed class ClydeTexture : OwnedTexture
+        private sealed class ClydeTexture : OwnedTexture
         {
             private readonly Clyde _clyde;
             public readonly bool IsSrgb;
@@ -664,7 +664,7 @@ namespace Robust.Client.Graphics.Clyde
 
                 fixed (byte* p = buffer)
                 {
-                    GL.GetTexImage(TextureTarget.Texture2D, 0, PF.Rgba, PT.UnsignedByte, (IntPtr) p);
+                    GL.GetnTexImage(TextureTarget.Texture2D, 0, PF.Rgba, PT.UnsignedByte, bufSize, (IntPtr) p);
                 }
 
                 GL.BindTexture(TextureTarget.Texture2D, curTexture2D);

Robust.Client/Graphics/Clyde/Clyde.Viewport.cs

@@ -52,7 +52,7 @@ namespace Robust.Client.Graphics.Clyde
 
             // view matrix
             vp.Eye.GetViewMatrixInv(out var viewMatrixInv, vp.RenderScale);
-            point = Vector2.Transform(point, viewMatrixInv);
+            point = viewMatrixInv * point;
 
             return point;
         }
@@ -136,7 +136,7 @@ namespace Robust.Client.Graphics.Clyde
 
                 // view matrix
                 Eye.GetViewMatrixInv(out var viewMatrixInv, RenderScale);
-                newPoint = Vector2.Transform(newPoint, viewMatrixInv);
+                newPoint = viewMatrixInv * newPoint;
 
                 return new MapCoordinates(newPoint, Eye.Position.MapId);
             }
@@ -150,7 +150,7 @@ namespace Robust.Client.Graphics.Clyde
                 var newPoint = point;
 
                 eye.GetViewMatrix(out var viewMatrix, RenderScale);
-                newPoint = Vector2.Transform(newPoint, viewMatrix);
+                newPoint = viewMatrix * newPoint;
 
                 // (inlined version of UiProjMatrix)
                 newPoint *= new Vector2(1, -1) * EyeManager.PixelsPerMeter;
@@ -159,14 +159,14 @@ namespace Robust.Client.Graphics.Clyde
                 return newPoint;
             }
 
-            public Matrix3x2 GetWorldToLocalMatrix()
+            public Matrix3 GetWorldToLocalMatrix()
             {
                 if (Eye == null)
-                    return Matrix3x2.Identity;
+                    return Matrix3.Identity;
 
                 Eye.GetViewMatrix(out var viewMatrix, RenderScale * new Vector2(EyeManager.PixelsPerMeter, -EyeManager.PixelsPerMeter));
-                viewMatrix.M31 += Size.X / 2f;
-                viewMatrix.M32 += Size.Y / 2f;
+                viewMatrix.R0C2 += Size.X / 2f;
+                viewMatrix.R1C2 += Size.Y / 2f;
                 return viewMatrix;
             }
 

Robust.Client/Graphics/Clyde/ClydeHeadless.cs

@@ -361,7 +361,7 @@ namespace Robust.Client.Graphics.Clyde
             {
             }
 
-            private protected override void SetParameterImpl(string name, in Matrix3x2 value)
+            private protected override void SetParameterImpl(string name, in Matrix3 value)
             {
             }
 
@@ -482,7 +482,7 @@ namespace Robust.Client.Graphics.Clyde
                 return default;
             }
 
-            public Matrix3x2 GetWorldToLocalMatrix() => default;
+            public Matrix3 GetWorldToLocalMatrix() => default;
 
             public Vector2 WorldToLocal(Vector2 point)
             {

Robust.Client/Graphics/Clyde/GLObjects/Clyde.ShaderProgram.cs

@@ -247,33 +247,28 @@ namespace Robust.Client.Graphics.Clyde
                 GL.Uniform1(uniformId, singles.Length, singles);
             }
 
-            public void SetUniform(string uniformName, in Matrix3x2 matrix)
+            public void SetUniform(string uniformName, in Matrix3 matrix)
             {
                 var uniformId = GetUniform(uniformName);
                 SetUniformDirect(uniformId, matrix);
             }
 
-            public void SetUniform(int uniformName, in Matrix3x2 matrix)
+            public void SetUniform(int uniformName, in Matrix3 matrix)
             {
                 var uniformId = GetUniform(uniformName);
                 SetUniformDirect(uniformId, matrix);
             }
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            private unsafe void SetUniformDirect(int slot, in Matrix3x2 value)
+            private unsafe void SetUniformDirect(int slot, in Matrix3 value, bool transpose=true)
             {
-                // We put the rows of the input matrix into the columns of our GPU matrices
-                // this transpose is required, as in C#, we premultiply vectors with matrices
-                // (vM) while GL postmultiplies vectors with matrices (Mv); however, since
-                // the Matrix3x2 data is stored row-major, and GL uses column-major, the
-                // memory layout is the same (or would be, if Matrix3x2 didn't have an
-                // implicit column)
-                var buf = stackalloc float[9]{
-                    value.M11, value.M12, 0,
-                    value.M21, value.M22, 0,
-                    value.M31, value.M32, 1
-                };
-                GL.UniformMatrix3(slot, 1, false, (float*)buf);
+                Matrix3 tmpTranspose = value;
+                if (transpose)
+                {
+                    // transposition not supported on GLES2, & no access to _hasGLES
+                    tmpTranspose.Transpose();
+                }
+                GL.UniformMatrix3(slot, 1, false, (float*) &tmpTranspose);
                 _clyde.CheckGlError();
             }
 
@@ -479,7 +474,7 @@ namespace Robust.Client.Graphics.Clyde
                 }
             }
 
-            public void SetUniformMaybe(string uniformName, in Matrix3x2 value)
+            public void SetUniformMaybe(string uniformName, in Matrix3 value)
             {
                 if (TryGetUniform(uniformName, out var slot))
                 {
@@ -495,7 +490,7 @@ namespace Robust.Client.Graphics.Clyde
                 }
             }
 
-            public void SetUniformMaybe(int uniformName, in Matrix3x2 value)
+            public void SetUniformMaybe(int uniformName, in Matrix3 value)
             {
                 if (TryGetUniform(uniformName, out var slot))
                 {

Robust.Client/Graphics/Clyde/Shaders/base-default.frag

@@ -1,5 +1,4 @@
 varying highp vec2 UV;
-varying highp vec2 UV2;
 varying highp vec2 Pos;
 varying highp vec4 VtxModulate;
 

Robust.Client/Graphics/Clyde/Shaders/base-default.vert

@@ -2,12 +2,10 @@
 /*layout (location = 0)*/ attribute vec2 aPos;
 // Texture coordinates.
 /*layout (location = 1)*/ attribute vec2 tCoord;
-/*layout (location = 2)*/ attribute vec2 tCoord2;
 // Colour modulation.
-/*layout (location = 3)*/ attribute vec4 modulate;
+/*layout (location = 2)*/ attribute vec4 modulate;
 
 varying vec2 UV;
-varying vec2 UV2;
 varying vec2 Pos;
 varying vec4 VtxModulate;
 
@@ -38,6 +36,5 @@ void main()
     gl_Position = vec4(VERTEX, 0.0, 1.0);
     Pos = (VERTEX + 1.0) / 2.0;
     UV = mix(modifyUV.xy, modifyUV.zw, tCoord);
-    UV2 = tCoord2;
     VtxModulate = zFromSrgb(modulate);
 }

Robust.Client/Graphics/Clyde/Shaders/base-raw.frag

@@ -1,5 +1,4 @@
 varying highp vec2 UV;
-varying highp vec2 UV2;
 
 uniform sampler2D lightMap;
 

Robust.Client/Graphics/Clyde/Shaders/base-raw.vert

@@ -2,12 +2,10 @@
 /*layout (location = 0)*/ attribute vec2 aPos;
 // Texture coordinates.
 /*layout (location = 1)*/ attribute vec2 tCoord;
-/*layout (location = 2)*/ attribute vec2 tCoord2;
 // Colour modulation.
-/*layout (location = 3)*/ attribute vec4 modulate;
+/*layout (location = 2)*/ attribute vec4 modulate;
 
 varying vec2 UV;
-varying vec2 UV2;
 
 // Maybe we should merge these CPU side.
 // idk yet.
@@ -42,7 +40,6 @@ void main()
     vec2 VERTEX = aPos;
 
     UV = tCoord;
-    UV2 = tCoord2;
 
     // [SHADER_CODE]
 

Robust.Client/Graphics/Drawing/DrawingHandleBase.cs

@@ -44,19 +44,19 @@ namespace Robust.Client.Graphics
         {
             CheckDisposed();
 
-            var matrix = Matrix3Helpers.CreateTransform(in position, in rotation, in scale);
+            var matrix = Matrix3.CreateTransform(in position, in rotation, in scale);
             SetTransform(in matrix);
         }
 
         public void SetTransform(in Vector2 position, in Angle rotation)
         {
-            var matrix = Matrix3Helpers.CreateTransform(in position, in rotation);
+            var matrix = Matrix3.CreateTransform(in position, in rotation);
             SetTransform(in matrix);
         }
 
-        public abstract void SetTransform(in Matrix3x2 matrix);
+        public abstract void SetTransform(in Matrix3 matrix);
 
-        public abstract Matrix3x2 GetTransform();
+        public abstract Matrix3 GetTransform();
 
         public abstract void UseShader(ShaderInstance? shader);
 
@@ -114,12 +114,43 @@ namespace Robust.Client.Graphics
             DrawPrimitives(primitiveTopology, White, indices, drawVertices);
         }
 
-        private void PadVerticesV2(ReadOnlySpan<Vector2> input, Span<DrawVertexUV2DColor> output, Color color)
+        private static void PadVerticesV2(ReadOnlySpan<Vector2> input, Span<DrawVertexUV2DColor> output, Color color)
         {
-            Color colorLinear = Color.FromSrgb(color);
-            for (var i = 0; i < output.Length; i++)
+            if (input.Length == 0)
+                return;
+
+            if (input.Length != output.Length)
             {
-                output[i] = new DrawVertexUV2DColor(input[i], new Vector2(0.5f, 0.5f), colorLinear);
+                throw new InvalidOperationException("Invalid lengths!");
+            }
+
+            var colorLinear = Color.FromSrgb(color);
+            var colorVec = Unsafe.As<Color, Vector128<float>>(ref colorLinear);
+            var uvVec = Vector128.Create(0, 0, 0.5f, 0.5f);
+            var maskVec = Vector128.Create(0xFFFFFFFF, 0xFFFFFFFF, 0, 0).AsSingle();
+
+            var simdVectors = (nuint)(input.Length / 2);
+            ref readonly var srcBase = ref Unsafe.As<Vector2, float>(ref Unsafe.AsRef(in input[0]));
+            ref var dstBase = ref Unsafe.As<DrawVertexUV2DColor, float>(ref output[0]);
+
+            for (nuint i = 0; i < simdVectors; i++)
+            {
+                var positions = Vector128.LoadUnsafe(in srcBase, i * 4);
+
+                var posColorLower = (positions & maskVec) | uvVec;
+                var posColorUpper = (Vector128.Shuffle(positions, Vector128.Create(2, 3, 0, 0)) & maskVec) | uvVec;
+
+                posColorLower.StoreUnsafe(ref dstBase, i * 16);
+                colorVec.StoreUnsafe(ref dstBase, i * 16 + 4);
+                posColorUpper.StoreUnsafe(ref dstBase, i * 16 + 8);
+                colorVec.StoreUnsafe(ref dstBase, i * 16 + 12);
+            }
+
+            var lastPos = (int)simdVectors * 2;
+            if (lastPos != output.Length)
+            {
+                // Odd number of vertices. Handle the last manually.
+                output[lastPos] = new DrawVertexUV2DColor(input[lastPos], new Vector2(0.5f, 0.5f), colorLinear);
             }
         }
 
@@ -237,8 +268,6 @@ namespace Robust.Client.Graphics
     {
         public Vector2 Position;
         public Vector2 UV;
-        public Vector2 UV2;
-
         /// <summary>
         ///     Modulation colour for this vertex.
         ///     Note that this color is in linear space.

Robust.Client/Graphics/IClydeViewport.cs

@@ -49,7 +49,7 @@ namespace Robust.Client.Graphics
         /// <summary>
         ///     Matrix equivalent of <see cref="LocalToWorld(Vector2)"/>.
         /// </summary>
-        Matrix3x2 GetWorldToLocalMatrix();
+        Matrix3 GetWorldToLocalMatrix();
 
         /// <summary>
         ///     Converts a point in world-space to the viewport's screen coordinates.

Robust.Client/Graphics/Shaders/ShaderInstance.cs

@@ -148,7 +148,7 @@ namespace Robust.Client.Graphics
             SetParameterImpl(name, value);
         }
 
-        public void SetParameter(string name, in Matrix3x2 value)
+        public void SetParameter(string name, in Matrix3 value)
         {
             EnsureAlive();
             EnsureMutable();
@@ -219,7 +219,7 @@ namespace Robust.Client.Graphics
         private protected abstract void SetParameterImpl(string name, int value);
         private protected abstract void SetParameterImpl(string name, Vector2i value);
         private protected abstract void SetParameterImpl(string name, bool value);
-        private protected abstract void SetParameterImpl(string name, in Matrix3x2 value);
+        private protected abstract void SetParameterImpl(string name, in Matrix3 value);
         private protected abstract void SetParameterImpl(string name, in Matrix4 value);
         private protected abstract void SetParameterImpl(string name, Texture value);
         private protected abstract void SetStencilImpl(StencilParameters value);

Robust.Client/Graphics/Shaders/ShaderPrototype.cs

@@ -176,7 +176,7 @@ namespace Robust.Client.Graphics
                         return node.AsVector4();
                     }
                 case ShaderDataType.Mat3:
-                    return node.AsMatrix3x2();
+                    return node.AsMatrix3();
                 case ShaderDataType.Mat4:
                     return node.AsMatrix4();
                 default:
@@ -219,7 +219,7 @@ namespace Robust.Client.Graphics
                     case bool i:
                         instance.SetParameter(key, i);
                         break;
-                    case Matrix3x2 i:
+                    case Matrix3 i:
                         instance.SetParameter(key, i);
                         break;
                     case Matrix4 i:

Robust.Client/Input/InputManager.cs

@@ -346,7 +346,7 @@ namespace Robust.Client.Input
                 {
                     if (binding.CanRepeat)
                     {
-                        return SetBindState(binding, BoundKeyState.Down, uiOnly, isRepeat);
+                        return SetBindState(binding, BoundKeyState.Down, uiOnly);
                     }
 
                     return true;
@@ -375,7 +375,7 @@ namespace Robust.Client.Input
             SetBindState(binding, BoundKeyState.Up);
         }
 
-        private bool SetBindState(KeyBinding binding, BoundKeyState state, bool uiOnly = false, bool isRepeat = false)
+        private bool SetBindState(KeyBinding binding, BoundKeyState state, bool uiOnly = false)
         {
             if (binding.BindingType == KeyBindingType.Command && state == BoundKeyState.Down)
             {
@@ -387,7 +387,6 @@ namespace Robust.Client.Input
             // I honestly have no idea what the best solution here is.
             // note from the future: context switches won't cause re-entrancy anymore because InputContextContainer defers context switches
             DebugTools.Assert(!_currentlyFindingViewport, "Re-entrant key events??");
-            DebugTools.Assert(!isRepeat || binding.CanRepeat);
 
             try
             {
@@ -400,7 +399,7 @@ namespace Robust.Client.Input
                 binding.State = state;
 
                 var eventArgs = new BoundKeyEventArgs(binding.Function, binding.State,
-                    MouseScreenPosition, binding.CanFocus, isRepeat);
+                    MouseScreenPosition, binding.CanFocus);
 
                 // UI returns true here into blockPass if it wants to prevent us from giving input events
                 // to the viewport, but doesn't want it hard-handled so we keep processing possible key actions.

Robust.Client/Map/TileEdgeOverlay.cs

@@ -120,6 +120,6 @@ public sealed class TileEdgeOverlay : GridOverlay
             }
         }
 
-        args.WorldHandle.SetTransform(Matrix3x2.Identity);
+        args.WorldHandle.SetTransform(Matrix3.Identity);
     }
 }

Robust.Client/Physics/GridFixtureSystem.cs

@@ -139,7 +139,7 @@ namespace Robust.Client.Physics
                         return true;
                     }, true);
 
-                worldHandle.SetTransform(Matrix3x2.Identity);
+                worldHandle.SetTransform(Matrix3.Identity);
             }
         }
     }

Robust.Client/Physics/PhysicsSystem.Predict.cs

@@ -2,7 +2,6 @@ using System.Buffers;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Dynamics;

Robust.Client/Placement/Modes/AlignSnapgridCenter.cs

@@ -19,7 +19,7 @@ namespace Robust.Client.Placement.Modes
 
         public SnapgridCenter(PlacementManager pMan) : base(pMan) { }
 
-        public override void Render(in OverlayDrawArgs args)
+        public override void Render(DrawingHandleWorld handle)
         {
             if (Grid != null)
             {
@@ -34,18 +34,18 @@ namespace Robust.Client.Placement.Modes
                 {
                     var from = ScreenToWorld(new Vector2(a, 0));
                     var to = ScreenToWorld(new Vector2(a, viewportSize.Y));
-                    args.WorldHandle.DrawLine(from, to, new Color(0, 0, 1f));
+                    handle.DrawLine(from, to, new Color(0, 0, 1f));
                 }
                 for (var a = gridstart.Y; a < viewportSize.Y; a += SnapSize * EyeManager.PixelsPerMeter)
                 {
                     var from = ScreenToWorld(new Vector2(0, a));
                     var to = ScreenToWorld(new Vector2(viewportSize.X, a));
-                    args.WorldHandle.DrawLine(from, to, new Color(0, 0, 1f));
+                    handle.DrawLine(from, to, new Color(0, 0, 1f));
                 }
             }
 
             // Draw grid BELOW the ghost thing.
-            base.Render(args);
+            base.Render(handle);
         }
 
         public override void AlignPlacementMode(ScreenCoordinates mouseScreen)

Robust.Client/Placement/PlacementManager.cs

@@ -628,20 +628,20 @@ namespace Robust.Client.Placement
             return true;
         }
 
-        private void Render(in OverlayDrawArgs args)
+        private void Render(DrawingHandleWorld handle)
         {
             if (CurrentMode == null || !IsActive)
             {
                 if (EraserRect.HasValue)
                 {
-                    args.WorldHandle.UseShader(_drawingShader);
-                    args.WorldHandle.DrawRect(EraserRect.Value, new Color(255, 0, 0, 50));
-                    args.WorldHandle.UseShader(null);
+                    handle.UseShader(_drawingShader);
+                    handle.DrawRect(EraserRect.Value, new Color(255, 0, 0, 50));
+                    handle.UseShader(null);
                 }
                 return;
             }
 
-            CurrentMode.Render(args);
+            CurrentMode.Render(handle);
 
             if (CurrentPermission is not {Range: > 0} ||
                 !CurrentMode.RangeRequired ||
@@ -650,7 +650,7 @@ namespace Robust.Client.Placement
 
             var worldPos = EntityManager.GetComponent<TransformComponent>(controlled).WorldPosition;
 
-            args.WorldHandle.DrawCircle(worldPos, CurrentPermission.Range, new Color(1, 1, 1, 0.25f));
+            handle.DrawCircle(worldPos, CurrentPermission.Range, new Color(1, 1, 1, 0.25f));
         }
 
         private void HandleStartPlacement(MsgPlacement msg)

Robust.Client/Placement/PlacementMode.cs

@@ -88,7 +88,7 @@ namespace Robust.Client.Placement
         /// <returns></returns>
         public abstract bool IsValidPosition(EntityCoordinates position);
 
-        public virtual void Render(in OverlayDrawArgs args)
+        public virtual void Render(DrawingHandleWorld handle)
         {
             var uid = pManager.CurrentPlacementOverlayEntity;
             if (!pManager.EntityManager.TryGetComponent(uid, out SpriteComponent? sprite) || !sprite.Visible)
@@ -125,8 +125,7 @@ namespace Robust.Client.Placement
                 var worldRot = pManager.EntityManager.GetComponent<TransformComponent>(coordinate.EntityId).WorldRotation + dirAng;
 
                 sprite.Color = IsValidPosition(coordinate) ? ValidPlaceColor : InvalidPlaceColor;
-                var rot = args.Viewport.Eye?.Rotation ?? default;
-                spriteSys.Render(uid.Value, sprite, args.WorldHandle, rot, worldRot, worldPos);
+                spriteSys.Render(uid.Value, sprite, handle, pManager.EyeManager.CurrentEye.Rotation, worldRot, worldPos);
             }
         }
 

Robust.Client/Placement/PlacementOverlay.cs

@@ -19,7 +19,7 @@ namespace Robust.Client.Placement
 
             protected internal override void Draw(in OverlayDrawArgs args)
             {
-                _manager.Render(args);
+                _manager.Render(args.WorldHandle);
             }
         }
     }

Robust.Client/Replays/Loading/ReplayLoadManager.Checkpoints.cs

@@ -88,6 +88,7 @@ public sealed partial class ReplayLoadManager
         if (initMessages != null)
             UpdateMessages(initMessages, uploadedFiles, prototypes, cvars, detachQueue, ref timeBase, true);
         UpdateMessages(messages[0], uploadedFiles, prototypes, cvars, detachQueue, ref timeBase, true);
+        ProcessQueue(GameTick.MaxValue, detachQueue, detached);
 
         var entSpan = state0.EntityStates.Value;
         Dictionary<NetEntity, EntityState> entStates = new(entSpan.Count);
@@ -97,8 +98,6 @@ public sealed partial class ReplayLoadManager
             entStates.Add(entState.NetEntity, modifiedState);
         }
 
-        ProcessQueue(GameTick.MaxValue, detachQueue, detached, entStates);
-
         await callback(0, states.Count, LoadingState.ProcessingFiles, true);
         var playerSpan = state0.PlayerStates.Value;
         Dictionary<NetUserId, SessionState> playerStates = new(playerSpan.Count);
@@ -133,11 +132,6 @@ public sealed partial class ReplayLoadManager
         var spawnedTracker = 0;
         var stateTracker = 0;
         var curState = state0;
-
-        var stats_due_ticks = 0;
-        var stats_due_spawned = 0;
-        var stats_due_state = 0;
-
         for (var i = 1; i < states.Count; i++)
         {
             if (i % 10 == 0)
@@ -150,33 +144,16 @@ public sealed partial class ReplayLoadManager
             UpdatePlayerStates(curState.PlayerStates.Span, playerStates);
             UpdateEntityStates(curState.EntityStates.Span, entStates, ref spawnedTracker, ref stateTracker, detached);
             UpdateMessages(messages[i], uploadedFiles, prototypes, cvars, detachQueue, ref timeBase);
-            ProcessQueue(curState.ToSequence, detachQueue, detached, entStates);
+            ProcessQueue(curState.ToSequence, detachQueue, detached);
             UpdateDeletions(curState.EntityDeletions, entStates, detached);
             serverTime[i] = GetTime(curState.ToSequence) - initialTime;
             ticksSinceLastCheckpoint++;
 
-            // Don't create checkpoints too frequently no matter the circumstance
-            if (ticksSinceLastCheckpoint < _checkpointMinInterval)
-                continue;
-
-            // Check if enough time, spawned entities or changed states have occurred.
             if (ticksSinceLastCheckpoint < _checkpointInterval
                 && spawnedTracker < _checkpointEntitySpawnThreshold
                 && stateTracker < _checkpointEntityStateThreshold)
+            {
                 continue;
-
-            // Track and update statistics about why checkpoints are getting created:
-            if (ticksSinceLastCheckpoint >= _checkpointInterval)
-            {
-                stats_due_ticks += 1;
-            }
-            else if (spawnedTracker >= _checkpointEntitySpawnThreshold)
-            {
-                stats_due_spawned += 1;
-            }
-            else if (stateTracker >= _checkpointEntityStateThreshold)
-            {
-                stats_due_state += 1;
             }
 
             ticksSinceLastCheckpoint = 0;
@@ -191,8 +168,7 @@ public sealed partial class ReplayLoadManager
             checkPoints.Add(new CheckpointState(newState, timeBase, cvars, i, detached));
         }
 
-        _sawmill.Info($"Finished generating {checkPoints.Count} checkpoints. Elapsed time: {st.Elapsed}. Checkpoint every {(float)states.Count / checkPoints.Count} ticks on average");
-        _sawmill.Info($"Checkpoint stats - Spawning: {stats_due_spawned} StateChanges: {stats_due_state} Ticks: {stats_due_ticks}. ");
+        _sawmill.Info($"Finished generating checkpoints. Elapsed time: {st.Elapsed}");
         await callback(states.Count, states.Count, LoadingState.ProcessingFiles, false);
         return (checkPoints.ToArray(), serverTime);
     }
@@ -200,28 +176,14 @@ public sealed partial class ReplayLoadManager
     private void ProcessQueue(
         GameTick curTick,
         Dictionary<GameTick, List<NetEntity>> detachQueue,
-        HashSet<NetEntity> detached,
-        Dictionary<NetEntity, EntityState> entStates)
+        HashSet<NetEntity> detached)
     {
         foreach (var (tick, ents) in detachQueue)
         {
             if (tick > curTick)
                 continue;
             detachQueue.Remove(tick);
-
-            foreach (var e in ents)
-            {
-                if (entStates.ContainsKey(e))
-                    detached.Add(e);
-                else
-                {
-                    // AFAIK this should only happen if the client skipped over some ticks, probably due to packet loss
-                    // I.e., entity was created on tick n, then leaves PVS range on the tick n+1
-                    // If the n-th tick gets dropped, the client only ever receives the pvs-leave message.
-                    // In that case we should just ignore it.
-                    _sawmill.Debug($"Received a PVS detach msg for entity {e} before it was received?");
-                }
-            }
+            detached.UnionWith(ents);
         }
     }
 
@@ -363,7 +325,7 @@ public sealed partial class ReplayLoadManager
 #if DEBUG
                 foreach (var state in modifiedState.ComponentChanges.Value)
                 {
-                    DebugTools.Assert(state.State is not IComponentDeltaState delta);
+                    DebugTools.Assert(state.State is not IComponentDeltaState delta || delta.FullState);
                 }
 #endif
                 continue;
@@ -376,7 +338,7 @@ public sealed partial class ReplayLoadManager
 #if DEBUG
             foreach (var state in entStates[entState.NetEntity].ComponentChanges.Span)
             {
-                DebugTools.Assert(state.State is not IComponentDeltaState delta);
+                DebugTools.Assert(state.State is not IComponentDeltaState delta || delta.FullState);
             }
 #endif
         }
@@ -407,20 +369,20 @@ public sealed partial class ReplayLoadManager
             if (!newCompStates.Remove(existing.NetID, out var newCompState))
                 continue;
 
-            if (newCompState.State is not IComponentDeltaState delta)
+            if (newCompState.State is not IComponentDeltaState delta || delta.FullState)
             {
                 combined[index] = newCompState;
                 continue;
             }
 
-            DebugTools.Assert(existing.State != null && existing.State is not IComponentDeltaState);
-            combined[index] = new ComponentChange(existing.NetID, delta.CreateNewFullState(existing.State!), newCompState.LastModifiedTick);
+            DebugTools.Assert(existing.State is IComponentDeltaState fullDelta && fullDelta.FullState);
+            combined[index] = new ComponentChange(existing.NetID, delta.CreateNewFullState(existing.State), newCompState.LastModifiedTick);
         }
 
         foreach (var compChange in newCompStates.Values)
         {
             // I'm not 100% sure about this, but I think delta states should always be full states here?
-            DebugTools.Assert(compChange.State is not IComponentDeltaState delta);
+            DebugTools.Assert(compChange.State is not IComponentDeltaState delta || delta.FullState);
             combined.Add(compChange);
         }
 

Robust.Client/Replays/Loading/ReplayLoadManager.Implicit.cs

@@ -45,7 +45,7 @@ public sealed partial class ReplayLoadManager
                 continue;
 
             var state = _entMan.GetComponentState(_entMan.EventBus, component, null, GameTick.Zero);
-            DebugTools.Assert(state is not IComponentDeltaState);
+            DebugTools.Assert(state is not IComponentDeltaState delta || delta.FullState);
             list.Add(new ComponentChange(netId, state, GameTick.Zero));
             set.Add(netId);
         }
@@ -61,7 +61,7 @@ public sealed partial class ReplayLoadManager
         {
             if (comp.NetID == _metaId)
             {
-                var state = (MetaDataComponentState) comp.State!;
+                var state = (MetaDataComponentState) comp.State;
                 return state.PrototypeId;
             }
         }

Robust.Client/Replays/Loading/ReplayLoadManager.cs

@@ -34,7 +34,6 @@ public sealed partial class ReplayLoadManager : IReplayLoadManager
     private ushort _metaId;
     private bool _initialized;
     private int _checkpointInterval;
-    private int _checkpointMinInterval;
     private int _checkpointEntitySpawnThreshold;
     private int _checkpointEntityStateThreshold;
     private ISawmill _sawmill = default!;
@@ -46,7 +45,6 @@ public sealed partial class ReplayLoadManager : IReplayLoadManager
 
         _initialized = true;
         _confMan.OnValueChanged(CVars.CheckpointInterval, value => _checkpointInterval = value, true);
-        _confMan.OnValueChanged(CVars.CheckpointMinInterval, value => _checkpointMinInterval = value, true);
         _confMan.OnValueChanged(CVars.CheckpointEntitySpawnThreshold, value => _checkpointEntitySpawnThreshold = value,
             true);
         _confMan.OnValueChanged(CVars.CheckpointEntityStateThreshold, value => _checkpointEntityStateThreshold = value,

Robust.Client/Replays/Playback/ReplayPlaybackManager.Checkpoint.cs

@@ -79,14 +79,13 @@ internal sealed partial class ReplayPlaybackManager
         if (checkpoint.DetachedStates == null)
             return;
 
-        DebugTools.Assert(checkpoint.Detached.Count == checkpoint.DetachedStates.Length);
+        DebugTools.Assert(checkpoint.Detached.Count == checkpoint.DetachedStates.Length); ;
+        var metas = _entMan.GetEntityQuery<MetaDataComponent>();
         foreach (var es in checkpoint.DetachedStates)
         {
-            if (_entMan.TryGetEntityData(es.NetEntity, out var uid, out var meta))
-            {
-                DebugTools.Assert(!meta.EntityDeleted);
+            var uid = _entMan.GetEntity(es.NetEntity);
+            if (metas.TryGetComponent(uid, out var meta) && !meta.EntityDeleted)
                 continue;
-            }
 
             var metaState = (MetaDataComponentState?)es.ComponentChanges.Value?
                 .FirstOrDefault(c => c.NetID == _metaId).State;
@@ -94,16 +93,18 @@ internal sealed partial class ReplayPlaybackManager
             if (metaState == null)
                 throw new MissingMetadataException(es.NetEntity);
 
-            uid = _entMan.CreateEntity(metaState.PrototypeId, out meta);
+            _entMan.CreateEntityUninitialized(metaState.PrototypeId, uid);
+            meta = metas.GetComponent(uid);
 
             // Client creates a client-side net entity for the newly created entity.
             // We need to clear this mapping before assigning the real net id.
             // TODO NetEntity Jank: prevent the client from creating this in the first place.
             _entMan.ClearNetEntity(meta.NetEntity);
-            _entMan.SetNetEntity(uid.Value, es.NetEntity, meta);
 
-            _entMan.InitializeEntity(uid.Value, meta);
-            _entMan.StartEntity(uid.Value);
+            _entMan.SetNetEntity(uid, es.NetEntity, meta);
+
+            _entMan.InitializeEntity(uid, meta);
+            _entMan.StartEntity(uid);
             meta.LastStateApplied = checkpoint.Tick;
         }
     }

Robust.Client/Replays/Playback/ReplayPlaybackManager.Time.cs

@@ -41,12 +41,12 @@ internal sealed partial class ReplayPlaybackManager
             skipEffectEvents = true;
             ResetToNearestCheckpoint(value, false);
         }
-        else if (value > Replay.CurrentIndex + _checkpointMinInterval)
+        else if (value > Replay.CurrentIndex + _checkpointInterval)
         {
             // If we are skipping many ticks into the future, we try to skip directly to a checkpoint instead of
             // applying every tick.
             var nextCheckpoint = GetNextCheckpoint(Replay, Replay.CurrentIndex);
-            if (nextCheckpoint.Index < value && nextCheckpoint.Index > Replay.CurrentIndex)
+            if (nextCheckpoint.Index < value)
                 ResetToNearestCheckpoint(value, false);
         }
 

Robust.Client/Replays/Playback/ReplayPlaybackManager.cs

@@ -51,7 +51,7 @@ internal sealed partial class ReplayPlaybackManager : IReplayPlaybackManager
 
     public ReplayData? Replay { get; private set; }
     public NetUserId? Recorder => Replay?.Recorder;
-    private int _checkpointMinInterval;
+    private int _checkpointInterval;
     private int _visualEventThreshold;
     public uint? AutoPauseCountdown { get; set; }
     public int? ScrubbingTarget { get; set; }
@@ -93,7 +93,7 @@ internal sealed partial class ReplayPlaybackManager : IReplayPlaybackManager
         _initialized = true;
         _sawmill = _logMan.GetSawmill("replay");
         _metaId = _factory.GetRegistration(typeof(MetaDataComponent)).NetID!.Value;
-        _confMan.OnValueChanged(CVars.CheckpointMinInterval, (value) => _checkpointMinInterval = value, true);
+        _confMan.OnValueChanged(CVars.CheckpointInterval, (value) => _checkpointInterval = value, true);
         _confMan.OnValueChanged(CVars.ReplaySkipThreshold, (value) => _visualEventThreshold = value, true);
         _client.RunLevelChanged += OnRunLevelChanged;
     }

Robust.Client/ResourceManagement/ResourceCache.Preload.cs

@@ -10,7 +10,6 @@ using Robust.Shared;
 using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
-using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
@@ -143,26 +142,6 @@ namespace Robust.Client.ResourceManagement
                 }
             });
 
-            // Do not meta-atlas RSIs with custom load parameters.
-            var atlasList = rsiList.Where(x => x.LoadParameters == TextureLoadParameters.Default).ToArray();
-            var nonAtlasList = rsiList.Where(x => x.LoadParameters != TextureLoadParameters.Default).ToArray();
-
-            foreach (var data in nonAtlasList)
-            {
-                if (data.Bad)
-                    continue;
-
-                try
-                {
-                    RSIResource.LoadTexture(Clyde, data);
-                }
-                catch (Exception e)
-                {
-                    sawmill.Error($"Exception while loading RSI {data.Path}:\n{e}");
-                    data.Bad = true;
-                }
-            }
-
             // This combines individual RSI atlases into larger atlases to reduce draw batches. currently this is a VERY
             // lazy bundling and is not at all compact, its basically an atlas of RSI atlases. Really what this should
             // try to do is to have each RSI write directly to the atlas, rather than having each RSI write to its own
@@ -176,7 +155,7 @@ namespace Robust.Client.ResourceManagement
             // TODO allow RSIs to opt out (useful for very big & rare RSIs)
             // TODO combine with (non-rsi) texture atlas?
 
-            Array.Sort(atlasList, (b, a) => (b.AtlasSheet?.Height ?? 0).CompareTo(a.AtlasSheet?.Height ?? 0));
+            Array.Sort(rsiList, (b, a) => (b.AtlasSheet?.Height ?? 0).CompareTo(a.AtlasSheet?.Height ?? 0));
 
             // Each RSI sub atlas has a different size.
             // Even if we iterate through them once to estimate total area, I have NFI how to sanely estimate an optimal square-texture size.
@@ -188,9 +167,9 @@ namespace Robust.Client.ResourceManagement
             Vector2i offset = default;
             int finalized = -1;
             int atlasCount = 0;
-            for (int i = 0; i < atlasList.Length; i++)
+            for (int i = 0; i < rsiList.Length; i++)
             {
-                var rsi = atlasList[i];
+                var rsi = rsiList[i];
                 if (rsi.Bad)
                     continue;
 
@@ -221,14 +200,14 @@ namespace Robust.Client.ResourceManagement
             var height = offset.Y + deltaY;
             var croppedSheet = new Image<Rgba32>(maxSize, height);
             sheet.Blit(new UIBox2i(0, 0, maxSize, height), croppedSheet, default);
-            FinalizeMetaAtlas(atlasList.Length - 1, croppedSheet);
+            FinalizeMetaAtlas(rsiList.Length - 1, croppedSheet);
 
             void FinalizeMetaAtlas(int toIndex, Image<Rgba32> sheet)
             {
                 var atlas = Clyde.LoadTextureFromImage(sheet);
                 for (int i = finalized + 1; i <= toIndex; i++)
                 {
-                    var rsi = atlasList[i];
+                    var rsi = rsiList[i];
                     rsi.AtlasTexture = atlas;
                 }
 
@@ -276,10 +255,9 @@ namespace Robust.Client.ResourceManagement
             }
 
             sawmill.Debug(
-                "Preloaded {CountLoaded} RSIs into {CountAtlas} Atlas(es?) ({CountNotAtlas} not atlassed, {CountErrored} errored) in {LoadTime}",
+                "Preloaded {CountLoaded} RSIs into {CountAtlas} Atlas(es?) ({CountErrored} errored) in {LoadTime}",
                 rsiList.Length,
                 atlasCount,
-                nonAtlasList.Length,
                 errors,
                 sw.Elapsed);
 

Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs

@@ -40,21 +40,17 @@ namespace Robust.Client.ResourceManagement
             var loadStepData = new LoadStepData {Path = path};
             var manager = dependencies.Resolve<IResourceManager>();
             LoadPreTexture(manager, loadStepData);
-            LoadTexture(dependencies.Resolve<IClyde>(), loadStepData);
+
+            loadStepData.AtlasTexture = dependencies.Resolve<IClyde>().LoadTextureFromImage(
+                loadStepData.AtlasSheet,
+                loadStepData.Path.ToString());
+
             LoadPostTexture(loadStepData);
             LoadFinish(dependencies.Resolve<IResourceCacheInternal>(), loadStepData);
 
             loadStepData.AtlasSheet.Dispose();
         }
 
-        internal static void LoadTexture(IClyde clyde, LoadStepData loadStepData)
-        {
-            loadStepData.AtlasTexture = clyde.LoadTextureFromImage(
-                loadStepData.AtlasSheet,
-                loadStepData.Path.ToString(),
-                loadStepData.LoadParameters);
-        }
-
         internal static void LoadPreTexture(IResourceManager manager, LoadStepData data)
         {
             var manifestPath = data.Path / "meta.json";
@@ -182,7 +178,6 @@ namespace Robust.Client.ResourceManagement
             data.FrameSize = frameSize;
             data.DimX = dimensionX;
             data.CallbackOffsets = callbackOffsets;
-            data.LoadParameters = metadata.LoadParameters;
         }
 
         internal static void LoadPostTexture(LoadStepData data)
@@ -385,7 +380,6 @@ namespace Robust.Client.ResourceManagement
             public Texture AtlasTexture = default!;
             public Vector2i AtlasOffset;
             public RSI Rsi = default!;
-            public TextureLoadParameters LoadParameters;
         }
 
         internal struct StateReg

Robust.Client/UserInterface/Control.Layout.cs

@@ -52,10 +52,6 @@ namespace Robust.Client.UserInterface
         [ViewVariables] public bool IsMeasureValid { get; private set; }
         [ViewVariables] public bool IsArrangeValid { get; private set; }
 
-        /// <summary>
-        /// Controls the amount of empty space in virtual pixels around the control.
-        /// </summary>
-        /// <remarks>Values can be provided as "All" or "Horizontal, Vertical" or "Left, Top, Right, Bottom"</remarks>
         [ViewVariables]
         public Thickness Margin
         {

Robust.Client/UserInterface/Control.cs

@@ -567,7 +567,7 @@ namespace Robust.Client.UserInterface
             public Vector2i Position;
             public Color Modulate;
             public UIBox2i? ScissorBox;
-            public ref Matrix3x2 CoordinateTransform;
+            public ref Matrix3 CoordinateTransform;
         }
 
         protected void RenderControl(ref ControlRenderArguments args, int childIndex, Vector2i position)

Robust.Client/UserInterface/Controllers/Implementations/TileSpawningUIController.cs

@@ -130,7 +130,7 @@ public sealed class TileSpawningUIController : UIController
 
         _window.TileList.Clear();
 
-        IEnumerable<ITileDefinition> tileDefs = _tiles.Where(def => !def.EditorHidden);
+        IEnumerable<ITileDefinition> tileDefs = _tiles;
 
         if (!string.IsNullOrEmpty(searchStr))
         {

Robust.Client/UserInterface/Controls/ColorSelectorStyleBox.cs

@@ -1,4 +1,3 @@
-using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.IoC;
@@ -21,19 +20,19 @@ public sealed class ColorSelectorStyleBox : StyleBoxTexture
     /// <summary>
     /// Base background colour.
     /// </summary>
-    public Robust.Shared.Maths.Vector4 BaseColor;
+    public Vector4 BaseColor;
 
     /// <summary>
     /// Colour to add to the background colour along the X-axis.
     /// I.e., from left to right the background colour will vary from (BaseColour) to (BaseColour + XAxis)
     /// </summary>
-    public Robust.Shared.Maths.Vector4 XAxis;
+    public Vector4 XAxis;
 
     /// <summary>
     /// Colour to add to the background colour along the y-axis.
     /// I.e., from left to right the background colour will vary from (BaseColour) to (BaseColour + XAxis)
     /// </summary>
-    public Robust.Shared.Maths.Vector4 YAxis;
+    public Vector4 YAxis;
 
     /// <summary>
     /// If true, then <see cref="BaseColor"/>, <see cref="XAxis"/>, and <see cref="YAxis"/> will be interpreted as HSVa
@@ -54,7 +53,7 @@ public sealed class ColorSelectorStyleBox : StyleBoxTexture
         var old = handle.GetShader();
         handle.UseShader(_shader);
 
-        var globalPixelPos = Vector2.Transform(default, handle.GetTransform());
+        var globalPixelPos = handle.GetTransform().Transform(default);
         _shader.SetParameter("size", box.Size);
         _shader.SetParameter("offset", globalPixelPos);
         _shader.SetParameter("xAxis", XAxis);
@@ -93,14 +92,14 @@ public sealed class ColorSelectorStyleBox : StyleBoxTexture
     {
         var colorData = Hsv
             ? Color.ToHsv(color)
-            : new Robust.Shared.Maths.Vector4(color.R, color.G, color.B, color.A);
+            : new Vector4(color.R, color.G, color.B, color.A);
         SetBaseColor(colorData);
     }
 
     /// <summary>
     /// Helper method that sets the base color by taking in some color and removing the components that are controlled by the x and y axes.
     /// </summary>
-    public void SetBaseColor(Robust.Shared.Maths.Vector4 colorData)
+    public void SetBaseColor(Vector4 colorData)
     {
         BaseColor = colorData - colorData * XAxis - colorData * YAxis;
     }

Robust.Client/UserInterface/Controls/LineEdit.cs

@@ -53,7 +53,7 @@ namespace Robust.Client.UserInterface.Controls
         private TimeSpan? _lastClickTime;
         private Vector2? _lastClickPosition;
 
-        private bool IsPlaceHolderVisible => !(HidePlaceHolderOnFocus && HasKeyboardFocus()) && string.IsNullOrEmpty(_text) && _placeHolder != null;
+        private bool IsPlaceHolderVisible => string.IsNullOrEmpty(_text) && _placeHolder != null;
 
         public event Action<LineEditEventArgs>? OnTextChanged;
         public event Action<LineEditEventArgs>? OnTextEntered;
@@ -186,8 +186,6 @@ namespace Robust.Client.UserInterface.Controls
         public int SelectionLower => Math.Min(_selectionStart, _cursorPosition);
         public int SelectionUpper => Math.Max(_selectionStart, _cursorPosition);
 
-        public bool HidePlaceHolderOnFocus { get; set; }
-
         public bool IgnoreNext { get; set; }
 
         private (int start, int length)? _imeData;

Robust.Client/UserInterface/CustomControls/IViewportControl.cs

@@ -43,11 +43,11 @@ namespace Robust.Client.UserInterface.CustomControls
         /// <remarks>
         ///     This is generally just be a combination of <see cref="IClydeViewport.GetWorldToLocalMatrix"/> and <see cref="GetLocalToScreenMatrix"/>
         /// </remarks>
-        Matrix3x2 GetWorldToScreenMatrix();
+        Matrix3 GetWorldToScreenMatrix();
 
         /// <summary>
         ///     Returns a matrix that can be used to transform from view-port local to screen coordinates.
         /// </summary>
-        Matrix3x2 GetLocalToScreenMatrix();
+        Matrix3 GetLocalToScreenMatrix();
     }
 }

Robust.Client/UserInterface/CustomControls/ViewportContainer.cs

@@ -155,17 +155,17 @@ namespace Robust.Client.UserInterface.CustomControls
             return WorldToLocalPixel(point) + GlobalPixelPosition;
         }
 
-        public Matrix3x2 GetWorldToScreenMatrix()
+        public Matrix3 GetWorldToScreenMatrix()
         {
             if (Viewport == null)
-                return Matrix3x2.Identity;
+                return Matrix3.Identity;
 
             return Viewport.GetWorldToLocalMatrix() * GetLocalToScreenMatrix();
         }
 
-        public Matrix3x2 GetLocalToScreenMatrix()
+        public Matrix3 GetLocalToScreenMatrix()
         {
-            return Matrix3Helpers.CreateTransform(GlobalPixelPosition, 0, Vector2.One / _viewportResolution);
+            return Matrix3.CreateTransform(GlobalPixelPosition, 0, Vector2.One / _viewportResolution);
         }
     }
 }

Robust.Client/UserInterface/DummyFileDialogManager.cs

@@ -13,7 +13,7 @@ namespace Robust.Client.UserInterface
             return Task.FromResult<Stream?>(null);
         }
 
-        public Task<(Stream fileStream, bool alreadyExisted)?> SaveFile(FileDialogFilters? filters = null, bool truncate = true)
+        public Task<(Stream fileStream, bool alreadyExisted)?> SaveFile(FileDialogFilters? filters = null)
         {
             return Task.FromResult<(Stream fileStream, bool alreadyExisted)?>(null);
         }

Robust.Client/UserInterface/FileDialogManager.cs

@@ -51,7 +51,7 @@ namespace Robust.Client.UserInterface
             return await OpenFileNfd(filters);
         }
 
-        public async Task<(Stream, bool)?> SaveFile(FileDialogFilters? filters, bool truncate = true)
+        public async Task<(Stream, bool)?> SaveFile(FileDialogFilters? filters)
         {
             var name = await GetSaveFileName(filters);
             if (name == null)
@@ -61,7 +61,7 @@ namespace Robust.Client.UserInterface
 
             try
             {
-                return (File.Open(name, truncate ? FileMode.Truncate : FileMode.Open), true);
+                return (File.Open(name, FileMode.Open), true);
             }
             catch (FileNotFoundException)
             {

Robust.Client/UserInterface/IFileDialogManager.cs

@@ -28,7 +28,6 @@ namespace Robust.Client.UserInterface
         /// The file stream the user chose to save to, and whether the file already existed.
         /// Null if the user cancelled the action.
         /// </returns>
-        /// <param name="truncate">Should we truncate an existing file to 0-size then write or append.</param>
-        Task<(Stream fileStream, bool alreadyExisted)?> SaveFile(FileDialogFilters? filters = null, bool truncate = true);
+        Task<(Stream fileStream, bool alreadyExisted)?> SaveFile(FileDialogFilters? filters = null);
     }
 }

Robust.Client/UserInterface/IUserInterfaceManager.cs

@@ -135,17 +135,6 @@ namespace Robust.Client.UserInterface
         /// Plays the UI hover sound if relevant.
         /// </summary>
         void HoverSound();
-
-        /// <summary>
-        /// Sets <see cref="CurrentlyHovered"/> to the given control.
-        /// </summary>
-        void SetHovered(Control? control);
-
-        /// <summary>
-        /// Forces <see cref="CurrentlyHovered"/> to get updated. This is done automatically when the mouse is moved,
-        /// but not necessarily a new or existing control is rearranged.
-        /// </summary>
-        void UpdateHovered();
     }
 
     public readonly struct PostDrawUIRootEventArgs

Robust.Client/UserInterface/IUserInterfaceManagerInternal.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -63,7 +63,7 @@ namespace Robust.Client.UserInterface
         Color GetMainClearColor();
 
         void RenderControl(IRenderHandle renderHandle, ref int total, Control control, Vector2i position, Color modulate,
-            UIBox2i? scissorBox, Matrix3x2 coordinateTransform);
+            UIBox2i? scissorBox, Matrix3 coordinateTransform);
     }
 }
 

Robust.Client/UserInterface/UserInterfaceManager.Input.cs

@@ -9,7 +9,6 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Client.UserInterface;
@@ -21,10 +20,9 @@ internal partial class UserInterfaceManager
     private bool _needUpdateActiveCursor;
     [ViewVariables] public Control? KeyboardFocused { get; private set; }
 
-    [ViewVariables] public Control? CurrentlyHovered { get; private set; }
+    [ViewVariables] public Control? CurrentlyHovered { get; private set; } = default!;
 
     private Control? _controlFocused;
-
     [ViewVariables]
     public Control? ControlFocused
     {
@@ -102,7 +100,6 @@ internal partial class UserInterfaceManager
             return;
         }
 
-
         var guiArgs = new GUIBoundKeyEventArgs(args.Function, args.State, args.PointerLocation, args.CanFocus,
             args.PointerLocation.Position / control.UIScale - control.GlobalPosition,
             args.PointerLocation.Position - control.GlobalPixelPosition);
@@ -114,20 +111,16 @@ internal partial class UserInterfaceManager
             args.Handle();
         }
 
-        // Attempt to ensure that keybind-up events get raised after a keybind-down.
-        DebugTools.Assert(!_focusedControls.TryGetValue(args.Function, out var existing)
-                          || !existing.VisibleInTree
-                          || args.IsRepeat && existing == control);
         _focusedControls[args.Function] = control;
-
         OnKeyBindDown?.Invoke(control);
     }
 
     public void KeyBindUp(BoundKeyEventArgs args)
     {
-        // Only raise keybind-up for the control on which we previously raised keybind-down
-        if (!_focusedControls.Remove(args.Function, out var control) || !control.VisibleInTree)
+        if (!_focusedControls.TryGetValue(args.Function, out var control))
+        {
             return;
+        }
 
         var guiArgs = new GUIBoundKeyEventArgs(args.Function, args.State, args.PointerLocation, args.CanFocus,
             args.PointerLocation.Position / control.UIScale - control.GlobalPosition,
@@ -138,6 +131,7 @@ internal partial class UserInterfaceManager
         // Always mark this as handled.
         // The only case it should not be is if we do not have a control to click on,
         // in which case we never reach this.
+        _focusedControls.Remove(args.Function);
         args.Handle();
     }
 
@@ -146,7 +140,23 @@ internal partial class UserInterfaceManager
         _resetTooltipTimer();
         // Update which control is considered hovered.
         var newHovered = MouseGetControl(mouseMoveEventArgs.Position);
-        SetHovered(newHovered);
+        if (newHovered != CurrentlyHovered)
+        {
+            _clearTooltip();
+            CurrentlyHovered?.MouseExited();
+            CurrentlyHovered = newHovered;
+            CurrentlyHovered?.MouseEntered();
+            if (CurrentlyHovered != null)
+            {
+                _tooltipDelay = CurrentlyHovered.TooltipDelay ?? TooltipDelay;
+            }
+            else
+            {
+                _tooltipDelay = null;
+            }
+
+            _needUpdateActiveCursor = true;
+        }
 
         var target = ControlFocused ?? newHovered;
         if (target != null)
@@ -162,33 +172,6 @@ internal partial class UserInterfaceManager
         }
     }
 
-    public void UpdateHovered()
-    {
-        var ctrl =  MouseGetControl(_inputManager.MouseScreenPosition);
-        SetHovered(ctrl);
-    }
-
-    public void SetHovered(Control? control)
-    {
-        if (control == CurrentlyHovered)
-            return;
-
-        _clearTooltip();
-        CurrentlyHovered?.MouseExited();
-        CurrentlyHovered = control;
-        CurrentlyHovered?.MouseEntered();
-        if (CurrentlyHovered != null)
-        {
-            _tooltipDelay = CurrentlyHovered.TooltipDelay ?? TooltipDelay;
-        }
-        else
-        {
-            _tooltipDelay = null;
-        }
-
-        _needUpdateActiveCursor = true;
-    }
-
     private void UpdateActiveCursor()
     {
         // Consider mouse input focus first so that dragging windows don't act up etc.

Robust.Client/UserInterface/UserInterfaceManager.Layout.cs

@@ -77,12 +77,15 @@ internal sealed partial class UserInterfaceManager
 
             ReleaseKeyboardFocus(control);
             RemoveModal(control);
-
-            if (control == ControlFocused)
-                ControlFocused = null;
-
             if (control == CurrentlyHovered)
-                UpdateHovered();
+            {
+                control.MouseExited();
+                CurrentlyHovered = null;
+                _clearTooltip();
+            }
+
+            if (control != ControlFocused) return;
+            ControlFocused = null;
         }
 
         public void PushModal(Control modal)
@@ -130,9 +133,9 @@ internal sealed partial class UserInterfaceManager
             {
                 var total = 0;
                 var drawingHandle = renderHandle.DrawingHandleScreen;
-                drawingHandle.SetTransform(Matrix3x2.Identity);
-                RenderControl(renderHandle, ref total, root, Vector2i.Zero, Color.White, null, Matrix3x2.Identity);
-                drawingHandle.SetTransform(Matrix3x2.Identity);
+                drawingHandle.SetTransform(Matrix3.Identity);
+                RenderControl(renderHandle, ref total, root, Vector2i.Zero, Color.White, null, Matrix3.Identity);
+                drawingHandle.SetTransform(Matrix3.Identity);
                 OnPostDrawUIRoot?.Invoke(new PostDrawUIRootEventArgs(root, drawingHandle));
 
                 _prof.WriteValue("Controls rendered", ProfData.Int32(total));

Robust.Client/UserInterface/UserInterfaceManager.cs

@@ -330,7 +330,7 @@ namespace Robust.Client.UserInterface
         }
 
         public void RenderControl(IRenderHandle renderHandle, ref int total, Control control, Vector2i position, Color modulate,
-            UIBox2i? scissorBox, Matrix3x2 coordinateTransform)
+            UIBox2i? scissorBox, Matrix3 coordinateTransform)
         {
             if (!control.Visible)
             {
@@ -378,7 +378,8 @@ namespace Robust.Client.UserInterface
 
             var handle = renderHandle.DrawingHandleScreen;
             var oldXform = handle.GetTransform();
-            var xform = oldXform * Matrix3Helpers.CreateTransform(position, Angle.Zero, Vector2.One);
+            var xform = oldXform;
+            xform.Multiply(Matrix3.CreateTransform(position, Angle.Zero, Vector2.One));
             handle.SetTransform(xform);
             modulate *= control.Modulate;
 
@@ -405,7 +406,7 @@ namespace Robust.Client.UserInterface
 
             foreach (var child in control.Children)
             {
-                var pos = position + (Vector2i)Vector2.Transform(child.PixelPosition, coordinateTransform);
+                var pos = position + (Vector2i) coordinateTransform.Transform(child.PixelPosition);
                 control.RenderChildOverride(ref args, child.GetPositionInParent(), pos);
             }
 

Robust.Client/Utility/OpenTKConversions.cs

@@ -4,6 +4,22 @@ namespace Robust.Client.Utility
 {
     internal static class OpenTKConversions
     {
+        public static OpenToolkit.Mathematics.Matrix3 ConvertOpenTK(this Matrix3 matrix)
+        {
+            return new()
+            {
+                M11 = matrix.R0C0,
+                M12 = matrix.R0C1,
+                M13 = matrix.R0C2,
+                M21 = matrix.R1C0,
+                M22 = matrix.R1C1,
+                M23 = matrix.R1C2,
+                M31 = matrix.R2C0,
+                M32 = matrix.R2C1,
+                M33 = matrix.R2C2
+            };
+        }
+
         public static OpenToolkit.Mathematics.Color4 ConvertOpenTK(this Color color)
         {
             return new(color.R, color.G, color.B, color.A);

Robust.Roslyn.Shared/Diagnostics.cs

@@ -29,8 +29,6 @@ public static class Diagnostics
     public const string IdComponentPauseNoParentAttribute = "RA0023";
     public const string IdComponentPauseWrongTypeAttribute = "RA0024";
     public const string IdDependencyFieldAssigned = "RA0025";
-    public const string IdUncachedRegex = "RA0026";
-    public const string IdDataFieldRedundantTag = "RA0027";
 
     public static SuppressionDescriptor MeansImplicitAssignment =>
         new SuppressionDescriptor("RADC1000", "CS0649", "Marked as implicitly assigned.");

Robust.Serialization.Generator/Generator.cs

@@ -1,4 +1,6 @@
-using System.Text;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -34,7 +36,6 @@ public class Generator : IIncrementalGenerator
                 var (compilation, declarations) = source;
                 var builder = new StringBuilder();
                 var containingTypes = new Stack<INamedTypeSymbol>();
-                var declarationsGenerated = new HashSet<string>();
 
                 foreach (var declaration in declarations)
                 {
@@ -43,14 +44,6 @@ public class Generator : IIncrementalGenerator
 
                     var type = compilation.GetSemanticModel(declaration.SyntaxTree).GetDeclaredSymbol(declaration)!;
 
-                    var symbolName = type
-                        .ToDisplayString()
-                        .Replace('<', '{')
-                        .Replace('>', '}');
-
-                    if (!declarationsGenerated.Add(symbolName))
-                        continue;
-
                     var nonPartial = !IsPartial(declaration);
 
                     var namespaceString = type.ContainingNamespace.IsGlobalNamespace
@@ -114,6 +107,11 @@ using Robust.Shared.Serialization.TypeSerializers.Interfaces;
 {{containingTypesEnd}}
 """);
 
+                    var symbolName = type
+                        .ToDisplayString()
+                        .Replace('<', '{')
+                        .Replace('>', '}');
+
                     var sourceText = CSharpSyntaxTree
                         .ParseText(builder.ToString())
                         .GetRoot()

Robust.Server/Audio/AudioSystem.cs

@@ -42,28 +42,6 @@ public sealed partial class AudioSystem : SharedAudioSystem
         component.Source = new DummyAudioSource();
     }
 
-    public override void SetGridAudio(Entity<AudioComponent>? entity)
-    {
-        if (entity == null)
-            return;
-
-        base.SetGridAudio(entity);
-
-        // Need to global override so everyone can hear it.
-        _pvs.AddGlobalOverride(entity.Value.Owner);
-    }
-
-    public override void SetMapAudio(Entity<AudioComponent>? audio)
-    {
-        if (audio == null)
-            return;
-
-        base.SetMapAudio(audio);
-
-        // Also need a global override because clients not near 0,0 won't get the audio.
-        _pvs.AddGlobalOverride(audio.Value);
-    }
-
     private void AddAudioFilter(EntityUid uid, AudioComponent component, Filter filter)
     {
         var count = filter.Count;
@@ -92,10 +70,11 @@ public sealed partial class AudioSystem : SharedAudioSystem
     /// <inheritdoc />
     public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string? filename, Filter playerFilter, bool recordReplay, AudioParams? audioParams = null)
     {
-        var entity = SetupAudio(filename, audioParams);
-        AddAudioFilter(entity, entity.Comp, playerFilter);
-        entity.Comp.Global = true;
-        return (entity, entity.Comp);
+        var entity = Spawn("Audio", MapCoordinates.Nullspace);
+        var audio = SetupAudio(entity, filename, audioParams);
+        AddAudioFilter(entity, audio, playerFilter);
+        audio.Global = true;
+        return (entity, audio);
     }
 
     /// <inheritdoc />
@@ -105,14 +84,16 @@ public sealed partial class AudioSystem : SharedAudioSystem
             return null;
 
         if (TerminatingOrDeleted(uid))
+        {
+            Log.Error($"Tried to play audio on a terminating / deleted entity {ToPrettyString(uid)}. Trace: {Environment.StackTrace}");
             return null;
+        }
 
-        var entity = SetupAudio(filename, audioParams);
-        // Move it after setting it up
-        XformSystem.SetCoordinates(entity, new EntityCoordinates(uid, Vector2.Zero));
-        AddAudioFilter(entity, entity.Comp, playerFilter);
+        var entity = Spawn("Audio", new EntityCoordinates(uid, Vector2.Zero));
+        var audio = SetupAudio(entity, filename, audioParams);
+        AddAudioFilter(entity, audio, playerFilter);
 
-        return (entity, entity.Comp);
+        return (entity, audio);
     }
 
     /// <inheritdoc />
@@ -122,12 +103,15 @@ public sealed partial class AudioSystem : SharedAudioSystem
             return null;
 
         if (TerminatingOrDeleted(uid))
+        {
+            Log.Error($"Tried to play audio on a terminating / deleted entity {ToPrettyString(uid)}. Trace: {Environment.StackTrace}");
             return null;
+        }
 
-        var entity = SetupAudio(filename, audioParams);
-        XformSystem.SetCoordinates(entity, new EntityCoordinates(uid, Vector2.Zero));
+        var entity = Spawn("Audio", new EntityCoordinates(uid, Vector2.Zero));
+        var audio = SetupAudio(entity, filename, audioParams);
 
-        return (entity, entity.Comp);
+        return (entity, audio);
     }
 
     /// <inheritdoc />
@@ -145,11 +129,11 @@ public sealed partial class AudioSystem : SharedAudioSystem
         if (!coordinates.IsValid(EntityManager))
             return null;
 
-        var entity = SetupAudio(filename, audioParams);
-        XformSystem.SetCoordinates(entity, coordinates);
-        AddAudioFilter(entity, entity.Comp, playerFilter);
+        var entity = Spawn("Audio", coordinates);
+        var audio = SetupAudio(entity, filename, audioParams);
+        AddAudioFilter(entity, audio, playerFilter);
 
-        return (entity, entity.Comp);
+        return (entity, audio);
     }
 
     /// <inheritdoc />
@@ -168,11 +152,10 @@ public sealed partial class AudioSystem : SharedAudioSystem
         if (!coordinates.IsValid(EntityManager))
             return null;
 
-        // TODO: Transform TryFindGridAt mess + optimisation required.
-        var entity = SetupAudio(filename, audioParams);
-        XformSystem.SetCoordinates(entity, coordinates);
+        var entity = Spawn("Audio", coordinates);
+        var audio = SetupAudio(entity, filename, audioParams);
 
-        return (entity, entity.Comp);
+        return (entity, audio);
     }
 
     /// <inheritdoc />

Robust.Server/GameObjects/Components/UserInterface/IgnoreUIRangeComponent.cs

@@ -1,12 +1,12 @@
-using Robust.Shared.GameStates;
+using Robust.Shared.GameObjects;
 
-namespace Robust.Shared.GameObjects;
+namespace Robust.Server.GameObjects;
 
 /// <summary>
 ///     Lets any entities with this component ignore user interface range checks that would normally
 ///     close the UI automatically.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent]
 public sealed partial class IgnoreUIRangeComponent : Component
 {
 }

Robust.Server/GameObjects/EntitySystems/MapLoaderSystem.cs

@@ -844,7 +844,7 @@ public sealed class MapLoaderSystem : EntitySystem
 
             if (xformQuery.TryGetComponent(rootEntity, out var xform) && IsRoot(xform, mapQuery) && !HasComp<MapComponent>(rootEntity))
             {
-                _transform.SetLocalPosition(xform, Vector2.Transform(xform.LocalPosition, data.Options.TransformMatrix));
+                _transform.SetLocalPosition(xform, data.Options.TransformMatrix.Transform(xform.LocalPosition));
                 xform.LocalRotation += data.Options.Rotation;
             }
         }
@@ -856,7 +856,7 @@ public sealed class MapLoaderSystem : EntitySystem
             if (xformQuery.TryGetComponent(entity, out var xform) && IsRoot(xform, mapQuery))
             {
                 // Don't want to trigger events
-                xform._localPosition = Vector2.Transform(xform.LocalPosition, data.Options.TransformMatrix);
+                xform._localPosition = data.Options.TransformMatrix.Transform(xform.LocalPosition);
                 if (!xform.NoLocalRotation)
                     xform._localRotation += data.Options.Rotation;
 

Robust.Server/GameObjects/EntitySystems/UserInterfaceSystem.cs

@@ -1,32 +1,416 @@
+using System;
 using System.Collections.Generic;
-using Robust.Server.GameStates;
+using System.Linq;
+using JetBrains.Annotations;
+using Robust.Server.Player;
+using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
-namespace Robust.Server.GameObjects;
-
-public sealed class UserInterfaceSystem : SharedUserInterfaceSystem
+namespace Robust.Server.GameObjects
 {
-    public override void Initialize()
+    public sealed class UserInterfaceSystem : SharedUserInterfaceSystem
     {
-        base.Initialize();
-        SubscribeLocalEvent<UserInterfaceUserComponent, ExpandPvsEvent>(OnBuiUserExpand);
+        [Dependency] private readonly IPlayerManager _playerMan = default!;
+        [Dependency] private readonly TransformSystem _xformSys = default!;
+
+        private EntityQuery<IgnoreUIRangeComponent> _ignoreUIRangeQuery;
+
+        private readonly List<ICommonSession> _sessionCache = new();
+
+        /// <inheritdoc />
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeNetworkEvent<BoundUIWrapMessage>(OnMessageReceived);
+            _playerMan.PlayerStatusChanged += OnPlayerStatusChanged;
+
+            _ignoreUIRangeQuery = GetEntityQuery<IgnoreUIRangeComponent>();
+        }
+
+        public override void Shutdown()
+        {
+            base.Shutdown();
+
+            _playerMan.PlayerStatusChanged -= OnPlayerStatusChanged;
+        }
+
+        private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs args)
+        {
+            if (args.NewStatus != SessionStatus.Disconnected)
+                return;
+
+            if (!OpenInterfaces.TryGetValue(args.Session, out var buis))
+                return;
+
+            foreach (var bui in buis.ToArray())
+            {
+                CloseShared(bui, args.Session);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void Update(float frameTime)
+        {
+            var xformQuery = GetEntityQuery<TransformComponent>();
+            var query = AllEntityQuery<ActiveUserInterfaceComponent, TransformComponent>();
+
+            while (query.MoveNext(out var uid, out var activeUis, out var xform))
+            {
+                foreach (var ui in activeUis.Interfaces)
+                {
+                    CheckRange(uid, activeUis, ui, xform, xformQuery);
+
+                    if (!ui.StateDirty)
+                        continue;
+
+                    ui.StateDirty = false;
+
+                    foreach (var (player, state) in ui.PlayerStateOverrides)
+                    {
+                        RaiseNetworkEvent(state, player.Channel);
+                    }
+
+                    if (ui.LastStateMsg == null)
+                        continue;
+
+                    foreach (var session in ui.SubscribedSessions)
+                    {
+                        if (!ui.PlayerStateOverrides.ContainsKey(session))
+                            RaiseNetworkEvent(ui.LastStateMsg, session.Channel);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        ///     Verify that the subscribed clients are still in range of the interface.
+        /// </summary>
+        private void CheckRange(EntityUid uid, ActiveUserInterfaceComponent activeUis, PlayerBoundUserInterface ui, TransformComponent transform, EntityQuery<TransformComponent> query)
+        {
+            if (ui.InteractionRange <= 0)
+                return;
+
+            // We have to cache the set of sessions because Unsubscribe modifies the original.
+            _sessionCache.Clear();
+            _sessionCache.AddRange(ui.SubscribedSessions);
+
+            var uiPos = _xformSys.GetWorldPosition(transform, query);
+            var uiMap = transform.MapID;
+
+            foreach (var session in _sessionCache)
+            {
+                // The component manages the set of sessions, so this invalid session should be removed soon.
+                if (!query.TryGetComponent(session.AttachedEntity, out var xform))
+                    continue;
+
+                if (_ignoreUIRangeQuery.HasComponent(session.AttachedEntity))
+                    continue;
+
+                // Handle pluggable BoundUserInterfaceCheckRangeEvent
+                var checkRangeEvent = new BoundUserInterfaceCheckRangeEvent(uid, ui, session);
+                RaiseLocalEvent(uid, ref checkRangeEvent, broadcast: true);
+                if (checkRangeEvent.Result == BoundUserInterfaceRangeResult.Pass)
+                    continue;
+
+                if (checkRangeEvent.Result == BoundUserInterfaceRangeResult.Fail)
+                {
+                    CloseUi(ui, session, activeUis);
+                    continue;
+                }
+
+                DebugTools.Assert(checkRangeEvent.Result == BoundUserInterfaceRangeResult.Default);
+
+                if (uiMap != xform.MapID)
+                {
+                    CloseUi(ui, session, activeUis);
+                    continue;
+                }
+
+                var distanceSquared = (uiPos - _xformSys.GetWorldPosition(xform, query)).LengthSquared();
+                if (distanceSquared > ui.InteractionRangeSqrd)
+                    CloseUi(ui, session, activeUis);
+            }
+        }
+
+        #region Get BUI
+
+        public bool HasUi(EntityUid uid, Enum uiKey, UserInterfaceComponent? ui = null)
+        {
+            if (!Resolve(uid, ref ui))
+                return false;
+
+            return ui.Interfaces.ContainsKey(uiKey);
+        }
+
+        public PlayerBoundUserInterface GetUi(EntityUid uid, Enum uiKey, UserInterfaceComponent? ui = null)
+        {
+            if (!Resolve(uid, ref ui))
+                throw new InvalidOperationException($"Cannot get {typeof(PlayerBoundUserInterface)} from an entity without {typeof(UserInterfaceComponent)}!");
+
+            return ui.Interfaces[uiKey];
+        }
+
+        public PlayerBoundUserInterface? GetUiOrNull(EntityUid uid, Enum uiKey, UserInterfaceComponent? ui = null)
+        {
+            return TryGetUi(uid, uiKey, out var bui, ui)
+                ? bui
+                : null;
+        }
+
+        /// <summary>
+        ///     Return UIs a session has open.
+        ///     Null if empty.
+        /// </summary>
+        public List<PlayerBoundUserInterface>? GetAllUIsForSession(ICommonSession session)
+        {
+            OpenInterfaces.TryGetValue(session, out var value);
+            return value;
+        }
+        #endregion
+
+        public bool IsUiOpen(EntityUid uid, Enum uiKey, UserInterfaceComponent? ui = null)
+        {
+            if (!TryGetUi(uid, uiKey, out var bui, ui))
+                return false;
+
+            return bui.SubscribedSessions.Count > 0;
+        }
+
+        public bool SessionHasOpenUi(EntityUid uid, Enum uiKey, ICommonSession session, UserInterfaceComponent? ui = null)
+        {
+            if (!TryGetUi(uid, uiKey, out var bui, ui))
+                return false;
+
+            return bui.SubscribedSessions.Contains(session);
+        }
+
+        /// <summary>
+        ///     Sets a state. This can be used for stateful UI updating.
+        ///     This state is sent to all clients, and automatically sent to all new clients when they open the UI.
+        ///     Pretty much how NanoUI did it back in ye olde BYOND.
+        /// </summary>
+        /// <param name="state">
+        ///     The state object that will be sent to all current and future client.
+        ///     This can be null.
+        /// </param>
+        /// <param name="session">
+        ///     The player session to send this new state to.
+        ///     Set to null for sending it to every subscribed player session.
+        /// </param>
+        public bool TrySetUiState(EntityUid uid,
+            Enum uiKey,
+            BoundUserInterfaceState state,
+            ICommonSession? session = null,
+            UserInterfaceComponent? ui = null,
+            bool clearOverrides = true)
+        {
+            if (!TryGetUi(uid, uiKey, out var bui, ui))
+                return false;
+
+            SetUiState(bui, state, session, clearOverrides);
+            return true;
+        }
+
+        /// <summary>
+        ///     Sets a state. This can be used for stateful UI updating.
+        ///     This state is sent to all clients, and automatically sent to all new clients when they open the UI.
+        ///     Pretty much how NanoUI did it back in ye olde BYOND.
+        /// </summary>
+        /// <param name="state">
+        ///     The state object that will be sent to all current and future client.
+        ///     This can be null.
+        /// </param>
+        /// <param name="session">
+        ///     The player session to send this new state to.
+        ///     Set to null for sending it to every subscribed player session.
+        /// </param>
+        public void SetUiState(PlayerBoundUserInterface bui, BoundUserInterfaceState state, ICommonSession? session = null, bool clearOverrides = true)
+        {
+            var msg = new BoundUIWrapMessage(GetNetEntity(bui.Owner), new UpdateBoundStateMessage(state), bui.UiKey);
+            if (session == null)
+            {
+                bui.LastStateMsg = msg;
+                if (clearOverrides)
+                    bui.PlayerStateOverrides.Clear();
+            }
+            else
+            {
+                bui.PlayerStateOverrides[session] = msg;
+            }
+
+            bui.StateDirty = true;
+        }
+
+        #region Close
+        protected override void CloseShared(PlayerBoundUserInterface bui, ICommonSession session, ActiveUserInterfaceComponent? activeUis = null)
+        {
+            var owner = bui.Owner;
+            bui._subscribedSessions.Remove(session);
+            bui.PlayerStateOverrides.Remove(session);
+
+            if (OpenInterfaces.TryGetValue(session, out var buis))
+                buis.Remove(bui);
+
+            RaiseLocalEvent(owner, new BoundUIClosedEvent(bui.UiKey, owner, session));
+
+            if (bui._subscribedSessions.Count == 0)
+                DeactivateInterface(bui.Owner, bui, activeUis);
+        }
+
+        /// <summary>
+        ///     Closes this all interface for any clients that have any open.
+        /// </summary>
+        public bool TryCloseAll(EntityUid uid, Shared.GameObjects.ActiveUserInterfaceComponent? aui = null)
+        {
+            if (!Resolve(uid, ref aui, false))
+                return false;
+
+            foreach (var ui in aui.Interfaces)
+            {
+                CloseAll(ui);
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        ///     Closes this specific interface for any clients that have it open.
+        /// </summary>
+        public bool TryCloseAll(EntityUid uid, Enum uiKey, UserInterfaceComponent? ui = null)
+        {
+            if (!TryGetUi(uid, uiKey, out var bui, ui))
+                return false;
+
+            CloseAll(bui);
+            return true;
+        }
+
+        /// <summary>
+        ///     Closes this interface for any clients that have it open.
+        /// </summary>
+        public void CloseAll(PlayerBoundUserInterface bui)
+        {
+            foreach (var session in bui.SubscribedSessions.ToArray())
+            {
+                CloseUi(bui, session);
+            }
+        }
+
+        #endregion
+
+        #region SendMessage
+
+        /// <summary>
+        ///     Send a BUI message to all connected player sessions.
+        /// </summary>
+        public bool TrySendUiMessage(EntityUid uid, Enum uiKey, BoundUserInterfaceMessage message, UserInterfaceComponent? ui = null)
+        {
+            if (!TryGetUi(uid, uiKey, out var bui, ui))
+                return false;
+
+            SendUiMessage(bui, message);
+            return true;
+        }
+
+        /// <summary>
+        ///     Send a BUI message to all connected player sessions.
+        /// </summary>
+        public void SendUiMessage(PlayerBoundUserInterface bui, BoundUserInterfaceMessage message)
+        {
+            var msg = new BoundUIWrapMessage(GetNetEntity(bui.Owner), message, bui.UiKey);
+            foreach (var session in bui.SubscribedSessions)
+            {
+                RaiseNetworkEvent(msg, session.Channel);
+            }
+        }
+
+        /// <summary>
+        ///     Send a BUI message to a specific player session.
+        /// </summary>
+        public bool TrySendUiMessage(EntityUid uid, Enum uiKey, BoundUserInterfaceMessage message, ICommonSession session, UserInterfaceComponent? ui = null)
+        {
+            if (!TryGetUi(uid, uiKey, out var bui, ui))
+                return false;
+
+            return TrySendUiMessage(bui, message, session);
+        }
+
+        /// <summary>
+        ///     Send a BUI message to a specific player session.
+        /// </summary>
+        public bool TrySendUiMessage(PlayerBoundUserInterface bui, BoundUserInterfaceMessage message, ICommonSession session)
+        {
+            if (!bui.SubscribedSessions.Contains(session))
+                return false;
+
+            RaiseNetworkEvent(new BoundUIWrapMessage(GetNetEntity(bui.Owner), message, bui.UiKey), session.Channel);
+            return true;
+        }
+
+        #endregion
     }
 
-    private void OnBuiUserExpand(Entity<UserInterfaceUserComponent> ent, ref ExpandPvsEvent args)
+    /// <summary>
+    /// Raised by <see cref="UserInterfaceSystem"/> to check whether an interface is still accessible by its user.
+    /// </summary>
+    [ByRefEvent]
+    [PublicAPI]
+    public struct BoundUserInterfaceCheckRangeEvent
     {
-        var buis = ent.Comp.OpenInterfaces.Keys;
+        /// <summary>
+        /// The entity owning the UI being checked for.
+        /// </summary>
+        public readonly EntityUid Target;
 
-        if (buis.Count == 0)
-            return;
+        /// <summary>
+        /// The UI itself.
+        /// </summary>
+        /// <returns></returns>
+        public readonly PlayerBoundUserInterface UserInterface;
 
-        args.Entities ??= new List<EntityUid>(buis.Count);
+        /// <summary>
+        /// The player for which the UI is being checked.
+        /// </summary>
+        public readonly ICommonSession Player;
 
-        foreach (var ui in buis)
+        /// <summary>
+        /// The result of the range check.
+        /// </summary>
+        public BoundUserInterfaceRangeResult Result;
+
+        public BoundUserInterfaceCheckRangeEvent(
+            EntityUid target,
+            PlayerBoundUserInterface userInterface,
+            ICommonSession player)
         {
-            DebugTools.Assert(ent.Comp.OpenInterfaces[ui].Count > 0);
-            DebugTools.Assert(HasComp<UserInterfaceComponent>(ui));
-            args.Entities.Add(ui);
+            Target = target;
+            UserInterface = userInterface;
+            Player = player;
         }
     }
+
+    /// <summary>
+    /// Possible results for a <see cref="BoundUserInterfaceCheckRangeEvent"/>.
+    /// </summary>
+    public enum BoundUserInterfaceRangeResult : byte
+    {
+        /// <summary>
+        /// Run built-in range check.
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// Range check passed, UI is accessible.
+        /// </summary>
+        Pass,
+
+        /// <summary>
+        /// Range check failed, UI is inaccessible.
+        /// </summary>
+        Fail
+    }
 }

Robust.Server/GameObjects/ServerEntityManager.cs

@@ -86,7 +86,7 @@ namespace Robust.Server.GameObjects
             StartEntity(entity);
         }
 
-        internal override EntityUid CreateEntity(string? prototypeName, out MetaDataComponent metadata, IEntityLoadContext? context = null)
+        private protected override EntityUid CreateEntity(string? prototypeName, out MetaDataComponent metadata, IEntityLoadContext? context = null)
         {
             if (prototypeName == null)
                 return base.CreateEntity(prototypeName, out metadata, context);

Robust.Server/GameStates/PvsChunk.cs

@@ -62,7 +62,7 @@ internal sealed class PvsChunk
     /// <summary>
     /// The <see cref="Root"/>'s inverse world matrix.
     /// </summary>
-    public Matrix3x2 InvWorldMatrix { get; set; }
+    public Matrix3 InvWorldMatrix { get; set; }
 
     // These are only used while populating the chunk. They aren't local variables because the chunks are pooled, so
     // the same chunk can be repopulated more than once.

Robust.Server/GameStates/PvsData.cs

@@ -51,15 +51,10 @@ internal sealed class PvsSession(ICommonSession session, ResizableMemoryRegion<P
     public (GameTick ToTick, List<PvsIndex> PreviouslySent)? LastSent;
 
     /// <summary>
-    /// Visible chunks, sorted by proximity to the client's viewers.
+    /// Visible chunks, sorted by proximity to the clients's viewers;
     /// </summary>
     public readonly List<(PvsChunk Chunk, float ChebyshevDistance)> Chunks = new();
 
-    /// <summary>
-    /// Unsorted set of visible chunks. Used to construct the <see cref="Chunks"/> list.
-    /// </summary>
-    public readonly HashSet<PvsChunk> ChunkSet = new();
-
     /// <summary>
     /// Squared distance ta all of the visible chunks.
     /// </summary>
@@ -122,7 +117,6 @@ internal sealed class PvsSession(ICommonSession session, ResizableMemoryRegion<P
     {
         PlayerStates.Clear();
         Chunks.Clear();
-        ChunkSet.Clear();
         States.Clear();
         State = null;
     }

Robust.Server/GameStates/PvsSystem.Chunks.cs

@@ -72,7 +72,7 @@ internal sealed partial class PvsSystem
         var xform = Transform(chunk.Root);
         DebugTools.AssertEqual(chunk.Map.Owner, xform.MapUid);
         chunk.InvWorldMatrix = xform.InvLocalMatrix;
-        var worldPos = Vector2.Transform(chunk.Centre, xform.LocalMatrix);
+        var worldPos = xform.LocalMatrix.Transform(chunk.Centre);
         chunk.Position = new(worldPos, xform.MapID);
         chunk.UpdateQueued = false;
     }
@@ -90,13 +90,15 @@ internal sealed partial class PvsSystem
         foreach (var session in _sessions)
         {
             session.Chunks.Clear();
-            session.ChunkSet.Clear();
             GetSessionViewers(session);
 
             foreach (var eye in session.Viewers)
             {
-                GetVisibleChunks(eye, session.ChunkSet);
+                GetVisibleChunks(eye, session.Chunks);
             }
+
+            // The list of visible chunks should be unique.
+            DebugTools.Assert(session.Chunks.Select(x => x.Chunk).ToHashSet().Count == session.Chunks.Count);
         }
         DebugTools.Assert(_dirtyChunks.ToHashSet().Count == _dirtyChunks.Count);
         DebugTools.Assert(_cleanChunks.ToHashSet().Count == _cleanChunks.Count);
@@ -106,7 +108,7 @@ internal sealed partial class PvsSystem
     /// Get the chunks visible to a single entity and add them to a player's set of visible chunks.
     /// </summary>
     private void GetVisibleChunks(Entity<TransformComponent, EyeComponent?> eye,
-        HashSet<PvsChunk> chunks)
+        List<(PvsChunk Chunk, float ChebyshevDistance)> playerChunks)
     {
         var (viewPos, range, mapUid) = CalcViewBounds(eye);
         if (mapUid is not {} map)
@@ -119,7 +121,7 @@ internal sealed partial class PvsSystem
             if (!_chunks.TryGetValue(loc, out var chunk))
                 continue;
 
-            chunks.Add(chunk);
+            playerChunks.Add((chunk, default));
             if (chunk.UpdateQueued)
                 continue;
 
@@ -137,7 +139,7 @@ internal sealed partial class PvsSystem
 
         foreach (var (grid, _) in _grids)
         {
-            var localPos = Vector2.Transform(viewPos, _transform.GetInvWorldMatrix(grid));
+            var localPos = _transform.GetInvWorldMatrix(grid).Transform(viewPos);
             var gridChunkEnumerator = new ChunkIndicesEnumerator(localPos, range, ChunkSize);
             while (gridChunkEnumerator.MoveNext(out var gridChunkIndices))
             {
@@ -145,7 +147,7 @@ internal sealed partial class PvsSystem
                 if (!_chunks.TryGetValue(loc, out var chunk))
                     continue;
 
-                chunks.Add(chunk);
+                playerChunks.Add((chunk, default));
                 if (chunk.UpdateQueued)
                     continue;
 

Robust.Server/GameStates/PvsSystem.Entity.cs

@@ -55,10 +55,13 @@ internal sealed partial class PvsSystem
             return;
         }
 
-        if (xform.ParentUid != xform.GridUid && xform.ParentUid != xform.MapUid)
+        var root = (xform.GridUid ?? xform.MapUid);
+        DebugTools.AssertNotNull(root);
+
+        if (xform.ParentUid != root)
             return;
 
-        var location = new PvsChunkLocation(xform.ParentUid, GetChunkIndices(xform._localPosition));
+        var location = new PvsChunkLocation(root.Value, GetChunkIndices(xform._localPosition));
         if (meta.LastPvsLocation == location)
             return;
 

Robust.Server/GameStates/PvsSystem.GetStates.cs

@@ -50,11 +50,9 @@ internal sealed partial class PvsSystem
                 continue;
 
             var state = EntityManager.GetComponentState(bus, component, player, fromTick);
+            DebugTools.Assert(fromTick > component.CreationTick || state is not IComponentDeltaState delta || delta.FullState);
             changed.Add(new ComponentChange(netId, state, component.LastModifiedTick));
 
-            if (state != null)
-                DebugTools.Assert(fromTick > component.CreationTick || state is not IComponentDeltaState);
-
             if (sendCompList)
                 netComps!.Add(netId);
         }
@@ -87,7 +85,7 @@ internal sealed partial class PvsSystem
                 continue;
 
             var state = EntityManager.GetComponentState(bus, component, player, GameTick.Zero);
-            DebugTools.Assert(state is not IComponentDeltaState);
+            DebugTools.Assert(state is not IComponentDeltaState delta || delta.FullState);
             changed.Add(new ComponentChange(netId, state, component.LastModifiedTick));
             netComps.Add(netId);
         }

Robust.Server/GameStates/PvsSystem.Overrides.cs

@@ -100,13 +100,7 @@ internal sealed partial class PvsSystem
     /// </summary>
     private bool RecursivelyAddOverride(PvsSession session, EntityUid uid, GameTick fromTick, bool addChildren)
     {
-        if (!_xformQuery.TryGetComponent(uid, out var xform))
-        {
-            // Can happen if systems add deleted entities to PVS move event.
-            Log.Error($"Attempted to add non-existent entity {uid} to PVS override for session {session.Session}");
-            return false;
-        }
-
+        var xform = _xformQuery.GetComponent(uid);
         var parent = xform.ParentUid;
 
         // First we process all parents. This is because while this entity may already have been added

Robust.Server/GameStates/PvsSystem.Session.cs

@@ -137,19 +137,15 @@ internal sealed partial class PvsSystem
         if (!CullingEnabled || session.DisableCulling)
             return;
 
-        var chunkSet = session.ChunkSet;
         var chunks = session.Chunks;
         var distances = session.ChunkDistanceSq;
-
-        DebugTools.AssertEqual(chunks.Count, 0);
-
         distances.Clear();
-        distances.EnsureCapacity(chunkSet.Count);
-        chunks.EnsureCapacity(chunkSet.Count);
+        distances.EnsureCapacity(chunks.Count);
 
         // Assemble list of chunks and their distances to the nearest eye.
-        foreach(var chunk in chunkSet)
+        foreach (ref var tuple in CollectionsMarshal.AsSpan(chunks))
         {
+            var chunk = tuple.Chunk;
             var dist = float.MaxValue;
             var chebDist = float.MaxValue;
 
@@ -163,13 +159,13 @@ internal sealed partial class PvsSystem
 
                 dist = Math.Min(dist, (pos.Position - chunk.Position.Position).LengthSquared());
 
-                var relative = Vector2.Transform(pos.Position, chunk.InvWorldMatrix)  - chunk.Centre;
+                var relative = chunk.InvWorldMatrix.Transform(pos.Position)  - chunk.Centre;
                 relative = Vector2.Abs(relative);
                 chebDist = Math.Min(chebDist, Math.Max(relative.X, relative.Y));
             }
 
             distances.Add(dist);
-            chunks.Add((chunk, chebDist));
+            tuple.ChebyshevDistance = chebDist;
         }
 
         // Sort chunks based on distances

Robust.Server/GameStates/PvsSystem.cs

@@ -134,7 +134,7 @@ internal sealed partial class PvsSystem : EntitySystem
         SubscribeLocalEvent<TransformComponent, TransformStartupEvent>(OnTransformStartup);
 
         _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
-        _transform.OnBeforeMoveEvent += OnEntityMove;
+        _transform.OnGlobalMoveEvent += OnEntityMove;
         EntityManager.EntityAdded += OnEntityAdded;
         EntityManager.EntityDeleted += OnEntityDeleted;
         EntityManager.AfterEntityFlush += AfterEntityFlush;
@@ -159,7 +159,7 @@ internal sealed partial class PvsSystem : EntitySystem
         base.Shutdown();
 
         _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
-        _transform.OnBeforeMoveEvent -= OnEntityMove;
+        _transform.OnGlobalMoveEvent -= OnEntityMove;
         EntityManager.EntityAdded -= OnEntityAdded;
         EntityManager.EntityDeleted -= OnEntityDeleted;
         EntityManager.AfterEntityFlush -= AfterEntityFlush;

Robust.Server/Maps/MapLoadOptions.cs

@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using JetBrains.Annotations;
 using Robust.Shared.Maths;
 
@@ -21,7 +21,7 @@ namespace Robust.Server.Maps
             get => _offset;
             set
             {
-                TransformMatrix = Matrix3Helpers.CreateTransform(value, Rotation);
+                TransformMatrix = Matrix3.CreateTransform(value, Rotation);
                 _offset = value;
             }
         }
@@ -37,14 +37,14 @@ namespace Robust.Server.Maps
             get => _rotation;
             set
             {
-                TransformMatrix = Matrix3Helpers.CreateTransform(Offset, value);
+                TransformMatrix = Matrix3.CreateTransform(Offset, value);
                 _rotation = value;
             }
         }
 
         private Angle _rotation = Angle.Zero;
 
-        public Matrix3x2 TransformMatrix { get; set; } = Matrix3x2.Identity;
+        public Matrix3 TransformMatrix { get; set; } = Matrix3.Identity;
 
         /// <summary>
         /// If there is a map entity serialized should we also load it.

Robust.Server/Physics/GridFixtureSystem.Merging.cs

@@ -32,7 +32,7 @@ public sealed partial class GridFixtureSystem
         TransformComponent? xformA = null,
         TransformComponent? xformB = null)
     {
-        var matrix = Matrix3Helpers.CreateTransform(offset, rotation);
+        var matrix = Matrix3.CreateTransform(offset, rotation);
         Merge(gridAUid, gridBUid, matrix, gridA, gridB, xformA, xformB);
     }
 
@@ -45,7 +45,7 @@ public sealed partial class GridFixtureSystem
     public void Merge(
         EntityUid gridAUid,
         EntityUid gridBUid,
-        Matrix3x2 matrix,
+        Matrix3 matrix,
         MapGridComponent? gridA = null,
         MapGridComponent? gridB = null,
         TransformComponent? xformA = null,
@@ -63,7 +63,7 @@ public sealed partial class GridFixtureSystem
 
         while (enumerator.MoveNext(out var tileRef))
         {
-            var offsetTile = Vector2.Transform(new Vector2(tileRef.Value.GridIndices.X, tileRef.Value.GridIndices.Y) + gridA.TileSizeHalfVector, matrix);
+            var offsetTile = matrix.Transform(new Vector2(tileRef.Value.GridIndices.X, tileRef.Value.GridIndices.Y) + gridA.TileSizeHalfVector);
             tiles.Add((offsetTile.Floored(), tileRef.Value.Tile));
         }
 
@@ -87,7 +87,7 @@ public sealed partial class GridFixtureSystem
             if (snapgrid == null || snapgrid.Count == 0)
                 continue;
 
-            var offsetTile = Vector2.Transform(new Vector2(tileRef.Value.GridIndices.X, tileRef.Value.GridIndices.Y) + gridA.TileSizeHalfVector, matrix);
+            var offsetTile = matrix.Transform(new Vector2(tileRef.Value.GridIndices.X, tileRef.Value.GridIndices.Y) + gridA.TileSizeHalfVector);
             var tileIndex = offsetTile.Floored();
 
             for (var j = snapgrid.Count - 1; j >= 0; j--)
@@ -124,7 +124,7 @@ public sealed partial class GridFixtureSystem
                 if (entXform.ParentUid != gridBUid ||
                     !bounds.Contains(entXform.LocalPosition)) continue;
 
-                var newPos = Vector2.Transform(entXform.LocalPosition, matrix);
+                var newPos = matrix.Transform(entXform.LocalPosition);
 
                 _xformSystem.SetCoordinates(ent, entXform, new EntityCoordinates(gridAUid, newPos), entXform.LocalRotation + rotationDiff, oldParent: xformB, newParent: xformA);
             }

Robust.Server/Placement/PlacementManager.cs

@@ -172,10 +172,16 @@ namespace Robust.Server.Placement
                     }
                 }
 
-                var created = _entityManager.SpawnAttachedTo(entityTemplateName, coordinates, rotation: dirRcv.ToAngle());
+                var created = _entityManager.SpawnEntity(entityTemplateName, coordinates);
 
                 var placementCreateEvent = new PlacementEntityEvent(created, coordinates, PlacementEventAction.Create, msg.MsgChannel.UserId);
                 _entityManager.EventBus.RaiseEvent(EventSource.Local, placementCreateEvent);
+
+                // Some entities immediately delete themselves
+                if (_entityManager.EntityExists(created))
+                {
+                    _entityManager.GetComponent<TransformComponent>(created).LocalRotation = dirRcv.ToAngle();
+                }
             }
             else
             {