Fix bug where anchored entities would be spawned at 0,0 always.

This is because the parent was attached first, and then the Entity Coordinates are set, but position doesn't change because the parent is the same and the entity is anchored.
NOTE: I only fixed the EntityCoordinates overload. Unsure if this is even a problem with MapCoordinates.

.github/workflows/test-content.yml

@@ -38,4 +38,4 @@ jobs:
     - name: Content.Tests
       run: dotnet test --no-build Content.Tests/Content.Tests.csproj -v n
     - name: Content.IntegrationTests
-      run: dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n
+      run: COMPlus_gcServer=1 dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -v n

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "ManagedHttpListener"]
 	path = ManagedHttpListener
 	url = https://github.com/space-wizards/ManagedHttpListener.git
+[submodule "Linguini"]
+	path = Linguini
+	url = https://github.com/space-wizards/Linguini

OpenToolkit.GraphicsLibraryFramework/GLFWNative.cs

@@ -23,12 +23,12 @@ namespace OpenToolkit.GraphicsLibraryFramework
                     return IntPtr.Zero;
                 }
 
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                if (OperatingSystem.IsLinux())
                 {
                     return NativeLibrary.Load("libglfw.so.3", assembly, path);
                 }
 
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                if (OperatingSystem.IsMacOS())
                 {
                     return NativeLibrary.Load("libglfw.3.dylib", assembly, path);
                 }

Resources/EngineCredits/Libraries.yml

@@ -23,6 +23,48 @@
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+- name: Box2D
+  license:
+    MIT License
+
+    Copyright (c) 2019 Erin Catto
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is 
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
+- name: Bullet Physics SDK
+  license:
+    The files in this repository are licensed under the zlib license, except for the files under 'Extras' and examples/ThirdPartyLibs.
+
+    Bullet Continuous Collision Detection and Physics Library
+    http://bulletphysics.org
+
+    This software is provided 'as-is', without any express or implied warranty.
+    In no event will the authors be held liable for any damages arising from the use of this software.
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it freely,
+    subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. 
+    If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+    2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+    3. This notice may not be removed or altered from any source distribution. 
+
 - name: Castle Core
   license: |
     Copyright 2004-2016 Castle Project - http://www.castleproject.org/
@@ -317,6 +359,43 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
+- name: Farseer Physics Engine
+  license:
+    Microsoft Permissive License (Ms-PL)
+
+    This license governs use of the accompanying software.
+    If you use the software, you accept this license.
+    If you do not accept the license, do not use the software.
+
+    1. Definitions
+    The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
+    A "contribution" is the original software, or any additions or changes to the software.
+    A "contributor" is any person that distributes its contribution under this license.
+    "Licensed patents" are a contributor's patent claims that read directly on its contribution.
+
+    2. Grant of Rights
+    (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, 
+    each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, 
+    prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
+    (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, 
+    each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to 
+    make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or 
+    derivative works of the contribution in the software.
+
+    3. Conditions and Limitations
+    (A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
+    (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, 
+    your patent license from such contributor to the software ends automatically.
+    (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, 
+    and attribution notices that are present in the software.
+    (D) If you distribute any portion of the software in source code form, you may do so only under this license by 
+    including a complete copy of this license with your distribution. If you distribute any portion of the software in 
+    compiled or object code form, you may only do so under a license that complies with this license.
+    (E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, 
+    guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. 
+    To the extent permitted under your local laws, the contributors exclude the implied warranties of 
+    merchantability, fitness for a particular purpose and non-infringement.
+
 - name: Mono.Cecil
   license: |
     Copyright (c) 2008 - 2015 Jb Evain

Resources/Locale/en-US/console.ftl

@@ -1 +0,0 @@
-console-line-edit-placeholder = Command Here

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

@@ -0,0 +1,7 @@
+## EntitySpawnWindow
+
+entity-spawn-window-title = Entity Spawn Panel
+entity-spawn-window-search-bar-placeholder = search
+entity-spawn-window-clear-button = Clear
+entity-spawn-window-erase-button-text = Erase Mode
+entity-spawn-window-override-menu-tooltip = Override placement

Resources/Locale/en-US/tab-container.ftl

@@ -0,0 +1 @@
+tab-container-not-tab-title-provided = No title

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

@@ -0,0 +1,11 @@
+## ViewVariablesInstanceEntity
+
+view-variable-instance-entity-server-components-add-component-button-placeholder = Add Component
+view-variable-instance-entity-client-variables-tab-title = Client Variables
+view-variable-instance-entity-client-components-tab-title = Client Components
+view-variable-instance-entity-server-variables-tab-title = Server Variables
+view-variable-instance-entity-server-components-tab-title = Server Components
+view-variable-instance-entity-client-components-search-bar-placeholder = Search
+view-variable-instance-entity-server-components-search-bar-placeholder = Search
+view-variable-instance-entity-add-window-server-components = Add Component [S]
+view-variable-instance-entity-add-window-client-components = Add Component [C]

Robust.Client.NameGenerator/XamlUiPartialClassGenerator.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using Microsoft.CodeAnalysis;
@@ -147,9 +148,10 @@ namespace {nameSpace}
             foreach (var typeSymbol in symbols)
             {
                 var xamlFileName = $"{typeSymbol.Name}.xaml";
-                var relevantXamlFile = context.AdditionalFiles.FirstOrDefault(t => t.Path.EndsWith(xamlFileName));
+                var xamlFileNameSep = $"{Path.DirectorySeparatorChar}{xamlFileName}";
+                var relevantXamlFiles = context.AdditionalFiles.Where(t => t.Path.EndsWith(xamlFileNameSep)).ToArray();
 
-                if (relevantXamlFile == null)
+                if (relevantXamlFiles.Length == 0)
                 {
                     context.ReportDiagnostic(
                         Diagnostic.Create(
@@ -165,13 +167,28 @@ namespace {nameSpace}
                     continue;
                 }
 
-                var txt = relevantXamlFile.GetText()?.ToString();
-                if (txt == null)
+                if (relevantXamlFiles.Length > 1)
                 {
                     context.ReportDiagnostic(
                         Diagnostic.Create(
                             new DiagnosticDescriptor(
                                 "RXN0002",
+                                $"Found multiple candidate XAML files for {typeSymbol}",
+                                $"Multiple files exist with name {xamlFileName}",
+                                "Usage",
+                                DiagnosticSeverity.Error,
+                                true),
+                            typeSymbol.Locations[0]));
+                    continue;
+                }
+
+                var txt = relevantXamlFiles[0].GetText()?.ToString();
+                if (txt == null)
+                {
+                    context.ReportDiagnostic(
+                        Diagnostic.Create(
+                            new DiagnosticDescriptor(
+                                "RXN0004",
                                 $"Unexpected empty Xaml-File was found at {xamlFileName}",
                                 "Expected Content due to a Class with the same name being annotated with [GenerateTypedNameReferences].",
                                 "Usage",
@@ -192,7 +209,7 @@ namespace {nameSpace}
                     context.ReportDiagnostic(
                         Diagnostic.Create(
                             new DiagnosticDescriptor(
-                                "AXN0003",
+                                "RXN0003",
                                 "Unhandled exception occured while generating typed Name references.",
                                 $"Unhandled exception occured while generating typed Name references: {e}",
                                 "Usage",

Robust.Client/Audio/Midi/MidiManager.cs

@@ -225,7 +225,7 @@ namespace Robust.Client.Audio.Midi
                 // Since the last loaded soundfont takes priority, we load the fallback soundfont before the soundfont.
                 renderer.LoadSoundfont(FallbackSoundfont);
 
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                if (OperatingSystem.IsLinux())
                 {
                     foreach (var filepath in LinuxSoundfonts)
                     {
@@ -243,12 +243,12 @@ namespace Robust.Client.Audio.Midi
                         break;
                     }
                 }
-                else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                else if (OperatingSystem.IsMacOS())
                 {
                     if (File.Exists(OsxSoundfont) && SoundFont.IsSoundFont(OsxSoundfont))
                         renderer.LoadSoundfont(OsxSoundfont, true);
                 }
-                else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                else if (OperatingSystem.IsWindows())
                 {
                     if (File.Exists(WindowsSoundfont) && SoundFont.IsSoundFont(WindowsSoundfont))
                         renderer.LoadSoundfont(WindowsSoundfont, true);

Robust.Client/Console/Commands/Scripting.cs

@@ -1,6 +1,5 @@
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 
 namespace Robust.Client.Console.Commands
 {
@@ -41,7 +40,7 @@ namespace Robust.Client.Console.Commands
             var mgr = IoCManager.Resolve<IScriptClient>();
             if (!mgr.CanScript)
             {
-                shell.WriteError(Loc.GetString("You do not have server side scripting permission."));
+                shell.WriteError("You do not have server side scripting permission.");
                 return;
             }
 

Robust.Client/Console/ScriptConsoleClient.cs

@@ -1,5 +1,4 @@
 #if CLIENT_SCRIPTING
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -14,7 +13,6 @@ using Microsoft.CodeAnalysis.Text;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.ViewVariables;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Reflection;
 using Robust.Shared.Scripting;
@@ -43,14 +41,14 @@ namespace Robust.Client.Console
 
         public ScriptConsoleClient()
         {
-            Title = Loc.GetString("Robust C# Interactive (CLIENT)");
+            Title = "Robust C# Interactive (CLIENT)";
             ScriptInstanceShared.InitDummy();
 
             _globals = new ScriptGlobalsImpl(this);
 
             IoCManager.InjectDependencies(this);
 
-            OutputPanel.AddText(Loc.GetString(@"Robust C# interactive console (CLIENT)."));
+            OutputPanel.AddText("Robust C# interactive console (CLIENT).");
             OutputPanel.AddText(">");
         }
 

Robust.Client/Console/WatchWindow.cs

@@ -8,8 +8,6 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 using Robust.Shared.Reflection;
 using Robust.Shared.Scripting;
 using Robust.Shared.Timing;
@@ -31,7 +29,7 @@ namespace Robust.Client.Console
 
             ScriptInstanceShared.InitDummy();
 
-            Title = Loc.GetString("Watch Window");
+            Title = "Watch Window";
 
             var mainVBox = new VBoxContainer
             {
@@ -49,11 +47,11 @@ namespace Robust.Client.Console
                             (_addWatchEdit = new HistoryLineEdit
                             {
                                 HorizontalExpand = true,
-                                PlaceHolder = Loc.GetString("Add watch (C# interactive)")
+                                PlaceHolder = "Add watch (C# interactive)"
                             }),
                             (_addWatchButton = new Button
                             {
-                                Text = Loc.GetString("Add")
+                                Text = "Add"
                             })
                         }
                     }
@@ -118,7 +116,7 @@ namespace Robust.Client.Console
                         }),
                         (delButton = new Button
                         {
-                            Text = Loc.GetString("Remove")
+                            Text = "Remove"
                         }),
                     }
                 });
@@ -178,7 +176,7 @@ namespace Robust.Client.Console
                             ClipText = true,
                             HorizontalExpand = true
                         },
-                        (delButton = new Button {Text = Loc.GetString("Remove")})
+                        (delButton = new Button {Text = "Remove"})
                     }
                 });
 

Robust.Client/Debugging/DebugDrawing.cs

@@ -130,17 +130,17 @@ namespace Robust.Client.Debugging
                 {
                     if (body != _hoverBodies[0])
                     {
-                        DrawString(screenHandle, _font, drawPos + new Vector2(0, row * lineHeight), "------");
+                        screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), "------");
                         row++;
                     }
 
-                    DrawString(screenHandle, _font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {body.Owner}");
+                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {body.Owner}");
                     row++;
-                    DrawString(screenHandle, _font, drawPos + new Vector2(0, row * lineHeight), $"Layer: {Convert.ToString(body.CollisionLayer, 2)}");
+                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Layer: {Convert.ToString(body.CollisionLayer, 2)}");
                     row++;
-                    DrawString(screenHandle, _font, drawPos + new Vector2(0, row * lineHeight), $"Mask: {Convert.ToString(body.CollisionMask, 2)}");
+                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Mask: {Convert.ToString(body.CollisionMask, 2)}");
                     row++;
-                    DrawString(screenHandle, _font, drawPos + new Vector2(0, row * lineHeight), $"Enabled: {body.CanCollide}, Hard: {body.Hard}, Anchored: {(body).BodyType == BodyType.Static}");
+                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Enabled: {body.CanCollide}, Hard: {body.Hard}, Anchored: {(body).BodyType == BodyType.Static}");
                     row++;
                 }
 
@@ -171,7 +171,7 @@ namespace Robust.Client.Debugging
                     // all entities have a TransformComponent
                     var transform = physBody.Owner.Transform;
 
-                    var worldBox = physBody.GetWorldAABB(_mapManager);
+                    var worldBox = physBody.GetWorldAABB();
                     if (worldBox.IsEmpty()) continue;
 
                     foreach (var fixture in physBody.Fixtures)
@@ -199,17 +199,6 @@ namespace Robust.Client.Debugging
                 }
             }
 
-            private static void DrawString(DrawingHandleScreen handle, Font font, Vector2 pos, string str)
-            {
-                var baseLine = new Vector2(pos.X, font.GetAscent(1) + pos.Y);
-
-                foreach (var rune in str.EnumerateRunes())
-                {
-                    var advance = font.DrawChar(handle, rune, baseLine, 1, Color.White);
-                    baseLine += new Vector2(advance, 0);
-                }
-            }
-
             private class PhysDrawingAdapter : DebugDrawingHandle
             {
                 private readonly DrawingHandleWorld _handle;

Robust.Client/GameController/GameController.cs

@@ -82,7 +82,7 @@ namespace Robust.Client
             _commandLineArgs = args;
         }
 
-        private bool StartupContinue(DisplayMode displayMode)
+        internal bool StartupContinue(DisplayMode displayMode)
         {
             _clyde.InitializePostWindowing();
             _clyde.SetWindowTitle(Options.DefaultWindowTitle);
@@ -196,7 +196,7 @@ namespace Robust.Client
             return true;
         }
 
-        private bool StartupSystemSplash(Func<ILogHandler>? logHandlerFactory)
+        internal bool StartupSystemSplash(Func<ILogHandler>? logHandlerFactory)
         {
             ReadInitialLaunchState();
 
@@ -471,7 +471,7 @@ namespace Robust.Client
             Clyde,
         }
 
-        private void Cleanup()
+        internal void Cleanup()
         {
             _networkManager.Shutdown("Client shutting down");
             _midiManager.Shutdown();

Robust.Client/GameObjects/Components/Appearance/AppearanceComponent.cs

@@ -104,7 +104,7 @@ namespace Robust.Client.GameObjects
             _appearanceDirty = false;
         }
 
-        public override void Initialize()
+        protected override void Initialize()
         {
             base.Initialize();
 

Robust.Client/GameObjects/Components/Eye/EyeComponent.cs

@@ -116,7 +116,7 @@ namespace Robust.Client.GameObjects
         public MapCoordinates? Position => _eye?.Position;
 
         /// <inheritdoc />
-        public override void Initialize()
+        protected override void Initialize()
         {
             base.Initialize();
 
@@ -156,7 +156,7 @@ namespace Robust.Client.GameObjects
             VisibilityMask = state.VisibilityMask;
         }
 
-        public override void OnRemove()
+        protected override void OnRemove()
         {
             base.OnRemove();
 

Robust.Client/GameObjects/Components/Light/ClientOccluderComponent.cs

@@ -34,11 +34,11 @@ namespace Robust.Client.GameObjects
 
             if (Owner.Transform.Anchored)
             {
-                SnapGridOnPositionChanged();
+                AnchorStateChanged();
             }
         }
 
-        public void SnapGridOnPositionChanged()
+        public void AnchorStateChanged()
         {
             SendDirty();
 

Robust.Client/GameObjects/Components/Light/PointLightComponent.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -135,30 +135,13 @@ namespace Robust.Client.GameObjects
         public bool VisibleNested
         {
             get => _visibleNested;
-            set
-            {
-                if (_visibleNested == value) return;
-                _visibleNested = value;
-                if (value)
-                {
-                    if (Owner.Transform.Parent == null) return;
-
-                    _lightOnParent = true;
-                }
-                else
-                {
-                    if (!_lightOnParent) return;
-
-                    _lightOnParent = false;
-                }
-            }
+            set => _visibleNested = value;
         }
 
         [DataField("radius")]
         private float _radius = 5f;
         [DataField("nestedvisible")]
         private bool _visibleNested = true;
-        private bool _lightOnParent;
         [DataField("color")]
         private Color _color = Color.White;
         [DataField("offset")]
@@ -218,42 +201,13 @@ namespace Robust.Client.GameObjects
             }
         }
 
-        public override void Initialize()
+        protected override void Initialize()
         {
             base.Initialize();
             UpdateMask();
         }
 
-        /// <inheritdoc />
-        public override void HandleMessage(ComponentMessage message, IComponent? component)
-        {
-            base.HandleMessage(message, component);
-
-            if (message is ParentChangedMessage msg)
-            {
-                HandleTransformParentChanged(msg);
-            }
-        }
-
-        private void HandleTransformParentChanged(ParentChangedMessage obj)
-        {
-            // TODO: this does not work for things nested multiply layers deep.
-            if (!VisibleNested)
-            {
-                return;
-            }
-
-            if (obj.NewParent != null && obj.NewParent.IsValid())
-            {
-                _lightOnParent = true;
-            }
-            else
-            {
-                _lightOnParent = false;
-            }
-        }
-
-        public override void OnRemove()
+        protected override void OnRemove()
         {
             base.OnRemove();
 

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

@@ -46,6 +46,7 @@ namespace Robust.Client.GameObjects
             {
                 if (_visible == value) return;
                 _visible = value;
+
                 Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new SpriteUpdateEvent());
             }
         }
@@ -271,7 +272,7 @@ namespace Robust.Client.GameObjects
                 }
 
                 _layerMapShared = true;
-                UpdateIsInert();
+                QueueUpdateIsInert();
             }
         }
 
@@ -336,6 +337,8 @@ namespace Robust.Client.GameObjects
         [ViewVariables(VVAccess.ReadWrite)]
         public bool TreeUpdateQueued { get; set; }
 
+        [ViewVariables(VVAccess.ReadWrite)] private bool _inertUpdateQueued;
+
         [ViewVariables(VVAccess.ReadWrite)]
         public ShaderInstance? PostShader { get; set; }
 
@@ -636,7 +639,7 @@ namespace Robust.Client.GameObjects
                 index = Layers.Count - 1;
             }
 
-            UpdateIsInert();
+            QueueUpdateIsInert();
             return index;
         }
 
@@ -663,7 +666,7 @@ namespace Robust.Client.GameObjects
                 }
             }
 
-            UpdateIsInert();
+            QueueUpdateIsInert();
         }
 
         public void RemoveLayer(object layerKey)
@@ -1514,8 +1517,20 @@ namespace Robust.Client.GameObjects
             };
         }
 
-        private void UpdateIsInert()
+        private void QueueUpdateIsInert()
         {
+            if (_inertUpdateQueued)
+                return;
+
+            _inertUpdateQueued = true;
+            // Yes that null check is valid because of that stupid fucking dummy IEntity.
+            // Who thought that was a good idea.
+            Owner?.EntityManager?.EventBus?.RaiseEvent(EventSource.Local, new SpriteUpdateInertEvent {Sprite = this});
+        }
+
+        internal void DoUpdateIsInert()
+        {
+            _inertUpdateQueued = false;
             IsInert = true;
 
             foreach (var layer in Layers)
@@ -1865,14 +1880,14 @@ namespace Robust.Client.GameObjects
             {
                 AutoAnimated = value;
 
-                _parent.UpdateIsInert();
+                _parent.QueueUpdateIsInert();
             }
 
             public void SetVisible(bool value)
             {
                 Visible = value;
 
-                _parent.UpdateIsInert();
+                _parent.QueueUpdateIsInert();
             }
 
             public void SetRsi(RSI? rsi)
@@ -1904,7 +1919,7 @@ namespace Robust.Client.GameObjects
                     }
                 }
 
-                _parent.UpdateIsInert();
+                _parent.QueueUpdateIsInert();
             }
 
             public void SetState(RSI.StateId stateId)
@@ -1936,7 +1951,7 @@ namespace Robust.Client.GameObjects
                 AnimationTime = 0;
                 AnimationTimeLeft = state.GetDelay(0);
 
-                _parent.UpdateIsInert();
+                _parent.QueueUpdateIsInert();
             }
 
             public void SetTexture(Texture? texture)
@@ -1944,7 +1959,7 @@ namespace Robust.Client.GameObjects
                 State = default;
                 Texture = texture;
 
-                _parent.UpdateIsInert();
+                _parent.QueueUpdateIsInert();
             }
 
             public void SetOffset(Vector2 offset)
@@ -2235,4 +2250,9 @@ namespace Robust.Client.GameObjects
     {
 
     }
+
+    internal struct SpriteUpdateInertEvent
+    {
+        public SpriteComponent Sprite;
+    }
 }

Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs

@@ -35,7 +35,7 @@ namespace Robust.Client.GameObjects
 
             SubscribeLocalEvent<OccluderDirtyEvent>(HandleDirtyEvent);
 
-            SubscribeLocalEvent<ClientOccluderComponent, SnapGridPositionChangedEvent>(HandleSnapGridMove);
+            SubscribeLocalEvent<ClientOccluderComponent, AnchorStateChangedEvent>(HandleAnchorChanged);
         }
 
         public override void FrameUpdate(float frameTime)
@@ -62,9 +62,9 @@ namespace Robust.Client.GameObjects
             }
         }
 
-        private static void HandleSnapGridMove(EntityUid uid, ClientOccluderComponent component, SnapGridPositionChangedEvent args)
+        private static void HandleAnchorChanged(EntityUid uid, ClientOccluderComponent component, AnchorStateChangedEvent args)
         {
-            component.SnapGridOnPositionChanged();
+            component.AnchorStateChanged();
         }
 
         private void HandleDirtyEvent(OccluderDirtyEvent ev)

Robust.Client/GameObjects/EntitySystems/InputSystem.cs

@@ -173,4 +173,24 @@ namespace Robust.Client.GameObjects
             AttachedEntity = attachedEntity;
         }
     }
+
+    public class PlayerAttachedEvent : EntityEventArgs
+    {
+        public PlayerAttachedEvent(IEntity entity)
+        {
+            Entity = entity;
+        }
+
+        public IEntity Entity { get; }
+    }
+
+    public class PlayerDetachedEvent : EntityEventArgs
+    {
+        public PlayerDetachedEvent(IEntity entity)
+        {
+            Entity = entity;
+        }
+
+        public IEntity Entity { get; }
+    }
 }

Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs

@@ -1,9 +1,9 @@
-using JetBrains.Annotations;
+using System.Collections.Generic;
+using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Robust.Client.GameObjects
 {
@@ -17,16 +17,29 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IMapManager _mapManager = default!;
 
         private RenderingTreeSystem _treeSystem = default!;
+        private readonly Queue<SpriteComponent> _inertUpdateQueue = new();
 
         public override void Initialize()
         {
             base.Initialize();
+
             _treeSystem = Get<RenderingTreeSystem>();
+            SubscribeLocalEvent<SpriteUpdateInertEvent>(QueueUpdateInert);
+        }
+
+        private void QueueUpdateInert(SpriteUpdateInertEvent ev)
+        {
+            _inertUpdateQueue.Enqueue(ev.Sprite);
         }
 
         /// <inheritdoc />
         public override void FrameUpdate(float frameTime)
         {
+            while (_inertUpdateQueue.TryDequeue(out var sprite))
+            {
+                sprite.DoUpdateIsInert();
+            }
+
             // So we could calculate the correct size of the entities based on the contents of their sprite...
             // Or we can just assume that no entity is larger than 10x10 and get a stupid easy check.
             var pvsBounds = _eyeManager.GetWorldViewport().Enlarged(5);

Robust.Client/GameObjects/PlayerMessages.cs

@@ -1,17 +0,0 @@
-using System;
-using Robust.Shared.GameObjects;
-
-namespace Robust.Client.GameObjects
-{
-    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
-    public class PlayerAttachedMsg : ComponentMessage
-    {
-
-    }
-
-    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
-    public class PlayerDetachedMsg : ComponentMessage
-    {
-
-    }
-}

Robust.Client/GameStates/ClientGameStateManager.cs

@@ -319,6 +319,8 @@ namespace Robust.Client.GameStates
 
         private void ResetPredictedEntities(GameTick curTick)
         {
+            var bus = (EntityEventBus) _entities.EventBus;
+
             foreach (var entity in _entities.GetEntities())
             {
                 // TODO: 99% there's an off-by-one here.
@@ -347,6 +349,7 @@ namespace Robust.Client.GameStates
 
                     Logger.DebugS(CVars.NetPredict.Name, $"  And also its component {comp.Name}");
                     // TODO: Handle interpolation.
+                    bus.RaiseComponentEvent(comp, new ComponentHandleState(compState, null));
                     comp.HandleComponentState(compState, null);
                 }
             }
@@ -455,12 +458,14 @@ namespace Robust.Client.GameStates
                 }
             }
 
+            var bus = (EntityEventBus) _entities.EventBus;
+
             // Make sure this is done after all entities have been instantiated.
             foreach (var kvStates in toApply)
             {
                 var ent = kvStates.Key;
                 var entity = (Entity) ent;
-                HandleEntityState(entity.EntityManager.ComponentManager, entity, kvStates.Value.Item1,
+                HandleEntityState(entity.EntityManager.ComponentManager, entity, bus, kvStates.Value.Item1,
                     kvStates.Value.Item2);
             }
 
@@ -527,7 +532,7 @@ namespace Robust.Client.GameStates
             return created;
         }
 
-        private void HandleEntityState(IComponentManager compMan, IEntity entity, EntityState? curState,
+        private void HandleEntityState(IComponentManager compMan, IEntity entity, EntityEventBus bus, EntityState? curState,
             EntityState? nextState)
         {
             var compStateWork = new Dictionary<uint, (ComponentState? curState, ComponentState? nextState)>();
@@ -585,6 +590,7 @@ namespace Robust.Client.GameStates
                 {
                     try
                     {
+                        bus.RaiseComponentEvent(component, new ComponentHandleState(cur, next));
                         component.HandleComponentState(cur, next);
                     }
                     catch (Exception e)

Robust.Client/GameStates/NetEntityOverlay.cs

@@ -178,7 +178,7 @@ namespace Robust.Client.GameStates
                 var yPos = 10 + _lineHeight * i;
                 var name = $"({netEnt.Id}) {ent.Prototype?.ID}";
                 var color = CalcTextColor(ref netEnt);
-                DrawString(screenHandle, _font, new Vector2(xPos + (TrafficHistorySize + 4), yPos), name, color);
+                screenHandle.DrawString(_font, new Vector2(xPos + (TrafficHistorySize + 4), yPos), name, color);
                 DrawTrafficBox(screenHandle, ref netEnt, xPos, yPos);
             }
         }
@@ -223,17 +223,6 @@ namespace Robust.Client.GameStates
             base.DisposeBehavior();
         }
 
-        private static void DrawString(DrawingHandleScreen handle, Font font, Vector2 pos, string str, Color textColor)
-        {
-            var baseLine = new Vector2(pos.X, font.GetAscent(1) + pos.Y);
-
-            foreach (var rune in str.EnumerateRunes())
-            {
-                var advance = font.DrawChar(handle, rune, baseLine, 1, textColor);
-                baseLine += new Vector2(advance, 0);
-            }
-        }
-
         private struct NetEntity
         {
             public GameTick LastUpdate;

Robust.Client/GameStates/NetGraphOverlay.cs

@@ -184,7 +184,7 @@ namespace Robust.Client.GameStates
                 // Draw size if above average
                 if (drawSizeThreshold * 1.5 < state.Payload)
                 {
-                    DrawString(handle, _font, new Vector2(xOff, yoff - _font.GetLineHeight(1)), state.Payload.ToString());
+                    handle.DrawString(_font, new Vector2(xOff, yoff - _font.GetLineHeight(1)), state.Payload.ToString());
                 }
 
                 // second tick marks
@@ -224,14 +224,14 @@ namespace Robust.Client.GameStates
             handle.DrawLine(new Vector2(leftMargin, midYoff), new Vector2(leftMargin + width, midYoff), Color.DarkGray.WithAlpha(0.8f));
 
             // payload text
-            DrawString(handle, _font, new Vector2(leftMargin + width, warnYoff), "56K");
-            DrawString(handle, _font, new Vector2(leftMargin + width, midYoff), "33.6K");
+            handle.DrawString(_font, new Vector2(leftMargin + width, warnYoff), "56K");
+            handle.DrawString(_font, new Vector2(leftMargin + width, midYoff), "33.6K");
 
             // interp text info
             if(lastLagY != -1)
-                DrawString(handle, _font, new Vector2(leftMargin + width, lastLagY), $"{lastLagMs.ToString()}ms");
+                handle.DrawString(_font, new Vector2(leftMargin + width, lastLagY), $"{lastLagMs.ToString()}ms");
 
-            DrawString(handle, _font, new Vector2(leftMargin, height + LowerGraphOffset), $"{_gameStateManager.CurrentBufferSize.ToString()} states");
+            handle.DrawString(_font, new Vector2(leftMargin, height + LowerGraphOffset), $"{_gameStateManager.CurrentBufferSize.ToString()} states");
         }
 
         protected override void DisposeBehavior()
@@ -241,17 +241,6 @@ namespace Robust.Client.GameStates
             base.DisposeBehavior();
         }
 
-        private void DrawString(DrawingHandleScreen handle, Font font, Vector2 pos, string str)
-        {
-            var baseLine = new Vector2(pos.X, font.GetAscent(1) + pos.Y);
-
-            foreach (var rune in str.EnumerateRunes())
-            {
-                var advance = font.DrawChar(handle, rune, baseLine, 1, Color.White);
-                baseLine += new Vector2(advance, 0);
-            }
-        }
-
         private class NetShowGraphCommand : IConsoleCommand
         {
             public string Command => "net_graph";

Robust.Client/Graphics/Clyde/Clyde.DllMap.cs

@@ -11,7 +11,7 @@ namespace Robust.Client.Graphics.Clyde
     {
         static Clyde()
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) &&
+            if (OperatingSystem.IsWindows() &&
                 RuntimeInformation.ProcessArchitecture == Architecture.X64 &&
                 Environment.GetEnvironmentVariable("ROBUST_INTEGRATED_GPU") != "1")
             {
@@ -28,20 +28,20 @@ namespace Robust.Client.Graphics.Clyde
                 }
             }
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (OperatingSystem.IsWindows())
             {
                 return;
             }
 
             NativeLibrary.SetDllImportResolver(typeof(GL).Assembly, (name, assembly, path) =>
             {
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
+                if (OperatingSystem.IsLinux()
                     && _dllMapLinux.TryGetValue(name, out var mappedName))
                 {
                     return NativeLibrary.Load(mappedName);
                 }
 
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)
+                if (OperatingSystem.IsMacOS()
                     && _dllMapMacOS.TryGetValue(name, out mappedName))
                 {
                     return NativeLibrary.Load(mappedName);

Robust.Client/Graphics/Clyde/Clyde.Windowing.cs

@@ -131,7 +131,7 @@ namespace Robust.Client.Graphics.Clyde
 
             if (!succeeded)
             {
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                if (OperatingSystem.IsWindows())
                 {
                     var msgBoxContent = "Failed to create the game window. " +
                                         "This probably means your GPU is too old to play the game. " +
@@ -164,7 +164,7 @@ namespace Robust.Client.Graphics.Clyde
 
         private IEnumerable<Image<Rgba32>> LoadWindowIcons()
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            if (OperatingSystem.IsMacOS())
             {
                 // Does nothing on macOS so don't bother.
                 yield break;

Robust.Client/Graphics/Clyde/Windowing/Glfw.WindowThread.cs

@@ -1,4 +1,4 @@
-using System.Runtime.InteropServices;
+using System;
 using System.Threading.Channels;
 using System.Threading.Tasks;
 using OpenToolkit.GraphicsLibraryFramework;
@@ -13,11 +13,6 @@ namespace Robust.Client.Graphics.Clyde
     {
         private sealed partial class GlfwWindowingImpl
         {
-            // glfwPostEmptyEvent is broken on macOS and crashes when not called from the main thread
-            // (despite what the docs claim, and yes this makes it useless).
-            // Because of this, we just forego it and use glfwWaitEventsTimeout on macOS instead.
-            private static readonly bool IsMacOS = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
-
             private bool _windowingRunning;
             private ChannelWriter<CmdBase> _cmdWriter = default!;
             private ChannelReader<CmdBase> _cmdReader = default!;
@@ -53,7 +48,10 @@ namespace Robust.Client.Graphics.Clyde
 
                 while (_windowingRunning)
                 {
-                    if (IsMacOS)
+                    // glfwPostEmptyEvent is broken on macOS and crashes when not called from the main thread
+                    // (despite what the docs claim, and yes this makes it useless).
+                    // Because of this, we just forego it and use glfwWaitEventsTimeout on macOS instead.
+                    if (OperatingSystem.IsMacOS())
                         GLFW.WaitEventsTimeout(0.008);
                     else
                         GLFW.WaitEvents();
@@ -157,7 +155,7 @@ namespace Robust.Client.Graphics.Clyde
                 _cmdWriter.TryWrite(cmd);
 
                 // Post empty event to unstuck WaitEvents if necessary.
-                if (!IsMacOS)
+                if (!OperatingSystem.IsMacOS())
                     GLFW.PostEmptyEvent();
             }
 

Robust.Client/Graphics/Clyde/Windowing/Glfw.Windows.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Runtime.Loader;
 using System.Threading.Tasks;
 using OpenToolkit;
 using OpenToolkit.Graphics.OpenGL4;
@@ -33,6 +34,7 @@ namespace Robust.Client.Graphics.Clyde
             private GlfwWindowReg? _mainWindow;
             private GlfwBindingsContext _mainGraphicsContext = default!;
             private int _nextWindowId = 1;
+            private static bool _eglLoaded;
 
             public async Task<WindowHandle> WindowCreate(WindowCreateParameters parameters)
             {
@@ -474,6 +476,20 @@ namespace Robust.Client.Graphics.Clyde
                     GLFW.WindowHint(WindowHintContextApi.ContextCreationApi, ContextApi.EglContextApi);
                     GLFW.WindowHint(WindowHintOpenGlProfile.OpenGlProfile, OpenGlProfile.Any);
                     GLFW.WindowHint(WindowHintBool.SrgbCapable, false);
+
+                    if (!_eglLoaded && OperatingSystem.IsWindows())
+                    {
+                        // On non-published builds (so, development), GLFW can't find libEGL.dll
+                        // because it'll be in runtimes/<rid>/native/ instead of next to the actual executable.
+                        // We manually preload the library here so that GLFW will find it when it does its thing.
+                        NativeLibrary.TryLoad(
+                            "libEGL.dll",
+                            typeof(Clyde).Assembly,
+                            DllImportSearchPath.SafeDirectories,
+                            out _);
+
+                        _eglLoaded = true;
+                    }
                 }
 
 

Robust.Client/Graphics/Drawing/DrawingHandleScreen.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.Graphics
@@ -39,5 +40,57 @@ namespace Robust.Client.Graphics
             DrawPrimitiveTopology type = filled ? DrawPrimitiveTopology.TriangleFan : DrawPrimitiveTopology.LineStrip;
             DrawPrimitives(type, buffer, color);
         }
+
+        /// <summary>
+        ///     Draw a simple string to the screen at the specified position.
+        /// </summary>
+        /// <remarks>
+        ///     This method is primarily intended for debug purposes and does not handle things like UI scaling.
+        /// </remarks>
+        /// <returns>
+        ///     The space taken up (horizontal and vertical) by the text.
+        /// </returns>
+        /// <param name="font">The font to render with.</param>
+        /// <param name="pos">The top-left corner to start drawing text at.</param>
+        /// <param name="str">The text to draw.</param>
+        /// <param name="color">The color of text to draw.</param>
+        public Vector2 DrawString(Font font, Vector2 pos, string str, Color color)
+        {
+            var advanceTotal = Vector2.Zero;
+            var baseLine = new Vector2(pos.X, font.GetAscent(1) + pos.Y);
+            var lineHeight = font.GetLineHeight(1);
+
+            foreach (var rune in str.EnumerateRunes())
+            {
+                if (rune == new Rune('\n'))
+                {
+                    baseLine.X = pos.X;
+                    baseLine.Y += lineHeight;
+                    advanceTotal.Y += lineHeight;
+                    continue;
+                }
+
+                var advance = font.DrawChar(this, rune, baseLine, 1, color);
+                advanceTotal.X += advance;
+                baseLine += new Vector2(advance, 0);
+            }
+
+            return advanceTotal;
+        }
+
+        /// <summary>
+        ///     Draw a simple string to the screen at the specified position.
+        /// </summary>
+        /// <remarks>
+        ///     This method is primarily intended for debug purposes and does not handle things like UI scaling.
+        /// </remarks>
+        /// <returns>
+        ///     The space taken up (horizontal and vertical) by the text.
+        /// </returns>
+        /// <param name="font">The font to render with.</param>
+        /// <param name="pos">The top-left corner to start drawing text at.</param>
+        /// <param name="str">The text to draw.</param>
+        public Vector2 DrawString(Font font, Vector2 pos, string str)
+            => DrawString(font, pos, str, Color.White);
     }
 }

Robust.Client/Input/InputDevices.cs

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
+using System;
+using System.Collections.Generic;
 using Robust.Shared.Localization;
-using Robust.Shared.Map;
 
 namespace Robust.Client.Input
 {
@@ -179,9 +178,9 @@ namespace Robust.Client.Input
             var locId = $"input-key-{key}";
             if (key == Key.LSystem || key == Key.RSystem)
             {
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                if (OperatingSystem.IsWindows())
                     locId += "-win";
-                else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                else if (OperatingSystem.IsMacOS())
                     locId += "-mac";
                 else
                     locId += "-linux";

Robust.Client/Player/LocalPlayer.cs

@@ -1,6 +1,5 @@
-using System;
+using System;
 using Robust.Client.GameObjects;
-using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Network;
@@ -71,10 +70,10 @@ namespace Robust.Client.Player
             eye.Current = true;
 
             EntityAttached?.Invoke(new EntityAttachedEventArgs(entity));
-            entity.SendMessage(null, new PlayerAttachedMsg());
 
             // notify ECS Systems
             ControlledEntity.EntityManager.EventBus.RaiseEvent(EventSource.Local, new PlayerAttachSysMessage(ControlledEntity));
+            ControlledEntity.EntityManager.EventBus.RaiseLocalEvent(ControlledEntity.Uid, new PlayerAttachedEvent(ControlledEntity));
         }
 
         /// <summary>
@@ -83,13 +82,13 @@ namespace Robust.Client.Player
         public void DetachEntity()
         {
             var previous = ControlledEntity;
-            if (previous != null && previous.Initialized && !previous.Deleted)
+            if (previous is {Initialized: true, Deleted: false})
             {
                 previous.GetComponent<EyeComponent>().Current = false;
-                previous.SendMessage(null, new PlayerDetachedMsg());
 
                 // notify ECS Systems
                 previous.EntityManager.EventBus.RaiseEvent(EventSource.Local, new PlayerAttachSysMessage(null));
+                previous.EntityManager.EventBus.RaiseLocalEvent(previous.Uid, new PlayerDetachedEvent(previous));
             }
 
             ControlledEntity = null;

Robust.Client/UserInterface/Controls/ItemList.cs

@@ -318,6 +318,8 @@ namespace Robust.Client.UserInterface.Controls
         {
             base.Draw(handle);
 
+            var sizeBox = PixelSizeBox;
+
             var font = ActualFont;
             var listBg = ActualBackground;
             var iconBg = ActualItemBackground;
@@ -346,31 +348,38 @@ namespace Robust.Client.UserInterface.Controls
                     itemHeight = item.IconSize.Y;
                 }
 
-                itemHeight = Math.Max(itemHeight, ActualFont.GetHeight(UIScale));
+                itemHeight = Math.Max(itemHeight, font.GetHeight(UIScale));
                 itemHeight += ActualItemBackground.MinimumSize.Y;
 
-                item.Region = UIBox2.FromDimensions(0, offset, PixelWidth, itemHeight);
+                var region = UIBox2.FromDimensions(0, offset, PixelWidth, itemHeight);
+                item.Region = region;
 
-                bg.Draw(handle, item.Region.Value);
-
-                var contentBox = bg.GetContentBox(item.Region.Value);
-                var drawOffset = contentBox.TopLeft;
-                if (item.Icon != null)
+                if (region.Intersects(sizeBox))
                 {
-                    if (item.IconRegion.Size == Vector2.Zero)
-                    {
-                        handle.DrawTextureRect(item.Icon, UIBox2.FromDimensions(drawOffset, item.Icon.Size), item.IconModulate);
-                    }
-                    else
-                    {
-                        handle.DrawTextureRectRegion(item.Icon, UIBox2.FromDimensions(drawOffset, item.Icon.Size), item.IconRegion, item.IconModulate);
-                    }
-                }
+                    bg.Draw(handle, item.Region.Value);
 
-                if (item.Text != null)
-                {
-                    var textBox = new UIBox2(contentBox.Left + item.IconSize.X, contentBox.Top, contentBox.Right, contentBox.Bottom);
-                    DrawTextInternal(handle, item.Text, textBox);
+                    var contentBox = bg.GetContentBox(item.Region.Value);
+                    var drawOffset = contentBox.TopLeft;
+                    if (item.Icon != null)
+                    {
+                        if (item.IconRegion.Size == Vector2.Zero)
+                        {
+                            handle.DrawTextureRect(item.Icon, UIBox2.FromDimensions(drawOffset, item.Icon.Size),
+                                item.IconModulate);
+                        }
+                        else
+                        {
+                            handle.DrawTextureRectRegion(item.Icon, UIBox2.FromDimensions(drawOffset, item.Icon.Size),
+                                item.IconRegion, item.IconModulate);
+                        }
+                    }
+
+                    if (item.Text != null)
+                    {
+                        var textBox = new UIBox2(contentBox.Left + item.IconSize.X, contentBox.Top, contentBox.Right,
+                            contentBox.Bottom);
+                        DrawTextInternal(handle, item.Text, textBox);
+                    }
                 }
 
                 offset += itemHeight;

Robust.Client/UserInterface/Controls/TabContainer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Robust.Client.Graphics;
 using Robust.Shared.Input;
 using Robust.Shared.Localization;
@@ -75,7 +75,7 @@ namespace Robust.Client.UserInterface.Controls
             var control = GetChild(tab);
             var title = control.GetValue(TabTitleProperty);
 
-            return title ?? control.Name ?? Loc.GetString("No title");
+            return title ?? control.Name ?? Loc.GetString("tab-container-not-tab-title-provided");
         }
 
         public static string? GetTabTitle(Control control)

Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.cs

@@ -65,7 +65,7 @@ namespace Robust.Client.UserInterface.CustomControls
             this.prototypeManager = prototypeManager;
             this.resourceCache = resourceCache;
 
-            Title = Loc.GetString("Entity Spawn Panel");
+            Title = Loc.GetString("entity-spawn-window-title");
 
 
             SetSize = (250, 300);
@@ -83,13 +83,13 @@ namespace Robust.Client.UserInterface.CustomControls
                             (SearchBar = new LineEdit
                             {
                                 HorizontalExpand = true,
-                                PlaceHolder = Loc.GetString("Search")
+                                PlaceHolder = Loc.GetString("entity-spawn-window-search-bar-placeholder")
                             }),
 
                             (ClearButton = new Button
                             {
                                 Disabled = true,
-                                Text = Loc.GetString("Clear"),
+                                Text = Loc.GetString("entity-spawn-window-clear-button"),
                             })
                         }
                     },
@@ -109,13 +109,13 @@ namespace Robust.Client.UserInterface.CustomControls
                             (EraseButton = new Button
                             {
                                 ToggleMode = true,
-                                Text = Loc.GetString("Erase Mode")
+                                Text = Loc.GetString("entity-spawn-window-erase-button-text")
                             }),
 
                             (OverrideMenu = new OptionButton
                             {
                                 HorizontalExpand = true,
-                                ToolTip = Loc.GetString("Override placement")
+                                ToolTip = Loc.GetString("entity-spawn-window-override-menu-tooltip")
                             })
                         }
                     },

Robust.Client/UserInterface/CustomControls/ScriptConsole.cs

@@ -1,6 +1,5 @@
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.UserInterface.CustomControls
@@ -37,9 +36,9 @@ namespace Robust.Client.UserInterface.CustomControls
                             (InputBar = new HistoryLineEdit
                             {
                                 HorizontalExpand = true,
-                                PlaceHolder = Loc.GetString("Your C# code here.")
+                                PlaceHolder = "Your C# code here."
                             }),
-                            (RunButton = new Button {Text = Loc.GetString("Run")})
+                            (RunButton = new Button {Text = "Run"})
                         }
                     },
                 }

Robust.Client/UserInterface/FileDialogManager.cs

@@ -148,7 +148,7 @@ namespace Robust.Client.UserInterface
         // ReSharper disable once MemberCanBeMadeStatic.Local
         private Task<string?> RunAsyncMaybe(Func<string?> action)
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            if (OperatingSystem.IsMacOS())
             {
                 // macOS seems pretty annoying about having the file dialog opened from the main thread.
                 // So we are forced to execute this synchronously on the main thread.
@@ -326,7 +326,7 @@ namespace Robust.Client.UserInterface
 
         private async Task<bool> IsKDialogAvailable()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            if (!OperatingSystem.IsLinux())
                 return false;
 
             if (!_checkedKDialogAvailable)

Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -120,7 +120,7 @@ namespace Robust.Client.ViewVariables.Instances
 
             var clientVBox = new VBoxContainer {SeparationOverride = 0};
             _tabs.AddChild(clientVBox);
-            _tabs.SetTabTitle(TabClientVars, "Client Variables");
+            _tabs.SetTabTitle(TabClientVars, Loc.GetString("view-variable-instance-entity-client-variables-tab-title"));
 
             var first = true;
             foreach (var group in LocalPropertyList(obj, ViewVariablesManager, _robustSerializer))
@@ -138,7 +138,7 @@ namespace Robust.Client.ViewVariables.Instances
 
             _clientComponents = new VBoxContainer {SeparationOverride = 0};
             _tabs.AddChild(_clientComponents);
-            _tabs.SetTabTitle(TabClientComponents, "Client Components");
+            _tabs.SetTabTitle(TabClientComponents, Loc.GetString("view-variable-instance-entity-client-components-tab-title"));
 
             PopulateClientComponents();
 
@@ -146,11 +146,11 @@ namespace Robust.Client.ViewVariables.Instances
             {
                 _serverVariables = new VBoxContainer {SeparationOverride = 0};
                 _tabs.AddChild(_serverVariables);
-                _tabs.SetTabTitle(TabServerVars, "Server Variables");
+                _tabs.SetTabTitle(TabServerVars, Loc.GetString("view-variable-instance-entity-server-variables-tab-title"));
 
                 _serverComponents = new VBoxContainer {SeparationOverride = 0};
                 _tabs.AddChild(_serverComponents);
-                _tabs.SetTabTitle(TabServerComponents, "Server Components");
+                _tabs.SetTabTitle(TabServerComponents, Loc.GetString("view-variable-instance-entity-server-components-tab-title"));
 
                 PopulateServerComponents(false);
             }
@@ -162,13 +162,13 @@ namespace Robust.Client.ViewVariables.Instances
 
             _clientComponents.AddChild(_clientComponentsSearchBar = new LineEdit
             {
-                PlaceHolder = Loc.GetString("Search"),
+                PlaceHolder = Loc.GetString("view-variable-instance-entity-client-components-search-bar-placeholder"),
                 HorizontalExpand = true,
             });
 
             _clientComponents.AddChild(_clientComponentsAddButton = new Button()
             {
-                Text = Loc.GetString("Add Component"),
+                Text = Loc.GetString("view-variable-instance-entity-server-components-add-component-button-placeholder"),
                 HorizontalExpand = true,
             });
 
@@ -198,13 +198,13 @@ namespace Robust.Client.ViewVariables.Instances
 
             _serverComponents.AddChild(_serverComponentsSearchBar = new LineEdit
             {
-                PlaceHolder = Loc.GetString("Search"),
+                PlaceHolder = Loc.GetString("view-variable-instance-entity-server-components-search-bar-placeholder"),
                 HorizontalExpand = true,
             });
 
             _serverComponents.AddChild(_serverComponentsAddButton = new Button()
             {
-                Text = Loc.GetString("Add Component"),
+                Text = Loc.GetString("view-variable-instance-entity-server-components-add-component-button-placeholder"),
                 HorizontalExpand = true,
             });
 
@@ -336,7 +336,7 @@ namespace Robust.Client.ViewVariables.Instances
         {
             _addComponentWindow?.Dispose();
 
-            _addComponentWindow = new ViewVariablesAddWindow(GetValidComponentsForAdding(), "Add Component [C]");
+            _addComponentWindow = new ViewVariablesAddWindow(GetValidComponentsForAdding(), Loc.GetString("view-variable-instance-entity-add-window-client-components"));
             _addComponentWindow.AddButtonPressed += TryAdd;
             _addComponentServer = false;
 
@@ -349,7 +349,7 @@ namespace Robust.Client.ViewVariables.Instances
 
             if (_entitySession == null) return;
 
-            _addComponentWindow = new ViewVariablesAddWindow(await GetValidServerComponentsForAdding(), "Add Component [S]");
+            _addComponentWindow = new ViewVariablesAddWindow(await GetValidServerComponentsForAdding(), Loc.GetString("view-variable-instance-entity-add-window-server-components"));
             _addComponentWindow.AddButtonPressed += TryAdd;
             _addComponentServer = true;
 

Robust.Server/BaseServer.cs

@@ -355,7 +355,7 @@ namespace Robust.Server
             AddFinalStringsToSerializer();
             _stringSerializer.LockStrings();
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && _config.GetCVar(CVars.SysWinTickPeriod) >= 0)
+            if (OperatingSystem.IsWindows() && _config.GetCVar(CVars.SysWinTickPeriod) >= 0)
             {
                 WindowsTickPeriod.TimeBeginPeriod((uint) _config.GetCVar(CVars.SysWinTickPeriod));
             }
@@ -449,8 +449,7 @@ namespace Robust.Server
             }
         }
 
-        /// <inheritdoc />
-        public void MainLoop()
+        internal void SetupMainLoop()
         {
             if (_mainLoop == null)
             {
@@ -472,14 +471,26 @@ namespace Robust.Server
 
             // set GameLoop.Running to false to return from this function.
             _time.Paused = false;
-            _mainLoop.Run();
+        }
 
+        internal void FinishMainLoop()
+        {
             _time.InSimulation = true;
             Cleanup();
 
             _shutdownEvent.Set();
         }
 
+        /// <inheritdoc />
+        public void MainLoop()
+        {
+            SetupMainLoop();
+
+            _mainLoop.Run();
+
+            FinishMainLoop();
+        }
+
         public bool ContentStart { get; set; }
         public bool LoadConfigAndUserData { private get; set; } = true;
 
@@ -560,7 +571,7 @@ namespace Robust.Server
 
             //TODO: This should prob shutdown all managers in a loop.
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && _config.GetCVar(CVars.SysWinTickPeriod) >= 0)
+            if (OperatingSystem.IsWindows() && _config.GetCVar(CVars.SysWinTickPeriod) >= 0)
             {
                 WindowsTickPeriod.TimeEndPeriod((uint) _config.GetCVar(CVars.SysWinTickPeriod));
             }

Robust.Server/GameObjects/Components/Actor/ActorComponent.cs

@@ -1,4 +1,3 @@
-using System;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
@@ -12,34 +11,4 @@ namespace Robust.Server.GameObjects
         [ViewVariables]
         public IPlayerSession PlayerSession { get; internal set; } = default!;
     }
-
-    /// <summary>
-    ///     Raised on an entity whenever a player attaches to this entity.
-    /// </summary>
-    [Serializable]
-    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
-    public class PlayerAttachedMsg : ComponentMessage
-    {
-        public IPlayerSession NewPlayer { get; }
-
-        public PlayerAttachedMsg(IPlayerSession newPlayer)
-        {
-            NewPlayer = newPlayer;
-        }
-    }
-
-    /// <summary>
-    ///     Raised on an entity whenever a player detaches from this entity.
-    /// </summary>
-    [Serializable]
-    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
-    public class PlayerDetachedMsg : ComponentMessage
-    {
-        public IPlayerSession OldPlayer { get; }
-
-        public PlayerDetachedMsg(IPlayerSession oldPlayer)
-        {
-            OldPlayer = oldPlayer;
-        }
-    }
 }

Robust.Server/GameObjects/EntitySystems/ActorSystem.cs

@@ -1,4 +1,3 @@
-using System;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
@@ -9,7 +8,7 @@ namespace Robust.Server.GameObjects
     ///     System that handles players being attached/detached from entities.
     /// </summary>
     [UsedImplicitly]
-    public class ActorSystem : EntitySystem
+    public sealed class ActorSystem : EntitySystem
     {
         public override void Initialize()
         {
@@ -22,27 +21,54 @@ namespace Robust.Server.GameObjects
 
         private void OnActorPlayerAttach(AttachPlayerEvent args)
         {
+            args.Result = Attach(args.Entity, args.Player, args.Force, out var forceKicked);
+            args.ForceKicked = forceKicked;
+        }
+
+        /// <summary>
+        ///     Attaches a player session to an entity, optionally kicking any sessions already attached to it.
+        /// </summary>
+        /// <param name="entity">The entity to attach the player to</param>
+        /// <param name="player">The player to attach to the entity</param>
+        /// <param name="force">Whether to kick any existing players from the entity</param>
+        /// <returns>Whether the attach succeeded, or not.</returns>
+        public bool Attach(IEntity entity, IPlayerSession player, bool force = false)
+        {
+            return Attach(entity, player, false, out _);
+        }
+
+        /// <summary>
+        ///     Attaches a player session to an entity, optionally kicking any sessions already attached to it.
+        /// </summary>
+        /// <param name="entity">The entity to attach the player to</param>
+        /// <param name="player">The player to attach to the entity</param>
+        /// <param name="force">Whether to kick any existing players from the entity</param>
+        /// <param name="forceKicked">The player that was forcefully kicked, or null.</param>
+        /// <returns>Whether the attach succeeded, or not.</returns>
+        public bool Attach(IEntity entity, IPlayerSession player, bool force, out IPlayerSession? forceKicked)
+        {
+            // Null by default.
+            forceKicked = null;
+
             // Cannot attach to a deleted entity.
-            if (args.Entity.Deleted)
+            if (entity.Deleted)
             {
-                args.Result = false;
-                return;
+                return false;
             }
 
-            var uid = args.Entity.Uid;
+            var uid = entity.Uid;
 
             // Check if there was a player attached to the entity already...
             if (ComponentManager.TryGetComponent(uid, out ActorComponent actor))
             {
                 // If we're not forcing the attach, this fails.
-                if (!args.Force)
+                if (!force)
                 {
-                    args.Result = false;
-                    return;
+                    return false;
                 }
 
                 // Set the event's force-kicked session before detaching it.
-                args.ForceKicked = actor.PlayerSession;
+                forceKicked = actor.PlayerSession;
 
                 // This detach cannot fail, as a player is attached to this entity.
                 // It's important to note that detaching the player removes the component.
@@ -50,18 +76,16 @@ namespace Robust.Server.GameObjects
             }
 
             // We add the actor component.
-            actor = ComponentManager.AddComponent<ActorComponent>(args.Entity);
-            actor.PlayerSession = args.Player;
-            args.Player.SetAttachedEntity(args.Entity);
-            args.Result = true;
-
-            // TODO: Remove component message.
-            args.Entity.SendMessage(actor, new PlayerAttachedMsg(args.Player));
+            actor = ComponentManager.AddComponent<ActorComponent>(entity);
+            actor.PlayerSession = player;
+            player.SetAttachedEntity(entity);
 
             // The player is fully attached now, raise an event!
-            RaiseLocalEvent(uid, new PlayerAttachedEvent(args.Entity, args.Player));
+            RaiseLocalEvent(uid, new PlayerAttachedEvent(entity, player, forceKicked));
+            return true;
         }
 
+        // Not gonna make this method call Detach as all we have to do is remove a component...
         private void OnActorPlayerDetach(EntityUid uid, ActorComponent component, DetachPlayerEvent args)
         {
             // Removing the component will call shutdown, and our subscription will handle the rest of the detach logic.
@@ -69,15 +93,39 @@ namespace Robust.Server.GameObjects
             args.Result = true;
         }
 
+        /// <summary>
+        ///     Detaches an attached session from the entity, if any.
+        /// </summary>
+        /// <param name="entity">The entity player sessions will be detached from.</param>
+        /// <returns>Whether any player session was detached.</returns>
+        public bool Detach(IEntity entity)
+        {
+            if (!entity.HasComponent<ActorComponent>())
+                return false;
+
+            // Removing the component will call shutdown, and our subscription will handle the rest of the detach logic.
+            entity.RemoveComponent<ActorComponent>();
+            return true;
+        }
+
+        /// <summary>
+        ///     Detaches this player from its attached entity, if any.
+        /// </summary>
+        /// <param name="player">The player session that will be detached from any attached entities.</param>
+        /// <returns>Whether the player is now detached from any entities.
+        /// This returns true if the player wasn't attached to any entity.</returns>
+        public bool Detach(IPlayerSession player)
+        {
+            var entity = player.AttachedEntity;
+            return entity == null || Detach(entity);
+        }
+
         private void OnActorShutdown(EntityUid uid, ActorComponent component, ComponentShutdown args)
         {
             component.PlayerSession.SetAttachedEntity(null);
 
             var entity = EntityManager.GetEntity(uid);
 
-            // TODO: Remove component message.
-            entity.SendMessage(component, new PlayerDetachedMsg(component.PlayerSession));
-
             // The player is fully detached now that the component has shut down.
             RaiseLocalEvent(uid, new PlayerDetachedEvent(entity, component.PlayerSession));
         }
@@ -86,7 +134,7 @@ namespace Robust.Server.GameObjects
     /// <summary>
     ///     Raise this broadcast event to attach a player to an entity, optionally detaching the player attached to it.
     /// </summary>
-    public class AttachPlayerEvent : EntityEventArgs
+    public sealed class AttachPlayerEvent : EntityEventArgs
     {
         /// <summary>
         ///     Player to attach to the entity.
@@ -131,7 +179,7 @@ namespace Robust.Server.GameObjects
     /// <summary>
     ///     Raise this directed event to detach a player from an entity.
     /// </summary>
-    public class DetachPlayerEvent : EntityEventArgs
+    public sealed class DetachPlayerEvent : EntityEventArgs
     {
         /// <summary>
         ///     Whether the player was detached correctly.
@@ -144,22 +192,28 @@ namespace Robust.Server.GameObjects
     /// <summary>
     ///     Event for when a player has been attached to an entity.
     /// </summary>
-    public class PlayerAttachedEvent : EntityEventArgs
+    public sealed class PlayerAttachedEvent : EntityEventArgs
     {
         public IEntity Entity { get; }
         public IPlayerSession Player { get; }
 
-        public PlayerAttachedEvent(IEntity entity, IPlayerSession player)
+        /// <summary>
+        ///     The player session that was forcefully kicked from the entity, if any.
+        /// </summary>
+        public IPlayerSession? Kicked { get; }
+
+        public PlayerAttachedEvent(IEntity entity, IPlayerSession player, IPlayerSession? kicked = null)
         {
             Entity = entity;
             Player = player;
+            Kicked = kicked;
         }
     }
 
     /// <summary>
     ///     Event for when a player has been detached from an entity.
     /// </summary>
-    public class PlayerDetachedEvent : EntityEventArgs
+    public sealed class PlayerDetachedEvent : EntityEventArgs
     {
         public IEntity Entity { get; }
         public IPlayerSession Player { get; }

Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupNode.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
@@ -7,7 +8,7 @@ namespace Robust.Server.GameObjects
     internal sealed class GridTileLookupNode
     {
         internal GridTileLookupChunk ParentChunk { get; }
-        
+
         internal Vector2i Indices { get; }
 
         internal IEnumerable<IEntity> Entities
@@ -17,7 +18,18 @@ namespace Robust.Server.GameObjects
                 foreach (var entity in _entities)
                 {
                     if (!entity.Deleted)
+                    {
                         yield return entity;
+                    }
+
+                    if (!entity.TryGetComponent(out ContainerManagerComponent? containerManager)) continue;
+                    foreach (var container in containerManager.GetAllContainers())
+                    {
+                        foreach (var child in container.ContainedEntities)
+                        {
+                            yield return child;
+                        }
+                    }
                 }
             }
         }
@@ -29,7 +41,7 @@ namespace Robust.Server.GameObjects
             ParentChunk = parentChunk;
             Indices = indices;
         }
-        
+
         internal void AddEntity(IEntity entity)
         {
             _entities.Add(entity);

Robust.Server/GameObjects/EntitySystems/TileLookup/GridTileLookupSystem.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
+using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
@@ -16,6 +17,7 @@ namespace Robust.Server.GameObjects
     [UsedImplicitly]
     public sealed class GridTileLookupSystem : EntitySystem
     {
+        [Dependency] private readonly IEntityLookup _lookup = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
 
         private readonly Dictionary<GridId, Dictionary<Vector2i, GridTileLookupChunk>> _graph =
@@ -198,12 +200,10 @@ namespace Robust.Server.GameObjects
 
         private Box2 GetEntityBox(IEntity entity)
         {
-            // Need to clip the aabb as anything with an edge intersecting another tile might be picked up, such as walls.
-            if (entity.TryGetComponent(out IPhysBody? physics))
-                return new Box2(physics.GetWorldAABB().BottomLeft + 0.01f, physics.GetWorldAABB().TopRight - 0.01f);
+            var aabb = _lookup.GetWorldAabbFromEntity(entity);
 
-            // Don't want to accidentally get neighboring tiles unless we're near an edge
-            return Box2.CenteredAround(entity.Transform.Coordinates.ToMapPos(EntityManager), Vector2.One / 2);
+            // Need to clip the aabb as anything with an edge intersecting another tile might be picked up, such as walls.
+            return aabb.Scale(0.98f);
         }
 
         public override void Initialize()
@@ -213,6 +213,8 @@ namespace Robust.Server.GameObjects
             SubscribeNetworkEvent<RequestGridTileLookupMessage>(HandleRequest);
             #endif
             SubscribeLocalEvent<MoveEvent>(HandleEntityMove);
+            SubscribeLocalEvent<EntInsertedIntoContainerMessage>(HandleContainerInsert);
+            SubscribeLocalEvent<EntRemovedFromContainerMessage>(HandleContainerRemove);
             SubscribeLocalEvent<EntityInitializedMessage>(HandleEntityInitialized);
             SubscribeLocalEvent<EntityDeletedMessage>(HandleEntityDeleted);
             _mapManager.OnGridCreated += HandleGridCreated;
@@ -220,6 +222,16 @@ namespace Robust.Server.GameObjects
             _mapManager.TileChanged += HandleTileChanged;
         }
 
+        private void HandleContainerRemove(EntRemovedFromContainerMessage ev)
+        {
+            HandleEntityAdd(ev.Entity);
+        }
+
+        private void HandleContainerInsert(EntInsertedIntoContainerMessage ev)
+        {
+            HandleEntityRemove(ev.Entity);
+        }
+
         public override void Shutdown()
         {
             base.Shutdown();
@@ -239,6 +251,11 @@ namespace Robust.Server.GameObjects
 
         private void HandleEntityInitialized(EntityInitializedMessage message)
         {
+            if (message.Entity.IsInContainer())
+            {
+                return;
+            }
+
             HandleEntityAdd(message.Entity);
         }
 

Robust.Server/GameStates/EntityViewCulling.cs

@@ -213,7 +213,8 @@ namespace Robust.Server.GameStates
                         new TransformComponent.TransformComponentState(Vector2NaN,
                             oldState.Rotation,
                             oldState.ParentID,
-                            oldState.NoLocalRotation)
+                            oldState.NoLocalRotation,
+                            oldState.Anchored)
                     }));
             }
 

Robust.Server/GameStates/ServerGameStateManager.cs

@@ -183,6 +183,8 @@ namespace Robust.Server.GameStates
                     oldestAck = lastAck;
                 }
 
+                DebugTools.Assert(state.MapData?.CreatedMaps is null || (state.MapData?.CreatedMaps is not null && state.EntityStates is not null), "Sending new maps, but no entity state.");
+
                 // actually send the state
                 var stateUpdateMessage = _networkManager.CreateNetMessage<MsgState>();
                 stateUpdateMessage.State = state;
@@ -296,10 +298,8 @@ namespace Robust.Server.GameStates
 
                 DebugTools.Assert(entity.Initialized);
 
-                if (entity.LastModifiedTick <= fromTick)
-                    continue;
-
-                stateEntities.Add(GetEntityState(entityMan.ComponentManager, player, entity.Uid, fromTick));
+                if (entity.LastModifiedTick >= fromTick)
+                    stateEntities.Add(GetEntityState(entityMan.ComponentManager, player, entity.Uid, fromTick));
             }
 
             // no point sending an empty collection

Robust.Server/Player/PlayerSession.cs

@@ -117,11 +117,7 @@ namespace Robust.Server.Player
             if (entity == null)
                 return;
 
-            // This event needs to be broadcast.
-            var attachPlayer = new AttachPlayerEvent(entity, this);
-            entity.EntityManager.EventBus.RaiseLocalEvent(entity.Uid, attachPlayer);
-
-            if (!attachPlayer.Result)
+            if (!EntitySystem.Get<ActorSystem>().Attach(entity, this))
             {
                 Logger.Warning($"Couldn't attach player \"{this}\" to entity \"{entity}\"! Did it have a player already attached to it?");
             }
@@ -133,10 +129,19 @@ namespace Robust.Server.Player
             if (AttachedEntity == null)
                 return;
 
-            var detachPlayer = new DetachPlayerEvent();
-            AttachedEntity.EntityManager.EventBus.RaiseLocalEvent(AttachedEntity.Uid, detachPlayer, false);
+#if EXCEPTION_TOLERANCE
+            if (AttachedEntity.Deleted)
+            {
+                Logger.Warning($"Player \"{this}\" was attached to an entity that was deleted. THIS SHOULD NEVER HAPPEN, BUT DOES.");
+                // We can't contact ActorSystem because trying to fire an entity event would crash.
+                // Work around it.
+                AttachedEntity = null;
+                UpdatePlayerState();
+                return;
+            }
+#endif
 
-            if (!detachPlayer.Result)
+            if (!EntitySystem.Get<ActorSystem>().Detach(AttachedEntity))
             {
                 Logger.Warning($"Couldn't detach player \"{this}\" to entity \"{AttachedEntity}\"! Is it missing an ActorComponent?");
             }

Robust.Server/Program.cs

@@ -98,7 +98,7 @@ namespace Robust.Server
 
         internal static void SetupLogging()
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (OperatingSystem.IsWindows())
             {
 #if WINDOWS_USE_UTF8_CONSOLE
                 System.Console.OutputEncoding = Encoding.UTF8;

Robust.Server/ServerIoC.cs

@@ -37,6 +37,7 @@ namespace Robust.Server
 
             IoCManager.Register<IBaseServer, BaseServer>();
             IoCManager.Register<IBaseServerInternal, BaseServer>();
+            IoCManager.Register<BaseServer, BaseServer>();
             IoCManager.Register<IGameTiming, GameTiming>();
             IoCManager.Register<IComponentFactory, ServerComponentFactory>();
             IoCManager.Register<IConGroupController, ConGroupController>();

Robust.Server/Utility/WindowsTickPeriod.cs

@@ -11,7 +11,7 @@ namespace Robust.Server.Utility
 
         public static void TimeBeginPeriod(uint period)
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (!OperatingSystem.IsWindows())
                 throw new InvalidOperationException();
 
             var ret = timeBeginPeriod(period);
@@ -21,7 +21,7 @@ namespace Robust.Server.Utility
 
         public static void TimeEndPeriod(uint period)
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (!OperatingSystem.IsWindows())
                 throw new InvalidOperationException();
 
             var ret = timeEndPeriod(period);

Robust.Shared/Asynchronous/TaskManager.cs

@@ -14,6 +14,11 @@ namespace Robust.Shared.Asynchronous
         public void Initialize()
         {
             _mainThreadContext = new RobustSynchronizationContext(_runtimeLog);
+            ResetSynchronizationContext();
+        }
+
+        public void ResetSynchronizationContext()
+        {
             SynchronizationContext.SetSynchronizationContext(_mainThreadContext);
         }
 

Robust.Shared/CVars.cs

@@ -73,7 +73,7 @@ namespace Robust.Shared
         // just has the Lidgren thread go absolute brr polling.
         public static readonly CVarDef<float> NetPredictLagBias = CVarDef.Create(
                 "net.predict_lag_bias",
-                RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? 0.016f : 0,
+                OperatingSystem.IsWindows() ? 0.016f : 0,
                 CVar.ARCHIVE);
 
         public static readonly CVarDef<int> NetStateBufMergeThreshold =

Robust.Shared/Containers/BaseContainer.cs

@@ -68,6 +68,10 @@ namespace Robust.Shared.Containers
             InternalInsert(toinsert);
             transform.AttachParent(Owner.Transform);
 
+            // This is an edge case where the parent grid is the container being inserted into, so AttachParent would not unanchor.
+            if (transform.Anchored)
+                transform.Anchored = false;
+
             // spatially move the object to the location of the container. If you don't want this functionality, the
             // calling code can save the local position before calling this function, and apply it afterwords.
             transform.LocalPosition = Vector2.Zero;
@@ -147,7 +151,6 @@ namespace Robust.Shared.Containers
 
             Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new EntInsertedIntoContainerMessage(toinsert, this));
             Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new UpdateContainerOcclusionMessage(toinsert));
-            Manager.Owner.SendMessage(Manager, new ContainerContentsModifiedMessage(this, toinsert, false));
             Manager.Dirty();
         }
 
@@ -164,7 +167,6 @@ namespace Robust.Shared.Containers
 
             Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new EntRemovedFromContainerMessage(toremove, this));
             Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new UpdateContainerOcclusionMessage(toremove));
-            Manager.Owner.SendMessage(Manager, new ContainerContentsModifiedMessage(this, toremove, true));
             Manager.Dirty();
         }
     }

Robust.Shared/Containers/ContainerContentsModifiedMessage.cs

@@ -1,40 +0,0 @@
-using System;
-using Robust.Shared.GameObjects;
-
-namespace Robust.Shared.Containers
-{
-    /// <summary>
-    /// The contents of this container have been changed.
-    /// </summary>
-    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
-    public class ContainerContentsModifiedMessage : ComponentMessage
-    {
-        /// <summary>
-        /// Container whose contents were modified.
-        /// </summary>
-        public IContainer Container { get; }
-
-        /// <summary>
-        /// Entity that was added or removed from the container.
-        /// </summary>
-        public IEntity Entity { get; }
-
-        /// <summary>
-        /// If true, the entity was removed. If false, it was added to the container.
-        /// </summary>
-        public bool Removed { get; }
-
-        /// <summary>
-        /// Constructs a new instance of <see cref="ContainerContentsModifiedMessage"/>.
-        /// </summary>
-        /// <param name="container">Container whose contents were modified.</param>
-        /// <param name="entity">Entity that was added or removed in the container.</param>
-        /// <param name="removed">If true, the entity was removed. If false, it was added to the container.</param>
-        public ContainerContentsModifiedMessage(IContainer container, IEntity entity, bool removed)
-        {
-            Container = container;
-            Entity = entity;
-            Removed = removed;
-        }
-    }
-}

Robust.Shared/Containers/ContainerManagerComponent.cs

@@ -33,7 +33,7 @@ namespace Robust.Shared.Containers
         public sealed override uint? NetID => NetIDs.CONTAINER_MANAGER;
 
         /// <inheritdoc />
-        public override void OnRemove()
+        protected override void OnRemove()
         {
             base.OnRemove();
 
@@ -47,7 +47,7 @@ namespace Robust.Shared.Containers
         }
 
         /// <inheritdoc />
-        public override void Initialize()
+        protected override void Initialize()
         {
             base.Initialize();
 

Robust.Shared/ContentPack/ModLoader.cs

@@ -106,8 +106,16 @@ namespace Robust.Shared.ContentPack
                 Logger.DebugS("res.mod", $"Verified assemblies in {checkerSw.ElapsedMilliseconds}ms");
             }
 
+            var nodes = TopologicalSort.FromBeforeAfter(
+                files,
+                kv => kv.Key,
+                kv => kv.Value.Path,
+                _ => Array.Empty<string>(),
+                kv => kv.Value.references,
+                allowMissing: true); // missing refs would be non-content assemblies so allow that.
+
             // Actually load them in the order they depend on each other.
-            foreach (var path in TopologicalSortModules(files))
+            foreach (var path in TopologicalSort.Sort(nodes))
             {
                 Logger.DebugS("res.mod", $"Loading module: '{path}'");
                 try
@@ -136,38 +144,6 @@ namespace Robust.Shared.ContentPack
             return true;
         }
 
-        private static IEnumerable<ResourcePath> TopologicalSortModules(
-            IEnumerable<KeyValuePair<string, (ResourcePath Path, string[] references)>> modules)
-        {
-            var elems = modules.ToDictionary(
-                node => node.Key,
-                node => (node.Value.Path, refs: new HashSet<string>(node.Value.references)));
-
-            // Remove assembly references we aren't sorting for.
-            foreach (var (_, set) in elems.Values)
-            {
-                set.RemoveWhere(r => !elems.ContainsKey(r));
-            }
-
-            while (elems.Count > 0)
-            {
-                var elem = elems.FirstOrNull(x => x.Value.refs.Count == 0);
-                if (elem == null)
-                {
-                    throw new InvalidOperationException(
-                        "Found circular dependency in assembly dependency graph");
-                }
-
-                elems.Remove(elem.Value.Key);
-                foreach (var sElem in elems)
-                {
-                    sElem.Value.refs.Remove(elem.Value.Key);
-                }
-
-                yield return elem.Value.Value.Path;
-            }
-        }
-
         private static (string[] refs, string name) GetAssemblyReferenceData(Stream stream)
         {
             using var reader = new PEReader(stream);

Robust.Shared/ContentPack/PathHelpers.cs

@@ -60,8 +60,8 @@ namespace Robust.Shared.ContentPack
 
         // TODO: gaf
         public static bool IsFileSystemCaseSensitive() =>
-            !RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-            && !RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+            !OperatingSystem.IsWindows()
+            && !OperatingSystem.IsMacOS();
 
     }
 }

Robust.Shared/DllMapHelper.cs

@@ -33,12 +33,12 @@ namespace Robust.Shared
                     return IntPtr.Zero;
                 }
 
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                if (OperatingSystem.IsLinux())
                 {
                     return NativeLibrary.Load(linuxName, assembly, path);
                 }
 
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                if (OperatingSystem.IsMacOS())
                 {
                     return NativeLibrary.Load(macName, assembly, path);
                 }

Robust.Shared/GameObjects/Component.cs

@@ -41,31 +41,94 @@ namespace Robust.Shared.GameObjects
 
         /// <inheritdoc />
         [ViewVariables]
-        public bool Initialized { get; private set; }
+        public ComponentLifeStage LifeStage { get; private set; } = ComponentLifeStage.PreAdd;
 
-        private bool _running;
-        /// <inheritdoc />
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool Running
+        /// <summary>
+        /// Increases the life stage from <see cref="ComponentLifeStage.PreAdd" /> to <see cref="ComponentLifeStage.Added" />,
+        /// calling <see cref="OnAdd" />.
+        /// </summary>
+        internal void LifeAddToEntity()
         {
-            get => _running;
-            set
-            {
-                if(_running == value)
-                    return;
+            DebugTools.Assert(LifeStage == ComponentLifeStage.PreAdd);
 
-                if(value)
-                    Startup();
-                else
-                    Shutdown();
+            LifeStage = ComponentLifeStage.Adding;
+            OnAdd();
 
-                _running = value;
-            }
+            DebugTools.Assert(LifeStage == ComponentLifeStage.Added, $"Component {this.GetType().Name} did not call base {nameof(OnAdd)} in derived method.");
+        }
+
+        /// <summary>
+        /// Increases the life stage from <see cref="ComponentLifeStage.Added" /> to <see cref="ComponentLifeStage.Initialized" />,
+        /// calling <see cref="Initialize" />.
+        /// </summary>
+        internal void LifeInitialize()
+        {
+            DebugTools.Assert(LifeStage == ComponentLifeStage.Added);
+
+            LifeStage = ComponentLifeStage.Initializing;
+            Initialize();
+
+            DebugTools.Assert(LifeStage == ComponentLifeStage.Initialized, $"Component {this.GetType().Name} did not call base {nameof(Initialize)} in derived method.");
+        }
+
+        /// <summary>
+        /// Increases the life stage from <see cref="ComponentLifeStage.Initialized" /> to
+        /// <see cref="ComponentLifeStage.Running" />, calling <see cref="Startup" />.
+        /// </summary>
+        internal void LifeStartup()
+        {
+            DebugTools.Assert(LifeStage == ComponentLifeStage.Initialized);
+
+            LifeStage = ComponentLifeStage.Starting;
+            Startup();
+
+            DebugTools.Assert(LifeStage == ComponentLifeStage.Running, $"Component {this.GetType().Name} did not call base {nameof(Startup)} in derived method.");
+        }
+
+        /// <summary>
+        /// Increases the life stage from <see cref="ComponentLifeStage.Running" /> to <see cref="ComponentLifeStage.Stopped" />,
+        /// calling <see cref="Shutdown" />.
+        /// </summary>
+        /// <remarks>
+        /// Components are allowed to remove themselves in their own Startup function.
+        /// </remarks>
+        internal void LifeShutdown()
+        {
+            // Starting allows a component to remove itself in it's own Startup function.
+            DebugTools.Assert(LifeStage == ComponentLifeStage.Starting || LifeStage == ComponentLifeStage.Running);
+
+            LifeStage = ComponentLifeStage.Stopping;
+            Shutdown();
+
+            DebugTools.Assert(LifeStage == ComponentLifeStage.Stopped, $"Component {this.GetType().Name} did not call base {nameof(Shutdown)} in derived method.");
+        }
+
+        /// <summary>
+        /// Increases the life stage from <see cref="ComponentLifeStage.Stopped" /> to <see cref="ComponentLifeStage.Deleted" />,
+        /// calling <see cref="OnRemove" />.
+        /// </summary>
+        internal void LifeRemoveFromEntity()
+        {
+            // can be called at any time after PreAdd, including inside other life stage events.
+            DebugTools.Assert(LifeStage != ComponentLifeStage.PreAdd);
+
+            LifeStage = ComponentLifeStage.Removing;
+            OnRemove();
+
+            DebugTools.Assert(LifeStage == ComponentLifeStage.Deleted, $"Component {this.GetType().Name} did not call base {nameof(OnRemove)} in derived method.");
         }
 
         /// <inheritdoc />
         [ViewVariables]
-        public bool Deleted { get; private set; }
+        public bool Initialized => LifeStage >= ComponentLifeStage.Initializing;
+
+        /// <inheritdoc />
+        [ViewVariables]
+        public bool Running => ComponentLifeStage.Starting <= LifeStage && LifeStage <= ComponentLifeStage.Stopping;
+
+        /// <inheritdoc />
+        [ViewVariables]
+        public bool Deleted => LifeStage >= ComponentLifeStage.Removing;
 
         /// <inheritdoc />
         [ViewVariables]
@@ -91,87 +154,56 @@ namespace Robust.Shared.GameObjects
             return (EntityEventBus) Owner.EntityManager.EventBus;
         }
 
-        /// <inheritdoc />
-        public virtual void OnRemove()
+        /// <summary>
+        /// Called when the component gets added to an entity.
+        /// </summary>
+        protected virtual void OnAdd()
         {
-            if (Running)
-                throw new InvalidOperationException("Cannot Remove a running entity!");
-
-            // We have been marked for deletion by the Component Manager.
-            Deleted = true;
-            GetBus().RaiseComponentEvent(this, CompRemoveInstance);
+            CreationTick = Owner.EntityManager.CurrentTick;
+            GetBus().RaiseComponentEvent(this, CompAddInstance);
+            LifeStage = ComponentLifeStage.Added;
         }
 
         /// <summary>
-        ///     Called when the component gets added to an entity.
+        /// Called when all of the entity's other components have been added and are available,
+        /// But are not necessarily initialized yet. DO NOT depend on the values of other components to be correct.
         /// </summary>
-        public virtual void OnAdd()
+        protected virtual void Initialize()
         {
-            if (Initialized)
-                throw new InvalidOperationException("Cannot Add an Initialized component!");
-
-            if (Running)
-                throw new InvalidOperationException("Cannot Add a running component!");
-
-            if (Deleted)
-                throw new InvalidOperationException("Cannot Add a Deleted component!");
-
-            CreationTick = Owner.EntityManager.CurrentTick;
-            GetBus().RaiseComponentEvent(this, CompAddInstance);
-        }
-
-        /// <inheritdoc />
-        public virtual void Initialize()
-        {
-            if (Initialized)
-                throw new InvalidOperationException("Component already Initialized!");
-
-            if (Running)
-                throw new InvalidOperationException("Cannot Initialize a running component!");
-
-            if (Deleted)
-                throw new InvalidOperationException("Cannot Initialize a Deleted component!");
-
-            Initialized = true;
             GetBus().RaiseComponentEvent(this, CompInitInstance);
+            LifeStage = ComponentLifeStage.Initialized;
         }
 
         /// <summary>
         ///     Starts up a component. This is called automatically after all components are Initialized and the entity is Initialized.
-        ///     This can be called multiple times during the component's life, and at any time.
         /// </summary>
+        /// <remarks>
+        /// Components are allowed to remove themselves in their own Startup function.
+        /// </remarks>
         protected virtual void Startup()
         {
-            if (!Initialized)
-                throw new InvalidOperationException("Cannot Start an uninitialized component!");
-
-            if (Running)
-                throw new InvalidOperationException("Cannot Startup a running component!");
-
-            if (Deleted)
-                throw new InvalidOperationException("Cannot Start a Deleted component!");
-
-            _running = true;
             GetBus().RaiseComponentEvent(this, CompStartupInstance);
+            LifeStage = ComponentLifeStage.Running;
         }
 
         /// <summary>
-        ///     Shuts down the component. The is called Automatically by OnRemove. This can be called multiple times during
-        ///     the component's life, and at any time.
+        ///     Shuts down the component. The is called Automatically by OnRemove.
         /// </summary>
         protected virtual void Shutdown()
         {
-            if (!Initialized)
-                throw new InvalidOperationException("Cannot Shutdown an uninitialized component!");
-
-            if (!Running)
-                throw new InvalidOperationException("Cannot Shutdown an unstarted component!");
-
-            if (Deleted)
-                throw new InvalidOperationException("Cannot Shutdown a Deleted component!");
-
-            _running = false;
             GetBus().RaiseComponentEvent(this, CompShutdownInstance);
+            LifeStage = ComponentLifeStage.Stopped;
+        }
+
+        /// <summary>
+        /// Called when the component is removed from an entity.
+        /// Shuts down the component.
+        /// The component has already been marked as deleted in the component manager.
+        /// </summary>
+        protected virtual void OnRemove()
+        {
+            GetBus().RaiseComponentEvent(this, CompRemoveInstance);
+            LifeStage = ComponentLifeStage.Deleted;
         }
 
         /// <inheritdoc />
@@ -244,6 +276,67 @@ namespace Robust.Shared.GameObjects
         }
     }
 
+    /// <summary>
+    /// The life stages of an ECS component.
+    /// </summary>
+    public enum ComponentLifeStage
+    {
+        /// <summary>
+        /// The component has just been allocated.
+        /// </summary>
+        PreAdd = 0,
+
+        /// <summary>
+        /// Currently being added to an entity.
+        /// </summary>
+        Adding,
+
+        /// <summary>
+        /// Has been added to an entity.
+        /// </summary>
+        Added,
+
+        /// <summary>
+        /// Currently being initialized.
+        /// </summary>
+        Initializing,
+
+        /// <summary>
+        /// Has been initialized.
+        /// </summary>
+        Initialized,
+
+        /// <summary>
+        /// Currently being started up.
+        /// </summary>
+        Starting,
+
+        /// <summary>
+        /// Has started up.
+        /// </summary>
+        Running,
+
+        /// <summary>
+        /// Currently shutting down.
+        /// </summary>
+        Stopping,
+
+        /// <summary>
+        /// Has been shut down.
+        /// </summary>
+        Stopped,
+
+        /// <summary>
+        /// Currently being removed from it's entity.
+        /// </summary>
+        Removing,
+
+        /// <summary>
+        /// Removed from it's entity, and is deleted.
+        /// </summary>
+        Deleted,
+    }
+
     /// <summary>
     /// The component has been added to the entity. This is the first function
     /// to be called after the component has been allocated and (optionally) deserialized.

Robust.Shared/GameObjects/ComponentExt.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Shared.Log;
 
@@ -93,5 +94,21 @@ namespace Robust.Shared.GameObjects
 
             return entity.AddComponent<T>();
         }
+
+        public static IComponent SetAndDirtyIfChanged<TValue>(
+            this IComponent comp,
+            ref TValue backingField,
+            TValue value)
+        {
+            if (EqualityComparer<TValue>.Default.Equals(backingField, value))
+            {
+                return comp;
+            }
+
+            backingField = value;
+            comp.Dirty();
+
+            return comp;
+        }
     }
 }

Robust.Shared/GameObjects/ComponentManager.cs

@@ -164,19 +164,15 @@ namespace Robust.Shared.GameObjects
 
             _componentDependencyManager.OnComponentAdd(entity.Uid, component);
 
-            component.OnAdd();
+            component.LifeAddToEntity();
 
-            if (!entity.Initialized && !entity.Initializing) return;
+            if (!entity.Initialized && !entity.Initializing)
+                return;
 
-            component.Initialize();
-
-            DebugTools.Assert(component.Initialized, "Component is not initialized after calling Initialize(). "
-                                                     + "Did you forget to call base.Initialize() in an override?");
+            component.LifeInitialize();
 
             if (entity.Initialized)
-            {
-                component.Running = true;
-            }
+                component.LifeStartup();
         }
 
         /// <inheritdoc />
@@ -273,8 +269,11 @@ namespace Robust.Shared.GameObjects
                     return;
                 }
 
-                component.Running = false;
-                component.OnRemove();
+                if(component.Running)
+                    component.LifeShutdown();
+
+                if (component.LifeStage != ComponentLifeStage.PreAdd)
+                    component.LifeRemoveFromEntity();
                 _componentDependencyManager.OnComponentRemove(uid, component);
                 ComponentRemoved?.Invoke(this, new RemovedComponentEventArgs(component, uid));
 #if EXCEPTION_TOLERANCE
@@ -300,8 +299,12 @@ namespace Robust.Shared.GameObjects
                     return;
                 }
 
-                component.Running = false;
-                component.OnRemove(); // Sets delete
+                if(component.Running)
+                    component.LifeShutdown();
+
+                if(component.LifeStage != ComponentLifeStage.PreAdd)
+                    component.LifeRemoveFromEntity(); // Sets delete
+
                 ComponentRemoved?.Invoke(this, new RemovedComponentEventArgs(component, component.Owner.Uid));
 
             }

Robust.Shared/GameObjects/ComponentMessages/Messages.cs

@@ -1,45 +0,0 @@
-using System;
-using JetBrains.Annotations;
-
-namespace Robust.Shared.GameObjects
-{
-    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
-    public class RelayMovementEntityMessage : ComponentMessage
-    {
-        [PublicAPI]
-        public readonly IEntity Entity;
-
-        public RelayMovementEntityMessage(IEntity entity)
-        {
-            Entity = entity;
-        }
-    }
-
-    /// <summary>
-    ///     The entity transform parent has been changed.
-    /// </summary>
-    [Obsolete("Component Messages are deprecated, use Entity Events instead.")]
-    public class ParentChangedMessage : ComponentMessage
-    {
-        /// <summary>
-        ///     The new parent of the transform.
-        /// </summary>
-        public IEntity? NewParent { get; }
-
-        /// <summary>
-        ///     The old parent of the transform.
-        /// </summary>
-        public IEntity? OldParent { get; }
-
-        /// <summary>
-        ///     Constructs a new instance of <see cref="ParentChangedMessage"/>.
-        /// </summary>
-        /// <param name="newParent">The new parent of the transform.</param>
-        /// <param name="oldParent">The old parent of the transform.</param>
-        public ParentChangedMessage(IEntity? newParent, IEntity? oldParent)
-        {
-            NewParent = newParent;
-            OldParent = oldParent;
-        }
-    }
-}

Robust.Shared/GameObjects/Components/Collidable/PhysicsComponent.Physics.cs

@@ -62,8 +62,9 @@ namespace Robust.Shared.GameObjects
 
         /// <summary>
         ///     Store the body's index within the island so we can lookup its data.
+        ///     Key is Island's ID and value is our index.
         /// </summary>
-        public int IslandIndex { get; set; }
+        public Dictionary<int, int> IslandIndex { get; set; } = new();
 
         // TODO: Actually implement after the initial pr dummy
         /// <summary>
@@ -514,35 +515,23 @@ namespace Robust.Shared.GameObjects
             Dirty();
         }
 
-        public Box2 GetWorldAABB(IMapManager? mapManager = null)
+        public Box2 GetWorldAABB(Vector2? worldPos = null, Angle? worldRot = null)
         {
-            mapManager ??= IoCManager.Resolve<IMapManager>();
-            var bounds = new Box2();
+            worldPos ??= Owner.Transform.WorldPosition;
+            worldRot ??= Owner.Transform.WorldRotation;
+
+            var worldPosValue = worldPos.Value;
+            var worldRotValue = worldRot.Value;
+
+            var bounds = new Box2(worldPosValue, worldPosValue);
 
             foreach (var fixture in _fixtures)
             {
-                foreach (var (gridId, proxies) in fixture.Proxies)
-                {
-                    Vector2 offset;
-
-                    if (gridId == GridId.Invalid)
-                    {
-                        offset = Vector2.Zero;
-                    }
-                    else
-                    {
-                        offset = mapManager.GetGrid(gridId).WorldPosition;
-                    }
-
-                    foreach (var proxy in proxies)
-                    {
-                        var shapeBounds = proxy.AABB.Translated(offset);
-                        bounds = bounds.IsEmpty() ? shapeBounds : bounds.Union(shapeBounds);
-                    }
-                }
+                var boundy = fixture.Shape.CalculateLocalBounds(worldRotValue);
+                bounds = bounds.Union(boundy.Translated(worldPosValue));
             }
 
-            return bounds.IsEmpty() ? Box2.UnitCentered.Translated(Owner.Transform.WorldPosition) : bounds;
+            return bounds;
         }
 
         /// <inheritdoc />
@@ -1160,7 +1149,7 @@ namespace Robust.Shared.GameObjects
         }
 
         /// <inheritdoc />
-        public override void Initialize()
+        protected override void Initialize()
         {
             base.Initialize();
 
@@ -1265,7 +1254,7 @@ namespace Robust.Shared.GameObjects
             Logger.DebugS("physics", $"Removed joint id: {joint.ID} type: {joint.GetType().Name} from {Owner}");
         }
 
-        public override void OnRemove()
+        protected override void OnRemove()
         {
             base.OnRemove();
             // Need to do these immediately in case collision behaviors deleted the body

Robust.Shared/GameObjects/Components/CollisionWakeComponent.cs

@@ -38,7 +38,7 @@ namespace Robust.Shared.GameObjects
             Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new CollisionWakeStateMessage(), false);
         }
 
-        public override void OnRemove()
+        protected override void OnRemove()
         {
             base.OnRemove();
             if (Owner.TryGetComponent(out IPhysBody? body))

Robust.Shared/GameObjects/Components/DebugExceptionComponents.cs

@@ -17,7 +17,7 @@ namespace Robust.Shared.GameObjects
     {
         public override string Name => "DebugExceptionOnAdd";
 
-        public override void OnAdd() => throw new NotSupportedException();
+        protected override void OnAdd() => throw new NotSupportedException();
     }
 
     /// <summary>
@@ -27,7 +27,7 @@ namespace Robust.Shared.GameObjects
     {
         public override string Name => "DebugExceptionInitialize";
 
-        public override void Initialize() => throw new NotSupportedException();
+        protected override void Initialize() => throw new NotSupportedException();
     }
 
     /// <summary>

Robust.Shared/GameObjects/Components/IgnorePauseComponent.cs

@@ -8,13 +8,13 @@ namespace Robust.Shared.GameObjects
     {
         public override string Name => "IgnorePause";
 
-        public override void OnAdd()
+        protected override void OnAdd()
         {
             base.OnAdd();
             Owner.Paused = false;
         }
 
-        public override void OnRemove()
+        protected override void OnRemove()
         {
             base.OnRemove();
             if (IoCManager.Resolve<IPauseManager>().IsMapPaused(Owner.Transform.MapID))

Robust.Shared/GameObjects/Components/Map/MapGridComponent.cs

@@ -2,6 +2,8 @@ using System;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
@@ -18,6 +20,9 @@ namespace Robust.Shared.GameObjects
         GridId GridIndex { get; }
         IMapGrid Grid { get; }
         void ClearGridId();
+
+        bool AnchorEntity(ITransformComponent transform);
+        void UnanchorEntity(ITransformComponent transform);
     }
 
     /// <inheritdoc cref="IMapGridComponent"/>
@@ -47,12 +52,13 @@ namespace Robust.Shared.GameObjects
         [ViewVariables]
         public IMapGrid Grid => _mapManager.GetGrid(_gridIndex);
 
+        /// <inheritdoc />
         public void ClearGridId()
         {
             _gridIndex = GridId.Invalid;
         }
 
-        public override void Initialize()
+        protected override void Initialize()
         {
             base.Initialize();
             var mapId = Owner.Transform.MapID;
@@ -63,6 +69,50 @@ namespace Robust.Shared.GameObjects
             }
         }
 
+        /// <inheritdoc />
+        public bool AnchorEntity(ITransformComponent transform)
+        {
+            var xform = (TransformComponent) transform;
+            var tileIndices = Grid.TileIndicesFor(transform.Coordinates);
+            var result = Grid.AddToSnapGridCell(tileIndices, transform.Owner.Uid);
+
+            if (result)
+            {
+                xform.Parent = Owner.Transform;
+
+                // anchor snapping
+                xform.LocalRotation = xform.LocalRotation.GetCardinalDir().ToAngle();
+                xform.LocalPosition = Grid.GridTileToLocal(Grid.TileIndicesFor(xform.LocalPosition)).Position;
+
+                xform.SetAnchored(result);
+
+                if (xform.Owner.TryGetComponent<PhysicsComponent>(out var physicsComponent))
+                {
+                    physicsComponent.BodyType = BodyType.Static;
+                }
+            }
+
+            return result;
+        }
+
+        /// <inheritdoc />
+        public void UnanchorEntity(ITransformComponent transform)
+        {
+            //HACK: Client grid pivot causes this.
+            //TODO: make grid components the actual grid
+            if(GridIndex == GridId.Invalid)
+                return;
+
+            var xform = (TransformComponent)transform;
+            var tileIndices = Grid.TileIndicesFor(transform.Coordinates);
+            Grid.RemoveFromSnapGridCell(tileIndices, transform.Owner.Uid);
+            xform.SetAnchored(false);
+            if (xform.Owner.TryGetComponent<PhysicsComponent>(out var physicsComponent))
+            {
+                physicsComponent.BodyType = BodyType.Dynamic;
+            }
+        }
+
         /// <param name="player"></param>
         /// <inheritdoc />
         public override ComponentState GetComponentState(ICommonSession player)

Robust.Shared/GameObjects/Components/Transform/SnapGridComponent.cs

@@ -1,24 +1,14 @@
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
+using System;
 
 namespace Robust.Shared.GameObjects
 {
     /// <summary>
     /// Makes it possible to look this entity up with the snap grid.
     /// </summary>
+    [Obsolete("Use Transform.Anchored instead of this flag component.")]
     internal class SnapGridComponent : Component
     {
         /// <inheritdoc />
         public sealed override string Name => "SnapGrid";
-
-        /// <summary>
-        /// GridId the last time this component was moved.
-        /// </summary>
-        internal GridId LastGrid = GridId.Invalid;
-
-        /// <summary>
-        /// TileIndices the last time this component was moved.
-        /// </summary>
-        internal Vector2i LastTileIndices;
     }
 }

Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs

@@ -26,6 +26,8 @@ namespace Robust.Shared.GameObjects
         private Angle _localRotation; // local rotation
         [DataField("noRot")]
         private bool _noLocalRotation;
+        [DataField("anchored")]
+        private bool _anchored;
 
         private Matrix3 _localMatrix = Matrix3.Identity;
         private Matrix3 _invLocalMatrix = Matrix3.Identity;
@@ -111,6 +113,9 @@ namespace Robust.Shared.GameObjects
                 if (_localRotation.EqualsApprox(value, 0.00001))
                     return;
 
+                if(Anchored)
+                    return;
+
                 var oldRotation = _localRotation;
 
                 // Set _nextRotation to null to break any active lerps if this is a client side prediction.
@@ -160,6 +165,11 @@ namespace Robust.Shared.GameObjects
             get => !_parent.IsValid() ? null : Owner.EntityManager.GetEntity(_parent).Transform;
             set
             {
+                if (_anchored && value?.Owner.Uid != _parent)
+                {
+                    Anchored = false;
+                }
+
                 if (value != null)
                 {
                     AttachParent(value);
@@ -212,6 +222,7 @@ namespace Robust.Shared.GameObjects
             }
         }
 
+        [Obsolete("Use ContainerHelper to check if this entity is inside a container.")]
         public bool IsMapTransform => !Owner.IsInContainer();
 
         /// <inheritdoc />
@@ -261,6 +272,10 @@ namespace Robust.Shared.GameObjects
             // NOTE: This setter must be callable from before initialize (inheriting from AttachParent's note)
             set
             {
+                // unless the parent is changing, nothing to do here
+                if(value.EntityId == _parent && _anchored)
+                    return;
+
                 var oldPosition = Coordinates;
                 _localPosition = value.Position;
 
@@ -268,6 +283,9 @@ namespace Robust.Shared.GameObjects
 
                 if (value.EntityId != _parent)
                 {
+                    if(_parent != EntityUid.Invalid) // Allow setting Transform.Parent in Prototypes
+                        Anchored = false; // changing the parent un-anchors the entity
+
                     changedParent = true;
                     var newParentEnt = Owner.EntityManager.GetEntity(value.EntityId);
                     var newParent = newParentEnt.Transform;
@@ -284,16 +302,11 @@ namespace Robust.Shared.GameObjects
                     var newConcrete = (TransformComponent) newParent;
                     newConcrete._children.Add(uid);
 
-                    var oldParentOwner = oldParent?.Owner;
-                    var entMessage = new EntParentChangedMessage(Owner, oldParentOwner);
-                    var compMessage = new ParentChangedMessage(newParentEnt, oldParentOwner);
-
                     // offset position from world to parent
                     _parent = newParentEnt.Uid;
                     ChangeMapId(newConcrete.MapID);
 
-                    Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, entMessage);
-                    Owner.SendMessage(this, compMessage);
+                    Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new EntParentChangedMessage(Owner, oldParent?.Owner));
 
                     GridID = GetGridIndex();
                 }
@@ -310,7 +323,8 @@ namespace Robust.Shared.GameObjects
                     //TODO: This is a hack, look into WHY we can't call GridPosition before the comp is Running
                     if (Running)
                     {
-                        Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new MoveEvent(Owner, oldPosition, Coordinates));
+                        if(!oldPosition.Position.Equals(Coordinates.Position))
+                            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new MoveEvent(Owner, oldPosition, Coordinates));
                     }
                 }
                 else
@@ -330,6 +344,9 @@ namespace Robust.Shared.GameObjects
             get => _localPosition;
             set
             {
+                if(Anchored)
+                    return;
+
                 if (_localPosition.EqualsApprox(value, 0.00001))
                     return;
 
@@ -353,17 +370,38 @@ namespace Robust.Shared.GameObjects
         }
 
         /// <inheritdoc />
-        [ViewVariables]
+        [ViewVariables(VVAccess.ReadWrite)]
         public bool Anchored
         {
-            get => Owner.HasComponent<SnapGridComponent>();
+            get => _anchored;
             set
             {
-                if(value && !Owner.HasComponent<SnapGridComponent>())
-                    Owner.AddComponent<SnapGridComponent>();
-
-                else if(!value && Owner.HasComponent<SnapGridComponent>())
-                    Owner.RemoveComponent<SnapGridComponent>();
+                // This will be set again when the transform starts, actually anchoring it.
+                if (LifeStage < ComponentLifeStage.Starting)
+                {
+                    _anchored = value;
+                }
+                else if (LifeStage == ComponentLifeStage.Starting)
+                {
+                    if (value && _mapManager.TryFindGridAt(MapPosition, out var grid))
+                    {
+                        _anchored = Owner.EntityManager.GetEntity(grid.GridEntityId).GetComponent<IMapGridComponent>().AnchorEntity(this);
+                    }
+                }
+                else if (value && !_anchored && _mapManager.TryFindGridAt(MapPosition, out var grid))
+                {
+                    _anchored = Owner.EntityManager.GetEntity(grid.GridEntityId).GetComponent<IMapGridComponent>().AnchorEntity(this);
+                }
+                else if (!value && _anchored)
+                {
+                    // An anchored entity is always parented to the grid.
+                    // If Transform.Anchored is true in the prototype but the entity was not spawned with a grid as the parent,
+                    // then this will be false.
+                    if (Owner.EntityManager.ComponentManager.TryGetComponent<IMapGridComponent>(ParentUid, out var gridComp))
+                        gridComp.UnanchorEntity(this);
+                    else
+                        SetAnchored(false);
+                }
             }
         }
 
@@ -404,7 +442,7 @@ namespace Robust.Shared.GameObjects
         [ViewVariables] public EntityUid LerpParent { get; private set; }
 
         /// <inheritdoc />
-        public override void Initialize()
+        protected override void Initialize()
         {
             base.Initialize();
 
@@ -482,6 +520,10 @@ namespace Robust.Shared.GameObjects
         /// <inheritdoc />
         protected override void Startup()
         {
+            // Re-Anchor the entity if needed.
+            if (_anchored)
+                Anchored = true;
+
             base.Startup();
 
             // Keep the cached matrices in sync with the fields.
@@ -568,17 +610,14 @@ namespace Robust.Shared.GameObjects
                 return;
             }
 
+            Anchored = false;
+
             var oldConcrete = (TransformComponent) oldParent;
             var uid = Owner.Uid;
             oldConcrete._children.Remove(uid);
 
-            var oldParentOwner = oldParent?.Owner;
-
-            var entMessage = new EntParentChangedMessage(Owner, oldParentOwner);
-            var compMessage = new ParentChangedMessage(null, oldParentOwner);
             _parent = EntityUid.Invalid;
-            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, entMessage);
-            Owner.SendMessage(this, compMessage);
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new EntParentChangedMessage(Owner, oldParent?.Owner));
             var oldMapId = MapID;
             MapID = MapId.Nullspace;
 
@@ -687,7 +726,7 @@ namespace Robust.Shared.GameObjects
         /// <inheritdoc />
         public override ComponentState GetComponentState(ICommonSession player)
         {
-            return new TransformComponentState(_localPosition, LocalRotation, _parent, _noLocalRotation);
+            return new TransformComponentState(_localPosition, LocalRotation, _parent, _noLocalRotation, _anchored);
         }
 
         /// <inheritdoc />
@@ -737,6 +776,16 @@ namespace Robust.Shared.GameObjects
                 _prevPosition = newState.LocalPosition;
                 _prevRotation = newState.Rotation;
 
+                Anchored = newState.Anchored;
+
+                // This is not possible, because client entities don't exist on the server, so the parent HAS to be a shared entity.
+                // If this assert fails, the code above that sets the parent is broken.
+                DebugTools.Assert(!_parent.IsClientSide(), "Transform received a state, but is still parented to a client entity.");
+
+                // Whatever happened on the client, these should still be correct
+                DebugTools.Assert(ParentUid == newState.ParentID);
+                DebugTools.Assert(Anchored == newState.Anchored);
+
                 if (rebuildMatrices)
                 {
                     RebuildMatrices();
@@ -837,6 +886,11 @@ namespace Robust.Shared.GameObjects
             /// </summary>
             public readonly bool NoLocalRotation;
 
+            /// <summary>
+            /// True if the transform is anchored to a tile.
+            /// </summary>
+            public readonly bool Anchored;
+
             /// <summary>
             ///     Constructs a new state snapshot of a TransformComponent.
             /// </summary>
@@ -844,15 +898,24 @@ namespace Robust.Shared.GameObjects
             /// <param name="rotation">Current direction offset of this entity.</param>
             /// <param name="parentId">Current parent transform of this entity.</param>
             /// <param name="noLocalRotation"></param>
-            public TransformComponentState(Vector2 localPosition, Angle rotation, EntityUid parentId, bool noLocalRotation)
+            public TransformComponentState(Vector2 localPosition, Angle rotation, EntityUid parentId, bool noLocalRotation, bool anchored)
                 : base(NetIDs.TRANSFORM)
             {
                 LocalPosition = localPosition;
                 Rotation = rotation;
                 ParentID = parentId;
                 NoLocalRotation = noLocalRotation;
+                Anchored = anchored;
             }
         }
+
+        public void SetAnchored(bool value)
+        {
+            _anchored = value;
+            Dirty();
+
+            Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new AnchorStateChangedEvent());
+        }
     }
 
     /// <summary>
@@ -900,4 +963,9 @@ namespace Robust.Shared.GameObjects
         /// </summary>
         public Box2? WorldAABB { get; }
     }
+
+    /// <summary>
+    /// Raised when the Anchor state of the transform is changed.
+    /// </summary>
+    public class AnchorStateChangedEvent : EntityEventArgs { }
 }

Robust.Shared/GameObjects/Entity.cs

@@ -134,13 +134,13 @@ namespace Robust.Shared.GameObjects
                     _ => int.MaxValue
                 });
 
-            foreach (var comp in components)
+            foreach (var component in components)
             {
-                if (comp == null || comp.Initialized) continue;
+                var comp = (Component) component;
+                if (comp.Initialized)
+                    continue;
 
-                comp.Initialize();
-
-                DebugTools.Assert(comp.Initialized, $"Component {comp.Name} did not call base {nameof(comp.Initialize)} in derived method.");
+                comp.LifeInitialize();
             }
 
 #if DEBUG
@@ -173,11 +173,12 @@ namespace Robust.Shared.GameObjects
                     _ => int.MaxValue
                 });
 
-            foreach (var comp in comps)
+            foreach (var component in comps)
             {
-                if (comp != null && comp.Initialized && !comp.Deleted)
+                var comp = (Component) component;
+                if (comp.LifeStage == ComponentLifeStage.Initialized)
                 {
-                    comp.Running = true;
+                    comp.LifeStartup();
                 }
             }
         }

Robust.Shared/GameObjects/EntityEventBus.Broadcast.cs

@@ -24,6 +24,15 @@ namespace Robust.Shared.GameObjects
         void SubscribeEvent<T>(EventSource source, IEntityEventSubscriber subscriber,
             EntityEventHandler<T> eventHandler) where T : notnull;
 
+        void SubscribeEvent<T>(
+            EventSource source,
+            IEntityEventSubscriber subscriber,
+            EntityEventHandler<T> eventHandler,
+            Type orderType,
+            Type[]? before=null,
+            Type[]? after=null)
+            where T : notnull;
+
         /// <summary>
         /// Unsubscribes all event handlers of a given type.
         /// </summary>
@@ -137,7 +146,7 @@ namespace Robust.Shared.GameObjects
                 return;
 
             // UnsubscribeEvent modifies _inverseEventSubscriptions, requires val to be cached
-            foreach (var (type, (source, originalHandler, handler)) in val.ToList())
+            foreach (var (type, (source, originalHandler, handler, _)) in val.ToList())
             {
                 UnsubscribeEvent(source, type, originalHandler, handler, subscriber);
             }
@@ -154,7 +163,36 @@ namespace Robust.Shared.GameObjects
         }
 
         /// <inheritdoc />
-        public void SubscribeEvent<T>(EventSource source, IEntityEventSubscriber subscriber, EntityEventHandler<T> eventHandler) where T : notnull
+        public void SubscribeEvent<T>(
+            EventSource source,
+            IEntityEventSubscriber subscriber,
+            EntityEventHandler<T> eventHandler)
+            where T : notnull
+        {
+            SubscribeEventCommon(source, subscriber, eventHandler, null);
+        }
+
+        public void SubscribeEvent<T>(
+            EventSource source,
+            IEntityEventSubscriber subscriber,
+            EntityEventHandler<T> eventHandler,
+            Type orderType,
+            Type[]? before=null,
+            Type[]? after=null)
+            where T : notnull
+        {
+            var order = new OrderingData(orderType, before, after);
+
+            SubscribeEventCommon(source, subscriber, eventHandler, order);
+            HandleOrderRegistration(typeof(T), order);
+        }
+
+        private void SubscribeEventCommon<T>(
+            EventSource source,
+            IEntityEventSubscriber subscriber,
+            EntityEventHandler<T> eventHandler,
+            OrderingData? order)
+            where T : notnull
         {
             if (source == EventSource.None)
                 throw new ArgumentOutOfRangeException(nameof(source));
@@ -166,7 +204,7 @@ namespace Robust.Shared.GameObjects
                 throw new ArgumentNullException(nameof(subscriber));
 
             var eventType = typeof(T);
-            var subscriptionTuple = new Registration(source, eventHandler, ev => eventHandler((T) ev), eventHandler);
+            var subscriptionTuple = new Registration(source, eventHandler, ev => eventHandler((T) ev), eventHandler, order);
             if (!_eventSubscriptions.TryGetValue(eventType, out var subscriptions))
                 _eventSubscriptions.Add(eventType, new List<Registration> {subscriptionTuple});
             else if (!subscriptions.Any(p => p.Mask == source && p.Original == (Delegate) eventHandler))
@@ -184,7 +222,6 @@ namespace Robust.Shared.GameObjects
                     inverseSubscription
                 );
             }
-
             else if (!inverseSubscription.ContainsKey(eventType))
             {
                 inverseSubscription.Add(eventType, subscriptionTuple);
@@ -290,15 +327,13 @@ namespace Robust.Shared.GameObjects
                 });
             }
 
-
-
             _awaitingMessages.Add(type, (source, reg, tcs));
             return tcs.Task;
         }
 
         private void UnsubscribeEvent(EventSource source, Type eventType, Delegate originalHandler, EventHandler handler, IEntityEventSubscriber subscriber)
         {
-            var tuple = new Registration(source, originalHandler, handler, originalHandler);
+            var tuple = new Registration(source, originalHandler, handler, originalHandler, null);
             if (_eventSubscriptions.TryGetValue(eventType, out var subscriptions) && subscriptions.Contains(tuple))
                 subscriptions.Remove(tuple);
 
@@ -310,7 +345,11 @@ namespace Robust.Shared.GameObjects
         {
             var eventType = eventArgs.GetType();
 
-            if (_eventSubscriptions.TryGetValue(eventType, out var subs))
+            if (_orderedEvents.Contains(eventType))
+            {
+                ProcessSingleEventOrdered(source, eventArgs, eventType);
+            }
+            else if (_eventSubscriptions.TryGetValue(eventType, out var subs))
             {
                 foreach (var handler in subs)
                 {
@@ -319,25 +358,20 @@ namespace Robust.Shared.GameObjects
                 }
             }
 
-            if (_awaitingMessages.TryGetValue(eventType, out var awaiting))
-            {
-                var (mask, _, tcs) = awaiting;
-
-                if ((source & mask) != 0)
-                {
-                    tcs.TrySetResult(eventArgs);
-                    _awaitingMessages.Remove(eventType);
-                }
-            }
+            ProcessAwaitingMessages(source, eventArgs, eventType);
         }
 
         private void ProcessSingleEvent<T>(EventSource source, T eventArgs) where T : notnull
         {
             var eventType = typeof(T);
 
-            if (_eventSubscriptions.TryGetValue(eventType, out var subs))
+            if (_orderedEvents.Contains(eventType))
             {
-                foreach (var (mask, originalHandler, _) in subs)
+                ProcessSingleEventOrdered(source, eventArgs, eventType);
+            }
+            else if (_eventSubscriptions.TryGetValue(eventType, out var subs))
+            {
+                foreach (var (mask, originalHandler, _, _) in subs)
                 {
                     if ((mask & source) != 0)
                     {
@@ -347,6 +381,13 @@ namespace Robust.Shared.GameObjects
                 }
             }
 
+            ProcessAwaitingMessages(source, eventArgs, eventType);
+        }
+
+        // Generic here so we can avoid boxing alloc unless actually awaiting.
+        private void ProcessAwaitingMessages<T>(EventSource source, T eventArgs, Type eventType)
+            where T : notnull
+        {
             if (_awaitingMessages.TryGetValue(eventType, out var awaiting))
             {
                 var (mask1, _, tcs) = awaiting;
@@ -366,13 +407,20 @@ namespace Robust.Shared.GameObjects
 
             public readonly Delegate Original;
             public readonly EventHandler Handler;
+            public readonly OrderingData? Ordering;
 
-            public Registration(EventSource mask, Delegate original, EventHandler handler, object equalityToken)
+            public Registration(
+                EventSource mask,
+                Delegate original,
+                EventHandler handler,
+                object equalityToken,
+                OrderingData? ordering)
             {
                 Mask = mask;
                 Original = original;
                 Handler = handler;
                 EqualityToken = equalityToken;
+                Ordering = ordering;
             }
 
             public bool Equals(Registration other)
@@ -403,11 +451,16 @@ namespace Robust.Shared.GameObjects
                 return !left.Equals(right);
             }
 
-            public void Deconstruct(out EventSource mask, out Delegate originalHandler, out EventHandler handler)
+            public void Deconstruct(
+                out EventSource mask,
+                out Delegate originalHandler,
+                out EventHandler handler,
+                out OrderingData? order)
             {
                 mask = Mask;
                 originalHandler = Original;
                 handler = Handler;
+                order = Ordering;
             }
         }
     }

Robust.Shared/GameObjects/EntityEventBus.Directed.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Robust.Shared.GameObjects
 {
@@ -14,6 +16,12 @@ namespace Robust.Shared.GameObjects
             where TComp : IComponent
             where TEvent : EntityEventArgs;
 
+        void SubscribeLocalEvent<TComp, TEvent>(
+            ComponentEventHandler<TComp, TEvent> handler,
+            Type orderType, Type[]? before=null, Type[]? after=null)
+            where TComp : IComponent
+            where TEvent : EntityEventArgs;
+
         [Obsolete("Use the overload without the handler argument.")]
         void UnsubscribeLocalEvent<TComp, TEvent>(ComponentEventHandler<TComp, TEvent> handler)
             where TComp : IComponent
@@ -61,6 +69,12 @@ namespace Robust.Shared.GameObjects
         public void RaiseLocalEvent<TEvent>(EntityUid uid, TEvent args, bool broadcast = true)
             where TEvent : EntityEventArgs
         {
+            if (_orderedEvents.Contains(typeof(TEvent)))
+            {
+                RaiseLocalOrdered(uid, args, broadcast);
+                return;
+            }
+
             _eventTables.Dispatch(uid, typeof(TEvent), args);
 
             // we also broadcast it so the call site does not have to.
@@ -76,7 +90,24 @@ namespace Robust.Shared.GameObjects
             void EventHandler(EntityUid uid, IComponent comp, EntityEventArgs args)
                 => handler(uid, (TComp) comp, (TEvent) args);
 
-            _eventTables.Subscribe(typeof(TComp), typeof(TEvent), EventHandler);
+            _eventTables.Subscribe(typeof(TComp), typeof(TEvent), EventHandler, null);
+        }
+
+        public void SubscribeLocalEvent<TComp, TEvent>(
+            ComponentEventHandler<TComp, TEvent> handler,
+            Type orderType,
+            Type[]? before=null,
+            Type[]? after=null)
+            where TComp : IComponent
+            where TEvent : EntityEventArgs
+        {
+            void EventHandler(EntityUid uid, IComponent comp, EntityEventArgs args)
+                => handler(uid, (TComp) comp, (TEvent) args);
+
+            var orderData = new OrderingData(orderType, before, after);
+
+            _eventTables.Subscribe(typeof(TComp), typeof(TEvent), EventHandler, orderData);
+            HandleOrderRegistration(typeof(TEvent), orderData);
         }
 
         /// <inheritdoc />
@@ -105,7 +136,7 @@ namespace Robust.Shared.GameObjects
             private Dictionary<EntityUid, Dictionary<Type, HashSet<Type>>> _eventTables;
 
             // EventType -> CompType -> Handler
-            private Dictionary<Type, Dictionary<Type, DirectedEventHandler>> _subscriptions;
+            private Dictionary<Type, Dictionary<Type, (DirectedEventHandler handler, OrderingData? ordering)>> _subscriptions;
 
             // prevents shitcode, get your subscriptions figured out before you start spawning entities
             private bool _subscriptionLock;
@@ -148,25 +179,21 @@ namespace Robust.Shared.GameObjects
                 RemoveComponent(e.OwnerUid, e.Component.GetType());
             }
 
-            public void Subscribe(Type compType, Type eventType, DirectedEventHandler handler)
+            public void Subscribe(Type compType, Type eventType, DirectedEventHandler handler, OrderingData? order)
             {
                 if (_subscriptionLock)
                     throw new InvalidOperationException("Subscription locked.");
 
                 if (!_subscriptions.TryGetValue(compType, out var compSubs))
                 {
-                    compSubs = new Dictionary<Type, DirectedEventHandler>();
+                    compSubs = new Dictionary<Type, (DirectedEventHandler, OrderingData?)>();
                     _subscriptions.Add(compType, compSubs);
-
-                    compSubs.Add(eventType, handler);
                 }
-                else
-                {
-                    if (compSubs.ContainsKey(eventType))
-                        throw new InvalidOperationException($"Duplicate Subscriptions for comp={compType.Name}, event={eventType.Name}");
 
-                    compSubs.Add(eventType, handler);
-                }
+                if (compSubs.ContainsKey(eventType))
+                    throw new InvalidOperationException($"Duplicate Subscriptions for comp={compType.Name}, event={eventType.Name}");
+
+                compSubs.Add(eventType, (handler, order));
             }
 
             public void Unsubscribe(Type compType, Type eventType)
@@ -196,7 +223,8 @@ namespace Robust.Shared.GameObjects
             {
                 var eventTable = _eventTables[euid];
 
-                foreach (var type in GetReferences(compType))
+                var enumerator = GetReferences(compType);
+                while (enumerator.MoveNext(out var type))
                 {
                     if (!_subscriptions.TryGetValue(type, out var compSubs))
                         continue;
@@ -218,7 +246,8 @@ namespace Robust.Shared.GameObjects
             {
                 var eventTable = _eventTables[euid];
 
-                foreach (var type in GetReferences(compType))
+                var enumerator = GetReferences(compType);
+                while (enumerator.MoveNext(out var type))
                 {
                     if (!_subscriptions.TryGetValue(type, out var compSubs))
                         continue;
@@ -245,25 +274,53 @@ namespace Robust.Shared.GameObjects
                     if(!_subscriptions.TryGetValue(compType, out var compSubs))
                         return;
 
-                    if(!compSubs.TryGetValue(eventType, out var handler))
+                    if(!compSubs.TryGetValue(eventType, out var sub))
                         return;
 
+                    var (handler, _) = sub;
                     var component = _entMan.ComponentManager.GetComponent(euid, compType);
 
                     handler(euid, component, args);
                 }
             }
 
+            public void CollectOrdered(
+                EntityUid euid,
+                Type eventType,
+                List<(EventHandler, OrderingData?)> found)
+            {
+                var eventTable = _eventTables[euid];
+
+                if(!eventTable.TryGetValue(eventType, out var subscribedComps))
+                    return;
+
+                foreach (var compType in subscribedComps)
+                {
+                    if(!_subscriptions.TryGetValue(compType, out var compSubs))
+                        return;
+
+                    if(!compSubs.TryGetValue(eventType, out var sub))
+                        return;
+
+                    var (handler, order) = sub;
+                    var component = _entMan.ComponentManager.GetComponent(euid, compType);
+
+                    found.Add((ev => handler(euid, component, (EntityEventArgs) ev), order));
+                }
+            }
+
             public void DispatchComponent(EntityUid euid, IComponent component, Type eventType, EntityEventArgs args)
             {
-                foreach (var type in GetReferences(component.GetType()))
+                var enumerator = GetReferences(component.GetType());
+                while (enumerator.MoveNext(out var type))
                 {
                     if (!_subscriptions.TryGetValue(type, out var compSubs))
                         continue;
 
-                    if (!compSubs.TryGetValue(eventType, out var handler))
+                    if (!compSubs.TryGetValue(eventType, out var sub))
                         continue;
 
+                    var (handler, _) = sub;
                     handler(euid, component, args);
                 }
             }
@@ -294,9 +351,49 @@ namespace Robust.Shared.GameObjects
                 _subscriptions = null!;
             }
 
-            private IEnumerable<Type> GetReferences(Type type)
+            /// <summary>
+            ///     Enumerates the type's component references, returning the type itself last.
+            /// </summary>
+            private ReferencesEnumerator GetReferences(Type type)
             {
-                return _comFac.GetRegistration(type).References;
+                return new(type, _comFac.GetRegistration(type).References);
+            }
+
+            private struct ReferencesEnumerator
+            {
+                private readonly Type _baseType;
+                private readonly IReadOnlyList<Type> _list;
+                private readonly int _totalLength;
+                private int _idx;
+
+                public ReferencesEnumerator(Type baseType, IReadOnlyList<Type> list)
+                {
+                    _baseType = baseType;
+                    _list = list;
+                    _totalLength = list.Count;
+                    _idx = 0;
+                }
+
+                public bool MoveNext([NotNullWhen(true)] out Type? type)
+                {
+                    if (_idx >= _totalLength)
+                    {
+                        if (_idx++ == _totalLength)
+                        {
+                            type = _baseType;
+                            return true;
+                        }
+
+                        type = null;
+                        return false;
+                    }
+
+                    type = _list[_idx++];
+                    if (type == _baseType)
+                        return MoveNext(out type);
+
+                    return true;
+                }
             }
         }
 

Robust.Shared/GameObjects/EntityEventBus.Ordering.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Robust.Shared.Utility;
+
+namespace Robust.Shared.GameObjects
+{
+    internal partial class EntityEventBus
+    {
+        // TODO: Topological sort is currently done every time an event is emitted.
+        // This should be fine for low-volume stuff like interactions, but definitely not for anything high volume.
+        // Not sure if we could pre-cache the topological sort, here.
+
+        // Ordered event raising is slow so if this event has any ordering dependencies we use a slower path.
+        private readonly HashSet<Type> _orderedEvents = new();
+
+        private void ProcessSingleEventOrdered(EventSource source, object eventArgs, Type eventType)
+        {
+            var found = new List<(EventHandler, OrderingData?)>();
+
+            CollectBroadcastOrdered(source, eventType, found);
+
+            DispatchOrderedEvents(eventArgs, found);
+        }
+
+        private void CollectBroadcastOrdered(
+            EventSource source,
+            Type eventType,
+            List<(EventHandler, OrderingData?)> found)
+        {
+            if (!_eventSubscriptions.TryGetValue(eventType, out var subs))
+                return;
+
+            foreach (var handler in subs)
+            {
+                if ((handler.Mask & source) != 0)
+                    found.Add((handler.Handler, handler.Ordering));
+            }
+        }
+
+        private void RaiseLocalOrdered<TEvent>(
+            EntityUid uid,
+            TEvent args,
+            bool broadcast)
+            where TEvent : EntityEventArgs
+        {
+            var found = new List<(EventHandler, OrderingData?)>();
+
+            if (broadcast)
+                CollectBroadcastOrdered(EventSource.Local, typeof(TEvent), found);
+
+            _eventTables.CollectOrdered(uid, typeof(TEvent), found);
+
+            DispatchOrderedEvents(args, found);
+
+            if (broadcast)
+                ProcessAwaitingMessages(EventSource.Local, args, typeof(TEvent));
+        }
+
+        private static void DispatchOrderedEvents(object eventArgs, List<(EventHandler, OrderingData?)> found)
+        {
+            var nodes = TopologicalSort.FromBeforeAfter(
+                found.Where(f => f.Item2 != null),
+                n => n.Item2!.OrderType,
+                n => n.Item1!,
+                n => n.Item2!.Before ?? Array.Empty<Type>(),
+                n => n.Item2!.After ?? Array.Empty<Type>(),
+                allowMissing: true);
+
+            foreach (var handler in TopologicalSort.Sort(nodes))
+            {
+                handler(eventArgs);
+            }
+
+            // Go over all handlers that don't have ordering so weren't included in the sort.
+            foreach (var (handler, orderData) in found)
+            {
+                if (orderData == null)
+                    handler(eventArgs);
+            }
+        }
+
+        private void HandleOrderRegistration(Type eventType, OrderingData? data)
+        {
+            if (data == null)
+                return;
+
+            if (data.Before != null || data.After != null)
+                _orderedEvents.Add(eventType);
+        }
+
+        private sealed record OrderingData(Type OrderType, Type[]? Before, Type[]? After);
+
+    }
+}

Robust.Shared/GameObjects/EntityLifeState.cs

@@ -1,5 +1,8 @@
 namespace Robust.Shared.GameObjects
 {
+    /// <summary>
+    /// The life stages of an ECS Entity.
+    /// </summary>
     public enum EntityLifeStage
     {
         /// <summary>

Robust.Shared/GameObjects/EntityManager.cs

@@ -79,7 +79,6 @@ namespace Robust.Shared.GameObjects
             _eventBus = new EntityEventBus(this);
 
             ComponentManager.Initialize();
-            _componentManager.ComponentRemoved += (sender, args) => _eventBus.UnsubscribeEvents(args.Component);
         }
 
         public virtual void Startup()
@@ -158,9 +157,8 @@ namespace Robust.Shared.GameObjects
         {
             var newEntity = CreateEntity(prototypeName);
 
-            if (TryGetEntity(coordinates.EntityId, out var entity))
+            if (coordinates.IsValid(this))
             {
-                newEntity.Transform.AttachParent(entity);
                 newEntity.Transform.Coordinates = coordinates;
             }
 

Robust.Shared/GameObjects/EntitySystem.Subscriptions.cs

@@ -7,16 +7,22 @@ namespace Robust.Shared.GameObjects
     {
         private List<SubBase>? _subscriptions;
 
-        protected void SubscribeNetworkEvent<T>(EntityEventHandler<T> handler)
+        // NOTE: EntityEventHandler<T> and EntitySessionEventHandler<T> CANNOT BE ORDERED BETWEEN EACH OTHER.
+
+        protected void SubscribeNetworkEvent<T>(
+            EntityEventHandler<T> handler,
+            Type[]? before=null, Type[]? after=null)
             where T : notnull
         {
-            EntityManager.EventBus.SubscribeEvent(EventSource.Network, this, handler);
+            EntityManager.EventBus.SubscribeEvent(EventSource.Network, this, handler, GetType(), before, after);
 
             _subscriptions ??= new();
             _subscriptions.Add(new SubBroadcast<T>(EventSource.Network));
         }
 
-        protected void SubscribeNetworkEvent<T>(EntitySessionEventHandler<T> handler)
+        protected void SubscribeNetworkEvent<T>(
+            EntitySessionEventHandler<T> handler,
+            Type[]? before=null, Type[]? after=null)
             where T : notnull
         {
             EntityManager.EventBus.SubscribeSessionEvent(EventSource.Network, this, handler);
@@ -25,16 +31,20 @@ namespace Robust.Shared.GameObjects
             _subscriptions.Add(new SubBroadcast<EntitySessionMessage<T>>(EventSource.Network));
         }
 
-        protected void SubscribeLocalEvent<T>(EntityEventHandler<T> handler)
+        protected void SubscribeLocalEvent<T>(
+            EntityEventHandler<T> handler,
+            Type[]? before=null, Type[]? after=null)
             where T : notnull
         {
-            EntityManager.EventBus.SubscribeEvent(EventSource.Local, this, handler);
+            EntityManager.EventBus.SubscribeEvent(EventSource.Local, this, handler, GetType(), before, after);
 
             _subscriptions ??= new();
             _subscriptions.Add(new SubBroadcast<T>(EventSource.Local));
         }
 
-        protected void SubscribeLocalEvent<T>(EntitySessionEventHandler<T> handler)
+        protected void SubscribeLocalEvent<T>(
+            EntitySessionEventHandler<T> handler,
+            Type[]? before=null, Type[]? after=null)
             where T : notnull
         {
             EntityManager.EventBus.SubscribeSessionEvent(EventSource.Local, this, handler);
@@ -57,8 +67,9 @@ namespace Robust.Shared.GameObjects
             EntityManager.EventBus.UnsubscribeEvent<T>(EventSource.Local, this);
         }
 
-
-        protected void SubscribeLocalEvent<TComp, TEvent>(ComponentEventHandler<TComp, TEvent> handler)
+        protected void SubscribeLocalEvent<TComp, TEvent>(
+            ComponentEventHandler<TComp, TEvent> handler,
+            Type[]? before=null, Type[]? after=null)
             where TComp : IComponent
             where TEvent : EntityEventArgs
         {

Robust.Shared/GameObjects/EntitySystemManager.cs

@@ -114,7 +114,7 @@ namespace Robust.Shared.GameObjects
             {
                 Logger.DebugS("go.sys", "Initializing entity system {0}", type);
                 // Force IoC inject of all systems
-                var instance = _typeFactory.CreateInstanceUnchecked<IEntitySystem>(type);
+                var instance = _typeFactory.CreateInstanceUnchecked<IEntitySystem>(type, oneOff: true);
 
                 _systems.Add(type, instance);
 
@@ -166,15 +166,15 @@ namespace Robust.Shared.GameObjects
                 Dictionary<Type, IEntitySystem>.ValueCollection systems,
                 Dictionary<Type, IEntitySystem> supertypeSystems)
         {
-            var allNodes = new List<GraphNode<IEntitySystem>>();
-            var typeToNode = new Dictionary<Type, GraphNode<IEntitySystem>>();
+            var allNodes = new List<TopologicalSort.GraphNode<IEntitySystem>>();
+            var typeToNode = new Dictionary<Type, TopologicalSort.GraphNode<IEntitySystem>>();
 
             foreach (var system in systems)
             {
-                var node = new GraphNode<IEntitySystem>(system);
+                var node = new TopologicalSort.GraphNode<IEntitySystem>(system);
 
-                allNodes.Add(node);
                 typeToNode.Add(system.GetType(), node);
+                allNodes.Add(node);
             }
 
             foreach (var (type, system) in supertypeSystems)
@@ -183,52 +183,30 @@ namespace Robust.Shared.GameObjects
                 typeToNode[type] = node;
             }
 
-            foreach (var node in allNodes)
+            foreach (var node in typeToNode.Values)
             {
-                foreach (var after in node.System.UpdatesAfter)
+                foreach (var after in node.Value.UpdatesAfter)
                 {
                     var system = typeToNode[after];
 
-                    node.DependsOn.Add(system);
+                    system.Dependant.Add(node);
                 }
 
-                foreach (var before in node.System.UpdatesBefore)
+                foreach (var before in node.Value.UpdatesBefore)
                 {
                     var system = typeToNode[before];
 
-                    system.DependsOn.Add(node);
+                    node.Dependant.Add(system);
                 }
             }
 
-            var order = TopologicalSort(allNodes).Select(p => p.System).ToArray();
+            var order = TopologicalSort.Sort(allNodes).ToArray();
             var frameUpdate = order.Where(p => NeedsFrameUpdate(p.GetType()));
             var update = order.Where(p => NeedsUpdate(p.GetType()));
 
             return (frameUpdate, update);
         }
 
-        internal static IEnumerable<GraphNode<T>> TopologicalSort<T>(IEnumerable<GraphNode<T>> nodes)
-        {
-            var elems = nodes.ToDictionary(node => node,
-                node => new HashSet<GraphNode<T>>(node.DependsOn));
-            while (elems.Count > 0)
-            {
-                var elem =
-                    elems.FirstOrDefault(x => x.Value.Count == 0);
-                if (elem.Key == null)
-                {
-                    throw new InvalidOperationException(
-                        "Found circular dependency when resolving entity system update dependency graph");
-                }
-                elems.Remove(elem.Key);
-                foreach (var selem in elems)
-                {
-                    selem.Value.Remove(elem.Key);
-                }
-                yield return elem.Key;
-            }
-        }
-
         private static IEnumerable<Type> GetBaseTypes(Type type) {
             if(type.BaseType == null) return type.GetInterfaces();
 
@@ -344,18 +322,6 @@ namespace Robust.Shared.GameObjects
             return mFrameUpdate!.DeclaringType != typeof(EntitySystem);
         }
 
-        [DebuggerDisplay("GraphNode: {" + nameof(System) + "}")]
-        internal sealed class GraphNode<T>
-        {
-            public readonly T System;
-            public readonly List<GraphNode<T>> DependsOn = new();
-
-            public GraphNode(T system)
-            {
-                System = system;
-            }
-        }
-
         private struct UpdateReg
         {
             [ViewVariables] public IEntitySystem System;

Robust.Shared/GameObjects/IComponent.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
@@ -11,7 +11,7 @@ namespace Robust.Shared.GameObjects
     ///     All discoverable implementations of IComponent must override the <see cref="Name" />.
     ///     Instances are dynamically instantiated by a <c>ComponentFactory</c>, and will have their IoC Dependencies resolved.
     /// </remarks>
-    public interface IComponent : IEntityEventSubscriber
+    public interface IComponent
     {
         /// <summary>
         ///     Represents the network ID for the component.
@@ -34,6 +34,12 @@ namespace Robust.Shared.GameObjects
         /// </summary>
         bool Paused { get; }
 
+        /// <summary>
+        ///     The current lifetime stage of this component. You can use this to check
+        ///     if the component is initialized or being deleted.
+        /// </summary>
+        ComponentLifeStage LifeStage { get; }
+
         /// <summary>
         ///     Whether the client should synchronize component additions and removals.
         ///     If this is false and the component gets added or removed server side, the client will not do the same.
@@ -64,9 +70,9 @@ namespace Robust.Shared.GameObjects
         bool Initialized { get; }
 
         /// <summary>
-        ///     This is true when the component is active. Set this value to start or stop the component.
+        ///     This is true when the component is active.
         /// </summary>
-        bool Running { get; set; }
+        bool Running { get; }
 
         /// <summary>
         ///     True if the component has been removed from its owner, AKA deleted.
@@ -88,19 +94,6 @@ namespace Robust.Shared.GameObjects
         /// </summary>
         GameTick LastModifiedTick { get; }
 
-        /// <summary>
-        ///     Called when the component is removed from an entity.
-        ///     Shuts down the component.
-        ///     This should be called AFTER any inheriting classes OnRemove code has run. This should be last.
-        /// </summary>
-        void OnRemove();
-
-        /// <summary>
-        ///     Called when all of the entity's other components have been added and are available,
-        ///     But are not necessarily initialized yet. DO NOT depend on the values of other components to be correct.
-        /// </summary>
-        void Initialize();
-
         /// <summary>
         ///     Handles a local incoming component message.
         /// </summary>

Robust.Shared/GameObjects/Systems/EntityLookup.cs

@@ -278,7 +278,7 @@ namespace Robust.Shared.GameObjects
         {
             if (entity.TryGetComponent<IPhysBody>(out var component))
             {
-                return GetEntitiesIntersecting(entity.Transform.MapID, component.GetWorldAABB(_mapManager), approximate);
+                return GetEntitiesIntersecting(entity.Transform.MapID, component.GetWorldAABB(), approximate);
             }
 
             return GetEntitiesIntersecting(entity.Transform.Coordinates, approximate);
@@ -295,7 +295,7 @@ namespace Robust.Shared.GameObjects
         {
             if (entity.TryGetComponent(out IPhysBody? component))
             {
-                if (component.GetWorldAABB(_mapManager).Contains(mapPosition))
+                if (component.GetWorldAABB().Contains(mapPosition))
                     return true;
             }
             else
@@ -341,7 +341,7 @@ namespace Robust.Shared.GameObjects
         {
             if (entity.TryGetComponent<IPhysBody>(out var component))
             {
-                return GetEntitiesInRange(entity.Transform.MapID, component.GetWorldAABB(_mapManager), range, approximate);
+                return GetEntitiesInRange(entity.Transform.MapID, component.GetWorldAABB(), range, approximate);
             }
 
             return GetEntitiesInRange(entity.Transform.Coordinates, range, approximate);
@@ -476,10 +476,11 @@ namespace Robust.Shared.GameObjects
             if (ent.Deleted)
                 return new Box2(0, 0, 0, 0);
 
-            if (ent.TryGetComponent(out IPhysBody? collider))
-                return collider.GetWorldAABB(_mapManager);
-
             var pos = ent.Transform.WorldPosition;
+
+            if (ent.TryGetComponent(out IPhysBody? collider))
+                return collider.GetWorldAABB(pos);
+
             return new Box2(pos, pos);
         }
 

Robust.Shared/GameObjects/Systems/MapSystem.cs

@@ -0,0 +1,24 @@
+using JetBrains.Annotations;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+
+namespace Robust.Shared.GameObjects
+{
+    [UsedImplicitly]
+    internal sealed class MapSystem : EntitySystem
+    {
+        [Dependency] private readonly IMapManagerInternal _mapManager = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<MapGridComponent, ComponentRemove>(RemoveHandler);
+        }
+
+        private void RemoveHandler(EntityUid uid, MapGridComponent component, ComponentRemove args)
+        {
+            _mapManager.OnComponentRemoved(component);
+        }
+    }
+}

Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs

@@ -12,8 +12,10 @@ using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Controllers;
 using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Physics.Dynamics.Joints;
 using Robust.Shared.Reflection;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute;
 using Logger = Robust.Shared.Log.Logger;
 
@@ -107,6 +109,8 @@ namespace Robust.Shared.GameObjects
             SubscribeLocalEvent<EntRemovedFromContainerMessage>(HandleContainerRemoved);
             BuildControllers();
             Logger.DebugS("physics", $"Found {_controllers.Count} physics controllers.");
+
+            IoCManager.Resolve<IIslandManager>().Initialize();
         }
 
 
@@ -114,45 +118,24 @@ namespace Robust.Shared.GameObjects
         {
             var reflectionManager = IoCManager.Resolve<IReflectionManager>();
             var typeFactory = IoCManager.Resolve<IDynamicTypeFactory>();
-            var allControllerTypes = new List<Type>();
+            var instantiated = new List<VirtualController>();
 
             foreach (var type in reflectionManager.GetAllChildren(typeof(VirtualController)))
             {
-                if (type.IsAbstract) continue;
-                allControllerTypes.Add(type);
+                if (type.IsAbstract)
+                    continue;
+
+                instantiated.Add(typeFactory.CreateInstance<VirtualController>(type));
             }
 
-            var instantiated = new Dictionary<Type, VirtualController>();
+            var nodes = TopologicalSort.FromBeforeAfter(
+                instantiated,
+                c => c.GetType(),
+                c => c,
+                c => c.UpdatesBefore,
+                c => c.UpdatesAfter);
 
-            foreach (var type in allControllerTypes)
-            {
-                instantiated.Add(type, (VirtualController) typeFactory.CreateInstance(type));
-            }
-
-            // Build dependency graph, copied from EntitySystemManager *COUGH
-
-            var nodes = new Dictionary<Type, EntitySystemManager.GraphNode<VirtualController>>();
-
-            foreach (var (_, controller) in instantiated)
-            {
-                var node = new EntitySystemManager.GraphNode<VirtualController>(controller);
-                nodes[controller.GetType()] = node;
-            }
-
-            foreach (var (type, node) in nodes)
-            {
-                foreach (var before in instantiated[type].UpdatesBefore)
-                {
-                    nodes[before].DependsOn.Add(node);
-                }
-
-                foreach (var after in instantiated[type].UpdatesAfter)
-                {
-                    node.DependsOn.Add(nodes[after]);
-                }
-            }
-
-            _controllers = GameObjects.EntitySystemManager.TopologicalSort(nodes.Values).Select(c => c.System).ToList();
+            _controllers = TopologicalSort.Sort(nodes).ToList();
 
             foreach (var controller in _controllers)
             {
@@ -268,6 +251,25 @@ namespace Robust.Shared.GameObjects
             _maps[mapId].AddBody(physicsComponent);
         }
 
+        internal void FilterContactsForJoint(Joint joint)
+        {
+            var bodyA = joint.BodyA;
+            var bodyB = joint.BodyB;
+
+            var edge = bodyB.ContactEdges;
+            while (edge != null)
+            {
+                if (edge.Other == bodyA)
+                {
+                    // Flag the contact for filtering at the next time step (where either
+                    // body is awake).
+                    edge.Contact!.FilterFlag = true;
+                }
+
+                edge = edge.Next;
+            }
+        }
+
         /// <summary>
         ///     Simulates the physical world for a given amount of time.
         /// </summary>

Robust.Shared/GameObjects/Systems/SharedTransformSystem.cs

@@ -1,12 +1,50 @@
 using System.Collections.Generic;
+using System.Linq;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
 
 namespace Robust.Shared.GameObjects
 {
     internal class SharedTransformSystem : EntitySystem
     {
+        [Dependency] private readonly IMapManager _mapManager = default!;
+
         private readonly Queue<MoveEvent> _gridMoves = new();
         private readonly Queue<MoveEvent> _otherMoves = new();
 
+        public override void Initialize()
+        {
+            base.Initialize();
+            _mapManager.TileChanged += MapManagerOnTileChanged;
+        }
+
+        public override void Shutdown()
+        {
+            _mapManager.TileChanged -= MapManagerOnTileChanged;
+            base.Shutdown();
+        }
+
+        private void MapManagerOnTileChanged(object? sender, TileChangedEventArgs e)
+        {
+            if(e.NewTile.Tile != Tile.Empty)
+                return;
+
+            var grid = _mapManager.GetGrid(e.NewTile.GridIndex);
+            var tileIndices = e.NewTile.GridIndices;
+            UnanchorAllEntsOnTile(grid, tileIndices);
+        }
+
+        private void UnanchorAllEntsOnTile(IMapGrid grid, Vector2i tileIndices)
+        {
+            var anchoredEnts = grid.GetAnchoredEntities(tileIndices);
+
+            foreach (var ent in anchoredEnts.ToList()) // changing anchored modifies this set
+            {
+                ComponentManager.GetComponent<TransformComponent>(ent).Anchored = false;
+            }
+        }
+
         public void DeferMoveEvent(MoveEvent moveEvent)
         {
             if (moveEvent.Sender.HasComponent<IMapGridComponent>())

Robust.Shared/GameObjects/Systems/SnapGridSystem.cs

@@ -1,109 +1,25 @@
 using JetBrains.Annotations;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Robust.Shared.GameObjects
 {
     [UsedImplicitly]
     internal class SnapGridSystem : EntitySystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
-
         /// <inheritdoc />
         public override void Initialize()
         {
             base.Initialize();
 
             SubscribeLocalEvent<SnapGridComponent, ComponentStartup>(HandleComponentStartup);
-            SubscribeLocalEvent<SnapGridComponent, ComponentShutdown>(HandleComponentShutdown);
-            SubscribeLocalEvent<SnapGridComponent, MoveEvent>(HandleMoveEvent);
         }
 
         private void HandleComponentStartup(EntityUid uid, SnapGridComponent component, ComponentStartup args)
         {
             var transform = ComponentManager.GetComponent<ITransformComponent>(uid);
-            UpdatePosition(uid, transform, component);
-        }
+            transform.Anchored = true;
 
-        private void HandleComponentShutdown(EntityUid uid, SnapGridComponent component, ComponentShutdown args)
-        {
-            if (component.LastGrid == GridId.Invalid)
-                return;
-
-            var transform = ComponentManager.GetComponent<ITransformComponent>(uid);
-
-            if (_mapManager.TryGetGrid(component.LastGrid, out var grid))
-            {
-                var indices = grid.TileIndicesFor(transform.WorldPosition);
-                grid.RemoveFromSnapGridCell(indices, uid);
-                return;
-            }
-
-            component.LastGrid = GridId.Invalid;
-        }
-
-        private void HandleMoveEvent(EntityUid uid, SnapGridComponent component, MoveEvent args)
-        {
-            var transform = ComponentManager.GetComponent<ITransformComponent>(uid);
-            UpdatePosition(uid, transform, component);
-        }
-
-        private void UpdatePosition(EntityUid euid, ITransformComponent transform, SnapGridComponent snapComp)
-        {
-            if (snapComp.LastGrid != GridId.Invalid)
-            {
-                if (!_mapManager.TryGetGrid(snapComp.LastGrid, out var lastGrid))
-                {
-                    Logger.WarningS("go.comp.snapgrid", "Entity {0} snapgrid didn't find grid {1}. Race condition?", euid, transform.GridID);
-                    return;
-                }
-
-                lastGrid.RemoveFromSnapGridCell(snapComp.LastTileIndices, euid);
-            }
-
-            if (!_mapManager.TryGetGrid(transform.GridID, out var grid))
-            {
-                // Either a race condition, or we're not on any grids.
-                return;
-            }
-
-            var oldPos = snapComp.LastTileIndices;
-            var oldGrid = snapComp.LastGrid;
-
-            var newPos = grid.TileIndicesFor(transform.MapPosition);
-            var newGrid = transform.GridID;
-
-            grid.AddToSnapGridCell(newPos, euid);
-
-            if (oldPos != newPos || oldGrid != newGrid)
-            {
-                RaiseLocalEvent(euid, new SnapGridPositionChangedEvent(newPos, oldPos, newGrid, oldGrid));
-            }
-
-            snapComp.LastTileIndices = newPos;
-            snapComp.LastGrid = newGrid;
-        }
-    }
-
-    public class SnapGridPositionChangedEvent : EntityEventArgs
-    {
-        public GridId OldGrid { get; }
-        public GridId NewGrid { get; }
-
-        public bool SameGrid => OldGrid == NewGrid;
-
-        public Vector2i OldPosition { get; }
-        public Vector2i Position { get; }
-
-        public SnapGridPositionChangedEvent(Vector2i position, Vector2i oldPosition, GridId newGrid, GridId oldGrid)
-        {
-            Position = position;
-            OldPosition = oldPosition;
-
-            NewGrid = newGrid;
-            OldGrid = oldGrid;
+            // Remove us, we have been migrated.
+            ComponentManager.RemoveComponent<SnapGridComponent>(uid);
         }
     }
 }

Robust.Shared/GameStates/ComponentStateEvents.cs

@@ -0,0 +1,16 @@
+using Robust.Shared.GameObjects;
+
+namespace Robust.Shared.GameStates
+{
+    public class ComponentHandleState : EntityEventArgs
+    {
+        public ComponentState? Current { get; }
+        public ComponentState? Next { get; }
+
+        public ComponentHandleState(ComponentState? current, ComponentState? next)
+        {
+            Current = current;
+            Next = next;
+        }
+    }
+}

Robust.Shared/Input/Binding/CommandBindRegistry.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Robust.Shared.Log;
+using Robust.Shared.Utility;
 
 namespace Robust.Shared.Input.Binding
 {
@@ -13,8 +14,8 @@ namespace Robust.Shared.Input.Binding
         // handlers in the order they should be resolved for the given key function.
         // internally we use a graph to construct this but we render it down to a flattened
         // list so we don't need to do any graph traversal at query time
-        private Dictionary<BoundKeyFunction, List<InputCmdHandler>> _bindingsForKey =
-            new();
+        private Dictionary<BoundKeyFunction, List<InputCmdHandler>> _bindingsForKey = new();
+        private bool _graphDirty = false;
 
         /// <inheritdoc />
         public void Register<TOwner>(CommandBinds commandBinds)
@@ -41,12 +42,15 @@ namespace Robust.Shared.Input.Binding
                 _bindings.Add(new TypedCommandBind(owner, binding));
             }
 
-            RebuildGraph();
+            _graphDirty = true;
         }
 
         /// <inheritdoc />
         public IEnumerable<InputCmdHandler> GetHandlers(BoundKeyFunction function)
         {
+            if (_graphDirty)
+                RebuildGraph();
+
             if (_bindingsForKey.TryGetValue(function, out var handlers))
             {
                 return handlers;
@@ -58,7 +62,8 @@ namespace Robust.Shared.Input.Binding
         public void Unregister(Type owner)
         {
             _bindings.RemoveAll(binding => binding.ForType == owner);
-            RebuildGraph();
+
+            _graphDirty = true;
         }
 
         /// <inheritdoc />
@@ -67,7 +72,7 @@ namespace Robust.Shared.Input.Binding
             Unregister(typeof(TOwner));
         }
 
-        private void RebuildGraph()
+        internal void RebuildGraph()
         {
             _bindingsForKey.Clear();
 
@@ -77,6 +82,7 @@ namespace Robust.Shared.Input.Binding
 
             }
 
+            _graphDirty = false;
         }
 
         private Dictionary<BoundKeyFunction, List<TypedCommandBind>> FunctionToBindings()
@@ -105,16 +111,16 @@ namespace Robust.Shared.Input.Binding
             //TODO: Probably could be optimized if needed! Generally shouldn't be a big issue since there is a relatively
             // tiny amount of bindings
 
-            List<GraphNode> allNodes = new();
-            Dictionary<Type,List<GraphNode>> typeToNode = new();
+            List<TopologicalSort.GraphNode<TypedCommandBind>> allNodes = new();
+            Dictionary<Type,List<TopologicalSort.GraphNode<TypedCommandBind>>> typeToNode = new();
             // build the dict for quick lookup on type
             foreach (var binding in bindingsForFunction)
             {
                 if (!typeToNode.ContainsKey(binding.ForType))
                 {
-                    typeToNode[binding.ForType] = new List<GraphNode>();
+                    typeToNode[binding.ForType] = new List<TopologicalSort.GraphNode<TypedCommandBind>>();
                 }
-                var newNode = new GraphNode(binding);
+                var newNode = new TopologicalSort.GraphNode<TypedCommandBind>(binding);
                 typeToNode[binding.ForType].Add(newNode);
                 allNodes.Add(newNode);
             }
@@ -122,7 +128,7 @@ namespace Robust.Shared.Input.Binding
             //add the graph edges
             foreach (var curBinding in allNodes)
             {
-                foreach (var afterType in curBinding.TypedCommandBind.CommandBind.After)
+                foreach (var afterType in curBinding.Value.CommandBind.After)
                 {
                     // curBinding should always fire after bindings associated with this afterType, i.e.
                     // this binding DEPENDS ON afterTypes' bindings
@@ -130,11 +136,12 @@ namespace Robust.Shared.Input.Binding
                     {
                         foreach (var afterBinding in afterBindings)
                         {
-                            curBinding.DependsOn.Add(afterBinding);
+                            afterBinding.Dependant.Add(curBinding);
                         }
                     }
                 }
-                foreach (var beforeType in curBinding.TypedCommandBind.CommandBind.Before)
+
+                foreach (var beforeType in curBinding.Value.CommandBind.Before)
                 {
                     // curBinding should always fire before bindings associated with this beforeType, i.e.
                     // beforeTypes' bindings DEPENDS ON this binding
@@ -142,7 +149,7 @@ namespace Robust.Shared.Input.Binding
                     {
                         foreach (var beforeBinding in beforeBindings)
                         {
-                            beforeBinding.DependsOn.Add(curBinding);
+                            curBinding.Dependant.Add(beforeBinding);
                         }
                     }
                 }
@@ -151,54 +158,7 @@ namespace Robust.Shared.Input.Binding
             //TODO: Log graph structure for debugging
 
             //use toposort to build the final result
-            var topoSorted = TopologicalSort(allNodes, function);
-            List<InputCmdHandler> result = new();
-
-            foreach (var node in topoSorted)
-            {
-                result.Add(node.TypedCommandBind.CommandBind.Handler);
-            }
-
-            return result;
-        }
-
-        //Adapted from https://stackoverflow.com/a/24058279
-        private static IEnumerable<GraphNode> TopologicalSort(IEnumerable<GraphNode> nodes, BoundKeyFunction function)
-        {
-            var elems = nodes.ToDictionary(node => node,
-                node => new HashSet<GraphNode>(node.DependsOn));
-            while (elems.Count > 0)
-            {
-                var elem =
-                    elems.FirstOrDefault(x => x.Value.Count == 0);
-                if (elem.Key == null)
-                {
-                    throw new InvalidOperationException("Found circular dependency when resolving" +
-                                                        $" command binding handler order for key function {function.FunctionName}." +
-                                                        $" Please check the systems which register bindings for" +
-                                                        $" this function and eliminate the circular dependency.");
-                }
-                elems.Remove(elem.Key);
-                foreach (var selem in elems)
-                {
-                    selem.Value.Remove(elem.Key);
-                }
-                yield return elem.Key;
-            }
-        }
-
-        /// <summary>
-        /// node in our temporary dependency graph
-        /// </summary>
-        private class GraphNode
-        {
-            public List<GraphNode> DependsOn = new();
-            public readonly TypedCommandBind TypedCommandBind;
-
-            public GraphNode(TypedCommandBind typedCommandBind)
-            {
-                TypedCommandBind = typedCommandBind;
-            }
+            return TopologicalSort.Sort(allNodes).Select(c => c.CommandBind.Handler).ToList();
         }
 
         /// <summary>

Robust.Shared/IoC/DependencyCollection.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -38,6 +39,24 @@ namespace Robust.Shared.IoC
         private readonly Dictionary<Type, (InjectorDelegate? @delegate, object[]? services)> _injectorCache =
             new();
 
+        private readonly IDependencyCollection? _parentCollection;
+
+        public DependencyCollection() { }
+
+        public DependencyCollection(IDependencyCollection parentCollection)
+        {
+            _parentCollection = parentCollection;
+        }
+
+        /// <inheritdoc />
+        public bool TryResolveType(Type objectType, [MaybeNullWhen(false)] out object instance)
+        {
+            if(!_services.TryGetValue(objectType, out instance))
+                return _parentCollection is not null && _parentCollection.TryResolveType(objectType, out instance);
+
+            return true;
+        }
+
         /// <inheritdoc />
         public void Register<TInterface, TImplementation>(bool overwrite = false)
             where TImplementation : class, TInterface
@@ -57,8 +76,10 @@ namespace Robust.Shared.IoC
                 {
                     var param = constructorParams[index];
 
-                    if (_services.TryGetValue(param.ParameterType, out var instance))
+                    if (TryResolveType(param.ParameterType, out var instance))
+                    {
                         parameters[index] = instance;
+                    }
                     else
                     {
                         if (_resolveTypes.ContainsKey(param.ParameterType))
@@ -74,6 +95,7 @@ namespace Robust.Shared.IoC
             }, overwrite);
         }
 
+        /// <inheritdoc />
         public void Register<TInterface, TImplementation>(DependencyFactoryDelegate<TImplementation> factory, bool overwrite = false)
             where TImplementation : class, TInterface
         {
@@ -85,6 +107,48 @@ namespace Robust.Shared.IoC
             _pendingResolves.Enqueue(interfaceType);
         }
 
+        /// <inheritdoc />
+        public void Register(Type implementation, DependencyFactoryDelegate<object>? factory = null, bool overwrite = false)
+        {
+            CheckRegisterInterface(implementation, implementation, overwrite);
+
+            object DefaultFactory()
+            {
+                var constructors = implementation.GetConstructors();
+
+                if (constructors.Length != 1)
+                    throw new InvalidOperationException($"Dependency '{implementation.FullName}' requires exactly one constructor.");
+
+                var constructorParams = constructors[0].GetParameters();
+                var parameters = new object[constructorParams.Length];
+
+                for (var index = 0; index < constructorParams.Length; index++)
+                {
+                    var param = constructorParams[index];
+
+                    if (TryResolveType(param.ParameterType, out var instance))
+                    {
+                        parameters[index] = instance;
+                    }
+                    else
+                    {
+                        if (_resolveTypes.ContainsKey(param.ParameterType))
+                        {
+                            throw new InvalidOperationException($"Dependency '{implementation.FullName}' ctor requires {param.ParameterType.FullName} registered before it.");
+                        }
+
+                        throw new InvalidOperationException($"Dependency '{implementation.FullName}' ctor has unknown dependency {param.ParameterType.FullName}");
+                    }
+                }
+
+                return Activator.CreateInstance(implementation, parameters)!;
+            }
+
+            _resolveTypes[implementation] = implementation;
+            _resolveFactories[implementation] = factory ?? DefaultFactory;
+            _pendingResolves.Enqueue(implementation);
+        }
+
         [AssertionMethod]
         private void CheckRegisterInterface(Type interfaceType, Type implementationType, bool overwrite)
         {
@@ -155,7 +219,7 @@ namespace Robust.Shared.IoC
         [System.Diagnostics.Contracts.Pure]
         public object ResolveType(Type type)
         {
-            if (_services.TryGetValue(type, out var value))
+            if (TryResolveType(type, out var value))
             {
                 return value;
             }
@@ -268,21 +332,22 @@ namespace Robust.Shared.IoC
                 }
 
                 // Not using Resolve<T>() because we're literally building it right now.
-                if (!_services.ContainsKey(field.FieldType))
+                if (TryResolveType(field.FieldType, out var dep))
                 {
-                    // A hard-coded special case so the DependencyCollection can inject itself.
-                    // This is not put into the services so it can be overridden if needed.
-                    if (field.FieldType == typeof(IDependencyCollection))
-                    {
-                        field.SetValue(obj, this);
-                        continue;
-                    }
-
-                    throw new UnregisteredDependencyException(type, field.FieldType, field.Name);
+                    // Quick note: this DOES work with read only fields, though it may be a CLR implementation detail.
+                    field.SetValue(obj, dep);
+                    continue;
                 }
 
-                // Quick note: this DOES work with read only fields, though it may be a CLR implementation detail.
-                field.SetValue(obj, _services[field.FieldType]);
+                // A hard-coded special case so the DependencyCollection can inject itself.
+                // This is not put into the services so it can be overridden if needed.
+                if (field.FieldType == typeof(IDependencyCollection))
+                {
+                    field.SetValue(obj, this);
+                    continue;
+                }
+
+                throw new UnregisteredDependencyException(type, field.FieldType, field.Name);
             }
         }
 
@@ -322,7 +387,7 @@ namespace Robust.Shared.IoC
                 generator.Emit(OpCodes.Ldarg_0);
 
                 // Not using Resolve<T>() because we're literally building it right now.
-                if (!_services.TryGetValue(field.FieldType, out var service))
+                if (!TryResolveType(field.FieldType, out var service))
                 {
                     // A hard-coded special case so the DependencyCollection can inject itself.
                     // This is not put into the services so it can be overridden if needed.

Robust.Shared/IoC/DynamicTypeFactory.cs

@@ -45,8 +45,9 @@ namespace Robust.Shared.IoC
         ///     The type MUST have a parameterless constructor.
         /// </summary>
         /// <param name="type">Type of object to instantiate.</param>
+        /// <param name="oneOff">If true, do not cache injector delegates.</param>
         /// <returns>Newly created object.</returns>
-        object CreateInstanceUnchecked(Type type);
+        object CreateInstanceUnchecked(Type type, bool oneOff = false);
 
         /// <summary>
         ///     Constructs a new instance of the given type with Dependencies resolved.
@@ -101,12 +102,16 @@ namespace Robust.Shared.IoC
         /// </summary>
         /// <param name="dynamicTypeFactory">The dynamic type factory to use.</param>
         /// <param name="type">The type to instantiate.</param>
+        /// <param name="oneOff">If true, do not cache injector delegates.</param>
         /// <typeparam name="T">The type that the instance will be cast to.</typeparam>
         /// <returns>Newly created object, cast to <typeparamref name="T"/>.</returns>
-        internal static T CreateInstanceUnchecked<T>(this IDynamicTypeFactoryInternal dynamicTypeFactory, Type type)
+        internal static T CreateInstanceUnchecked<T>(
+            this IDynamicTypeFactoryInternal dynamicTypeFactory,
+            Type type,
+            bool oneOff = false)
         {
             DebugTools.Assert(typeof(T).IsAssignableFrom(type), "type must be subtype of T");
-            return (T) dynamicTypeFactory.CreateInstanceUnchecked(type);
+            return (T) dynamicTypeFactory.CreateInstanceUnchecked(type, oneOff);
         }
 
         /// <summary>
@@ -117,7 +122,10 @@ namespace Robust.Shared.IoC
         /// <param name="args">The arguments to pass to the constructor.</param>
         /// <typeparam name="T">The type that the instance will be cast to.</typeparam>
         /// <returns>Newly created object, cast to <typeparamref name="T"/>.</returns>
-        internal static T CreateInstanceUnchecked<T>(this IDynamicTypeFactoryInternal dynamicTypeFactory, Type type, object[] args)
+        internal static T CreateInstanceUnchecked<T>(
+            this IDynamicTypeFactoryInternal dynamicTypeFactory,
+            Type type,
+            object[] args)
         {
             DebugTools.Assert(typeof(T).IsAssignableFrom(type), "type must be subtype of T");
             return (T) dynamicTypeFactory.CreateInstanceUnchecked(type, args);
@@ -165,13 +173,13 @@ namespace Robust.Shared.IoC
             return CreateInstanceUnchecked<T>();
         }
 
-        public object CreateInstanceUnchecked(Type type)
+        public object CreateInstanceUnchecked(Type type, bool oneOff = false)
         {
             if (type == null)
                 throw new ArgumentNullException(nameof(type));
 
             var instance = Activator.CreateInstance(type)!;
-            _dependencies.InjectDependencies(instance);
+            _dependencies.InjectDependencies(instance, oneOff);
             return instance;
         }
 

Robust.Shared/IoC/IDependencyCollection.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using Robust.Shared.IoC.Exceptions;
 using Robust.Shared.Reflection;
@@ -62,6 +63,18 @@ namespace Robust.Shared.IoC
         void Register<TInterface, TImplementation>(DependencyFactoryDelegate<TImplementation> factory, bool overwrite = false)
             where TImplementation : class, TInterface;
 
+
+        /// <summary>
+        /// Registers a simple implementation without an interface.
+        /// </summary>
+        /// <param name="implementation">The type that will be resolvable.</param>
+        /// <param name="factory">A factory method to construct the instance of the implementation.</param>
+        /// <param name="overwrite">
+        /// If true, do not throw an <see cref="InvalidOperationException"/> if an interface is already registered,
+        /// replace the current implementation instead.
+        /// </param>
+        void Register(Type implementation, DependencyFactoryDelegate<object>? factory = null, bool overwrite = false);
+
         /// <summary>
         ///     Registers an interface to an existing instance of an implementation,
         ///     making it accessible to <see cref="IDependencyCollection.Resolve{T}"/>.
@@ -106,6 +119,11 @@ namespace Robust.Shared.IoC
         [Pure]
         object ResolveType(Type type);
 
+        /// <summary>
+        /// Resolve a dependency manually.
+        /// </summary>
+        bool TryResolveType(Type objectType, [MaybeNullWhen(false)] out object instance);
+
         /// <summary>
         /// Initializes the object graph by building every object and resolving all dependencies.
         /// </summary>

Robust.Shared/Localization/ILocalizationManager.cs

@@ -52,7 +52,7 @@ namespace Robust.Shared.Localization
         ///     Does not log a warning if the message does not exist.
         ///     Does however log errors if any occur while formatting.
         /// </remarks>
-        bool TryGetString(string messageId, [NotNullWhen(true)] out string? value, params (string, object)[] args);
+        bool TryGetString(string messageId, [NotNullWhen(true)] out string? value, params (string, object)[] keyArgs);
 
         /// <summary>
         ///     Default culture used by other methods when no culture is explicitly specified.

Robust.Shared/Localization/Loc.cs

@@ -25,7 +25,7 @@ namespace Robust.Shared.Localization
         private static ILocalizationManager LocalizationManager => IoCManager.Resolve<ILocalizationManager>();
 
         /// <summary>
-        ///     Gets a language approrpiate string represented by the supplied messageId.
+        ///     Gets a language appropriate string represented by the supplied messageId.
         /// </summary>
         /// <param name="messageId">Unique Identifier for a translated message.</param>
         /// <returns>
@@ -68,7 +68,6 @@ namespace Robust.Shared.Localization
             LocalizationManager.LoadCulture(resourceManager, culture);
         }
 
-
         /// <summary>
         /// Remnants of the old Localization system.
         /// It exists to prevent source errors and allow existing game text to *mostly* work

Robust.Shared/Localization/LocFunction.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using Fluent.Net;
 using JetBrains.Annotations;
+using Linguini.Bundle;
 using Robust.Shared.GameObjects;
 
 namespace Robust.Shared.Localization
@@ -25,13 +25,13 @@ namespace Robust.Shared.Localization
     [PublicAPI]
     public readonly struct LocContext
     {
-        public CultureInfo Culture => Context.Culture;
+        public CultureInfo Culture => Bundle.Culture;
 
-        internal readonly MessageContext Context;
+        internal readonly FluentBundle Bundle;
 
-        internal LocContext(MessageContext ctx)
+        internal LocContext(FluentBundle bundle)
         {
-            Context = ctx;
+            Bundle = bundle;
         }
     }
 
@@ -86,7 +86,7 @@ namespace Robust.Shared.Localization
         /// <summary>
         ///     Checks if this value matches a string in a select expression.
         /// </summary>
-        bool Matches(LocContext ctx, string matchValue)
+        bool Matches(LocContext bundle, string matchValue)
         {
             return false;
         }
@@ -119,7 +119,7 @@ namespace Robust.Shared.Localization
         public abstract string Format(LocContext ctx);
 
         /*
-        public virtual bool Matches(LocContext ctx, string matchValue)
+        public virtual bool Matches(LocContext bundle, string matchValue)
         {
             return false;
         }
@@ -150,6 +150,7 @@ namespace Robust.Shared.Localization
         }
     }
 
+
     /// <summary>
     ///     Stores an "invalid" string value. Produced by e.g. unresolved variable references.
     /// </summary>
@@ -173,13 +174,13 @@ namespace Robust.Shared.Localization
 
     /*public sealed record LocValueBool(bool Value) : LocValue<bool>(Value)
     {
-        public override string Format(LocContext ctx)
+        public override string Format(LocContext bundle)
         {
-            return Value.ToString(ctx.Culture);
+            return Value.ToString(bundle.Culture);
         }
 
         /*
-        public override bool Matches(LocContext ctx, string matchValue)
+        public override bool Matches(LocContext bundle, string matchValue)
         {
             var word = Value ? "true" : "false";
             return word.Equals(matchValue, StringComparison.InvariantCultureIgnoreCase);
@@ -189,14 +190,14 @@ namespace Robust.Shared.Localization
 
     public sealed record LocValueEnum(Enum Value) : LocValue<Enum>(Value)
     {
-        public override string Format(LocContext ctx)
+        public override string Format(LocContext bundle)
         {
             return Value.ToString().ToLowerInvariant();
         }
 
-        /*public override bool Matches(LocContext ctx, string matchValue)
+        /*public override bool Matches(LocContext bundle, string matchValue)
         {
             return matchValue.Equals(Value.ToString(), StringComparison.InvariantCultureIgnoreCase);
         }#1#
     }*/
-}
+}

Robust.Shared/Localization/LocHelper.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Text;
+using Linguini.Bundle.Errors;
+using Linguini.Syntax.Parser.Error;
+
+namespace Robust.Shared.Localization
+{
+    internal static class LocHelper
+    {
+        public static string FormatCompileErrors(this ParseError self, ReadOnlyMemory<char> resource)
+        {
+            ErrorSpan span = new(self.Row, self.Slice!.Value.Start.Value, self.Slice.Value.End.Value,
+                self.Position.Start.Value, self.Position.End.Value);
+            return FormatErrors(self.Message, span, resource);
+        }
+
+        private static string FormatErrors(string message, ErrorSpan span, ReadOnlyMemory<char> resource)
+        {
+            var sb = new StringBuilder();
+            var row = $"  {span.Row}  ";
+            var errContext = resource.Slice(span.StartSpan, span.EndSpan - span.StartSpan).ToString();
+            sb.Append(row).Append('|')
+                .AppendLine(errContext);
+            sb.Append(' ', row.Length).Append('|')
+                .Append(' ', span.StartMark - span.StartSpan - 1).Append('^', span.EndMark - span.StartMark)
+                .AppendLine($" {message}");
+            return sb.ToString();
+        }
+    }
+}

Robust.Shared/Localization/LocalizationManager.Entity.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
+using Linguini.Bundle.Errors;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Prototypes;
@@ -41,7 +42,7 @@ namespace Robust.Shared.Localization
         // Flush caches conservatively on prototype/localization changes.
         private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
         {
-            if (!args.ByType.TryGetValue(typeof(EntityPrototype), out var changeSet))
+            if (!args.ByType.ContainsKey(typeof(EntityPrototype)))
                 return;
 
             FlushEntityCache();
@@ -52,48 +53,58 @@ namespace Robust.Shared.Localization
             string? name = null;
             string? desc = null;
             string? suffix = null;
-            Dictionary<string, string>? attribs = null;
+            Dictionary<string, string>? attributes = null;
 
             while (true)
             {
                 var prototype = _prototype.Index<EntityPrototype>(prototypeId);
                 var locId = prototype.CustomLocalizationID ?? $"ent-{prototypeId}";
 
-                if (TryGetMessage(locId, out var ctx, out var msg))
+                if (TryGetMessage(locId, out var bundle, out var msg))
                 {
                     // Localization override exists.
-                    var mAttribs = msg.Attributes;
+                    var msgAttrs = msg.Attributes;
 
                     if (name == null && msg.Value != null)
                     {
                         // Only set name if the value isn't empty.
                         // So that you can override *only* a desc/suffix.
-                        name = ctx.Format(msg.Value);
+                        name = bundle.FormatPattern(msg.Value, null, out var fmtErr);
+                        WriteWarningForErrs(fmtErr, locId);
                     }
 
-                    if (mAttribs != null && mAttribs.Count != 0)
+                    if (msgAttrs.Count != 0)
                     {
-                        if (desc == null && mAttribs.TryGetValue("desc", out var mDesc))
+                        foreach (var (attrId, pattern) in msg.Attributes)
                         {
-                            desc = ctx.Format(mDesc);
-                        }
-
-                        if (suffix == null && mAttribs.TryGetValue("suffix", out var mSuffix))
-                        {
-                            suffix = ctx.Format(mSuffix);
-                        }
-
-                        foreach (var (attrib, value) in msg.Attributes)
-                        {
-                            if (attrib is "desc" or "suffix")
+                            var attrib = attrId.ToString();
+                            if (attrib.Equals("desc")
+                                || attrib.Equals("suffix"))
                                 continue;
 
-                            attribs ??= new Dictionary<string, string>();
-                            if (!attribs.ContainsKey(attrib))
+                            attributes ??= new Dictionary<string, string>();
+                            if (!attributes.ContainsKey(attrib))
                             {
-                                attribs[attrib] = ctx.Format(value);
+                                var value = bundle.FormatPattern(pattern, null, out var errors);
+                                WriteWarningForErrs(errors, locId);
+                                attributes[attrib] = value;
                             }
                         }
+
+                        var allErrors = new List<FluentError>();
+                        if (desc == null
+                            && bundle.TryGetMsg(locId, "desc", null, out var err1, out desc))
+                        {
+                            allErrors.AddRange(err1);
+                        }
+
+                        if (suffix == null
+                            && bundle.TryGetMsg(locId, "suffix", null, out var err, out suffix))
+                        {
+                            allErrors.AddRange(err);
+                        }
+
+                        WriteWarningForErrs(allErrors, locId);
                     }
                 }
 
@@ -105,10 +116,10 @@ namespace Robust.Shared.Localization
                 {
                     foreach (var (attrib, value) in prototype.LocProperties)
                     {
-                        attribs ??= new Dictionary<string, string>();
-                        if (!attribs.ContainsKey(attrib))
+                        attributes ??= new Dictionary<string, string>();
+                        if (!attributes.ContainsKey(attrib))
                         {
-                            attribs[attrib] = value;
+                            attributes[attrib] = value;
                         }
                     }
                 }
@@ -123,9 +134,10 @@ namespace Robust.Shared.Localization
                 name ?? "",
                 desc ?? "",
                 suffix,
-                attribs?.ToImmutableDictionary() ?? ImmutableDictionary<string, string>.Empty);
+                attributes?.ToImmutableDictionary() ?? ImmutableDictionary<string, string>.Empty);
         }
 
+
         public EntityLocData GetEntityData(string prototypeId)
         {
             return _entityCache.GetOrAdd(prototypeId, (id, t) => t.CalcEntityLoc(id), this);

Robust.Shared/Localization/LocalizationManager.Functions.cs

@@ -1,38 +1,39 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using Fluent.Net;
+using Linguini.Bundle;
+using Linguini.Bundle.Types;
+using Linguini.Shared.Types.Bundle;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Localization;
-using Robust.Shared.Utility;
 
 namespace Robust.Shared.Localization
 {
     internal sealed partial class LocalizationManager
     {
-        private void AddBuiltinFunctions(MessageContext context)
+        private void AddBuiltInFunctions(FluentBundle bundle)
         {
             // Grammatical gender / pronouns
-            AddCtxFunction(context, "GENDER", FuncGender);
-            AddCtxFunction(context, "SUBJECT", FuncSubject);
-            AddCtxFunction(context, "OBJECT", FuncObject);
-            AddCtxFunction(context, "POSS-ADJ", FuncPossAdj);
-            AddCtxFunction(context, "POSS-PRONOUN", FuncPossPronoun);
-            AddCtxFunction(context, "REFLEXIVE", FuncReflexive);
+            AddCtxFunction(bundle, "GENDER", FuncGender);
+            AddCtxFunction(bundle, "SUBJECT", FuncSubject);
+            AddCtxFunction(bundle, "OBJECT", FuncObject);
+            AddCtxFunction(bundle, "POSS-ADJ", FuncPossAdj);
+            AddCtxFunction(bundle, "POSS-PRONOUN", FuncPossPronoun);
+            AddCtxFunction(bundle, "REFLEXIVE", FuncReflexive);
 
             // Conjugation
-            AddCtxFunction(context, "CONJUGATE-BE", FuncConjugateBe);
-            AddCtxFunction(context, "CONJUGATE-HAVE", FuncConjugateHave);
+            AddCtxFunction(bundle, "CONJUGATE-BE", FuncConjugateBe);
+            AddCtxFunction(bundle, "CONJUGATE-HAVE", FuncConjugateHave);
 
             // Proper nouns
-            AddCtxFunction(context, "PROPER", FuncProper);
-            AddCtxFunction(context, "THE", FuncThe);
+            AddCtxFunction(bundle, "PROPER", FuncProper);
+            AddCtxFunction(bundle, "THE", FuncThe);
 
             // Misc
-            AddCtxFunction(context, "ATTRIB", args => FuncAttrib(context, args));
-            AddCtxFunction(context, "CAPITALIZE", FuncCapitalize);
+            AddCtxFunction(bundle, "ATTRIB", args => FuncAttrib(bundle, args));
+            AddCtxFunction(bundle, "CAPITALIZE", FuncCapitalize);
         }
 
         /// <summary>
@@ -50,7 +51,7 @@ namespace Robust.Shared.Localization
         {
             var input = args.Args[0].Format(new LocContext());
             if (!String.IsNullOrEmpty(input))
-                return new LocValueString(input.First().ToString().ToUpper() + input.Substring(1));
+                return new LocValueString(input[0].ToString().ToUpper() + input.Substring(1));
             else return new LocValueString("");
         }
 
@@ -64,7 +65,7 @@ namespace Robust.Shared.Localization
             ILocValue entity0 = args.Args[0];
             if (entity0.Value != null)
             {
-                IEntity entity = (IEntity) entity0.Value;
+                IEntity entity = (IEntity)entity0.Value;
 
                 if (entity.TryGetComponent<GrammarComponent>(out var grammar) && grammar.Gender.HasValue)
                 {
@@ -136,16 +137,16 @@ namespace Robust.Shared.Localization
             return new LocValueString(GetString("zzzz-conjugate-have", ("ent", args.Args[0])));
         }
 
-        private ILocValue FuncAttrib(MessageContext context, LocArgs args)
+        private ILocValue FuncAttrib(FluentBundle bundle, LocArgs args)
         {
             if (args.Args.Count < 2) return new LocValueString("other");
 
             ILocValue entity0 = args.Args[0];
             if (entity0.Value != null)
             {
-                IEntity entity = (IEntity) entity0.Value;
+                IEntity entity = (IEntity)entity0.Value;
                 ILocValue attrib0 = args.Args[1];
-                if (TryGetEntityLocAttrib(entity, attrib0.Format(new LocContext(context)), out var attrib))
+                if (TryGetEntityLocAttrib(entity, attrib0.Format(new LocContext(bundle)), out var attrib))
                 {
                     return new LocValueString(attrib);
                 }
@@ -164,7 +165,7 @@ namespace Robust.Shared.Localization
             ILocValue entity0 = args.Args[0];
             if (entity0.Value != null)
             {
-                IEntity entity = (IEntity) entity0.Value;
+                IEntity entity = (IEntity)entity0.Value;
 
                 if (entity.TryGetComponent<GrammarComponent>(out var grammar) && grammar.ProperNoun.HasValue)
                 {
@@ -180,39 +181,108 @@ namespace Robust.Shared.Localization
             return new LocValueString("false");
         }
 
-        private void AddCtxFunction(MessageContext ctx, string name, LocFunction function)
+
+        private void AddCtxFunction(FluentBundle ctx, string name, LocFunction function)
         {
-            ctx.Functions.Add(name, (args, options) => CallFunction(function, args, options));
+            ctx.AddFunction(name, (args, options)
+                => CallFunction(function, args, options), out _, InsertBehavior.Overriding);
+        }
+
+        private IFluentType CallFunction(LocFunction function,
+            IList<IFluentType> positionalArgs, IDictionary<string, IFluentType> namedArgs)
+        {
+            var args = new ILocValue[positionalArgs.Count];
+            for (var i = 0; i < args.Length; i++)
+            {
+                args[i] = positionalArgs[i].ToLocValue();
+            }
+
+            var options = new Dictionary<string, ILocValue>(namedArgs.Count);
+            foreach (var (k, v) in namedArgs)
+            {
+                options.Add(k, v.ToLocValue());
+            }
+
+            var argStruct = new LocArgs(args, options);
+            return function.Invoke(argStruct).FluentFromVal();
         }
 
         public void AddFunction(CultureInfo culture, string name, LocFunction function)
         {
-            var context = _contexts[culture];
+            var bundle = _contexts[culture];
 
-            context.Functions.Add(name, (args, options) => CallFunction(function, args, options));
-        }
-
-        private FluentType CallFunction(
-            LocFunction function,
-            IList<object> fluentArgs, IDictionary<string, object> fluentOptions)
-        {
-            var args = new ILocValue[fluentArgs.Count];
-            for (var i = 0; i < args.Length; i++)
-            {
-                args[i] = ValFromFluent(fluentArgs[i]);
-            }
-
-            var options = new Dictionary<string, ILocValue>(fluentOptions.Count);
-            foreach (var (k, v) in fluentOptions)
-            {
-                options.Add(k, ValFromFluent(v));
-            }
-
-            var argStruct = new LocArgs(args, options);
-
-            var ret = function(argStruct);
-
-            return ValToFluent(ret);
+            bundle.AddFunction(name, (args, options)
+                => CallFunction(function, args, options), out _, InsertBehavior.Overriding);
         }
     }
-}
+
+    internal sealed class FluentLocWrapperType : IFluentType
+    {
+        public readonly ILocValue WrappedValue;
+
+        public FluentLocWrapperType(ILocValue wrappedValue)
+        {
+            WrappedValue = wrappedValue;
+        }
+
+        public string AsString()
+        {
+            return WrappedValue.Format(new LocContext());
+        }
+
+        public IFluentType Copy()
+        {
+            return this;
+        }
+    }
+
+    static class LinguiniAdapter
+    {
+        internal static ILocValue ToLocValue(this IFluentType arg)
+        {
+            return arg switch
+            {
+                FluentNone => new LocValueNone(""),
+                FluentNumber number => new LocValueNumber(number),
+                FluentString str => new LocValueString(str),
+                FluentLocWrapperType value => value.WrappedValue,
+                _ => throw new ArgumentOutOfRangeException(nameof(arg)),
+            };
+        }
+
+        public static IFluentType FluentFromObject(this object obj)
+        {
+            return obj switch
+            {
+                ILocValue wrap => new FluentLocWrapperType(wrap),
+                IEntity entity => new FluentLocWrapperType(new LocValueEntity(entity)),
+                DateTime dateTime => new FluentLocWrapperType(new LocValueDateTime(dateTime)),
+                bool or Enum => (FluentString)obj.ToString()!.ToLowerInvariant(),
+                string str => (FluentString)str,
+                byte num => (FluentNumber)num,
+                sbyte num => (FluentNumber)num,
+                short num => (FluentNumber)num,
+                ushort num => (FluentNumber)num,
+                int num => (FluentNumber)num,
+                uint num => (FluentNumber)num,
+                long num => (FluentNumber)num,
+                ulong num => (FluentNumber)num,
+                double dbl => (FluentNumber)dbl,
+                float dbl => (FluentNumber)dbl,
+                _ => (FluentString)obj.ToString()!,
+            };
+        }
+
+        public static IFluentType FluentFromVal(this ILocValue locValue)
+        {
+            return locValue switch
+            {
+                LocValueNone => FluentNone.None,
+                LocValueNumber number => (FluentNumber)number.Value,
+                LocValueString str => (FluentString)str.Value,
+                LocValueDateTime dateTime => new FluentLocWrapperType(dateTime),
+                _ => new FluentLocWrapperType(locValue),
+            };
+        }
+    }
+}

Robust.Shared/Localization/LocalizationManager.cs

@@ -4,9 +4,14 @@ using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using Fluent.Net;
-using Fluent.Net.RuntimeAst;
 using JetBrains.Annotations;
+using Linguini.Bundle;
+using Linguini.Bundle.Builder;
+using Linguini.Bundle.Errors;
+using Linguini.Shared.Types.Bundle;
+using Linguini.Syntax.Ast;
+using Linguini.Syntax.Parser;
+using Linguini.Syntax.Parser.Error;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -24,7 +29,7 @@ namespace Robust.Shared.Localization
         [Dependency] private readonly IPrototypeManager _prototype = default!;
 
         private ISawmill _logSawmill = default!;
-        private readonly Dictionary<CultureInfo, MessageContext> _contexts = new();
+        private readonly Dictionary<CultureInfo, FluentBundle> _contexts = new();
 
         private CultureInfo? _defaultCulture;
 
@@ -48,16 +53,6 @@ namespace Robust.Shared.Localization
             return msg;
         }
 
-        public bool TryGetString(string messageId, [NotNullWhen(true)] out string? value)
-        {
-            if (!TryGetNode(messageId, out var context, out var node))
-            {
-                value = null;
-                return false;
-            }
-
-            return DoFormat(messageId, out value, context, node);
-        }
 
         public string GetString(string messageId, params (string, object)[] args0)
         {
@@ -73,144 +68,38 @@ namespace Robust.Shared.Localization
             return msg;
         }
 
-        public bool TryGetString(string messageId, [NotNullWhen(true)] out string? value,
-            params (string, object)[] args0)
+        public bool TryGetString(string messageId, [NotNullWhen(true)] out string? value)
         {
-            if (!TryGetNode(messageId, out var context, out var node))
+            return TryGetString(messageId, out value, null);
+        }
+
+        public bool TryGetString(string messageId, [NotNullWhen(true)] out string? value,
+            params (string, object)[]? keyArgs)
+        {
+            var args = new Dictionary<string, IFluentType>();
+            if (keyArgs != null)
+            {
+                foreach (var (k, v) in keyArgs)
+                {
+                    args.Add(k, v.FluentFromObject());
+                }
+            }
+
+            if (!HasMessage(messageId, out var bundle))
             {
                 value = null;
                 return false;
             }
 
-            var args = new Dictionary<string, object>();
-            foreach (var (k, v) in args0)
-            {
-                var val = v switch
-                {
-                    IEntity entity => new LocValueEntity(entity),
-                    bool or Enum => v.ToString()!.ToLowerInvariant(),
-                    _ => v,
-                };
-
-                if (val is ILocValue locVal)
-                    val = new FluentLocWrapperType(locVal);
-
-                args.Add(k, val);
-            }
-
-            return DoFormat(messageId, out value, context, node, args);
-        }
-
-        private bool TryGetMessage(
-            string messageId,
-            [NotNullWhen(true)] out MessageContext? ctx,
-            [NotNullWhen(true)] out Message? message)
-        {
-            if (_defaultCulture == null)
-            {
-                ctx = null;
-                message = null;
-                return false;
-            }
-
-            ctx = _contexts[_defaultCulture];
-            message = ctx.GetMessage(messageId);
-            return message != null;
-        }
-
-        private bool TryGetNode(
-            string messageId,
-            [NotNullWhen(true)] out MessageContext? ctx,
-            [NotNullWhen(true)] out Node? node)
-        {
-            string? attribName = null;
-
-            if (messageId.Contains('.'))
-            {
-                var split = messageId.Split('.');
-                messageId = split[0];
-                attribName = split[1];
-            }
-
-            if (!TryGetMessage(messageId, out ctx, out var message))
-            {
-                node = null;
-                return false;
-            }
-
-            if (attribName != null)
-            {
-                if (message.Attributes == null || !message.Attributes.TryGetValue(attribName, out var attrib))
-                {
-                    node = null;
-                    return false;
-                }
-
-                node = attrib;
-            }
-            else
-            {
-                node = message;
-            }
-
-            return true;
-        }
-
-        public void ReloadLocalizations()
-        {
-            foreach (var (culture, context) in _contexts.ToArray())
-            {
-                // Fluent.Net doesn't allow us to remove messages so...
-                var newContext = new MessageContext(
-                    culture.Name,
-                    new MessageContextOptions
-                    {
-                        UseIsolating = false,
-                        Functions = context.Functions
-                    }
-                );
-
-                _contexts[culture] = newContext;
-
-                _loadData(_res, culture, newContext);
-            }
-
-            FlushEntityCache();
-        }
-
-        private static ILocValue ValFromFluent(object arg)
-        {
-            return arg switch
-            {
-                FluentNone none => new LocValueNone(none.Value),
-                FluentNumber number => new LocValueNumber(double.Parse(number.Value)),
-                FluentString str => new LocValueString(str.Value),
-                FluentDateTime dateTime =>
-                    new LocValueDateTime(DateTime.Parse(dateTime.Value, null, DateTimeStyles.RoundtripKind)),
-                FluentLocWrapperType wrap => wrap.WrappedValue,
-                _ => throw new ArgumentOutOfRangeException(nameof(arg))
-            };
-        }
-
-        private static FluentType ValToFluent(ILocValue arg)
-        {
-            return arg switch
-            {
-                LocValueNone =>
-                    throw new NotSupportedException("Cannot currently return LocValueNone from loc functions."),
-                LocValueNumber number => new FluentNumber(number.Value.ToString("R")),
-                LocValueString str => new FluentString(str.Value),
-                LocValueDateTime dateTime => new FluentDateTime(dateTime.Value),
-                _ => new FluentLocWrapperType(arg)
-            };
-        }
-
-        private bool DoFormat(string messageId, out string? value, MessageContext context, Node node, IDictionary<string, object>? args = null)
-        {
-            var errs = new List<FluentError>();
             try
             {
-                value = context.Format(node, args, errs);
+                var result = bundle.TryGetAttrMsg(messageId, args, out var errs, out value);
+                foreach (var err in errs)
+                {
+                    _logSawmill.Error("{culture}/{messageId}: {error}", _defaultCulture!.Name, messageId, err);
+                }
+
+                return result;
             }
             catch (Exception e)
             {
@@ -218,13 +107,52 @@ namespace Robust.Shared.Localization
                 value = null;
                 return false;
             }
+        }
 
-            foreach (var err in errs)
+        private bool HasMessage(
+            string messageId,
+            [NotNullWhen(true)] out FluentBundle? bundle)
+        {
+            if (_defaultCulture == null)
             {
-                _logSawmill.Error("{culture}/{messageId}: {error}", _defaultCulture!.Name, messageId, err);
+                bundle = null;
+                return false;
             }
 
-            return true;
+            bundle = _contexts[_defaultCulture];
+            if (messageId.Contains('.'))
+            {
+                var split = messageId.Split('.');
+                return bundle.HasMessage(split[0]);
+            }
+
+            return bundle.HasMessage(messageId);
+        }
+
+        private bool TryGetMessage(
+            string messageId,
+            [NotNullWhen(true)] out FluentBundle? bundle,
+            [NotNullWhen(true)] out AstMessage? message)
+        {
+            if (_defaultCulture == null)
+            {
+                bundle = null;
+                message = null;
+                return false;
+            }
+
+            bundle = _contexts[_defaultCulture];
+            return bundle.TryGetAstMessage(messageId, out message);
+        }
+
+        public void ReloadLocalizations()
+        {
+            foreach (var (culture, context) in _contexts.ToArray())
+            {
+                _loadData(_res, culture, context);
+            }
+
+            FlushEntityCache();
         }
 
         /// <summary>
@@ -261,26 +189,18 @@ namespace Robust.Shared.Localization
 
         public void LoadCulture(CultureInfo culture)
         {
-            var context = new MessageContext(
-                culture.Name,
-                new MessageContextOptions
-                {
-                    UseIsolating = false,
-                    // Have to pass empty dict here or else Fluent.Net will fuck up
-                    // and share the same dict between multiple message contexts.
-                    // Yes, you read that right.
-                    Functions = new Dictionary<string, Resolver.ExternalFunction>(),
-                }
-            );
-            AddBuiltinFunctions(context);
+            var bundle = LinguiniBuilder.Builder()
+                .CultureInfo(culture)
+                .SkipResources()
+                .SetUseIsolating(false)
+                .UseConcurrent()
+                .UncheckedBuild();
 
-            _contexts.Add(culture, context);
+            _contexts.Add(culture, bundle);
+            AddBuiltInFunctions(bundle);
 
-            _loadData(_res, culture, context);
-            if (DefaultCulture == null)
-            {
-                DefaultCulture = culture;
-            }
+            _loadData(_res, culture, bundle);
+            DefaultCulture ??= culture;
         }
 
         public void AddLoadedToStringSerializer(IRobustMappedStringSerializer serializer)
@@ -307,7 +227,7 @@ namespace Robust.Shared.Localization
             */
         }
 
-        private void _loadData(IResourceManager resourceManager, CultureInfo culture, MessageContext context)
+        private void _loadData(IResourceManager resourceManager, CultureInfo culture, FluentBundle context)
         {
             // Load data from .ftl files.
             // Data is loaded from /Locale/<language-code>/*
@@ -323,40 +243,33 @@ namespace Robust.Shared.Localization
                 using var fileStream = resourceManager.ContentFileRead(path);
                 using var reader = new StreamReader(fileStream, EncodingHelpers.UTF8);
 
-                var resource = FluentResource.FromReader(reader);
-                return (path, resource);
+                var parser = new LinguiniParser(reader);
+                var resource = parser.Parse();
+                return (path, resource, parser.GetReadonlyData);
             });
 
-            foreach (var (path, resource) in resources)
+            foreach (var (path, resource, data) in resources)
             {
-                var errors = context.AddResource(resource);
-                foreach (var error in errors)
-                {
-                    _logSawmill.Error("{path}: {exception}", path, error.Message);
-                }
+                var errors = resource.Errors;
+                context.AddResourceOverriding(resource);
+                WriteWarningForErrs(path, errors, data);
             }
         }
 
-        private sealed class FluentLocWrapperType : FluentType
+        private void WriteWarningForErrs(ResourcePath path, List<ParseError> errs, ReadOnlyMemory<char> resource)
         {
-            public readonly ILocValue WrappedValue;
-
-            public FluentLocWrapperType(ILocValue wrappedValue)
+            foreach (var err in errs)
             {
-                WrappedValue = wrappedValue;
+                _logSawmill.Warning("{path}:\n{exception}", path, err.FormatCompileErrors(resource));
             }
+        }
 
-            public override string Format(MessageContext ctx)
+        private void WriteWarningForErrs(IList<FluentError> errs, string locId)
+        {
+            foreach (var err in errs)
             {
-                return WrappedValue.Format(new LocContext(ctx));
-            }
-
-            public override bool Match(MessageContext ctx, object obj)
-            {
-                return false;
-                /*var strVal = obj is IFluentType ft ? ft.Value : obj.ToString() ?? "";
-                return WrappedValue.Matches(new LocContext(ctx), strVal);*/
+                _logSawmill.Warning("Error extracting `{locId}`\n{e1}", locId, err);
             }
         }
     }
-}
+}

Robust.Shared/Log/ConsoleLogHandler.cs

@@ -49,13 +49,13 @@ namespace Robust.Shared.Log
 
         private readonly bool _isUtf16Out = System.Console.OutputEncoding.CodePage == Encoding.Unicode.CodePage;
 
-        private static readonly bool IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+        private bool _disposed;
 
         static ConsoleLogHandler()
         {
             WriteAnsiColors = !System.Console.IsOutputRedirected;
 
-            if (WriteAnsiColors && IsWindows)
+            if (WriteAnsiColors && OperatingSystem.IsWindows())
             {
                 WriteAnsiColors = WindowsConsole.TryEnableVirtualTerminalProcessing();
             }
@@ -68,7 +68,7 @@ namespace Robust.Shared.Log
             {
                 lock (_stream)
                 {
-                    if (IsConsoleActive)
+                    if (IsConsoleActive && !_disposed)
                     {
                         _stream.Flush();
                     }
@@ -81,13 +81,13 @@ namespace Robust.Shared.Log
 #endif
         public static void TryDetachFromConsoleWindow()
         {
-            if (IsWindows)
+            if (OperatingSystem.IsWindows())
             {
                 WindowsConsole.TryDetachFromConsoleWindow();
             }
         }
 
-        private bool IsConsoleActive => !IsWindows || WindowsConsole.IsConsoleActive;
+        private bool IsConsoleActive => !OperatingSystem.IsWindows() || WindowsConsole.IsConsoleActive;
 
         public void Log(string sawmillName, LogEvent message)
         {
@@ -183,8 +183,9 @@ namespace Robust.Shared.Log
         {
             lock (_stream)
             {
-                _stream.Dispose();
+                _disposed = true;
                 _timer.Dispose();
+                _stream.Dispose();
             }
         }
     }

Robust.Shared/Map/IMapGrid.cs

@@ -110,8 +110,8 @@ namespace Robust.Shared.Map
         Vector2i TileIndicesFor(MapCoordinates worldPos) => CoordinatesToTile(MapToGrid(worldPos));
         Vector2i TileIndicesFor(Vector2 worldPos) => WorldToTile(worldPos);
 
-        void AddToSnapGridCell(Vector2i pos, EntityUid euid);
-        void AddToSnapGridCell(EntityCoordinates coords, EntityUid euid);
+        bool AddToSnapGridCell(Vector2i pos, EntityUid euid);
+        bool AddToSnapGridCell(EntityCoordinates coords, EntityUid euid);
         void RemoveFromSnapGridCell(Vector2i pos, EntityUid euid);
         void RemoveFromSnapGridCell(EntityCoordinates coords, EntityUid euid);
 

Robust.Shared/Map/IMapManagerInternal.cs

@@ -9,6 +9,8 @@ namespace Robust.Shared.Map
         IGameTiming GameTiming { get; }
         IEntityManager EntityManager { get; }
 
+        void OnComponentRemoved(MapGridComponent comp);
+
         /// <summary>
         ///     Raises the OnTileChanged event.
         /// </summary>