Update and clean up Prototype manager methods

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
 <Project>
     <!-- This file automatically reset by Tools/version.py -->
-    <PropertyGroup><Version>0.8.61</Version></PropertyGroup>
+    <PropertyGroup><Version>0.8.52</Version></PropertyGroup>
 </Project>

Robust.Client/Console/ClientConsoleHost.cs

@@ -109,13 +109,13 @@ namespace Robust.Client.Console
             if (AvailableCommands.ContainsKey(commandName))
             {
                 var playerManager = IoCManager.Resolve<IPlayerManager>();
-#if !DEBUG
+
                 if (!_conGroup.CanCommand(commandName) && playerManager.LocalPlayer?.Session.Status > SessionStatus.Connecting)
                 {
                     WriteError(null, $"Insufficient perms for command: {commandName}");
                     return;
                 }
-#endif
+
                 var command1 = AvailableCommands[commandName];
                 args.RemoveAt(0);
                 var shell = new ConsoleShell(this, null);

Robust.Client/GameController/GameController.cs

@@ -455,7 +455,6 @@ namespace Robust.Client
         private void Tick(FrameEventArgs frameEventArgs)
         {
             _modLoader.BroadcastUpdate(ModUpdateLevel.PreEngine, frameEventArgs);
-            _console.CommandBufferExecute();
             _timerManager.UpdateTimers(frameEventArgs);
             _taskManager.ProcessPendingTasks();
 
@@ -511,7 +510,7 @@ namespace Robust.Client
             logManager.GetSawmill("discord").Level = LogLevel.Warning;
             logManager.GetSawmill("net.predict").Level = LogLevel.Info;
             logManager.GetSawmill("szr").Level = LogLevel.Info;
-            logManager.GetSawmill("loc").Level = LogLevel.Warning;
+            logManager.GetSawmill("loc").Level = LogLevel.Error;
 
 #if DEBUG_ONLY_FCE_INFO
 #if DEBUG_ONLY_FCE_LOG

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

@@ -119,8 +119,7 @@ namespace Robust.Client.GameObjects
         ///     This is useful to allow layer map configs to be defined in prototypes,
         ///     while still allowing code to create configs if they're absent.
         /// </remarks>
-        /// <returns>Index of the new layer.</returns>
-        int LayerMapReserveBlank(object key);
+        void LayerMapReserveBlank(object key);
 
         /// <summary>
         ///     Adds a layer without texture (thus falling back to the error texture).
@@ -146,8 +145,8 @@ namespace Robust.Client.GameObjects
         void RemoveLayer(int layer);
         void RemoveLayer(object layerKey);
 
-        void LayerSetShader(int layer, ShaderInstance shader, string? prototype = null);
-        void LayerSetShader(object layerKey, ShaderInstance shader, string? prototype = null);
+        void LayerSetShader(int layer, ShaderInstance shader);
+        void LayerSetShader(object layerKey, ShaderInstance shader);
         void LayerSetShader(int layer, string shaderName);
         void LayerSetShader(object layerKey, string shaderName);
 
@@ -218,8 +217,8 @@ namespace Robust.Client.GameObjects
         int GetLayerDirectionCount(ISpriteLayer layer);
 
         /// <summary>
-        ///     Calculate the rotated sprite bounding box in world-space coordinates.
+        ///     Calculate sprite bounding box in world-space coordinates.
         /// </summary>
-        Box2Rotated CalculateRotatedBoundingBox(Vector2 worldPosition, Angle worldRotation, IEye? eye = null);
+        Box2 CalculateBoundingBox(Vector2 worldPos);
     }
 }

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

@@ -25,6 +25,8 @@ namespace Robust.Client.GameObjects
 
         RSI.State.Direction EffectiveDirection(Angle worldRotation);
 
+        Vector2 LocalToLayer(Vector2 localPos);
+
         /// <summary>
         ///     Layer size in pixels.
         ///     Don't account layer scale or sprite world transform.
@@ -35,6 +37,6 @@ namespace Robust.Client.GameObjects
         ///     Calculate layer bounding box in sprite local-space coordinates.
         /// </summary>
         /// <returns>Bounding box in sprite local-space coordinates.</returns>
-        Box2 CalculateBoundingBox(Angle worldAngle);
+        Box2 CalculateBoundingBox();
     }
 }

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

@@ -84,16 +84,10 @@ namespace Robust.Client.GameObjects
 
                 foreach (var sprite in comp.SpriteTree.QueryAabb(localAABB))
                 {
-                    var (worldPos, worldRot) = _entityManager.GetComponent<TransformComponent>(sprite.Owner).GetWorldPositionRotation();
-                    var bounds = sprite.CalculateRotatedBoundingBox(worldPos, worldRot);
-
-                    // Get scaled down bounds used to indicate the "south" of a sprite.
-                    var localBound = bounds.Box;
-                    var smallLocal = localBound.Scale(0.2f).Translated(-new Vector2(0f, localBound.Extents.Y));
-                    var southIndicator = new Box2Rotated(smallLocal, bounds.Rotation, bounds.Origin);
-
+                    var worldPos = _entityManager.GetComponent<TransformComponent>(sprite.Owner).WorldPosition;
+                    var bounds = sprite.CalculateBoundingBox(worldPos);
                     handle.DrawRect(bounds, Color.Red.WithAlpha(0.2f));
-                    handle.DrawRect(southIndicator, Color.Blue.WithAlpha(0.5f));
+                    handle.DrawRect(bounds.Scale(0.2f).Translated(-new Vector2(0f, bounds.Extents.Y)), Color.Blue.WithAlpha(0.5f));
                 }
             }
         }

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

@@ -20,7 +20,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth;
-using RSIDirection = Robust.Client.Graphics.RSI.State.Direction;
 
 namespace Robust.Client.GameObjects
 {
@@ -32,8 +31,6 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IResourceCache resourceCache = default!;
         [Dependency] private readonly IPrototypeManager prototypes = default!;
         [Dependency] private readonly IEntityManager entities = default!;
-        [Dependency] private readonly IReflectionManager reflection = default!;
-        [Dependency] private readonly IEyeManager eyeManager = default!;
 
         [DataField("visible")]
         private bool _visible = true;
@@ -75,11 +72,7 @@ namespace Robust.Client.GameObjects
         public Vector2 Scale
         {
             get => scale;
-            set 
-            {
-                scale = value;
-                UpdateLocalMatrix();
-            }
+            set => scale = value;
         }
 
         [DataField("rotation")]
@@ -90,11 +83,7 @@ namespace Robust.Client.GameObjects
         public Angle Rotation
         {
             get => rotation;
-            set
-            {
-                rotation = value;
-                UpdateLocalMatrix();
-            }
+            set => rotation = value;
         }
 
         [DataField("offset")]
@@ -108,18 +97,12 @@ namespace Robust.Client.GameObjects
         public Vector2 Offset
         {
             get => offset;
-            set
-            {
-                offset = value;
-                UpdateLocalMatrix();
-            }
+            set => offset = value;
         }
 
         [DataField("color")]
         private Color color = Color.White;
 
-        public Matrix3 LocalMatrix = Matrix3.Identity;
-
         [Animatable]
         [ViewVariables(VVAccess.ReadWrite)]
         public Color Color
@@ -151,7 +134,113 @@ namespace Robust.Client.GameObjects
                 Layers.Clear();
                 foreach (var layerDatum in value)
                 {
-                    AddLayer(layerDatum);
+                    var anyTextureAttempted = false;
+                    var layer = new Layer(this);
+                    if (!string.IsNullOrWhiteSpace(layerDatum.RsiPath))
+                    {
+                        var path = TextureRoot / layerDatum.RsiPath;
+
+                        if (IoCManager.Resolve<IResourceCache>().TryGetResource(path, out RSIResource? resource))
+                        {
+                            layer.RSI = resource.RSI;
+                        }
+                        else
+                        {
+                            Logger.ErrorS(LogCategory, "Unable to load layer RSI '{0}'.", path);
+                        }
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(layerDatum.State))
+                    {
+                        anyTextureAttempted = true;
+                        var theRsi = layer.RSI ?? BaseRSI;
+                        if (theRsi == null)
+                        {
+                            Logger.ErrorS(LogCategory,
+                                "Layer has no RSI to load states from. Cannot use 'state' property. ({0})",
+                                layerDatum.State);
+                        }
+                        else
+                        {
+                            var stateid = new RSI.StateId(layerDatum.State);
+                            layer.State = stateid;
+                            if (theRsi.TryGetState(stateid, out var state))
+                            {
+                                // Always use south because this layer will be cached in the serializer.
+                                layer.AnimationTimeLeft = state.GetDelay(0);
+                            }
+                            else
+                            {
+                                Logger.ErrorS(LogCategory,
+                                    $"State '{stateid}' not found in RSI: '{theRsi.Path}'.",
+                                    stateid);
+                            }
+                        }
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(layerDatum.TexturePath))
+                    {
+                        anyTextureAttempted = true;
+                        if (layer.State.IsValid)
+                        {
+                            Logger.ErrorS(LogCategory,
+                                "Cannot specify 'texture' on a layer if it has an RSI state specified."
+                            );
+                        }
+                        else
+                        {
+                            layer.Texture =
+                                IoCManager.Resolve<IResourceCache>().GetResource<TextureResource>(TextureRoot / layerDatum.TexturePath);
+                        }
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(layerDatum.Shader))
+                    {
+                        if (IoCManager.Resolve<IPrototypeManager>().TryIndex<ShaderPrototype>(layerDatum.Shader, out var prototype))
+                        {
+                            layer.Shader = prototype.Instance();
+                        }
+                        else
+                        {
+                            Logger.ErrorS(LogCategory,
+                                "Shader prototype '{0}' does not exist.",
+                                layerDatum.Shader);
+                        }
+                    }
+
+                    layer.Color = layerDatum.Color;
+                    layer.Rotation = layerDatum.Rotation;
+                    layer._offset = layerDatum.Offset;
+                    // If neither state: nor texture: were provided we assume that they want a blank invisible layer.
+                    layer.Visible = anyTextureAttempted && layerDatum.Visible;
+                    layer.Scale = layerDatum.Scale;
+
+                    Layers.Add(layer);
+
+                    if (layerDatum.MapKeys != null)
+                    {
+                        var index = Layers.Count - 1;
+                        foreach (var keyString in layerDatum.MapKeys)
+                        {
+                            object key;
+                            if (IoCManager.Resolve<IReflectionManager>().TryParseEnumReference(keyString, out var @enum))
+                            {
+                                key = @enum;
+                            }
+                            else
+                            {
+                                key = keyString;
+                            }
+
+                            if (LayerMap.ContainsKey(key))
+                            {
+                                Logger.ErrorS(LogCategory, "Duplicate layer map key definition: {0}", key);
+                                continue;
+                            }
+
+                            LayerMap.Add(key, index);
+                        }
+                    }
                 }
 
                 _layerMapShared = true;
@@ -247,13 +336,11 @@ namespace Robust.Client.GameObjects
 
         void ISerializationHooks.AfterDeserialization()
         {
-            IoCManager.InjectDependencies(this);
-
             {
                 if (!string.IsNullOrWhiteSpace(rsi))
                 {
                     var rsiPath = TextureRoot / rsi;
-                    if(resourceCache.TryGetResource(rsiPath, out RSIResource? resource))
+                    if(IoCManager.Resolve<IResourceCache>().TryGetResource(rsiPath, out RSIResource? resource))
                     {
                         BaseRSI = resource.RSI;
                     }
@@ -286,8 +373,6 @@ namespace Robust.Client.GameObjects
                 LayerMap.Clear();
                 LayerDatums = layerDatums;
             }
-
-            UpdateLocalMatrix();
         }
 
         /// <summary>
@@ -305,7 +390,6 @@ namespace Robust.Client.GameObjects
             offset = other.offset;
             rotation = other.rotation;
             scale = other.scale;
-            UpdateLocalMatrix();
             drawDepth = other.drawDepth;
             _screenLock = other._screenLock;
             _overrideDirection = other._overrideDirection;
@@ -331,14 +415,9 @@ namespace Robust.Client.GameObjects
             RenderOrder = other.RenderOrder;
         }
 
-        internal void UpdateLocalMatrix()
-        {
-            LocalMatrix = Matrix3.CreateTransform(in offset, in rotation, in scale);
-        }
-
         public Matrix3 GetLocalMatrix()
         {
-            return LocalMatrix;
+            return Matrix3.CreateTransform(in offset, in rotation, in scale);
         }
 
         /// <inheritdoc />
@@ -383,17 +462,14 @@ namespace Robust.Client.GameObjects
             _layerMapShared = false;
         }
 
-        public int LayerMapReserveBlank(object key)
+        public void LayerMapReserveBlank(object key)
         {
-            if (LayerMapTryGet(key, out var index))
+            if (LayerMapTryGet(key, out var _))
             {
-                return index;
+                return;
             }
 
-            index = AddBlankLayer();
-            LayerMapSet(key, index);
-
-            return index;
+            LayerMapSet(key, AddBlankLayer());
         }
 
         public int AddBlankLayer(int? newIndex = null)
@@ -402,19 +478,6 @@ namespace Robust.Client.GameObjects
             return AddLayer(layer, newIndex);
         }
 
-        /// <summary>
-        ///     Add a new layer based on some <see cref="PrototypeLayerData"/>.
-        /// </summary>
-        public int AddLayer(PrototypeLayerData layerDatum, int? newIndex = null)
-        {
-            var layer = new Layer(this);
-
-            var index = AddLayer(layer, newIndex);
-
-            LayerSetData(index, layerDatum);
-            return index;
-        }
-
         public int AddLayer(string texturePath, int? newIndex = null)
         {
             return AddLayer(new ResourcePath(texturePath), newIndex);
@@ -590,144 +653,7 @@ namespace Robust.Client.GameObjects
             RemoveLayer(layer);
         }
 
-        /// <summary>
-        ///     Fills in a layer's values using some <see cref="PrototypeLayerData"/>.
-        /// </summary>
-        public void LayerSetData(int index, PrototypeLayerData layerDatum)
-        {
-            if (Layers.Count <= index)
-            {
-                Logger.ErrorS(LogCategory, "Layer with index '{0}' does not exist, cannot set layer data! Trace:\n{1}",
-                    index, Environment.StackTrace);
-                return;
-            }
-
-            var layer = Layers[index];
-
-            var anyTextureAttempted = false;
-
-            if (!string.IsNullOrWhiteSpace(layerDatum.RsiPath))
-            {
-                var path = TextureRoot / layerDatum.RsiPath;
-
-                if (resourceCache.TryGetResource(path, out RSIResource? resource))
-                {
-                    layer.RSI = resource.RSI;
-                }
-                else
-                {
-                    Logger.ErrorS(LogCategory, "Unable to load layer RSI '{0}'.", path);
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(layerDatum.State))
-            {
-                anyTextureAttempted = true;
-                var theRsi = layer.RSI ?? BaseRSI;
-                if (theRsi == null)
-                {
-                    Logger.ErrorS(LogCategory,
-                        "Layer has no RSI to load states from. Cannot use 'state' property. ({0})",
-                        layerDatum.State);
-                }
-                else
-                {
-                    var stateid = new RSI.StateId(layerDatum.State);
-                    layer.State = stateid;
-                    if (theRsi.TryGetState(stateid, out var state))
-                    {
-                        // Always use south because this layer will be cached in the serializer.
-                        layer.AnimationTimeLeft = state.GetDelay(0);
-                    }
-                    else
-                    {
-                        Logger.ErrorS(LogCategory,
-                            $"State '{stateid}' not found in RSI: '{theRsi.Path}'.",
-                            stateid);
-                    }
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(layerDatum.TexturePath))
-            {
-                anyTextureAttempted = true;
-                if (layer.State.IsValid)
-                {
-                    Logger.ErrorS(LogCategory,
-                        "Cannot specify 'texture' on a layer if it has an RSI state specified."
-                    );
-                }
-                else
-                {
-                    layer.Texture =
-                        resourceCache.GetResource<TextureResource>(TextureRoot / layerDatum.TexturePath);
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(layerDatum.Shader))
-            {
-                if (prototypes.TryIndex<ShaderPrototype>(layerDatum.Shader, out var prototype))
-                {
-                    layer.ShaderPrototype = layerDatum.Shader;
-                    layer.Shader = prototype.Instance();
-                }
-                else
-                {
-                    Logger.ErrorS(LogCategory,
-                        "Shader prototype '{0}' does not exist.",
-                        layerDatum.Shader);
-                }
-            }
-
-            if (layerDatum.MapKeys != null)
-            {
-                foreach (var keyString in layerDatum.MapKeys)
-                {
-                    object key;
-                    if (reflection.TryParseEnumReference(keyString, out var @enum))
-                    {
-                        key = @enum;
-                    }
-                    else
-                    {
-                        key = keyString;
-                    }
-
-                    if (LayerMap.TryGetValue(key, out var mappedIndex))
-                    {
-                        if (mappedIndex != index)
-                            Logger.ErrorS(LogCategory, "Duplicate layer map key definition: {0}", key);
-                        continue;
-                    }
-
-                    _layerMapEnsurePrivate();
-                    LayerMap[key] = index;
-                }
-            }
-
-            layer.Color = layerDatum.Color;
-            layer._rotation = layerDatum.Rotation;
-            layer._offset = layerDatum.Offset;
-            layer._scale = layerDatum.Scale;
-            layer.UpdateLocalMatrix();
-
-            // If neither state: nor texture: were provided we assume that they want a blank invisible layer.
-            layer.Visible = anyTextureAttempted && layerDatum.Visible;
-        }
-
-        public void LayerSetData(object layerKey, PrototypeLayerData data)
-        {
-            if (!LayerMapTryGet(layerKey, out var layer))
-            {
-                Logger.ErrorS(LogCategory, "Layer with key '{0}' does not exist, cannot set shader! Trace:\n{1}",
-                    layerKey, Environment.StackTrace);
-                return;
-            }
-
-            LayerSetData(layer, data);
-        }
-
-        public void LayerSetShader(int layer, ShaderInstance? shader, string? prototype = null)
+        public void LayerSetShader(int layer, ShaderInstance? shader)
         {
             if (Layers.Count <= layer)
             {
@@ -738,10 +664,9 @@ namespace Robust.Client.GameObjects
 
             var theLayer = Layers[layer];
             theLayer.Shader = shader;
-            theLayer.ShaderPrototype = prototype;
         }
 
-        public void LayerSetShader(object layerKey, ShaderInstance shader, string? prototype = null)
+        public void LayerSetShader(object layerKey, ShaderInstance shader)
         {
             if (!LayerMapTryGet(layerKey, out var layer))
             {
@@ -750,7 +675,7 @@ namespace Robust.Client.GameObjects
                 return;
             }
 
-            LayerSetShader(layer, shader, prototype);
+            LayerSetShader(layer, shader);
         }
 
         public void LayerSetShader(int layer, string shaderName)
@@ -759,12 +684,10 @@ namespace Robust.Client.GameObjects
             {
                 Logger.ErrorS(LogCategory, "Shader prototype '{0}' does not exist. Trace:\n{1}", shaderName,
                     Environment.StackTrace);
-
-                LayerSetShader(layer, null, null);
-                return;
             }
 
-            LayerSetShader(layer, prototype.Instance(), shaderName);
+            // This will set the shader to null if it does not exist.
+            LayerSetShader(layer, prototype?.Instance());
         }
 
         public void LayerSetShader(object layerKey, string shaderName)
@@ -1225,7 +1148,7 @@ namespace Robust.Client.GameObjects
                 return;
             }
 
-            Layers[layer].Offset = layerOffset;
+            Layers[layer].SetOffset(layerOffset);
         }
 
         public void LayerSetOffset(object layerKey, Vector2 layerOffset)
@@ -1307,6 +1230,25 @@ namespace Robust.Client.GameObjects
             RenderInternal(drawingHandle, eyeRotation, worldRotation, worldPosition, overrideDir);
         }
 
+        private void CalcModelMatrix(int numDirs, Angle eyeRotation, Angle worldRotation, Vector2 worldPosition, out Matrix3 modelMatrix)
+        {
+            Angle angle;
+
+            if (_screenLock)
+            {
+                // Negate the eye rotation in the model matrix, so that later when the view matrix is applied the
+                // sprite will be locked upright to the screen
+                angle = new Angle(-eyeRotation.Theta);
+            }
+            else
+            {
+                angle = CalcRectWorldAngle(worldRotation + eyeRotation, numDirs) - eyeRotation;
+            }
+
+            var sWorldRotation = angle;
+            modelMatrix = Matrix3.CreateTransform(in worldPosition, in sWorldRotation);
+        }
+
         private void RenderInternal(DrawingHandleWorld drawingHandle, Angle eyeRotation, Angle worldRotation, Vector2 worldPosition, Direction? overrideDirection)
         {
             // Reduce the angles to fix math shenanigans
@@ -1315,16 +1257,56 @@ namespace Robust.Client.GameObjects
             if (worldRotation.Theta < 0)
                 worldRotation = new Angle(worldRotation.Theta + Math.Tau);
 
-            // worldRotation + eyeRotation should be the angle of the entity on-screen. If no-rot is enabled this is just set to zero.
-            // However, at some point later the eye-matrix is applied separately, so we subtract -eye rotation for now:
-            var entityMatrix = Matrix3.CreateTransform(worldPosition, NoRotation ? -eyeRotation : worldRotation);
+            // sprite matrix, WITHOUT offset.
+            // offset is applied after sprite numDirs snapping/rotation correction
+            // --> apply at same time as layer offset
+            var spriteMatrix = Matrix3.CreateTransform(Vector2.Zero, rotation, scale);
 
-            Matrix3.Multiply(ref LocalMatrix, ref entityMatrix, out var transform);
-
-            var angle = worldRotation + eyeRotation; // angle on-screen. Used to decide the direction of 4/8 directional RSIs
             foreach (var layer in Layers)
             {
-                layer.Render(drawingHandle, ref transform, angle, overrideDirection);
+                if (!layer.Visible)
+                {
+                    continue;
+                }
+
+                var numDirs = GetLayerDirectionCount(layer);
+                var layerRotation = worldRotation + layer.Rotation;
+                var layerPosition = worldPosition + layerRotation.RotateVec(layer._offset + offset);
+
+                CalcModelMatrix(numDirs, eyeRotation, layerRotation, layerPosition, out var modelMatrix);
+                Matrix3.Multiply(ref spriteMatrix, ref modelMatrix, out var transformMatrix);
+                drawingHandle.SetTransform(in transformMatrix);
+
+                RenderLayer(drawingHandle, layer, eyeRotation, layerRotation, overrideDirection);
+            }
+        }
+
+        private void RenderLayer(DrawingHandleWorld drawingHandle, Layer layer, Angle eyeRotation, Angle worldRotation, Direction? overrideDirection)
+        {
+            var texture = GetRenderTexture(layer, worldRotation + eyeRotation, overrideDirection);
+
+            if (layer.Shader != null)
+            {
+                drawingHandle.UseShader(layer.Shader);
+            }
+
+            var layerColor = color * layer.Color;
+
+            var position = -(Vector2)texture.Size / (2f * EyeManager.PixelsPerMeter);
+            var textureSize = texture.Size / (float)EyeManager.PixelsPerMeter;
+            var quad = Box2.FromDimensions(position, textureSize);
+
+            // TODO: Implement layer-specific rotation and scale.
+            // Apply these directly to the box.
+            // Oh and when you do update Layer.LocalToLayer so content doesn't break.
+
+            // handle.Modulate changes the color
+            // drawingHandle.SetTransform() is set above, turning the quad into local space vertices
+            drawingHandle.DrawTextureRectRegion(texture, quad, layerColor);
+
+            if (layer.Shader != null)
+            {
+                drawingHandle.UseShader(null);
             }
         }
 
@@ -1360,6 +1342,27 @@ namespace Robust.Client.GameObjects
             };
         }
 
+        private Texture GetRenderTexture(Layer layer, Angle worldRotation, Direction? overrideDirection)
+        {
+            var texture = layer.Texture;
+
+            if (layer.State.IsValid)
+            {
+                // Pull texture from RSI state instead.
+                var rsi = layer.RSI ?? BaseRSI;
+                if (rsi == null || !rsi.TryGetState(layer.State, out var state))
+                {
+                    state = GetFallbackState(resourceCache);
+                }
+
+                var layerSpecificDir = layer.EffectiveDirection(state, worldRotation, overrideDirection);
+                texture = state.GetFrame(layerSpecificDir, layer.AnimationFrame);
+            }
+
+            texture ??= resourceCache.GetFallback<TextureResource>().Texture;
+            return texture;
+        }
+
         public void FrameUpdate(float delta)
         {
             foreach (var t in Layers)
@@ -1414,14 +1417,12 @@ namespace Robust.Client.GameObjects
 
             Visible = thestate.Visible;
             DrawDepth = thestate.DrawDepth;
-            scale = thestate.Scale;
-            rotation = thestate.Rotation;
-            offset = thestate.Offset;
-            UpdateLocalMatrix();
+            Scale = thestate.Scale;
+            Rotation = thestate.Rotation;
+            Offset = thestate.Offset;
             Color = thestate.Color;
             RenderOrder = thestate.RenderOrder;
 
-
             if (thestate.BaseRsiPath != null && BaseRSI != null)
             {
                 if (resourceCache.TryGetResource<RSIResource>(TextureRoot / thestate.BaseRsiPath, out var res))
@@ -1437,8 +1438,43 @@ namespace Robust.Client.GameObjects
                 }
             }
 
-            // Maybe optimize this to NOT fully clear the layers. (see LayerDatums setter function)
-            LayerDatums = thestate.Layers;
+            // Maybe optimize this to NOT full clear.
+            Layers.Clear();
+            for (var i = 0; i < thestate.Layers.Count; i++)
+            {
+                var netlayer = thestate.Layers[i];
+                var layer = new Layer(this)
+                {
+                    // These are easy so do them here.
+                    Scale = netlayer.Scale,
+                    Rotation = netlayer.Rotation,
+                    Visible = netlayer.Visible,
+                    Color = netlayer.Color
+                };
+                Layers.Add(layer);
+
+                // Using the public API to handle errors.
+                // Probably slow as crap.
+                // Who am I kidding, DEFINITELY.
+                if (netlayer.Shader != null)
+                {
+                    LayerSetShader(i, netlayer.Shader);
+                }
+
+                if (netlayer.RsiPath != null)
+                {
+                    LayerSetRSI(i, netlayer.RsiPath);
+                }
+
+                if (netlayer.TexturePath != null)
+                {
+                    LayerSetTexture(i, netlayer.TexturePath);
+                }
+                else if (netlayer.State != null)
+                {
+                    LayerSetState(i, netlayer.State);
+                }
+            }
         }
 
         private void QueueUpdateIsInert()
@@ -1517,61 +1553,35 @@ namespace Robust.Client.GameObjects
         }
 
         /// <inheritdoc/>
-        public Box2Rotated CalculateRotatedBoundingBox(Vector2 worldPosition, Angle worldRotation, IEye? eye = null)
+        public Box2 CalculateBoundingBox(Vector2 worldPos)
         {
             // fast check for empty sprites
-            if (!Visible || Layers.Count == 0)
-            {
-                return new Box2Rotated(new Box2(worldPosition, worldPosition), Angle.Zero, worldPosition);
-            }
-
-            // We need to modify world rotation so that it lies between 0 and 2pi.
-            // This matters for 4 or 8 directional sprites deciding which quadrant (octant?) they lie in.
-            // the 0->2pi convention is set by the sprite-rendering code that selects the layers.
-            // See RenderInternal().
-
-            worldRotation = worldRotation.Reduced();
-            if (worldRotation.Theta < 0)
-                worldRotation = new Angle(worldRotation.Theta + Math.Tau);
-
-            eye ??= eyeManager.CurrentEye;
-
-            // Need relative angle on screen for determining the sprite rsi direction.
-            Angle relativeRotation = NoRotation
-                ? Angle.Zero
-                : worldRotation + eye.Rotation; 
+            if (Layers.Count == 0)
+                return new Box2(worldPos, worldPos);
 
             // we need to calculate bounding box taking into account all nested layers
-            // because layers can have offsets, scale or rotation, we need to calculate a new BB
-            // based on lowest bottomLeft and highest topRight points from all layers
-            var box = Layers[0].CalculateBoundingBox(relativeRotation);
+            // because layers can have offsets, scale or rotation we need to calculate a new BB
+            // based on lowest bottomLeft and hightest topRight points from all layers
+            var box = Layers[0].CalculateBoundingBox();
 
             for (int i = 1; i < Layers.Count; i++)
             {
                 var layer = Layers[i];
-                if (!layer.Visible) continue;
-                var layerBB = layer.CalculateBoundingBox(relativeRotation);
+                var layerBB = layer.CalculateBoundingBox();
 
                 box = box.Union(layerBB);
             }
 
-            // Next, what we do is take the box2 and apply the sprite's transform, and then the entity's transform. We
-            // could do this via Matrix3.TransformBox, but that only yields bounding boxes. So instead we manually
-            // transform our box by the combination of these matrices:
+            // apply sprite transformations and calculate sprite bounding box
+            // we can optimize it a bit, if sprite doesn't have rotation
+            var spriteBox = box.Scale(Scale);
+            var spriteHasRotation = !Rotation.EqualsApprox(Angle.Zero);
+            var spriteBB = spriteHasRotation ?
+                new Box2Rotated(spriteBox, Rotation).CalcBoundingBox() : spriteBox;
 
-            if (Scale != Vector2.One)
-                box = box.Scale(Scale);
-
-            var adjustedOffset = NoRotation
-                ? (-eye.Rotation).RotateVec(Offset)
-                : worldRotation.RotateVec(Offset);
-
-            Vector2 position = adjustedOffset + worldPosition;
-            Angle finalRotation = NoRotation
-                ? Rotation - eye.Rotation
-                : Rotation + worldRotation;
-
-            return new Box2Rotated(box.Translated(position), finalRotation, position);
+            // move it all to world transform system (with sprite offset)
+            var worldBB = spriteBB.Translated(Offset + worldPos);
+            return worldBB;
         }
 
         internal void UpdateBounds()
@@ -1605,11 +1615,10 @@ namespace Robust.Client.GameObjects
             Flip = 3,
         }
 
-        public sealed class Layer : ISpriteLayer, ISerializationHooks
+        public sealed class Layer : ISpriteLayer
         {
             [ViewVariables] private readonly SpriteComponent _parent;
 
-            [ViewVariables] public string? ShaderPrototype;
             [ViewVariables] public ShaderInstance? Shader;
             [ViewVariables] public Texture? Texture;
 
@@ -1619,37 +1628,11 @@ namespace Robust.Client.GameObjects
             [ViewVariables] public float AnimationTime;
             [ViewVariables] public int AnimationFrame;
 
-            public Matrix3 LocalMatrix = Matrix3.Identity;
+            [ViewVariables(VVAccess.ReadWrite)]
+            public Vector2 Scale { get; set; } = Vector2.One;
 
             [ViewVariables(VVAccess.ReadWrite)]
-            public Vector2 Scale
-            {
-                get => _scale;
-                set
-                {
-                    if (_scale.EqualsApprox(value)) return;
-
-                    _scale = value;
-                    UpdateLocalMatrix();
-                    _parent.UpdateBounds();
-                }
-            }
-            internal Vector2 _scale = Vector2.One;
-
-            [ViewVariables(VVAccess.ReadWrite)]
-            public Angle Rotation
-            {
-                get => _rotation;
-                set
-                {
-                    if (_rotation.EqualsApprox(value)) return;
-
-                    _rotation = value;
-                    UpdateLocalMatrix();
-                    _parent.UpdateBounds();
-                }
-            }
-            internal Angle _rotation = Angle.Zero;
+            public Angle Rotation { get; set; }
 
             [ViewVariables(VVAccess.ReadWrite)]
             public bool Visible = true;
@@ -1669,7 +1652,6 @@ namespace Robust.Client.GameObjects
                     if (_offset.EqualsApprox(value)) return;
 
                     _offset = value;
-                    UpdateLocalMatrix();
                     _parent.UpdateBounds();
                 }
             }
@@ -1693,7 +1675,6 @@ namespace Robust.Client.GameObjects
                 if (toClone.Shader != null)
                 {
                     Shader = toClone.Shader.Mutable ? toClone.Shader.Duplicate() : toClone.Shader;
-                    ShaderPrototype = toClone.ShaderPrototype;
                 }
                 Texture = toClone.Texture;
                 RSI = toClone.RSI;
@@ -1701,26 +1682,14 @@ namespace Robust.Client.GameObjects
                 AnimationTimeLeft = toClone.AnimationTimeLeft;
                 AnimationTime = toClone.AnimationTime;
                 AnimationFrame = toClone.AnimationFrame;
-                _scale = toClone.Scale;
-                _rotation = toClone.Rotation;
-                _offset = toClone.Offset;
-                UpdateLocalMatrix();
+                Scale = toClone.Scale;
+                Rotation = toClone.Rotation;
                 Visible = toClone.Visible;
                 Color = toClone.Color;
                 DirOffset = toClone.DirOffset;
                 AutoAnimated = toClone.AutoAnimated;
             }
 
-            void ISerializationHooks.AfterDeserialization()
-            {
-                UpdateLocalMatrix();
-            }
-
-            internal void UpdateLocalMatrix()
-            {
-                LocalMatrix = Matrix3.CreateTransform(in _offset, in _rotation, in _scale);
-            }
-
             RSI? ISpriteLayer.Rsi { get => RSI; set => SetRsi(value); }
             RSI.StateId ISpriteLayer.RsiState { get => State; set => SetState(value); }
             Texture? ISpriteLayer.Texture { get => Texture; set => SetTexture(value); }
@@ -1732,7 +1701,7 @@ namespace Robust.Client.GameObjects
                     Color = Color,
                     Rotation = Rotation,
                     Scale = Scale,
-                    Shader = ShaderPrototype,
+                    //todo Shader = Shader,
                     State = State.Name,
                     Visible = Visible,
                     RsiPath = RSI?.Path?.ToString(),
@@ -1761,7 +1730,7 @@ namespace Robust.Client.GameObjects
                 set => SetAutoAnimated(value);
             }
 
-            public RSIDirection EffectiveDirection(Angle worldRotation)
+            public RSI.State.Direction EffectiveDirection(Angle worldRotation)
             {
                 if (State == default)
                 {
@@ -1782,16 +1751,22 @@ namespace Robust.Client.GameObjects
                 return default;
             }
 
-            public RSIDirection EffectiveDirection(RSI.State state, Angle worldRotation,
+            public Vector2 LocalToLayer(Vector2 localPos)
+            {
+                // TODO: scale & rotation for layers is currently unimplemented.
+                return localPos;
+            }
+
+            public RSI.State.Direction EffectiveDirection(RSI.State state, Angle worldRotation,
                 Direction? overrideDirection)
             {
                 if (state.Directions == RSI.State.DirectionType.Dir1)
                 {
-                    return RSIDirection.South;
+                    return RSI.State.Direction.South;
                 }
                 else
                 {
-                    RSIDirection dir;
+                    RSI.State.Direction dir;
                     if (overrideDirection != null)
                     {
                         dir = overrideDirection.Value.Convert(state.Directions);
@@ -1923,6 +1898,11 @@ namespace Robust.Client.GameObjects
                 _parent.QueueUpdateIsInert();
             }
 
+            public void SetOffset(Vector2 offset)
+            {
+                Offset = offset;
+            }
+
             /// <inheritdoc/>
             public Vector2i PixelSize
             {
@@ -1943,121 +1923,10 @@ namespace Robust.Client.GameObjects
             }
 
             /// <inheritdoc/>
-            public Box2 CalculateBoundingBox(Angle angle)
+            public Box2 CalculateBoundingBox()
             {
-                // Other than some special cases for simple layers, this will basically just apply the matrix obtained
-                // via GetLayerDrawMatrix() to this layer's bounding box.
-
-                var rsiState = GetActualState();
-
-                var dir = (rsiState == null || rsiState.Directions == RSI.State.DirectionType.Dir1)
-                    ? RSIDirection.South
-                    : angle.ToRsiDirection(rsiState.Directions);
-
-                // special case for simple layers. The vast majority of layers are like this.
-                if (_rotation == Angle.Zero)
-                {
-                    var textureSize = PixelSize / EyeManager.PixelsPerMeter;
-
-                    // this switch block is basically an explicit version of the `rsiDirectionMatrix` in `GetLayerDrawMatrix()`.
-                    var box = dir switch
-                    {
-                        // No rotation:
-                        RSIDirection.South or RSIDirection.North => Box2.CenteredAround(Offset, textureSize),
-                        // rotate 90 degrees:
-                        RSIDirection.East or RSIDirection.West => Box2.CenteredAround(Offset, (textureSize.Y, textureSize.X)),
-                        // rotated 45 degrees (any 45 degree rotated rectangle has a square bounding box with sides of length (x+y)/sqrt(2) )
-                        _ => Box2.CenteredAround(Offset, Vector2.One * (textureSize.X + textureSize.Y) / MathF.Sqrt(2)) 
-                    };
-
-                    return _scale == Vector2.One ? box : box.Scale(_scale);
-                }
-
-                // Welp we have some non-zero _rotation, so lets just apply the generalized layer transform and get the bounding box from where;
-                GetLayerDrawMatrix(dir, out var layerDrawMatrix);
-                return layerDrawMatrix.TransformBox(Box2.CentredAroundZero(PixelSize / EyeManager.PixelsPerMeter));
-            }
-
-            internal RSI.State? GetActualState()
-            {
-                if (!State.IsValid)
-                    return null;
-
-                // Pull texture from RSI state
-                var rsi = RSI ?? _parent.BaseRSI;
-                if (rsi == null || !rsi.TryGetState(State, out var rsiState))
-                {
-                    rsiState = GetFallbackState(_parent.resourceCache);
-                }
-
-                return rsiState;
-            }
-
-            /// <summary>
-            ///     Given the apparent rotation of an entity on screen (world + eye rotation), get layer's matrix for drawing &
-            ///     relevant RSI direction.
-            /// </summary>
-            public void GetLayerDrawMatrix(RSIDirection dir, out Matrix3 layerDrawMatrix)
-            {
-                if (_parent.NoRotation)
-                    layerDrawMatrix = LocalMatrix;
-                else
-                {
-                    var rsiDirectionMatrix = Matrix3.CreateTransform(Vector2.Zero, -dir.Convert().ToAngle());
-                    Matrix3.Multiply(ref rsiDirectionMatrix, ref LocalMatrix, out layerDrawMatrix);
-                }
-            }
-
-            internal void Render(DrawingHandleWorld drawingHandle, ref Matrix3 spriteMatrix, Angle angle, Direction? overrideDirection)
-            {
-                if (!Visible)
-                    return;
-
-                var rsiState = GetActualState();
-
-                var dir = (rsiState == null || rsiState.Directions == RSI.State.DirectionType.Dir1)
-                    ? RSIDirection.South
-                    : angle.ToRsiDirection(rsiState.Directions);
-
-                // Set the drawing transform for this  layer
-                GetLayerDrawMatrix(dir, out var layerMatrix);
-                Matrix3.Multiply(ref layerMatrix, ref spriteMatrix, out var transformMatrix);
-                drawingHandle.SetTransform(in transformMatrix);
-
-                // The direction used to draw the sprite can differ from the one that the angle would naively suggest,
-                // due to direction overrides or offsets.
-                if (overrideDirection != null && rsiState != null)
-                    dir = overrideDirection.Value.Convert(rsiState.Directions);
-                dir = dir.OffsetRsiDir(DirOffset);
-
-                // Get the correct directional texture from the state, and draw it!
-                var texture = GetRenderTexture(rsiState, dir);
-                RenderTexture(drawingHandle, texture);
-            }
-
-            private void RenderTexture(DrawingHandleWorld drawingHandle, Texture texture)
-            {
-                if (Shader != null)
-                    drawingHandle.UseShader(Shader);
-
-                var layerColor = _parent.color * Color;
-
-                var position = -(Vector2)texture.Size / (2f * EyeManager.PixelsPerMeter);
-                var textureSize = texture.Size / (float)EyeManager.PixelsPerMeter;
-                var quad = Box2.FromDimensions(position, textureSize);
-
-                drawingHandle.DrawTextureRectRegion(texture, quad, layerColor);
-
-                if (Shader != null)
-                    drawingHandle.UseShader(null);
-            }
-
-            private Texture GetRenderTexture(RSI.State? state, RSIDirection dir)
-            {
-                if (state == null)
-                    return Texture ?? _parent.resourceCache.GetFallback<TextureResource>().Texture;
-
-                return state.GetFrame(dir, AnimationFrame);
+                // TODO: scale & rotation for layers is currently unimplemented.
+                return Box2.CenteredAround(Offset, PixelSize / EyeManager.PixelsPerMeter);
             }
         }
 
@@ -2165,7 +2034,6 @@ namespace Robust.Client.GameObjects
             return results;
         }
 
-        [Obsolete("Use SpriteSystem")]
         public static IRsiStateLike GetPrototypeIcon(EntityPrototype prototype, IResourceCache resourceCache)
         {
             var icon = IconComponent.GetPrototypeIcon(prototype, resourceCache);

Robust.Client/GameObjects/EntitySystems/AppearanceSystem.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
@@ -7,7 +6,7 @@ using Robust.Shared.GameStates;
 namespace Robust.Client.GameObjects
 {
     [UsedImplicitly]
-    public sealed class AppearanceSystem : SharedAppearanceSystem
+    internal sealed class AppearanceSystem : SharedAppearanceSystem
     {
         private readonly Queue<ClientAppearanceComponent> _queuedUpdates = new();
 
@@ -51,33 +50,10 @@ namespace Robust.Client.GameObjects
 
             if (!stateDiff) return;
 
-            component.AppearanceData = CloneAppearanceData(actualState.Data);
+            component.AppearanceData = actualState.Data;
             MarkDirty(component);
         }
 
-        /// <summary>
-        ///     Take in an appearance data dictionary and attempt to clone it.
-        /// </summary>
-        /// <remarks>
-        ///     As some appearance data values are not simple value-type objects, this is not just a shallow clone.
-        /// </remarks>
-        private Dictionary<object, object> CloneAppearanceData(Dictionary<object, object> data)
-        {
-            Dictionary<object, object> newDict = new(data.Count);
-
-            foreach (var (key, value) in data)
-            {
-                if (value.GetType().IsValueType)
-                    newDict[key] = value;
-                else if (value is ICloneable cloneable)
-                    newDict[key] = cloneable.Clone();
-                else
-                    throw new NotSupportedException("Invalid object in appearance data dictionary. Appearance data must be cloneable");
-            }
-
-            return newDict;
-        }
-
         public override void MarkDirty(AppearanceComponent component)
         {
             if (component.AppearanceDirty)
@@ -131,7 +107,7 @@ namespace Robust.Client.GameObjects
     [ByRefEvent]
     public struct AppearanceChangeEvent
     {
-        public AppearanceComponent Component;
-        public IReadOnlyDictionary<object, object> AppearanceData;
+        public AppearanceComponent Component = default!;
+        public IReadOnlyDictionary<object, object> AppearanceData = default!;
     }
 }

Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs

@@ -168,7 +168,7 @@ namespace Robust.Client.GameObjects
                 // This container is expecting an entity... but it got parented to some other entity???
                 // Ah well, the sever should send a new container state that updates expected entities so just ignore it for now.
                 return;
-            }
+            }    
 
             RemoveExpectedEntity(message.Entity);
 
@@ -210,101 +210,68 @@ namespace Robust.Client.GameObjects
         public override void FrameUpdate(float frameTime)
         {
             base.FrameUpdate(frameTime);
-            var pointQuery = EntityManager.GetEntityQuery<PointLightComponent>();
-            var spriteQuery = EntityManager.GetEntityQuery<SpriteComponent>();
-            var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
 
             foreach (var toUpdate in _updateQueue)
             {
-                if (Deleted(toUpdate))
+                if (EntityManager.Deleted(toUpdate))
+                {
                     continue;
+                }
 
-                UpdateEntityRecursively(toUpdate, xformQuery, pointQuery, spriteQuery);
+                UpdateEntityRecursively(toUpdate);
             }
 
             _updateQueue.Clear();
         }
 
-        private void UpdateEntityRecursively(
-            EntityUid entity,
-            EntityQuery<TransformComponent> xformQuery,
-            EntityQuery<PointLightComponent> pointQuery,
-            EntityQuery<SpriteComponent> spriteQuery)
+        private void UpdateEntityRecursively(EntityUid entity)
         {
-            // Recursively go up parents and containers to see whether both sprites and lights need to be occluded
-            // Could maybe optimise this more by checking nearest parent that has sprite / light and whether it's container
-            // occluded but this probably isn't a big perf issue.
-            var xform = xformQuery.GetComponent(entity);
-            var parent = xform.ParentUid;
-            var child = entity;
-            var spriteOccluded = false;
-            var lightOccluded = false;
+            // TODO: Since we are recursing down,
+            // we could cache ShowContents data here to speed it up for children.
+            // Am lazy though.
+            UpdateEntity(entity);
 
-            while (parent.IsValid() && !spriteOccluded && !lightOccluded)
+            foreach (var child in EntityManager.GetComponent<TransformComponent>(entity).Children)
             {
-                var parentXform = xformQuery.GetComponent(parent);
-                if (TryComp<ContainerManagerComponent>(parent, out var manager) && manager.TryGetContainer(child, out var container))
-                {
-                    spriteOccluded = spriteOccluded || !container.ShowContents;
-                    lightOccluded = lightOccluded || container.OccludesLight;
-                }
-
-                child = parent;
-                parent = parentXform.ParentUid;
+                UpdateEntityRecursively(child.Owner);
             }
-
-            // Alright so
-            // This is the CBT bit.
-            // The issue is we need to go through the children and re-check whether they are or are not contained.
-            // if they are contained then the occlusion values may need updating for all those children
-            UpdateEntity(entity, xform, xformQuery, pointQuery, spriteQuery, spriteOccluded, lightOccluded);
         }
 
-        private void UpdateEntity(
-            EntityUid entity,
-            TransformComponent xform,
-            EntityQuery<TransformComponent> xformQuery,
-            EntityQuery<PointLightComponent> pointQuery,
-            EntityQuery<SpriteComponent> spriteQuery,
-            bool spriteOccluded,
-            bool lightOccluded)
+        private void UpdateEntity(EntityUid entity)
         {
-            if (spriteQuery.TryGetComponent(entity, out var sprite))
+            if (EntityManager.TryGetComponent(entity, out SpriteComponent? sprite))
             {
-                sprite.ContainerOccluded = spriteOccluded;
-            }
+                sprite.ContainerOccluded = false;
 
-            if (pointQuery.TryGetComponent(entity, out var light))
-            {
-                light.ContainerOccluded = lightOccluded;
-            }
-
-            var childEnumerator = xform.ChildEnumerator;
-
-            // Try to avoid TryComp if we already know stuff is occluded.
-            if ((!spriteOccluded || !lightOccluded) && TryComp<ContainerManagerComponent>(entity, out var manager))
-            {
-                while (childEnumerator.MoveNext(out var child))
+                // We have to recursively scan for containers upwards in case of nested containers.
+                var tempParent = entity;
+                while (tempParent.TryGetContainer(out var container))
                 {
-                    // Thank god it's by value and not by ref.
-                    var childSpriteOccluded = spriteOccluded;
-                    var childLightOccluded = lightOccluded;
-
-                    // We already know either sprite or light is not occluding so need to check container.
-                    if (manager.TryGetContainer(child.Value, out var container))
+                    if (!container.ShowContents)
                     {
-                        childSpriteOccluded = childSpriteOccluded || !container.ShowContents;
-                        childLightOccluded = childLightOccluded || container.OccludesLight;
+                        sprite.ContainerOccluded = true;
+                        break;
                     }
 
-                    UpdateEntity(child.Value, xformQuery.GetComponent(child.Value), xformQuery, pointQuery, spriteQuery, childSpriteOccluded, childLightOccluded);
+                    tempParent = container.Owner;
                 }
             }
-            else
+
+            if (EntityManager.TryGetComponent(entity, out PointLightComponent? light))
             {
-                while (childEnumerator.MoveNext(out var child))
+                light.ContainerOccluded = false;
+
+                // We have to recursively scan for containers upwards in case of nested containers.
+                var tempParent = entity;
+                while (tempParent.TryGetContainer(out var container))
                 {
-                    UpdateEntity(child.Value, xformQuery.GetComponent(child.Value), xformQuery, pointQuery, spriteQuery, spriteOccluded, lightOccluded);
+                    if (container.OccludesLight)
+                    {
+                        light.ContainerOccluded = true;
+                        break;
+                    }
+
+                    tempParent = container.Owner;
                 }
             }
         }

Robust.Client/GameObjects/EntitySystems/EffectSystem.cs

@@ -323,7 +323,7 @@ namespace Robust.Client.GameObjects
         {
             private readonly IPlayerManager _playerManager;
 
-            public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
+            public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
             private readonly ShaderInstance _unshadedShader;
             private readonly EffectSystem _owner;

Robust.Client/GameObjects/EntitySystems/InputSystem.cs

@@ -4,15 +4,11 @@ using Robust.Client.Input;
 using Robust.Client.Player;
 using Robust.Shared;
 using Robust.Shared.Configuration;
-using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Players;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Robust.Client.GameObjects
@@ -25,8 +21,6 @@ namespace Robust.Client.GameObjects
         [Dependency] private readonly IInputManager _inputManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IClientGameStateManager _stateManager = default!;
-        [Dependency] private readonly IConsoleHost _conHost = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
 
         private readonly IPlayerCommandStates _cmdStates = new PlayerCommandStates();
 
@@ -114,43 +108,6 @@ namespace Robust.Client.GameObjects
         public override void Initialize()
         {
             SubscribeLocalEvent<PlayerAttachSysMessage>(OnAttachedEntityChanged);
-
-            _conHost.RegisterCommand("incmd",
-                "Inserts an input command into the simulation",
-                "incmd <KeyFunction> <d|u KeyState> <wxPos> <wyPos>",
-                GenerateInputCommand);
-        }
-
-        public override void Shutdown()
-        {
-            base.Shutdown();
-
-            _conHost.UnregisterCommand("incmd");
-        }
-
-        private void GenerateInputCommand(IConsoleShell shell, string argstr, string[] args)
-        {
-            var localPlayer = _playerManager.LocalPlayer;
-            if(localPlayer is null)
-                return;
-
-            var pent = localPlayer.ControlledEntity;
-            if(pent is null)
-                return;
-
-            BoundKeyFunction keyFunction = new BoundKeyFunction(args[0]);
-            BoundKeyState state = args[1] == "u" ? BoundKeyState.Up: BoundKeyState.Down;
-
-            var pxform = Transform(pent.Value);
-            var wPos = pxform.WorldPosition + new Vector2(float.Parse(args[2]), float.Parse(args[3]));
-            var coords = EntityCoordinates.FromMap(EntityManager, pent.Value, new MapCoordinates(wPos, pxform.MapID));
-
-            var funcId = _inputManager.NetworkBindMap.KeyFunctionID(keyFunction);
-
-            var message = new FullInputCmdMessage(_timing.CurTick, _timing.TickFraction, funcId, state,
-                coords, new ScreenCoordinates(0, 0, default), EntityUid.Invalid);
-
-            HandleInputCommand(localPlayer.Session, keyFunction, message);
         }
 
         private void OnAttachedEntityChanged(PlayerAttachSysMessage message)

Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs

@@ -113,18 +113,12 @@ namespace Robust.Client.GameObjects
 
         private void AnythingMoved(ref MoveEvent args)
         {
-            var pointQuery = EntityManager.GetEntityQuery<PointLightComponent>();
-            var spriteQuery = EntityManager.GetEntityQuery<SpriteComponent>();
-            var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
+            var xforms = EntityManager.GetEntityQuery<TransformComponent>();
 
-            AnythingMovedSubHandler(args.Sender, xformQuery, pointQuery, spriteQuery);
+            AnythingMovedSubHandler(args.Sender, xforms);
         }
 
-        private void AnythingMovedSubHandler(
-            EntityUid uid,
-            EntityQuery<TransformComponent> xformQuery,
-            EntityQuery<PointLightComponent> pointQuery,
-            EntityQuery<SpriteComponent> spriteQuery)
+        private void AnythingMovedSubHandler(EntityUid uid, EntityQuery<TransformComponent> xforms)
         {
             // To avoid doing redundant updates (and we don't need to update a grid's children ever)
             if (!_checkedChildren.Add(uid) || EntityManager.HasComponent<RenderingTreeComponent>(uid)) return;
@@ -133,19 +127,17 @@ namespace Robust.Client.GameObjects
             // WHATEVER YOU DO, DON'T REPLACE THIS WITH SPAMMING EVENTS UNLESS YOU HAVE A GUARANTEE IT WON'T LAG THE GC.
             // (Struct-based events ok though)
             // Ironically this was lagging the GC lolz
-            if (spriteQuery.TryGetComponent(uid, out var sprite))
+            if (EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
                 QueueSpriteUpdate(sprite);
 
-            if (pointQuery.TryGetComponent(uid, out var light))
+            if (EntityManager.TryGetComponent(uid, out PointLightComponent? light))
                 QueueLightUpdate(light);
 
-            if (!xformQuery.TryGetComponent(uid, out var xform)) return;
+            if (!xforms.TryGetComponent(uid, out var xform)) return;
 
-            var childEnumerator = xform.ChildEnumerator;
-
-            while (childEnumerator.MoveNext(out var child))
+            foreach (var child in xform.ChildEntities)
             {
-                AnythingMovedSubHandler(child.Value, xformQuery, pointQuery, spriteQuery);
+                AnythingMovedSubHandler(child, xforms);
             }
         }
 
@@ -377,10 +369,13 @@ namespace Robust.Client.GameObjects
         private Box2 SpriteAabbFunc(in SpriteComponent value)
         {
             var xforms = EntityManager.GetEntityQuery<TransformComponent>();
+
             var xform = xforms.GetComponent(value.Owner);
             var (worldPos, worldRot) = xform.GetWorldPositionRotation();
+            var bounds = new Box2Rotated(value.CalculateBoundingBox(worldPos), worldRot, worldPos);
+            var tree = GetRenderTree(value.Owner, xforms);
 
-            return SpriteAabbFunc(value, worldPos, worldRot, xforms);
+            return tree == null ? bounds.CalcBoundingBox() : xforms.GetComponent(tree.Owner).InvWorldMatrix.TransformBox(bounds);
         }
 
         private Box2 LightAabbFunc(in PointLightComponent value)
@@ -397,7 +392,7 @@ namespace Robust.Client.GameObjects
 
         private Box2 SpriteAabbFunc(SpriteComponent value, Vector2 worldPos, Angle worldRot, EntityQuery<TransformComponent> xforms)
         {
-            var bounds = value.CalculateRotatedBoundingBox(worldPos, worldRot);
+            var bounds = new Box2Rotated(value.CalculateBoundingBox(worldPos), worldRot, worldPos);
             var tree = GetRenderTree(value.Owner, xforms);
 
             return tree == null ? bounds.CalcBoundingBox() : xforms.GetComponent(tree.Owner).InvWorldMatrix.TransformBox(bounds);

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

@@ -1,84 +0,0 @@
-using System;
-using JetBrains.Annotations;
-using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
-using Robust.Client.Utility;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Robust.Client.GameObjects;
-
-public sealed partial class SpriteSystem
-{
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
-
-    [Pure]
-    public Texture Frame0(SpriteSpecifier specifier)
-    {
-        return RsiStateLike(specifier).Default;
-    }
-
-    [Pure]
-    public IRsiStateLike RsiStateLike(SpriteSpecifier specifier)
-    {
-        switch (specifier)
-        {
-            case SpriteSpecifier.Texture tex:
-                return tex.GetTexture(_resourceCache);
-
-            case SpriteSpecifier.Rsi rsi:
-                return GetState(rsi);
-
-            case SpriteSpecifier.EntityPrototype prototypeIcon:
-                if (!_proto.TryIndex<EntityPrototype>(prototypeIcon.EntityPrototypeId, out var prototype))
-                {
-                    Logger.Error("Failed to load PrototypeIcon {0}", prototypeIcon.EntityPrototypeId);
-                    return SpriteComponent.GetFallbackState(_resourceCache);
-                }
-
-                return SpriteComponent.GetPrototypeIcon(prototype, _resourceCache);
-
-            default:
-                throw new NotSupportedException();
-        }
-    }
-
-    [Pure]
-    public IRsiStateLike GetPrototypeIcon(EntityPrototype prototype, IResourceCache resourceCache)
-    {
-        var icon = IconComponent.GetPrototypeIcon(prototype, _resourceCache);
-        if (icon != null) return icon;
-
-        if (!prototype.Components.ContainsKey("Sprite"))
-        {
-            return SpriteComponent.GetFallbackState(resourceCache);
-        }
-
-        var dummy = Spawn(prototype.ID, MapCoordinates.Nullspace);
-        var spriteComponent = EnsureComp<SpriteComponent>(dummy);
-        var result = spriteComponent.Icon ?? SpriteComponent.GetFallbackState(resourceCache);
-        Del(dummy);
-
-        return result;
-    }
-
-    [Pure]
-    public RSI.State GetState(SpriteSpecifier.Rsi rsiSpecifier)
-    {
-        if (_resourceCache.TryGetResource<RSIResource>(
-                SharedSpriteComponent.TextureRoot / rsiSpecifier.RsiPath,
-                out var theRsi) &&
-            theRsi.RSI.TryGetState(rsiSpecifier.RsiState, out var state))
-        {
-            return state;
-        }
-
-        Logger.Error("Failed to load RSI {0}", rsiSpecifier.RsiPath);
-        return SpriteComponent.GetFallbackState(_resourceCache);
-    }
-}

Robust.Client/GameObjects/EntitySystems/SpriteSystem.cs

@@ -11,7 +11,7 @@ namespace Robust.Client.GameObjects
     /// Updates the layer animation for every visible sprite.
     /// </summary>
     [UsedImplicitly]
-    public sealed partial class SpriteSystem : EntitySystem
+    public sealed class SpriteSystem : EntitySystem
     {
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly RenderingTreeSystem _treeSystem = default!;

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

@@ -24,17 +24,11 @@ namespace Robust.Client.Graphics.Clyde
     {
         public ClydeDebugLayers DebugLayers { get; set; }
 
-        private readonly RefList<(SpriteComponent sprite, Vector2 worldPos, Angle worldRotation, Box2 spriteScreenBB)>
+        private readonly RefList<(SpriteComponent sprite, Matrix3 worldMatrix, Angle worldRotation, float yWorldPos)>
             _drawingSpriteList
                 =
                 new();
 
-        // TODO allow this scale to be passed with PostShader as variable
-        /// <summary>
-        ///     Some shaders that enlarge the final sprite, like emission or highlight effects, need to use a slightly larger render target.
-        /// </summary>
-        public static float PostShadeScale = 1.25f;
-
         public void Render()
         {
             CheckTransferringScreenshots();
@@ -223,8 +217,9 @@ namespace Robust.Client.Graphics.Clyde
             RenderOverlays(viewport, OverlaySpace.WorldSpaceBelowEntities, worldAABB, worldBounds);
 
             var screenSize = viewport.Size;
+            eye.GetViewMatrix(out var eyeMatrix, eye.Scale);
 
-            ProcessSpriteEntities(mapId, viewport, eye, worldBounds, _drawingSpriteList);
+            ProcessSpriteEntities(mapId, eyeMatrix, worldBounds, _drawingSpriteList);
 
             var worldOverlays = new List<Overlay>();
 
@@ -281,12 +276,30 @@ namespace Robust.Client.Graphics.Clyde
                     break;
                 }
 
+                var matrix = entry.worldMatrix;
+                var worldPosition = new Vector2(matrix.R0C2, matrix.R1C2);
+
                 RenderTexture? entityPostRenderTarget = null;
                 Vector2i roundedPos = default;
                 if (entry.sprite.PostShader != null)
                 {
-                    // get the size of the sprite on screen, scaled slightly to allow for shaders that increase the final sprite size.
-                    var screenSpriteSize = (Vector2i) (entry.spriteScreenBB.Size * PostShadeScale).Rounded();
+                    // calculate world bounding box
+                    var spriteBB = entry.sprite.CalculateBoundingBox(worldPosition);
+                    var spriteLB = spriteBB.BottomLeft;
+                    var spriteRT = spriteBB.TopRight;
+
+                    // finally we can calculate screen bounding in pixels
+                    var screenLB = viewport.WorldToLocal(spriteLB);
+                    var screenRT = viewport.WorldToLocal(spriteRT);
+
+                    // we need to scale RT a for effects like emission or highlight
+                    // scale can be passed with PostShader as variable in future
+                    var postShadeScale = 1.25f;
+                    var screenSpriteSize = (Vector2i) ((screenRT - screenLB) * postShadeScale).Rounded();
+
+                    // Rotate the vector by the eye angle, otherwise the bounding box will be incorrect
+                    screenSpriteSize = (Vector2i) eye.Rotation.RotateVec(screenSpriteSize).Rounded();
+                    screenSpriteSize.Y = -screenSpriteSize.Y;
 
                     // I'm not 100% sure why it works, but without it post-shader
                     // can be lower or upper by 1px than original sprite depending on sprite rotation or scale
@@ -309,14 +322,16 @@ namespace Robust.Client.Graphics.Clyde
                         // Calculate viewport so that the entity thinks it's drawing to the same position,
                         // which is necessary for light application,
                         // but it's ACTUALLY drawing into the center of the render target.
-                        roundedPos = (Vector2i) entry.spriteScreenBB.Center;
-                        var flippedPos = new Vector2i(roundedPos.X, screenSize.Y - roundedPos.Y);
+                        var spritePos = spriteBB.Center;
+                        var screenPos = viewport.WorldToLocal(spritePos);
+                        var (roundedX, roundedY) = roundedPos = (Vector2i) screenPos;
+                        var flippedPos = new Vector2i(roundedX, screenSize.Y - roundedY);
                         flippedPos -= entityPostRenderTarget.Size / 2;
                         _renderHandle.Viewport(Box2i.FromDimensions(-flippedPos, screenSize));
                     }
                 }
 
-                entry.sprite.Render(_renderHandle.DrawingHandleWorld, eye.Rotation, in entry.worldRotation, in entry.worldPos);
+                entry.sprite.Render(_renderHandle.DrawingHandleWorld, eye.Rotation, in entry.worldRotation, in worldPosition);
 
                 if (entry.sprite.PostShader != null && entityPostRenderTarget != null)
                 {
@@ -354,26 +369,17 @@ namespace Robust.Client.Graphics.Clyde
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
-        private void ProcessSpriteEntities(MapId map, Viewport view, IEye eye, Box2Rotated worldBounds,
-            RefList<(SpriteComponent sprite, Vector2 worldPos, Angle worldRot, Box2 spriteScreenBB)> list)
+        private void ProcessSpriteEntities(MapId map, Matrix3 eyeMatrix, Box2Rotated worldBounds,
+            RefList<(SpriteComponent sprite, Matrix3 matrix, Angle worldRot, float yWorldPos)> list)
         {
             var xforms = _entityManager.GetEntityQuery<TransformComponent>();
 
-            // Construct a matrix equivalent for Viewport.WorldToLocal()
-            eye.GetViewMatrix(out var viewMatrix, view.RenderScale);
-            var uiProjmatrix = Matrix3.Identity;
-            uiProjmatrix.R0C0 = EyeManager.PixelsPerMeter;
-            uiProjmatrix.R1C1 = -EyeManager.PixelsPerMeter;
-            uiProjmatrix.R0C2 = view.Size.X / 2f;
-            uiProjmatrix.R1C2 = view.Size.Y / 2f;
-            var worldToLocal = viewMatrix * uiProjmatrix;
-
             foreach (var comp in _entitySystemManager.GetEntitySystem<RenderingTreeSystem>().GetRenderTrees(map, worldBounds))
             {
                 var bounds = xforms.GetComponent(comp.Owner).InvWorldMatrix.TransformBox(worldBounds);
 
                 comp.SpriteTree.QueryAabb(ref list, (
-                    ref RefList<(SpriteComponent sprite, Vector2 worldPos, Angle worldRot, Box2 spriteScreenBB)> state,
+                    ref RefList<(SpriteComponent sprite, Matrix3 matrix, Angle worldRot, float yWorldPos)> state,
                     in SpriteComponent value) =>
                 {
                     var entity = value.Owner;
@@ -381,10 +387,12 @@ namespace Robust.Client.Graphics.Clyde
 
                     ref var entry = ref state.AllocAdd();
                     entry.sprite = value;
-                    (entry.worldPos, entry.worldRot) = transform.GetWorldPositionRotation();
-
-                    var spriteWorldBB = value.CalculateRotatedBoundingBox(entry.worldPos, entry.worldRot, eye);
-                    entry.spriteScreenBB = worldToLocal.TransformBox(spriteWorldBB);
+                    Vector2 worldPos;
+                    (worldPos, entry.worldRot, entry.matrix) = transform.GetWorldPositionRotationMatrix();
+                    var eyePos = eyeMatrix.Transform(worldPos);
+                    // Didn't use the bounds from the query as that has to be re-calculated (and is probably more expensive than this).
+                    var bounds = value.CalculateBoundingBox(eyePos);
+                    entry.yWorldPos = eyePos.Y - bounds.Extents.Y;
                     return true;
 
                 }, bounds, true);

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

@@ -514,14 +514,14 @@ namespace Robust.Client.Graphics.Clyde
             var enlargedBounds = worldAABB.Enlarged(renderingTreeSystem.MaxLightRadius);
 
             // Use worldbounds for this one as we only care if the light intersects our actual bounds
-            var state = (this, worldAABB, count: 0, shadowCastingCount: 0);
+            var state = (this, worldAABB, count: 0);
             var xforms = _entityManager.GetEntityQuery<TransformComponent>();
 
             foreach (var comp in renderingTreeSystem.GetRenderTrees(map, enlargedBounds))
             {
                 var bounds = xforms.GetComponent(comp.Owner).InvWorldMatrix.TransformBox(worldBounds);
 
-                comp.LightTree.QueryAabb(ref state, (ref (Clyde clyde, Box2 worldAABB, int count, int shadowCastingCount) state, in PointLightComponent light) =>
+                comp.LightTree.QueryAabb(ref state, (ref (Clyde clyde, Box2 worldAABB, int count) state, in PointLightComponent light) =>
                 {
                     if (state.count >= LightsToRenderListSize)
                     {
@@ -543,9 +543,6 @@ namespace Robust.Client.Graphics.Clyde
                         return true;
                     }
 
-                    // If the light is a shadow casting light, keep a separate track of that
-                    if (light.CastShadows) state.shadowCastingCount++;
-
                     float distanceSquared = (state.worldAABB.Center - lightPos).LengthSquared;
                     state.clyde._lightsToRenderList[state.count++] = (light, lightPos, distanceSquared);
 
@@ -553,29 +550,17 @@ namespace Robust.Client.Graphics.Clyde
                 }, bounds);
             }
 
-            if (state.shadowCastingCount > _maxLightsPerScene)
+            if (state.count > _maxLightsPerScene)
             {
-                // There are too many lights casting shadows to fit in the scene.
+                // There are too many lights to fit in the scene.
                 // This check must occur before occluder expansion, or else bad things happen.
-
-                // First, partition the array based on whether the lights are shadow casting or not
-                // (non shadow casting lights should be the first partition, shadow casting lights the second)
+                // Sort lights by distance.
                 Array.Sort(_lightsToRenderList, 0, state.count, Comparer<(PointLightComponent light, Vector2 pos, float distanceSquared)>.Create((x, y) =>
-                {
-                    if (x.light.CastShadows && !y.light.CastShadows) return 1;
-                    else if (!x.light.CastShadows && y.light.CastShadows) return -1;
-                    else return 0;
-                }));
-
-                // Next, sort just the shadow casting lights by distance.
-                Array.Sort(_lightsToRenderList, state.count - state.shadowCastingCount, state.shadowCastingCount, Comparer<(PointLightComponent light, Vector2 pos, float distanceSquared)>.Create((x, y) =>
                 {
                     return x.distanceSquared.CompareTo(y.distanceSquared);
                 }));
-
-                // Then effectively delete the furthest lights, by setting the end of the array to exclude N
-                // number of shadow casting lights (where N is the number above the max number per scene.)
-                state.count -= state.shadowCastingCount - _maxLightsPerScene;
+                // Then effectively delete the furthest lights.
+                state.count = _maxLightsPerScene;
             }
 
             // When culling occluders later, we can't just remove any occluders outside the worldBounds.

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

@@ -994,9 +994,9 @@ namespace Robust.Client.Graphics.Clyde
 
         private sealed class SpriteDrawingOrderComparer : IComparer<int>
         {
-            private readonly RefList<(SpriteComponent, Vector2, Angle, Box2)> _drawList;
+            private readonly RefList<(SpriteComponent, Matrix3, Angle, float)> _drawList;
 
-            public SpriteDrawingOrderComparer(RefList<(SpriteComponent, Vector2, Angle, Box2)> drawList)
+            public SpriteDrawingOrderComparer(RefList<(SpriteComponent, Matrix3, Angle, float)> drawList)
             {
                 _drawList = drawList;
             }
@@ -1019,8 +1019,7 @@ namespace Robust.Client.Graphics.Clyde
                     return cmp;
                 }
 
-                // compare the top of the sprite's BB for y-sorting. Because screen coordinates are flipped, the "top" of the BB is actually the "bottom".
-                cmp = _drawList[x].Item4.Top.CompareTo(_drawList[y].Item4.Top);
+                cmp = _drawList[y].Item4.CompareTo(_drawList[x].Item4);
 
                 if (cmp != 0)
                 {

Robust.Client/Utility/SpriteSpecifierExt.cs

@@ -22,7 +22,6 @@ namespace Robust.Client.Utility
                 .Texture;
         }
 
-        [Obsolete("Use SpriteSystem")]
         public static RSI.State GetState(this SpriteSpecifier.Rsi rsiSpecifier, IResourceCache cache)
         {
             if (cache.TryGetResource<RSIResource>(
@@ -37,7 +36,6 @@ namespace Robust.Client.Utility
             return SpriteComponent.GetFallbackState(cache);
         }
 
-        [Obsolete("Use SpriteSystem")]
         public static Texture Frame0(this SpriteSpecifier specifier)
         {
             return specifier.RsiStateLike().Default;
@@ -82,7 +80,6 @@ namespace Robust.Client.Utility
             return specifier.RsiStateLike();
         }
 
-        [Obsolete("Use SpriteSystem")]
         public static IRsiStateLike RsiStateLike(this SpriteSpecifier specifier)
         {
             var resC = IoCManager.Resolve<IResourceCache>();

Robust.Server/BaseServer.cs

@@ -659,7 +659,6 @@ namespace Robust.Server
 
             using (TickUsage.WithLabels("Timers").NewTimer())
             {
-                _consoleHost.CommandBufferExecute();
                 timerManager.UpdateTimers(frameEventArgs);
             }
 

Robust.Server/Console/Commands/MapCommands.cs

@@ -29,13 +29,14 @@ namespace Robust.Server.Console.Commands
             var mapId = new MapId(int.Parse(args[0]));
 
             var mapMgr = IoCManager.Resolve<IMapManager>();
+            var pauseMgr = IoCManager.Resolve<IPauseManager>();
 
             if (!mapMgr.MapExists(mapId))
             {
                 mapMgr.CreateMap(mapId);
                 if (args.Length >= 2 && args[1] == "false")
                 {
-                    mapMgr.AddUninitializedMap(mapId);
+                    pauseMgr.AddUninitializedMap(mapId);
                 }
 
                 shell.WriteLine($"Map with ID {mapId} created.");
@@ -317,6 +318,7 @@ namespace Robust.Server.Console.Commands
             }
 
             var mapManager = IoCManager.Resolve<IMapManager>();
+            var pauseManager = IoCManager.Resolve<IPauseManager>();
 
             var arg = args[0];
             var mapId = new MapId(int.Parse(arg, CultureInfo.InvariantCulture));
@@ -327,13 +329,13 @@ namespace Robust.Server.Console.Commands
                 return;
             }
 
-            if (mapManager.IsMapInitialized(mapId))
+            if (pauseManager.IsMapInitialized(mapId))
             {
                 shell.WriteError("Map is already initialized!");
                 return;
             }
 
-            mapManager.DoMapInitialize(mapId);
+            pauseManager.DoMapInitialize(mapId);
         }
     }
 
@@ -346,14 +348,15 @@ namespace Robust.Server.Console.Commands
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var mapManager = IoCManager.Resolve<IMapManager>();
+            var pauseManager = IoCManager.Resolve<IPauseManager>();
 
             var msg = new StringBuilder();
 
             foreach (var mapId in mapManager.GetAllMapIds().OrderBy(id => id.Value))
             {
                 msg.AppendFormat("{0}: init: {1}, paused: {2}, ent: {3}, grids: {4}\n",
-                    mapId, mapManager.IsMapInitialized(mapId),
-                    mapManager.IsMapPaused(mapId),
+                    mapId, pauseManager.IsMapInitialized(mapId),
+                    pauseManager.IsMapPaused(mapId),
                     string.Join(",", mapManager.GetAllMapGrids(mapId).Select(grid => grid.Index)),
                     mapManager.GetMapEntityId(mapId));
             }

Robust.Server/Console/Commands/TestbedCommand.cs

@@ -109,8 +109,9 @@ namespace Robust.Server.Console.Commands
         private void SetupPlayer(MapId mapId, IConsoleShell shell, IPlayerSession? player, IMapManager mapManager)
         {
             if (mapId == MapId.Nullspace) return;
-            mapManager.SetMapPaused(mapId, false);
-            var mapUid = mapManager.GetMapEntityIdOrThrow(mapId);
+            var pauseManager = IoCManager.Resolve<IPauseManager>();
+            pauseManager.SetMapPaused(mapId, false);
+            var mapUid = IoCManager.Resolve<IMapManager>().GetMapEntityIdOrThrow(mapId);
             IoCManager.Resolve<IEntityManager>().GetComponent<SharedPhysicsMapComponent>(mapUid).Gravity = new Vector2(0, -9.8f);
 
             return;

Robust.Server/GameObjects/EntitySystems/AppearanceSystem.cs

@@ -3,7 +3,7 @@ using Robust.Shared.GameStates;
 
 namespace Robust.Server.GameObjects;
 
-public sealed class AppearanceSystem : SharedAppearanceSystem
+internal sealed class AppearanceSystem : SharedAppearanceSystem
 {
     public override void Initialize()
     {

Robust.Server/GameStates/ChunkIndicesEnumerator.cs

@@ -5,31 +5,30 @@ namespace Robust.Server.GameStates;
 
 public struct ChunkIndicesEnumerator
 {
-    private Vector2i _bottomLeft;
-    private Vector2i _topRight;
+    private Vector2i _topLeft;
+    private Vector2i _bottomRight;
 
     private int _x;
     private int _y;
 
-    public ChunkIndicesEnumerator(Vector2 viewPos, float range, float chunkSize)
+    public ChunkIndicesEnumerator(Box2 viewBox, float chunkSize)
     {
-        _bottomLeft = ((viewPos - range) / chunkSize).Floored();
-        // Also floor this as we get the whole chunk anyway.
-        _topRight = ((viewPos + range) / chunkSize).Floored();
+        _topLeft = (viewBox.TopLeft / chunkSize).Floored();
+        _bottomRight = (viewBox.BottomRight / chunkSize).Floored();
 
-        _x = _bottomLeft.X;
-        _y = _bottomLeft.Y;
+        _x = _topLeft.X;
+        _y = _bottomRight.Y;
     }
 
     public bool MoveNext([NotNullWhen(true)] out Vector2i? chunkIndices)
     {
-        if (_y > _topRight.Y)
+        if (_y > _topLeft.Y)
         {
             _x++;
-            _y = _bottomLeft.Y;
+            _y = _bottomRight.Y;
         }
 
-        if (_x > _topRight.X)
+        if (_x > _bottomRight.X)
         {
             chunkIndices = null;
             return false;

Robust.Server/GameStates/PVSCollection.cs

@@ -37,6 +37,7 @@ public interface IPVSCollection
 public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : IComparable<TIndex>, IEquatable<TIndex>
 {
     [Shared.IoC.Dependency] private readonly IEntityManager _entityManager = default!;
+    [Shared.IoC.Dependency] private readonly IMapManager _mapManager = default!;
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static Vector2i GetChunkIndices(Vector2 coordinates)
@@ -80,14 +81,14 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
     private readonly List<(GameTick tick, TIndex index)> _deletionHistory = new();
 
     /// <summary>
-    /// An index containing the <see cref="IIndexLocation"/>s of all <see cref="TIndex"/>.
+    /// An index containing the <see cref="IndexLocation"/>s of all <see cref="TIndex"/>.
     /// </summary>
-    private readonly Dictionary<TIndex, IIndexLocation> _indexLocations = new();
+    private readonly Dictionary<TIndex, IndexLocation> _indexLocations = new();
 
     /// <summary>
     /// Buffer of all locationchanges since the last process call
     /// </summary>
-    private readonly Dictionary<TIndex, IIndexLocation> _locationChangeBuffer = new();
+    private readonly Dictionary<TIndex, IndexLocation> _locationChangeBuffer = new();
     /// <summary>
     /// Buffer of all indexremovals since the last process call
     /// </summary>
@@ -102,7 +103,7 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
     {
         var changedIndices = new HashSet<TIndex>(_locationChangeBuffer.Keys);
 
-        var changedChunkLocations = new HashSet<IIndexLocation>();
+        var changedChunkLocations = new HashSet<IndexLocation>();
         foreach (var (index, tick) in _removalBuffer)
         {
             //changes dont need to be computed if we are removing the index anyways
@@ -153,7 +154,7 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
 
     public HashSet<TIndex>.Enumerator GetElementsForSession(ICommonSession session) => _localOverrides[session].GetEnumerator();
 
-    private void AddIndexInternal(TIndex index, IIndexLocation location)
+    private void AddIndexInternal(TIndex index, IndexLocation location)
     {
         switch (location)
         {
@@ -185,7 +186,7 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
         _indexLocations.Add(index, location);
     }
 
-    private IIndexLocation? RemoveIndexInternal(TIndex index)
+    private IndexLocation? RemoveIndexInternal(TIndex index)
     {
         // the index might be gone due to disconnects/grid-/map-deletions
         if (!_indexLocations.TryGetValue(index, out var location))
@@ -351,14 +352,14 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
         var gridId = coordinates.GetGridId(_entityManager);
         if (gridId != GridId.Invalid)
         {
-            var gridIndices = GetChunkIndices(coordinates.Position);
+            var gridIndices = GetChunkIndices(_mapManager.GetGrid(gridId).LocalToGrid(coordinates));
             UpdateIndex(index, gridId, gridIndices, true); //skip overridecheck bc we already did it (saves some dict lookups)
             return;
         }
 
-        var mapCoordinates = coordinates.ToMap(_entityManager);
-        var mapIndices = GetChunkIndices(coordinates.Position);
-        UpdateIndex(index, mapCoordinates.MapId, mapIndices, true); //skip overridecheck bc we already did it (saves some dict lookups)
+        var mapId = coordinates.GetMapId(_entityManager);
+        var mapIndices = GetChunkIndices(coordinates.ToMapPos(_entityManager));
+        UpdateIndex(index, mapId, mapIndices, true); //skip overridecheck bc we already did it (saves some dict lookups)
     }
 
     /// <summary>
@@ -391,7 +392,7 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
         RegisterUpdate(index, new MapChunkLocation(mapId, chunkIndices));
     }
 
-    private void RegisterUpdate(TIndex index, IIndexLocation location)
+    private void RegisterUpdate(TIndex index, IndexLocation location)
     {
         if(_indexLocations.TryGetValue(index, out var oldLocation) && oldLocation == location) return;
 
@@ -399,78 +400,14 @@ public sealed class PVSCollection<TIndex> : IPVSCollection where TIndex : ICompa
     }
 
     #endregion
+
+    #region IndexLocations
+
+    private abstract record IndexLocation;
+    private record MapChunkLocation(MapId MapId, Vector2i ChunkIndices) : IndexLocation;
+    private record GridChunkLocation(GridId GridId, Vector2i ChunkIndices) : IndexLocation;
+    private record GlobalOverride : IndexLocation;
+    private record LocalOverride(ICommonSession Session) : IndexLocation;
+
+    #endregion
 }
-
-#region IndexLocations
-
-public interface IIndexLocation {};
-
-public interface IChunkIndexLocation{ };
-
-public struct MapChunkLocation : IIndexLocation, IChunkIndexLocation, IEquatable<MapChunkLocation>
-{
-    public MapChunkLocation(MapId mapId, Vector2i chunkIndices)
-    {
-        MapId = mapId;
-        ChunkIndices = chunkIndices;
-    }
-
-    public MapId MapId { get; init; }
-    public Vector2i ChunkIndices { get; init; }
-
-    public bool Equals(MapChunkLocation other)
-    {
-        return MapId.Equals(other.MapId) && ChunkIndices.Equals(other.ChunkIndices);
-    }
-
-    public override bool Equals(object? obj)
-    {
-        return obj is MapChunkLocation other && Equals(other);
-    }
-
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(MapId, ChunkIndices);
-    }
-}
-
-public struct GridChunkLocation : IIndexLocation, IChunkIndexLocation, IEquatable<GridChunkLocation>
-{
-    public GridChunkLocation(GridId gridId, Vector2i chunkIndices)
-    {
-        GridId = gridId;
-        ChunkIndices = chunkIndices;
-    }
-
-    public GridId GridId { get; init; }
-    public Vector2i ChunkIndices { get; init; }
-
-    public bool Equals(GridChunkLocation other)
-    {
-        return GridId.Equals(other.GridId) && ChunkIndices.Equals(other.ChunkIndices);
-    }
-
-    public override bool Equals(object? obj)
-    {
-        return obj is GridChunkLocation other && Equals(other);
-    }
-
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(GridId, ChunkIndices);
-    }
-}
-
-public struct GlobalOverride : IIndexLocation { }
-
-public struct LocalOverride : IIndexLocation
-{
-    public LocalOverride(ICommonSession session)
-    {
-        Session = session;
-    }
-
-    public ICommonSession Session { get; init; }
-}
-
-#endregion

Robust.Server/GameStates/PVSSystem.cs

@@ -24,7 +24,6 @@ internal sealed partial class PVSSystem : EntitySystem
     [Shared.IoC.Dependency] private readonly IPlayerManager _playerManager = default!;
     [Shared.IoC.Dependency] private readonly IConfigurationManager _configManager = default!;
     [Shared.IoC.Dependency] private readonly IServerGameStateManager _stateManager = default!;
-    [Shared.IoC.Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public const float ChunkSize = 8;
 
@@ -36,7 +35,7 @@ internal sealed partial class PVSSystem : EntitySystem
     /// <summary>
     /// Is view culling enabled, or will we send the whole map?
     /// </summary>
-    public bool CullingEnabled { get; private set; }
+    private bool _cullingEnabled;
 
     /// <summary>
     /// How many new entities we can send per tick (dont wanna nuke the clients mailbox).
@@ -57,31 +56,17 @@ internal sealed partial class PVSSystem : EntitySystem
     /// All <see cref="Robust.Shared.GameObjects.EntityUid"/>s a <see cref="ICommonSession"/> saw last iteration.
     /// </summary>
     private readonly Dictionary<ICommonSession, Dictionary<EntityUid, PVSEntityVisiblity>> _playerVisibleSets = new();
-    /// <summary>
-    /// All <see cref="Robust.Shared.GameObjects.EntityUid"/>s a <see cref="ICommonSession"/> saw along its entire connection.
-    /// </summary>
     private readonly Dictionary<ICommonSession, HashSet<EntityUid>> _playerSeenSets = new();
 
     private PVSCollection<EntityUid> _entityPvsCollection = default!;
     public PVSCollection<EntityUid> EntityPVSCollection => _entityPvsCollection;
     private readonly List<IPVSCollection> _pvsCollections = new();
 
-    private readonly ObjectPool<Dictionary<EntityUid, PVSEntityVisiblity>> _visSetPool
-        = new DefaultObjectPool<Dictionary<EntityUid, PVSEntityVisiblity>>(
-            new DictPolicy<EntityUid, PVSEntityVisiblity>(), MaxVisPoolSize);
-
-    private readonly ObjectPool<HashSet<EntityUid>> _uidSetPool
-        = new DefaultObjectPool<HashSet<EntityUid>>(new SetPolicy<EntityUid>(), MaxVisPoolSize);
-
-    private readonly ObjectPool<Dictionary<EntityUid, MetaDataComponent>> _chunkCachePool =
-        new DefaultObjectPool<Dictionary<EntityUid, MetaDataComponent>>(
-            new DictPolicy<EntityUid, MetaDataComponent>(), MaxVisPoolSize);
-
-    private readonly ObjectPool<HashSet<int>> _playerChunkPool =
-        new DefaultObjectPool<HashSet<int>>(new SetPolicy<int>(), MaxVisPoolSize);
-
-    private readonly ObjectPool<List<EntityUid>> _chunkOrderPool =
-        new DefaultObjectPool<List<EntityUid>>(new ListPolicy<EntityUid>(), MaxVisPoolSize);
+    private readonly ObjectPool<Dictionary<EntityUid, PVSEntityVisiblity>> _visSetPool =
+        new DefaultObjectPool<Dictionary<EntityUid, PVSEntityVisiblity>>(
+            new DefaultPooledObjectPolicy<Dictionary<EntityUid, PVSEntityVisiblity>>(), MaxVisPoolSize);
+    private readonly ObjectPool<HashSet<EntityUid>> _viewerEntsPool
+        = new DefaultObjectPool<HashSet<EntityUid>>(new DefaultPooledObjectPolicy<HashSet<EntityUid>>(), MaxVisPoolSize);
 
     public override void Initialize()
     {
@@ -94,7 +79,7 @@ internal sealed partial class PVSSystem : EntitySystem
         _mapManager.OnGridRemoved += OnGridRemoved;
         _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
         SubscribeLocalEvent<MoveEvent>(OnEntityMove);
-        SubscribeLocalEvent<TransformComponent, ComponentStartup>(OnTransformStartup);
+        SubscribeLocalEvent<TransformComponent, ComponentInit>(OnTransformInit);
         EntityManager.EntityDeleted += OnEntityDeleted;
 
         _configManager.OnValueChanged(CVars.NetPVS, SetPvs, true);
@@ -136,7 +121,7 @@ internal sealed partial class PVSSystem : EntitySystem
 
     private void SetPvs(bool value)
     {
-        CullingEnabled = value;
+        _cullingEnabled = value;
     }
 
     private void OnNewEntityBudgetChanged(int obj)
@@ -185,36 +170,29 @@ internal sealed partial class PVSSystem : EntitySystem
 
     private void OnEntityMove(ref MoveEvent ev)
     {
-        var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
-        var coordinates = _transform.GetMoverCoordinates(ev.Component);
-        UpdateEntityRecursive(ev.Sender, ev.Component, coordinates, xformQuery, false);
+        UpdateEntityRecursive(ev.Sender, ev.Component);
     }
 
-    private void OnTransformStartup(EntityUid uid, TransformComponent component, ComponentStartup args)
+    private void OnTransformInit(EntityUid uid, TransformComponent component, ComponentInit args)
     {
-        // use Startup because GridId is not set during the eventbus init yet!
-        var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
-        var coordinates = _transform.GetMoverCoordinates(component);
-        UpdateEntityRecursive(uid, component, coordinates, xformQuery, false);
+        UpdateEntityRecursive(uid, component);
     }
 
-    private void UpdateEntityRecursive(EntityUid uid, TransformComponent xform, EntityCoordinates coordinates, EntityQuery<TransformComponent> xformQuery, bool mover)
+    private void UpdateEntityRecursive(EntityUid uid, TransformComponent? transformComponent = null)
     {
-        if (mover && !xform.LocalPosition.Equals(Vector2.Zero))
-        {
-            coordinates = _transform.GetMoverCoordinates(xform);
-        }
+        if(!Resolve(uid, ref transformComponent))
+            return;
 
-        _entityPvsCollection.UpdateIndex(uid, coordinates);
+        _entityPvsCollection.UpdateIndex(uid, transformComponent.Coordinates);
 
         // since elements are cached grid-/map-relative, we dont need to update a given grids/maps children
         if(_mapManager.IsGrid(uid) || _mapManager.IsMap(uid)) return;
 
-        var children = xform.ChildEnumerator;
+        var children = transformComponent.ChildEnumerator;
 
         while (children.MoveNext(out var child))
         {
-            UpdateEntityRecursive(child.Value, xformQuery.GetComponent(child.Value), coordinates, xformQuery, true);
+            UpdateEntityRecursive(child.Value);
         }
     }
 
@@ -231,9 +209,8 @@ internal sealed partial class PVSSystem : EntitySystem
         }
         else if (e.NewStatus == SessionStatus.Disconnected)
         {
-            var playerVisSet = _playerVisibleSets[e.Session];
+            _visSetPool.Return(_playerVisibleSets[e.Session]);
             _playerVisibleSets.Remove(e.Session);
-            _visSetPool.Return(playerVisSet);
             _playerSeenSets.Remove(e.Session);
             foreach (var pvsCollection in _pvsCollections)
             {
@@ -283,214 +260,114 @@ internal sealed partial class PVSSystem : EntitySystem
 
     #endregion
 
-    public (List<(uint, IChunkIndexLocation)> , HashSet<int>[], EntityUid[][] viewers) GetChunks(IPlayerSession[] sessions)
-    {
-        var chunkList = new List<(uint, IChunkIndexLocation)>();
-        var playerChunks = new HashSet<int>[sessions.Length];
-        var eyeQuery = EntityManager.GetEntityQuery<EyeComponent>();
-        var transformQuery = EntityManager.GetEntityQuery<TransformComponent>();
-        var viewerEntities = new EntityUid[sessions.Length][];
-
-        // Keep track of the index of each chunk we use for a faster index lookup.
-        var mapIndices = new Dictionary<uint, Dictionary<MapChunkLocation, int>>(4);
-        var gridIndices = new Dictionary<uint, Dictionary<GridChunkLocation, int>>(4);
-
-        for (int i = 0; i < sessions.Length; i++)
-        {
-            var session = sessions[i];
-            playerChunks[i] = _playerChunkPool.Get();
-
-            var viewers = GetSessionViewers(session);
-            viewerEntities[i] = new EntityUid[viewers.Count];
-            viewers.CopyTo(viewerEntities[i]);
-
-            foreach (var eyeEuid in viewers)
-            {
-                var (viewPos, range, mapId) = CalcViewBounds(in eyeEuid, transformQuery);
-
-                uint visMask = EyeComponent.DefaultVisibilityMask;
-                if (eyeQuery.TryGetComponent(eyeEuid, out var eyeComp))
-                    visMask = eyeComp.VisibilityMask;
-
-                // Get the nyoom dictionary for index lookups.
-                if (!mapIndices.TryGetValue(visMask, out var mapDict))
-                {
-                    mapDict = new Dictionary<MapChunkLocation, int>(32);
-                    mapIndices[visMask] = mapDict;
-                }
-
-                var mapChunkEnumerator = new ChunkIndicesEnumerator(viewPos, range, ChunkSize);
-
-                while (mapChunkEnumerator.MoveNext(out var chunkIndices))
-                {
-                    var chunkLocation = new MapChunkLocation(mapId, chunkIndices.Value);
-                    var entry = (visMask, chunkLocation);
-
-                    if (mapDict.TryGetValue(chunkLocation, out var indexOf))
-                    {
-                        playerChunks[i].Add(indexOf);
-                    }
-                    else
-                    {
-                        playerChunks[i].Add(chunkList.Count);
-                        mapDict.Add(chunkLocation, chunkList.Count);
-                        chunkList.Add(entry);
-                    }
-                }
-
-                // Get the nyoom dictionary for index lookups.
-                if (!gridIndices.TryGetValue(visMask, out var gridDict))
-                {
-                    gridDict = new Dictionary<GridChunkLocation, int>(32);
-                    gridIndices[visMask] = gridDict;
-                }
-
-                _mapManager.FindGridsIntersectingEnumerator(mapId, new Box2(viewPos - range, viewPos + range), out var gridEnumerator, true);
-                while (gridEnumerator.MoveNext(out var mapGrid))
-                {
-                    var localPos = transformQuery.GetComponent(mapGrid.GridEntityId).InvWorldMatrix.Transform(viewPos);
-
-                    var gridChunkEnumerator =
-                        new ChunkIndicesEnumerator(localPos, range, ChunkSize);
-
-                    while (gridChunkEnumerator.MoveNext(out var gridChunkIndices))
-                    {
-                        var chunkLocation = new GridChunkLocation(mapGrid.Index, gridChunkIndices.Value);
-                        var entry = (visMask, chunkLocation);
-
-                        if (gridDict.TryGetValue(chunkLocation, out var indexOf))
-                        {
-                            playerChunks[i].Add(indexOf);
-                        }
-                        else
-                        {
-                            playerChunks[i].Add(chunkList.Count);
-                            gridDict.Add(chunkLocation, chunkList.Count);
-                            chunkList.Add(entry);
-                        }
-                    }
-                }
-            }
-
-            _uidSetPool.Return(viewers);
-        }
-
-        return (chunkList, playerChunks, viewerEntities);
-    }
-
-    public (Dictionary<EntityUid, MetaDataComponent> mData, List<EntityUid> order)? CalculateChunk(IChunkIndexLocation chunkLocation, uint visMask, EntityQuery<TransformComponent> transform, EntityQuery<MetaDataComponent> metadata)
-    {
-        var chunk = chunkLocation switch
-        {
-            GridChunkLocation gridChunkLocation => _entityPvsCollection.TryGetChunk(gridChunkLocation.GridId,
-                gridChunkLocation.ChunkIndices, out var gridChunk)
-                ? gridChunk
-                : null,
-            MapChunkLocation mapChunkLocation => _entityPvsCollection.TryGetChunk(mapChunkLocation.MapId,
-                mapChunkLocation.ChunkIndices, out var mapChunk)
-                ? mapChunk
-                : null
-        };
-        if (chunk == null) return null;
-        var chunkSet = _chunkCachePool.Get();
-        var order = _chunkOrderPool.Get();
-        foreach (var uid in chunk)
-        {
-            AddToChunkSetRecursively(in uid, visMask, order, chunkSet, transform, metadata);
-        }
-
-        return (chunkSet, order);
-    }
-
-    public void ReturnToPool((Dictionary<EntityUid, MetaDataComponent> metadata, List<EntityUid> order)?[] chunkCache, HashSet<int>[] playerChunks)
-    {
-        foreach (var chunk in chunkCache)
-        {
-            if(!chunk.HasValue) continue;
-            _chunkCachePool.Return(chunk.Value.metadata);
-            _chunkOrderPool.Return(chunk.Value.order);
-        }
-
-        foreach (var playerChunk in playerChunks)
-        {
-            _playerChunkPool.Return(playerChunk);
-        }
-    }
-
-    private bool AddToChunkSetRecursively(in EntityUid uid, uint visMask, List<EntityUid> order, Dictionary<EntityUid, MetaDataComponent> set, EntityQuery<TransformComponent> transform,
-        EntityQuery<MetaDataComponent> metadata)
-    {
-        //are we valid?
-        //sometimes uids gets added without being valid YET (looking at you mapmanager) (mapcreate & gridcreated fire before the uids becomes valid)
-        if (!uid.IsValid()) return false;
-
-        if (set.ContainsKey(uid)) return false;
-
-        var mComp = metadata.GetComponent(uid);
-
-        // TODO: Don't need to know about parents so no longer need to use bool for this method.
-        // If the eye is missing ANY layer this entity or any of its parents belongs to, it is considered invisible.
-        if ((visMask & mComp.VisibilityMask) != mComp.VisibilityMask)
-            return false;
-
-        var parent = transform.GetComponent(uid).ParentUid;
-
-        if (parent.IsValid() && //is it not a worldentity?
-            !set.ContainsKey(parent) && //was the parent not yet added to toSend?
-            !AddToChunkSetRecursively(in parent, visMask, order, set, transform, metadata)) //did we just fail to add the parent?
-            return false; //we failed? suppose we dont get added either
-
-        //todo paul i want it to crash here if it gets added double bc that shouldnt happen and will add alot of unneeded cycles, make this a simpl assignment at some point maybe idk
-        order.Add(uid);
-        set.Add(uid, mComp);
-        return true;
-    }
-
-    public (List<EntityState>? updates, List<EntityUid>? deletions) CalculateEntityStates(IPlayerSession session,
-        GameTick fromTick, GameTick toTick, (Dictionary<EntityUid, MetaDataComponent> metadata, List<EntityUid> order)?[] chunkCache, HashSet<int> chunkIndices, EntityQuery<MetaDataComponent> mQuery, EntityQuery<TransformComponent> tQuery, EntityUid[] viewerEntities)
+    public (List<EntityState>? updates, List<EntityUid>? deletions) CalculateEntityStates(ICommonSession session,
+        GameTick fromTick, GameTick toTick)
     {
         DebugTools.Assert(session.Status == SessionStatus.InGame);
         var newEntitiesSent = 0;
         var entitiesSent = 0;
+
+        var deletions = _entityPvsCollection.GetDeletedIndices(fromTick);
+        if (!_cullingEnabled)
+        {
+            var allStates = GetAllEntityStates(session, fromTick, toTick);
+            return (allStates, deletions);
+        }
+
         var playerVisibleSet = _playerVisibleSets[session];
         var visibleEnts = _visSetPool.Get();
         var seenSet = _playerSeenSets[session];
-        var deletions = _entityPvsCollection.GetDeletedIndices(fromTick);
 
-        foreach (var i in chunkIndices)
+        visibleEnts.Clear();
+
+        var eyeQuery = EntityManager.GetEntityQuery<EyeComponent>();
+        var transformQuery = EntityManager.GetEntityQuery<TransformComponent>();
+        var metadataQuery = EntityManager.GetEntityQuery<MetaDataComponent>();
+
+        var globalOverridesEnumerator = _entityPvsCollection.GlobalOverridesEnumerator;
+        while(globalOverridesEnumerator.MoveNext())
         {
-            var cache = chunkCache[i];
-            if(!cache.HasValue) continue;
-            foreach (var uid in cache.Value.order)
+            var uid = globalOverridesEnumerator.Current;
+            //todo paul reenable budgetcheck here once you fix mapmanager
+            TryAddToVisibleEnts(
+                in uid,
+                seenSet,
+                playerVisibleSet,
+                visibleEnts,
+                fromTick,
+                ref newEntitiesSent,
+                ref entitiesSent,
+                metadataQuery,
+                transformQuery,
+                dontSkip: true);
+        }
+        globalOverridesEnumerator.Dispose();
+
+        var localOverridesEnumerator = _entityPvsCollection.GetElementsForSession(session);
+        while (localOverridesEnumerator.MoveNext())
+        {
+            var uid = localOverridesEnumerator.Current;
+            //todo paul reenable budgetcheck here once you fix mapmanager
+            TryAddToVisibleEnts(in uid, seenSet, playerVisibleSet, visibleEnts, fromTick, ref newEntitiesSent, ref entitiesSent, metadataQuery, transformQuery, dontSkip: true);
+        }
+        localOverridesEnumerator.Dispose();
+
+        var expandEvent = new ExpandPvsEvent((IPlayerSession) session, new List<EntityUid>());
+        RaiseLocalEvent(ref expandEvent);
+        foreach (var entityUid in expandEvent.Entities)
+        {
+            TryAddToVisibleEnts(in entityUid, seenSet, playerVisibleSet, visibleEnts, fromTick, ref newEntitiesSent, ref entitiesSent, metadataQuery, transformQuery);
+        }
+
+        var viewers = GetSessionViewers(session);
+
+        foreach (var eyeEuid in viewers)
+        {
+            var (viewBox, mapId) = CalcViewBounds(in eyeEuid, transformQuery);
+
+            uint visMask = EyeComponent.DefaultVisibilityMask;
+            if (eyeQuery.TryGetComponent(eyeEuid, out var eyeComp))
+                visMask = eyeComp.VisibilityMask;
+
+            //todo at some point just register the viewerentities as localoverrides
+            TryAddToVisibleEnts(in eyeEuid, seenSet, playerVisibleSet, visibleEnts, fromTick, ref newEntitiesSent, ref entitiesSent, metadataQuery, transformQuery, visMask, dontSkip: true);
+
+            var mapChunkEnumerator = new ChunkIndicesEnumerator(viewBox, ChunkSize);
+
+            while (mapChunkEnumerator.MoveNext(out var chunkIndices))
             {
-                TryAddToVisibleEnts(in uid, seenSet, playerVisibleSet, visibleEnts, fromTick, ref newEntitiesSent,
-                    ref entitiesSent, mQuery, tQuery, cache.Value.metadata[uid]);
+                if(_entityPvsCollection.TryGetChunk(mapId, chunkIndices.Value, out var chunk))
+                {
+                    foreach (var index in chunk)
+                    {
+                        TryAddToVisibleEnts(in index, seenSet, playerVisibleSet, visibleEnts, fromTick, ref newEntitiesSent, ref entitiesSent, metadataQuery, transformQuery, visMask);
+                    }
+                }
+            }
+
+            _mapManager.FindGridsIntersectingEnumerator(mapId, viewBox, out var gridEnumerator, true);
+            while (gridEnumerator.MoveNext(out var mapGrid))
+            {
+                var gridXform = transformQuery.GetComponent(mapGrid.GridEntityId);
+
+                var gridChunkEnumerator =
+                    new ChunkIndicesEnumerator(gridXform.InvWorldMatrix.TransformBox(viewBox), ChunkSize);
+
+                while (gridChunkEnumerator.MoveNext(out var gridChunkIndices))
+                {
+                    if (_entityPvsCollection.TryGetChunk(mapGrid.Index, gridChunkIndices.Value, out var chunk))
+                    {
+                        foreach (var index in chunk)
+                        {
+                            TryAddToVisibleEnts(in index, seenSet, playerVisibleSet, visibleEnts, fromTick, ref newEntitiesSent, ref entitiesSent, metadataQuery, transformQuery, visMask);
+                        }
+                    }
+                }
             }
         }
 
-        var globalEnumerator = _entityPvsCollection.GlobalOverridesEnumerator;
-        while (globalEnumerator.MoveNext())
-        {
-            var uid = globalEnumerator.Current;
-            TryAddToVisibleEnts(in uid, seenSet, playerVisibleSet, visibleEnts, fromTick, ref newEntitiesSent,
-                ref entitiesSent, mQuery, tQuery, dontSkip: true, manualParents: true);
-        }
-        globalEnumerator.Dispose();
-
-        var localEnumerator = _entityPvsCollection.GetElementsForSession(session);
-        while (localEnumerator.MoveNext())
-        {
-            var uid = localEnumerator.Current;
-            TryAddToVisibleEnts(in uid, seenSet, playerVisibleSet, visibleEnts, fromTick, ref newEntitiesSent,
-                ref entitiesSent, mQuery, tQuery, dontSkip: true, manualParents: true);
-        }
-        localEnumerator.Dispose();
-
-        foreach (var viewerEntity in viewerEntities)
-        {
-            TryAddToVisibleEnts(in viewerEntity, seenSet, playerVisibleSet, visibleEnts, fromTick, ref newEntitiesSent,
-                ref entitiesSent, mQuery, tQuery, dontSkip: true, manualParents: true);
-        }
+        viewers.Clear();
+        _viewerEntsPool.Return(viewers);
 
         var entityStates = new List<EntityState>();
 
@@ -534,7 +411,7 @@ internal sealed partial class PVSSystem : EntitySystem
     }
 
     [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-    private void TryAddToVisibleEnts(
+    private bool TryAddToVisibleEnts(
         in EntityUid uid,
         HashSet<EntityUid> seenSet,
         Dictionary<EntityUid, PVSEntityVisiblity> previousVisibleEnts,
@@ -544,25 +421,40 @@ internal sealed partial class PVSSystem : EntitySystem
         ref int totalEnteredEntities,
         EntityQuery<MetaDataComponent> metadataQuery,
         EntityQuery<TransformComponent> transformQuery,
-        MetaDataComponent? metaDataComponent = null,
+        uint? visMask = null,
         bool dontSkip = false,
-        bool manualParents = false)
+        bool trustParent = false)
     {
-        //are we valid?
+        //are we valid yet?
         //sometimes uids gets added without being valid YET (looking at you mapmanager) (mapcreate & gridcreated fire before the uids becomes valid)
-        if (!uid.IsValid()) return;
+        if (!uid.IsValid()) return false;
 
         //did we already get added?
-        if (toSend.ContainsKey(uid)) return;
+        if (toSend.ContainsKey(uid)) return true;
 
-        if (manualParents)
+        var metadata = metadataQuery.GetComponent(uid);
+
+        // if we are invisible, we are not going into the visSet, so don't worry about parents, and children are not going in
+        if (visMask != null)
         {
-            var parent = transformQuery.GetComponent(uid).ParentUid;
-            TryAddToVisibleEnts(in parent, seenSet, previousVisibleEnts, toSend,
-                fromTick, ref newEntitiesSent, ref totalEnteredEntities, metadataQuery, transformQuery, dontSkip: dontSkip,
-                manualParents: true);
+            // TODO: Don't need to know about parents so no longer need to use bool for this method.
+
+            // If the eye is missing ANY layer this entity or any of its parents belongs to, it is considered invisible.
+            if ((visMask & metadata.VisibilityMask) != metadata.VisibilityMask)
+                return false;
         }
 
+        var parent = transformQuery.GetComponent(uid).ParentUid;
+
+        if (!trustParent && //do we have it on good authority the parent exists?
+            parent.IsValid() && //is it not a worldentity?
+            !toSend.ContainsKey(parent) && //was the parent not yet added to toSend?
+            !TryAddToVisibleEnts(in parent, seenSet, previousVisibleEnts, toSend, fromTick, ref newEntitiesSent, ref totalEnteredEntities, metadataQuery, transformQuery, visMask)) //did we just fail to add the parent?
+            return false; //we failed? suppose we dont get added either
+
+        //did we already get added through the parent call?
+        if (toSend.ContainsKey(uid)) return true;
+
         //are we new?
         var @new = !seenSet.Contains(uid);
         var entered = @new | !previousVisibleEnts.Remove(uid);
@@ -570,7 +462,7 @@ internal sealed partial class PVSSystem : EntitySystem
         if (entered)
         {
             if (!dontSkip && totalEnteredEntities >= _entityBudget)
-                return;
+                return false;
 
             totalEnteredEntities++;
         }
@@ -579,7 +471,7 @@ internal sealed partial class PVSSystem : EntitySystem
         {
             //we just entered pvs, do we still have enough budget to send us?
             if(!dontSkip && newEntitiesSent >= _newEntityBudget)
-                return;
+                return false;
 
             newEntitiesSent++;
             seenSet.Add(uid);
@@ -588,33 +480,29 @@ internal sealed partial class PVSSystem : EntitySystem
         if (entered)
         {
             toSend.Add(uid, PVSEntityVisiblity.Entered);
-            return;
+            return true;
         }
 
-        metaDataComponent ??= metadataQuery.GetComponent(uid);
-
-        if (metaDataComponent.EntityLastModifiedTick < fromTick)
+        if (metadata.EntityLastModifiedTick < fromTick)
         {
             //entity has been sent before and hasnt been updated since
             toSend.Add(uid, PVSEntityVisiblity.StayedUnchanged);
-            return;
+            return true;
         }
 
         //add us
         toSend.Add(uid, PVSEntityVisiblity.StayedChanged);
-        return;
+        return true;
     }
 
     /// <summary>
     ///     Gets all entity states that have been modified after and including the provided tick.
     /// </summary>
-    public (List<EntityState>? updates, List<EntityUid>? deletions) GetAllEntityStates(ICommonSession player, GameTick fromTick, GameTick toTick)
+    private List<EntityState>? GetAllEntityStates(ICommonSession player, GameTick fromTick, GameTick toTick)
     {
-        var deletions = _entityPvsCollection.GetDeletedIndices(fromTick);
-        // no point sending an empty collection
-        if (deletions.Count == 0) deletions = default;
+        List<EntityState> stateEntities;
 
-        var stateEntities = new List<EntityState>();
+        stateEntities = new List<EntityState>();
         var seenEnts = new HashSet<EntityUid>();
         var slowPath = false;
         var metadataQuery = EntityManager.GetEntityQuery<MetaDataComponent>();
@@ -656,9 +544,7 @@ internal sealed partial class PVSSystem : EntitySystem
 
         if (!slowPath)
         {
-            if (stateEntities.Count == 0) stateEntities = default;
-
-            return (stateEntities, deletions);
+            return stateEntities.Count == 0 ? default : stateEntities;
         }
 
         stateEntities = new List<EntityState>(EntityManager.EntityCount);
@@ -673,9 +559,7 @@ internal sealed partial class PVSSystem : EntitySystem
         }
 
         // no point sending an empty collection
-        if (stateEntities.Count == 0) stateEntities = default;
-
-        return (stateEntities, deletions);
+        return stateEntities.Count == 0 ? default : stateEntities;
     }
 
     /// <summary>
@@ -734,7 +618,7 @@ internal sealed partial class PVSSystem : EntitySystem
 
     private HashSet<EntityUid> GetSessionViewers(ICommonSession session)
     {
-        var viewers = _uidSetPool.Get();
+        var viewers = _viewerEntsPool.Get();
         if (session.Status != SessionStatus.InGame)
             return viewers;
 
@@ -754,52 +638,14 @@ internal sealed partial class PVSSystem : EntitySystem
     }
 
     // Read Safe
-    private (Vector2 worldPos, float range, MapId mapId) CalcViewBounds(in EntityUid euid, EntityQuery<TransformComponent> transformQuery)
+    private (Box2 view, MapId mapId) CalcViewBounds(in EntityUid euid, EntityQuery<TransformComponent> transformQuery)
     {
         var xform = transformQuery.GetComponent(euid);
-        return (xform.WorldPosition, _viewSize / 2f, xform.MapID);
-    }
 
-    public sealed class SetPolicy<T> : PooledObjectPolicy<HashSet<T>>
-    {
-        public override HashSet<T> Create()
-        {
-            return new HashSet<T>();
-        }
+        var view = Box2.UnitCentered.Scale(_viewSize).Translated(xform.WorldPosition);
+        var map = xform.MapID;
 
-        public override bool Return(HashSet<T> obj)
-        {
-            obj.Clear();
-            return true;
-        }
-    }
-
-    public sealed class ListPolicy<T> : PooledObjectPolicy<List<T>>
-    {
-        public override List<T> Create()
-        {
-            return new();
-        }
-
-        public override bool Return(List<T> obj)
-        {
-            obj.Clear();
-            return true;
-        }
-    }
-
-    public sealed class DictPolicy<T1, T2> : PooledObjectPolicy<Dictionary<T1, T2>> where T1 : notnull
-    {
-        public override Dictionary<T1, T2> Create()
-        {
-            return new Dictionary<T1, T2>();
-        }
-
-        public override bool Return(Dictionary<T1, T2> obj)
-        {
-            obj.Clear();
-            return true;
-        }
+        return (view, map);
     }
 }
 

Robust.Server/GameStates/ServerGameStateManager.cs

@@ -1,12 +1,9 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using Microsoft.CodeAnalysis;
-using Microsoft.Extensions.ObjectPool;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
@@ -128,37 +125,6 @@ namespace Robust.Server.GameStates
             // people not in the game don't get states
             var players = _playerManager.ServerSessions.Where(o => o.Status == SessionStatus.InGame).ToArray();
 
-            //todo paul oh my god make this less shit
-            EntityQuery<MetaDataComponent> metadataQuery = default!;
-            EntityQuery<TransformComponent> transformQuery = default!;
-            HashSet<int>[] playerChunks = default!;
-            EntityUid[][] viewerEntities = default!;
-            (Dictionary<EntityUid, MetaDataComponent> metadata, List<EntityUid> order)?[] chunkCache = default!;
-
-            if (_pvs.CullingEnabled)
-            {
-                List<(uint, IChunkIndexLocation)> chunks;
-                (chunks, playerChunks, viewerEntities) = _pvs.GetChunks(players);
-                const int ChunkBatchSize = 2;
-                var chunksCount = chunks.Count;
-                var chunkBatches = (int) MathF.Ceiling((float) chunksCount / ChunkBatchSize);
-                chunkCache =
-                    new (Dictionary<EntityUid, MetaDataComponent> metadata, List<EntityUid> order)?[chunksCount];
-                transformQuery = _entityManager.GetEntityQuery<TransformComponent>();
-                metadataQuery = _entityManager.GetEntityQuery<MetaDataComponent>();
-                Parallel.For(0, chunkBatches, i =>
-                {
-                    var start = i * ChunkBatchSize;
-                    var end = Math.Min(start + ChunkBatchSize, chunksCount);
-
-                    for (var j = start; j < end; ++j)
-                    {
-                        var (visMask, chunkIndexLocation) = chunks[j];
-                        chunkCache[j] = _pvs.CalculateChunk(chunkIndexLocation, visMask, transformQuery, metadataQuery);
-                    }
-                });
-            }
-
             const int BatchSize = 2;
             var batches = (int) MathF.Ceiling((float) players.Length / BatchSize);
 
@@ -169,9 +135,11 @@ namespace Robust.Server.GameStates
 
                 for (var j = start; j < end; ++j)
                 {
+                    var session = players[j];
+
                     try
                     {
-                        SendStateUpdate(j);
+                        SendStateUpdate(session);
                     }
                     catch (Exception e) // Catch EVERY exception
                     {
@@ -180,10 +148,8 @@ namespace Robust.Server.GameStates
                 }
             });
 
-            void SendStateUpdate(int sessionIndex)
+            void SendStateUpdate(IPlayerSession session)
             {
-                var session = players[sessionIndex];
-
                 // KILL IT WITH FIRE
                 if(mainThread != Thread.CurrentThread)
                     IoCManager.InitThread(new DependencyCollection(parentDeps), true);
@@ -195,10 +161,7 @@ namespace Robust.Server.GameStates
                     DebugTools.Assert("Why does this channel not have an entry?");
                 }
 
-                var (entStates, deletions) = _pvs.CullingEnabled
-                    ? _pvs.CalculateEntityStates(session, lastAck, _gameTiming.CurTick, chunkCache,
-                        playerChunks[sessionIndex], metadataQuery, transformQuery, viewerEntities[sessionIndex])
-                    : _pvs.GetAllEntityStates(session, lastAck, _gameTiming.CurTick);
+                var (entStates, deletions) = _pvs.CalculateEntityStates(session, lastAck, _gameTiming.CurTick);
                 var playerStates = _playerManager.GetPlayerStates(lastAck);
                 var mapData = _mapManager.GetStateData(lastAck);
 
@@ -231,8 +194,6 @@ namespace Robust.Server.GameStates
                 _networkManager.ServerSendMessage(stateUpdateMessage, channel);
             }
 
-            if(_pvs.CullingEnabled)
-                _pvs.ReturnToPool(chunkCache, playerChunks);
             _pvs.Cleanup(_playerManager.ServerSessions);
             var oldestAck = new GameTick(oldestAckValue);
 

Robust.Server/Maps/MapLoader.cs

@@ -24,6 +24,7 @@ using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Validation;
 using Robust.Shared.Serialization.Markdown.Value;
 using Robust.Shared.Serialization.TypeSerializers.Interfaces;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using YamlDotNet.Core;
 using YamlDotNet.RepresentationModel;
@@ -43,6 +44,7 @@ namespace Robust.Server.Maps
         [Dependency] private readonly IMapManagerInternal _mapManager = default!;
         [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
         [Dependency] private readonly IServerEntityManagerInternal _serverEntityManager = default!;
+        [Dependency] private readonly IPauseManager _pauseManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public event Action<YamlStream, string>? LoadedMapData;
@@ -52,7 +54,7 @@ namespace Robust.Server.Maps
         {
             var grid = _mapManager.GetGrid(gridId);
 
-            var context = new MapContext(_mapManager, _tileDefinitionManager, _serverEntityManager, _prototypeManager);
+            var context = new MapContext(_mapManager, _tileDefinitionManager, _serverEntityManager, _pauseManager, _prototypeManager);
             context.RegisterGrid(grid);
             var root = context.Serialize();
             var document = new YamlDocument(root);
@@ -98,7 +100,7 @@ namespace Robust.Server.Maps
                     throw new InvalidDataException("Cannot instance map with multiple grids as blueprint.");
                 }
 
-                var context = new MapContext(_mapManager, _tileDefinitionManager, _serverEntityManager,
+                var context = new MapContext(_mapManager, _tileDefinitionManager, _serverEntityManager, _pauseManager,
                     _prototypeManager, (YamlMappingNode) data.RootNode, mapId, options);
                 context.Deserialize();
                 grid = context.Grids[0];
@@ -118,7 +120,7 @@ namespace Robust.Server.Maps
                     _serverEntityManager.GetComponent<MetaDataComponent>(entity).EntityLifeStage = EntityLifeStage.MapInitialized;
                 }
             }
-            else if (_mapManager.IsMapInitialized(mapId))
+            else if (_pauseManager.IsMapInitialized(mapId))
             {
                 foreach (var entity in context.Entities)
                 {
@@ -126,7 +128,7 @@ namespace Robust.Server.Maps
                 }
             }
 
-            if (_mapManager.IsMapPaused(mapId))
+            if (_pauseManager.IsMapPaused(mapId))
             {
                 foreach (var entity in context.Entities)
                 {
@@ -139,7 +141,7 @@ namespace Robust.Server.Maps
         public void SaveMap(MapId mapId, string yamlPath)
         {
             Logger.InfoS("map", $"Saving map {mapId} to {yamlPath}");
-            var context = new MapContext(_mapManager, _tileDefinitionManager, _serverEntityManager, _prototypeManager);
+            var context = new MapContext(_mapManager, _tileDefinitionManager, _serverEntityManager, _pauseManager, _prototypeManager);
             foreach (var grid in _mapManager.GetAllMapGrids(mapId))
             {
                 context.RegisterGrid(grid);
@@ -205,7 +207,7 @@ namespace Robust.Server.Maps
 
                 LoadedMapData?.Invoke(data.Stream, resPath.ToString());
 
-                var context = new MapContext(_mapManager, _tileDefinitionManager, _serverEntityManager,
+                var context = new MapContext(_mapManager, _tileDefinitionManager, _serverEntityManager, _pauseManager,
                     _prototypeManager, (YamlMappingNode) data.RootNode, mapId, options);
                 context.Deserialize();
 
@@ -224,6 +226,7 @@ namespace Robust.Server.Maps
             private readonly IMapManagerInternal _mapManager;
             private readonly ITileDefinitionManager _tileDefinitionManager;
             private readonly IServerEntityManagerInternal _serverEntityManager;
+            private readonly IPauseManager _pauseManager;
             private readonly IPrototypeManager _prototypeManager;
 
             private readonly MapLoadOptions? _loadOptions;
@@ -257,11 +260,12 @@ namespace Robust.Server.Maps
             public bool MapIsPostInit { get; private set; }
 
             public MapContext(IMapManagerInternal maps, ITileDefinitionManager tileDefs,
-                IServerEntityManagerInternal entities, IPrototypeManager prototypeManager)
+                IServerEntityManagerInternal entities, IPauseManager pauseManager, IPrototypeManager prototypeManager)
             {
                 _mapManager = maps;
                 _tileDefinitionManager = tileDefs;
                 _serverEntityManager = entities;
+                _pauseManager = pauseManager;
                 _prototypeManager = prototypeManager;
 
                 RootNode = new YamlMappingNode();
@@ -279,12 +283,13 @@ namespace Robust.Server.Maps
 
             public MapContext(IMapManagerInternal maps, ITileDefinitionManager tileDefs,
                 IServerEntityManagerInternal entities,
-                IPrototypeManager prototypeManager,
+                IPauseManager pauseManager, IPrototypeManager prototypeManager,
                 YamlMappingNode node, MapId targetMapId, MapLoadOptions options)
             {
                 _mapManager = maps;
                 _tileDefinitionManager = tileDefs;
                 _serverEntityManager = entities;
+                _pauseManager = pauseManager;
                 _loadOptions = options;
 
                 RootNode = node;
@@ -607,7 +612,7 @@ namespace Robust.Server.Maps
 
                     if (!MapIsPostInit)
                     {
-                        _mapManager.AddUninitializedMap(TargetMap);
+                        _pauseManager.AddUninitializedMap(TargetMap);
                     }
                 }
             }
@@ -714,7 +719,7 @@ namespace Robust.Server.Maps
                 var isPostInit = false;
                 foreach (var grid in Grids)
                 {
-                    if (_mapManager.IsMapInitialized(grid.ParentMapId))
+                    if (_pauseManager.IsMapInitialized(grid.ParentMapId))
                     {
                         isPostInit = true;
                         break;

Robust.Shared.Maths/Vector2.cs

@@ -130,12 +130,6 @@ namespace Robust.Shared.Maths
             return new((int) MathF.Floor(X), (int) MathF.Floor(Y));
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public readonly Vector2i Ceiled()
-        {
-            return new((int) MathF.Ceiling(X), (int) MathF.Ceiling(Y));
-        }
-
         /// <summary>
         ///     Subtracts a vector from another, returning a new vector.
         /// </summary>

Robust.Shared/Console/CommandBuffer.cs

@@ -1,81 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Robust.Shared.Console;
-
-public class CommandBuffer
-{
-    private const string DelayMarker = "-DELAY-";
-
-    private int _tickrate = 0;
-    private int _delay = 0;
-
-    private readonly LinkedList<string> _commandBuffer = new();
-
-    public void Append(string command)
-    {
-        _commandBuffer.AddLast(command);
-    }
-
-    public void Insert(string command)
-    {
-        _commandBuffer.AddFirst(command);
-    }
-
-    public void Tick(byte tickRate)
-    {
-        _tickrate = tickRate;
-
-        if (_delay > 0)
-        {
-            _delay -= 1;
-        }
-    }
-
-    public bool TryGetCommand([MaybeNullWhen(false)]out string command)
-    {
-        var next = _commandBuffer.First;
-
-        if (next is null) // nothing to do here
-        {
-            command = null;
-            return false;
-        }
-
-        if (next.Value.Equals(DelayMarker))
-        {
-            if (_delay == 0) // just finished
-            {
-                _commandBuffer.RemoveFirst();
-                return TryGetCommand(out command);
-            }
-            else // currently counting down delay
-            {
-                command = null;
-                return false;
-            }
-        }
-
-        if (next.Value.StartsWith("wait "))
-        {
-            var sTicks = next.Value.Substring(5);
-            _commandBuffer.RemoveFirst();
-            if (string.IsNullOrWhiteSpace(sTicks) || !int.TryParse(sTicks, out var ticks)) // messed up command
-            {
-                return TryGetCommand(out command);
-            }
-
-            // Setup Timing
-            _commandBuffer.AddFirst(DelayMarker);
-            _delay = ticks;
-
-            command = null;
-            return false;
-        }
-
-        // normal command
-        _commandBuffer.RemoveFirst();
-        command = next.Value;
-        return true;
-    }
-}

Robust.Shared/Console/Commands/ExecCommand.cs

@@ -48,7 +48,7 @@ namespace Robust.Shared.Console.Commands
                     continue;
                 }
 
-                shell.ConsoleHost.AppendCommand(line);
+                shell.ExecuteCommand(line);
             }
         }
     }

Robust.Shared/Console/ConsoleHost.cs

@@ -7,7 +7,6 @@ using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 using Robust.Shared.Reflection;
-using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Shared.Console
@@ -18,16 +17,13 @@ namespace Robust.Shared.Console
         protected const string SawmillName = "con";
 
         [Dependency] protected readonly ILogManager LogManager = default!;
-        [Dependency] private readonly IReflectionManager ReflectionManager = default!;
+        [Dependency] protected readonly IReflectionManager ReflectionManager = default!;
         [Dependency] protected readonly INetManager NetManager = default!;
         [Dependency] private readonly IDynamicTypeFactoryInternal _typeFactory = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
 
         [ViewVariables]
         protected readonly Dictionary<string, IConsoleCommand> AvailableCommands = new();
 
-        private readonly CommandBuffer _commandBuffer = new CommandBuffer();
-
         /// <inheritdoc />
         public bool IsServer => NetManager.IsServer;
 
@@ -120,36 +116,6 @@ namespace Robust.Shared.Console
             ExecuteCommand(null, command);
         }
 
-        /// <inheritdoc />
-        public void AppendCommand(string command)
-        {
-            _commandBuffer.Append(command);
-        }
-
-        /// <inheritdoc />
-        public void InsertCommand(string command)
-        {
-            _commandBuffer.Insert(command);
-        }
-
-        /// <inheritdoc />
-        public void CommandBufferExecute()
-        {
-            _commandBuffer.Tick(_timing.TickRate);
-
-            while (_commandBuffer.TryGetCommand(out var cmd))
-            {
-                try
-                {
-                    ExecuteCommand(cmd);
-                }
-                catch (Exception e)
-                {
-                    LocalShell.WriteError(e.Message);
-                }
-            }
-        }
-
         /// <summary>
         /// A console command that was registered inline through <see cref="IConsoleHost"/>.
         /// </summary>

Robust.Shared/Console/IConsoleHost.cs

@@ -81,35 +81,11 @@ namespace Robust.Shared.Console
         IConsoleShell GetSessionShell(ICommonSession session);
 
         /// <summary>
-        /// Execute a command string immediately on the local shell, bypassing the command buffer completely.
+        /// Execute a command string on the local shell.
         /// </summary>
         /// <param name="command">Command string to execute.</param>
         void ExecuteCommand(string command);
 
-        /// <summary>
-        /// Appends a command into the end of the command buffer on the local shell.
-        /// </summary>
-        /// <remarks>
-        ///  This command will be ran *sometime* in the future, depending on how many waits are in the buffer.
-        /// </remarks>
-        /// <param name="command">Command string to execute.</param>
-        void AppendCommand(string command);
-
-        /// <summary>
-        /// Inserts a command into the front of the command buffer on the local shell.
-        /// </summary>
-        /// <remarks>
-        ///  This command will preempt the next command executed in the command buffer.
-        /// </remarks>
-        /// <param name="command">Command string to execute.</param>
-        void InsertCommand(string command);
-
-        /// <summary>
-        /// Processes any contents of the command buffer on the local shell. This needs to be called regularly (once a tick),
-        /// inside the simulation. Pausing the server should prevent the buffer from being processed.
-        /// </summary>
-        void CommandBufferExecute();
-
         /// <summary>
         /// Executes a command string on this specific session shell. If the command does not exist, the command will be forwarded
         /// to the

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

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Robust.Shared.GameStates;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Shared.GameObjects;
@@ -28,8 +27,6 @@ public abstract class AppearanceComponent : Component
         if (AppearanceData.TryGetValue(key, out var existing) && existing.Equals(value))
             return;
 
-        DebugTools.Assert(value.GetType().IsValueType || value is ICloneable, "Appearance data values must be cloneable.");
-
         AppearanceData[key] = value;
         Dirty();
         EntitySystem.Get<SharedAppearanceSystem>().MarkDirty(this);
@@ -40,8 +37,6 @@ public abstract class AppearanceComponent : Component
         if (AppearanceData.TryGetValue(key, out var existing) && existing.Equals(value))
             return;
 
-        DebugTools.Assert(value.GetType().IsValueType || value is ICloneable, "Appearance data values must be cloneable.");
-
         AppearanceData[key] = value;
         Dirty();
         EntitySystem.Get<SharedAppearanceSystem>().MarkDirty(this);

Robust.Shared/GameObjects/Components/IgnorePauseComponent.cs

@@ -1,24 +1,25 @@
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
+using Robust.Shared.Timing;
 
 namespace Robust.Shared.GameObjects
 {
     [RegisterComponent]
     public sealed class IgnorePauseComponent : Component
     {
+        [Dependency] private readonly IEntityManager _entMan = default!;
+
         protected override void OnAdd()
         {
             base.OnAdd();
-            IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner).EntityPaused = false;
+            _entMan.GetComponent<MetaDataComponent>(Owner).EntityPaused = false;
         }
 
         protected override void OnRemove()
         {
             base.OnRemove();
-            var entMan = IoCManager.Resolve<IEntityManager>();
-            if (IoCManager.Resolve<IMapManager>().IsMapPaused(entMan.GetComponent<TransformComponent>(Owner).MapID))
+            if (IoCManager.Resolve<IPauseManager>().IsMapPaused(_entMan.GetComponent<TransformComponent>(Owner).MapID))
             {
-                entMan.GetComponent<MetaDataComponent>(Owner).EntityPaused = true;
+                _entMan.GetComponent<MetaDataComponent>(Owner).EntityPaused = true;
             }
         }
     }

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

@@ -62,9 +62,8 @@ namespace Robust.Shared.GameObjects
 
             _mapIndex = state.MapId;
             LightingEnabled = state.LightingEnabled;
-            var xformQuery = _entMan.GetEntityQuery<TransformComponent>();
 
-            xformQuery.GetComponent(Owner).ChangeMapId(_mapIndex, xformQuery);
+            _entMan.GetComponent<TransformComponent>(Owner).ChangeMapId(_mapIndex);
         }
     }
 

Robust.Shared/GameObjects/Components/MetaDataComponent.cs

@@ -147,11 +147,9 @@ namespace Robust.Shared.GameObjects
             get => _entityPaused;
             set
             {
-                if (_entityPaused == value)
-                    return;
-                
                 var entMan = IoCManager.Resolve<IEntityManager>();
-                if (value && entMan.HasComponent<IgnorePauseComponent>(Owner))
+
+                if (_entityPaused == value || value && entMan.HasComponent<IgnorePauseComponent>(Owner))
                     return;
 
                 _entityPaused = value;

Robust.Shared/GameObjects/Components/Renderable/SharedSpriteComponent.cs

@@ -77,7 +77,7 @@ namespace Robust.Shared.GameObjects
             [DataField("color")]
             public Color Color = Color.White;
             [DataField("map")]
-            public HashSet<string>? MapKeys;
+            public List<string>? MapKeys;
 
             public static PrototypeLayerData New()
             {

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

@@ -8,7 +8,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Log; //Needed for release build, do not remove
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
@@ -85,12 +84,10 @@ namespace Robust.Shared.GameObjects
                 if (_gridId.Equals(value)) return;
 
                 _gridId = value;
-                var childEnumerator = ChildEnumerator;
-                var xformQuery = _entMan.GetEntityQuery<TransformComponent>();
-
-                while (childEnumerator.MoveNext(out var child))
+                foreach (var transformComponent in Children)
                 {
-                    xformQuery.GetComponent(child.Value).GridID = value;
+                    var child = transformComponent;
+                    child.GridID = value;
                 }
             }
         }
@@ -158,18 +155,12 @@ namespace Robust.Shared.GameObjects
         {
             get
             {
-                var parent = _parent;
-                var xformQuery = _entMan.GetEntityQuery<TransformComponent>();
-                var rotation = _localRotation;
-
-                while (parent.IsValid())
+                if (_parent.IsValid())
                 {
-                    var parentXform = xformQuery.GetComponent(parent);
-                    rotation += parentXform._localRotation;
-                    parent = parentXform.ParentUid;
+                    return Parent!.WorldRotation + _localRotation;
                 }
 
-                return rotation;
+                return _localRotation;
             }
             set
             {
@@ -220,21 +211,15 @@ namespace Robust.Shared.GameObjects
         {
             get
             {
-                var xformQuery = _entMan.GetEntityQuery<TransformComponent>();
-                var parent = _parent;
-                var myMatrix = _localMatrix;
-
-                while (parent.IsValid())
+                if (_parent.IsValid())
                 {
-                    var parentXform = xformQuery.GetComponent(parent);
-                    var parentMatrix = parentXform._localMatrix;
-                    parent = parentXform.ParentUid;
-
+                    var parentMatrix = Parent!.WorldMatrix;
+                    var myMatrix = GetLocalMatrix();
                     Matrix3.Multiply(ref myMatrix, ref parentMatrix, out var result);
-                    myMatrix = result;
+                    return result;
                 }
 
-                return myMatrix;
+                return GetLocalMatrix();
             }
         }
 
@@ -245,21 +230,15 @@ namespace Robust.Shared.GameObjects
         {
             get
             {
-                var xformQuery = _entMan.GetEntityQuery<TransformComponent>();
-                var parent = _parent;
-                var myMatrix = _invLocalMatrix;
-
-                while (parent.IsValid())
+                if (_parent.IsValid())
                 {
-                    var parentXform = xformQuery.GetComponent(parent);
-                    var parentMatrix = parentXform._invLocalMatrix;
-                    parent = parentXform.ParentUid;
-
-                    Matrix3.Multiply(ref parentMatrix, ref myMatrix, out var result);
-                    myMatrix = result;
+                    var matP = Parent!.InvWorldMatrix;
+                    var myMatrix = GetLocalMatrixInv();
+                    Matrix3.Multiply(ref matP, ref myMatrix, out var result);
+                    return result;
                 }
 
-                return myMatrix;
+                return GetLocalMatrixInv();
             }
         }
 
@@ -335,26 +314,25 @@ namespace Robust.Shared.GameObjects
 
                 if (!sameParent)
                 {
-                    var xformQuery = _entMan.GetEntityQuery<TransformComponent>();
                     changedParent = true;
-                    var newParent = xformQuery.GetComponent(value.EntityId);
+                    var newParent = _entMan.GetComponent<TransformComponent>(value.EntityId);
 
                     DebugTools.Assert(newParent != this,
                         $"Can't parent a {nameof(TransformComponent)} to itself.");
 
                     // That's already our parent, don't bother attaching again.
 
-                    var oldParent = _parent.IsValid() ? xformQuery.GetComponent(_parent) : null;
+                    var oldParent = Parent;
                     var uid = Owner;
                     oldParent?._children.Remove(uid);
                     newParent._children.Add(uid);
 
                     // offset position from world to parent
                     _parent = value.EntityId;
-                    ChangeMapId(newParent.MapID, xformQuery);
+                    ChangeMapId(newParent.MapID);
 
                     // Cache new GridID before raising the event.
-                    GridID = GetGridIndex(xformQuery);
+                    GridID = GetGridIndex();
 
                     var entParentChangedMessage = new EntParentChangedMessage(Owner, oldParent?.Owner);
                     _entMan.EventBus.RaiseLocalEvent(Owner, ref entParentChangedMessage);
@@ -365,8 +343,7 @@ namespace Robust.Shared.GameObjects
                 // This may not in fact be the right thing.
                 if (changedParent || !DeferUpdates)
                     RebuildMatrices();
-
-                Dirty(_entMan);
+                Dirty();
 
                 if (!DeferUpdates)
                 {
@@ -482,11 +459,10 @@ namespace Robust.Shared.GameObjects
                 if (_children.Count == 0) yield break;
 
                 var xforms = _entMan.GetEntityQuery<TransformComponent>();
-                var children = ChildEnumerator;
 
-                while (children.MoveNext(out var child))
+                foreach (var child in _children)
                 {
-                    yield return xforms.GetComponent(child.Value);
+                    yield return xforms.GetComponent(child);
                 }
             }
         }
@@ -531,23 +507,22 @@ namespace Robust.Shared.GameObjects
             // Children MAY be initialized here before their parents are.
             // We do this whole dance to handle this recursively,
             // setting _mapIdInitialized along the way to avoid going to the IMapComponent every iteration.
-            static MapId FindMapIdAndSet(TransformComponent xform, IEntityManager entMan, EntityQuery<TransformComponent> xformQuery)
+            static MapId FindMapIdAndSet(TransformComponent p, IEntityManager entMan)
             {
-                if (xform._mapIdInitialized)
+                if (p._mapIdInitialized)
                 {
-                    return xform.MapID;
+                    return p.MapID;
                 }
 
                 MapId value;
-
-                if (xform._parent.IsValid())
+                if (p._parent.IsValid())
                 {
-                    value = FindMapIdAndSet(xformQuery.GetComponent(xform._parent), entMan, xformQuery);
+                    value = FindMapIdAndSet((TransformComponent) p.Parent!, entMan);
                 }
                 else
                 {
                     // second level node, terminates recursion up the branch of the tree
-                    if (entMan.TryGetComponent(xform.Owner, out IMapComponent? mapComp))
+                    if (entMan.TryGetComponent(p.Owner, out IMapComponent? mapComp))
                     {
                         value = mapComp.WorldMap;
                     }
@@ -557,16 +532,14 @@ namespace Robust.Shared.GameObjects
                     }
                 }
 
-                xform.MapID = value;
-                xform._mapIdInitialized = true;
+                p.MapID = value;
+                p._mapIdInitialized = true;
                 return value;
             }
 
-            var xformQuery = _entMan.GetEntityQuery<TransformComponent>();
-
             if (!_mapIdInitialized)
             {
-                FindMapIdAndSet(this, _entMan, xformQuery);
+                FindMapIdAndSet(this, _entMan);
 
                 _mapIdInitialized = true;
             }
@@ -576,14 +549,14 @@ namespace Robust.Shared.GameObjects
             {
                 // Note that _children is a SortedSet<EntityUid>,
                 // so duplicate additions (which will happen) don't matter.
-                xformQuery.GetComponent(_parent)._children.Add(Owner);
+                ((TransformComponent) Parent!)._children.Add(Owner);
             }
 
-            GridID = GetGridIndex(xformQuery);
+            GridID = GetGridIndex();
             RebuildMatrices();
         }
 
-        private GridId GetGridIndex(EntityQuery<TransformComponent> xformQuery)
+        private GridId GetGridIndex()
         {
             if (_entMan.HasComponent<IMapComponent>(Owner))
             {
@@ -597,7 +570,7 @@ namespace Robust.Shared.GameObjects
 
             if (_parent.IsValid())
             {
-                return xformQuery.GetComponent(_parent).GridID;
+                return Parent!.GridID;
             }
 
             return _mapManager.TryFindGridAt(MapID, WorldPosition, out var mapgrid) ? mapgrid.Index : GridId.Invalid;
@@ -612,7 +585,7 @@ namespace Robust.Shared.GameObjects
             base.Startup();
 
             // Keep the cached matrices in sync with the fields.
-            Dirty(_entMan);
+            Dirty();
         }
 
         /// <summary>
@@ -748,36 +721,25 @@ namespace Robust.Shared.GameObjects
             Coordinates = new EntityCoordinates(newParent.Owner, newParent.InvWorldMatrix.Transform(WorldPosition));
         }
 
-        internal void ChangeMapId(MapId newMapId, EntityQuery<TransformComponent> xformQuery)
+        internal void ChangeMapId(MapId newMapId)
         {
             if (newMapId == MapID)
                 return;
 
             var oldMapId = MapID;
 
-            //Set Paused state
-            var mapPaused = _mapManager.IsMapPaused(newMapId);
-            var metaData = _entMan.GetComponent<MetaDataComponent>(Owner);
-            metaData.EntityPaused = mapPaused;
-
             MapID = newMapId;
             MapIdChanged(oldMapId);
-            var xforms = _entMan.GetEntityQuery<TransformComponent>();
-            var metaEnts = _entMan.GetEntityQuery<MetaDataComponent>();
-            UpdateChildMapIdsRecursive(MapID, mapPaused, xforms, metaEnts);
+            UpdateChildMapIdsRecursive(MapID, _entMan);
         }
 
-        private void UpdateChildMapIdsRecursive(MapId newMapId, bool mapPaused, EntityQuery<TransformComponent> xformQuery, EntityQuery<MetaDataComponent> metaQuery)
+        private void UpdateChildMapIdsRecursive(MapId newMapId, IEntityManager entMan)
         {
-            var childEnumerator = ChildEnumerator;
+            var xforms = _entMan.GetEntityQuery<TransformComponent>();
 
-            while (childEnumerator.MoveNext(out var child))
+            foreach (var child in _children)
             {
-                //Set Paused state
-                var metaData = metaQuery.GetComponent(child.Value);
-                metaData.EntityPaused = mapPaused;
-
-                var concrete = xformQuery.GetComponent(child.Value);
+                var concrete = xforms.GetComponent(child);
                 var old = concrete.MapID;
 
                 concrete.MapID = newMapId;
@@ -785,7 +747,7 @@ namespace Robust.Shared.GameObjects
 
                 if (concrete.ChildCount != 0)
                 {
-                    concrete.UpdateChildMapIdsRecursive(newMapId, mapPaused, xformQuery, metaQuery);
+                    concrete.UpdateChildMapIdsRecursive(newMapId, entMan);
                 }
             }
         }
@@ -838,14 +800,14 @@ namespace Robust.Shared.GameObjects
         {
             var parent = _parent;
             var worldRot = _localRotation;
-            var worldMatrix = _localMatrix;
+            var worldMatrix = GetLocalMatrix();
 
             // By doing these all at once we can elide multiple IsValid + GetComponent calls
             while (parent.IsValid())
             {
                 var xform = xforms.GetComponent(parent);
                 worldRot += xform.LocalRotation;
-                var parentMatrix = xform._localMatrix;
+                var parentMatrix = xform.GetLocalMatrix();
                 Matrix3.Multiply(ref worldMatrix, ref parentMatrix, out var result);
                 worldMatrix = result;
                 parent = xform.ParentUid;
@@ -899,8 +861,8 @@ namespace Robust.Shared.GameObjects
         {
             var parent = _parent;
             var worldRot = _localRotation;
-            var invMatrix = _invLocalMatrix;
-            var worldMatrix = _localMatrix;
+            var invMatrix = GetLocalMatrixInv();
+            var worldMatrix = GetLocalMatrix();
 
             // By doing these all at once we can elide multiple IsValid + GetComponent calls
             while (parent.IsValid())
@@ -908,11 +870,11 @@ namespace Robust.Shared.GameObjects
                 var xform = xformQuery.GetComponent(parent);
                 worldRot += xform.LocalRotation;
 
-                var parentMatrix = xform._localMatrix;
+                var parentMatrix = xform.GetLocalMatrix();
                 Matrix3.Multiply(ref worldMatrix, ref parentMatrix, out var result);
                 worldMatrix = result;
 
-                var parentInvMatrix = xform._invLocalMatrix;
+                var parentInvMatrix = xform.GetLocalMatrixInv();
                 Matrix3.Multiply(ref parentInvMatrix, ref invMatrix, out var invResult);
                 invMatrix = invResult;
 
@@ -1043,6 +1005,16 @@ namespace Robust.Shared.GameObjects
             }
         }
 
+        public Matrix3 GetLocalMatrix()
+        {
+            return _localMatrix;
+        }
+
+        public Matrix3 GetLocalMatrixInv()
+        {
+            return _invLocalMatrix;
+        }
+
         private void RebuildMatrices()
         {
             var pos = _localPosition;

Robust.Shared/GameObjects/EntityManager.cs

@@ -20,6 +20,7 @@ namespace Robust.Shared.GameObjects
         [IoC.Dependency] protected readonly IEntitySystemManager EntitySystemManager = default!;
         [IoC.Dependency] private readonly IMapManager _mapManager = default!;
         [IoC.Dependency] private readonly IGameTiming _gameTiming = default!;
+        [IoC.Dependency] private readonly IPauseManager _pauseManager = default!;
 
         #endregion Dependencies
 
@@ -437,7 +438,7 @@ namespace Robust.Shared.GameObjects
                 StartEntity(entity);
 
                 // If the map we're initializing the entity on is initialized, run map init on it.
-                if (_mapManager.IsMapInitialized(mapId))
+                if (_pauseManager.IsMapInitialized(mapId))
                     entity.RunMapInit();
             }
             catch (Exception e)

Robust.Shared/GameObjects/EntitySystem.Proxy.cs

@@ -571,47 +571,4 @@ public partial class EntitySystem
         => new($"Entity {uid} does not have a component of type {typeof(T)}");
 
     #endregion
-
-    #region Entity Query
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected EntityQuery<T> GetEntityQuery<T>() where T : Component
-    {
-        return EntityManager.GetEntityQuery<T>();
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected IEnumerable<TComp1> EntityQuery<TComp1>(bool includePaused = false) where TComp1 : Component
-    {
-        return EntityManager.EntityQuery<TComp1>(includePaused);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected IEnumerable<(TComp1, TComp2)> EntityQuery<TComp1, TComp2>(bool includePaused = false)
-        where TComp1 : Component
-        where TComp2 : Component
-    {
-        return EntityManager.EntityQuery<TComp1, TComp2>(includePaused);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected IEnumerable<(TComp1, TComp2, TComp3)> EntityQuery<TComp1, TComp2, TComp3>(bool includePaused = false)
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
-    {
-        return EntityManager.EntityQuery<TComp1, TComp2, TComp3>(includePaused);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected IEnumerable<(TComp1, TComp2, TComp3, TComp4)> EntityQuery<TComp1, TComp2, TComp3, TComp4>(bool includePaused = false)
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
-        where TComp4 : Component
-    {
-        return EntityManager.EntityQuery<TComp1, TComp2, TComp3, TComp4>(includePaused);
-    }
-
-    #endregion
 }

Robust.Shared/GameObjects/EntityUid.cs

@@ -3,6 +3,7 @@ using JetBrains.Annotations;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
@@ -171,7 +172,7 @@ namespace Robust.Shared.GameObjects
             set
             {
                 if (MetaData is {} metaData)
-                    metaData.EntityDescription = value;
+                    metaData.EntityName = value;
             }
         }
 

Robust.Shared/GameObjects/Systems/SharedAppearanceSystem.cs

@@ -4,7 +4,7 @@ using Robust.Shared.Serialization;
 
 namespace Robust.Shared.GameObjects;
 
-public abstract class SharedAppearanceSystem : EntitySystem
+internal abstract class SharedAppearanceSystem : EntitySystem
 {
     public virtual void MarkDirty(AppearanceComponent component) {}
 }

Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.Fixtures.cs

@@ -1,105 +0,0 @@
-using Robust.Shared.IoC;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Utility;
-
-namespace Robust.Shared.GameObjects;
-
-public abstract partial class SharedPhysicsSystem
-{
-    [Dependency] private readonly FixtureSystem _fixtures = default!;
-
-    #region Collision Masks & Layers
-
-    public void AddCollisionMask(FixturesComponent component, Fixture fixture, int mask)
-    {
-        if ((fixture.CollisionMask & mask) == mask) return;
-
-        DebugTools.Assert(component.Fixtures.ContainsKey(fixture.ID));
-        fixture._collisionMask |= mask;
-
-        if (TryComp<PhysicsComponent>(component.Owner, out var body))
-        {
-            _fixtures.FixtureUpdate(component, body);
-        }
-
-        _broadphaseSystem.Refilter(fixture);
-    }
-
-    public void SetCollisionMask(FixturesComponent component, Fixture fixture, int mask)
-    {
-        if (fixture.CollisionMask == mask) return;
-
-        DebugTools.Assert(component.Fixtures.ContainsKey(fixture.ID));
-        fixture._collisionMask = mask;
-
-        if (TryComp<PhysicsComponent>(component.Owner, out var body))
-        {
-            _fixtures.FixtureUpdate(component, body);
-        }
-
-        _broadphaseSystem.Refilter(fixture);
-    }
-
-    public void RemoveCollisionMask(FixturesComponent component, Fixture fixture, int mask)
-    {
-        if ((fixture.CollisionMask & mask) == 0x0) return;
-
-        DebugTools.Assert(component.Fixtures.ContainsKey(fixture.ID));
-        fixture._collisionMask &= ~mask;
-
-        if (TryComp<PhysicsComponent>(component.Owner, out var body))
-        {
-            _fixtures.FixtureUpdate(component, body);
-        }
-
-        _broadphaseSystem.Refilter(fixture);
-    }
-
-    public void AddCollisionLayer(FixturesComponent component, Fixture fixture, int layer)
-    {
-        if ((fixture.CollisionLayer & layer) == layer) return;
-
-        DebugTools.Assert(component.Fixtures.ContainsKey(fixture.ID));
-        fixture._collisionLayer |= layer;
-
-        if (TryComp<PhysicsComponent>(component.Owner, out var body))
-        {
-            _fixtures.FixtureUpdate(component, body);
-        }
-
-        _broadphaseSystem.Refilter(fixture);
-    }
-
-    public void SetCollisionLayer(FixturesComponent component, Fixture fixture, int layer)
-    {
-        if (fixture.CollisionLayer == layer) return;
-
-        DebugTools.Assert(component.Fixtures.ContainsKey(fixture.ID));
-        fixture._collisionLayer = layer;
-
-        if (TryComp<PhysicsComponent>(component.Owner, out var body))
-        {
-            _fixtures.FixtureUpdate(component, body);
-        }
-
-        _broadphaseSystem.Refilter(fixture);
-    }
-
-    public void RemoveCollisionLayer(FixturesComponent component, Fixture fixture, int layer)
-    {
-        if ((fixture.CollisionLayer & layer) == 0x0) return;
-
-        DebugTools.Assert(component.Fixtures.ContainsKey(fixture.ID));
-        fixture._collisionLayer &= ~layer;
-
-        if (TryComp<PhysicsComponent>(component.Owner, out var body))
-        {
-            _fixtures.FixtureUpdate(component, body);
-        }
-
-        _broadphaseSystem.Refilter(fixture);
-    }
-
-    #endregion
-}

Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs

@@ -70,7 +70,7 @@ namespace Robust.Shared.GameObjects
             IoCManager.Resolve<IIslandManager>().Initialize();
 
             var configManager = IoCManager.Resolve<IConfigurationManager>();
-            configManager.OnValueChanged(CVars.AutoClearForces, OnAutoClearChange);
+            configManager.OnValueChanged(CVars.AutoClearForces, OnAutoClearChange, true);
         }
 
         private void HandlePhysicsMapInit(EntityUid uid, SharedPhysicsMapComponent component, ComponentInit args)
@@ -81,7 +81,6 @@ namespace Robust.Shared.GameObjects
             component.ContactManager = new();
             component.ContactManager.Initialize();
             component.ContactManager.MapId = component.MapId;
-            component.AutoClearForces = IoCManager.Resolve<IConfigurationManager>().GetCVar(CVars.AutoClearForces);
 
             component.ContactManager.KinematicControllerCollision += KinematicControllerCollision;
         }

Robust.Shared/GameObjects/Systems/SharedTransformSystem.Component.cs

@@ -1,58 +0,0 @@
-using System.Runtime.CompilerServices;
-using JetBrains.Annotations;
-using Robust.Shared.Maths;
-
-namespace Robust.Shared.GameObjects;
-
-public abstract partial class SharedTransformSystem
-{
-    #region World Matrix
-
-    [Pure]
-    public Matrix3 GetWorldMatrix(EntityUid uid)
-    {
-        return Comp<TransformComponent>(uid).WorldMatrix;
-    }
-
-    // Temporary until it's moved here
-    [Pure]
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public Matrix3 GetWorldMatrix(TransformComponent component)
-    {
-        return component.WorldMatrix;
-    }
-
-    [Pure]
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public Matrix3 GetWorldMatrix(EntityUid uid, EntityQuery<TransformComponent> xformQuery)
-    {
-        return GetWorldMatrix(xformQuery.GetComponent(uid));
-    }
-
-    #endregion
-
-    #region Inverse World Matrix
-
-    [Pure]
-    public Matrix3 GetInvWorldMatrix(EntityUid uid)
-    {
-        return Comp<TransformComponent>(uid).InvWorldMatrix;
-    }
-
-    // Temporary until it's moved here
-    [Pure]
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public Matrix3 GetInvWorldMatrix(TransformComponent component)
-    {
-        return component.InvWorldMatrix;
-    }
-
-    [Pure]
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public Matrix3 GetInvWorldMatrix(EntityUid uid, EntityQuery<TransformComponent> xformQuery)
-    {
-        return GetInvWorldMatrix(xformQuery.GetComponent(uid));
-    }
-
-    #endregion
-}

Robust.Shared/GameObjects/Systems/SharedTransformSystem.cs

@@ -7,7 +7,7 @@ using Robust.Shared.Utility;
 
 namespace Robust.Shared.GameObjects
 {
-    public abstract partial class SharedTransformSystem : EntitySystem
+    public abstract class SharedTransformSystem : EntitySystem
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IEntityLookup _entityLookup = default!;
@@ -100,29 +100,5 @@ namespace Robust.Shared.GameObjects
                 }
             }
         }
-
-        public EntityCoordinates GetMoverCoordinates(TransformComponent xform)
-        {
-            // If they're parented directly to the map or grid then just return the coordinates.
-            if (!_mapManager.TryGetGrid(xform.GridID, out var grid))
-            {
-                var mapUid = _mapManager.GetMapEntityId(xform.MapID);
-                var coordinates = xform.Coordinates;
-
-                // Parented directly to the map.
-                if (xform.ParentUid == mapUid)
-                    return coordinates;
-
-                return new EntityCoordinates(mapUid, coordinates.ToMapPos(EntityManager));
-            }
-
-            // Parented directly to the grid
-            if (grid.GridEntityId == xform.ParentUid)
-                return xform.Coordinates;
-
-            // Parented to grid so convert their pos back to the grid.
-            var gridPos = Transform(grid.GridEntityId).InvWorldMatrix.Transform(xform.WorldPosition);
-            return new EntityCoordinates(grid.GridEntityId, gridPos);
-        }
     }
 }

Robust.Shared/Localization/LocHelper.cs

@@ -1,69 +1,30 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using Linguini.Bundle.Errors;
 using Linguini.Syntax.Parser.Error;
 
-namespace Robust.Shared.Localization;
-
-internal static class LocHelper
+namespace Robust.Shared.Localization
 {
-    public static string FormatCompileErrors(this ParseError self, ReadOnlyMemory<char> resource,
-        string? newLine = null)
+    internal static class LocHelper
     {
-        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, newLine);
-    }
-
-    private static string FormatErrors(string message, ErrorSpan span, ReadOnlyMemory<char> resource, string? newLine)
-    {
-        var sb = new StringBuilder();
-        var errContext = resource.Slice(span.StartSpan, span.EndSpan - span.StartSpan).ToString();
-        var lines = new List<ReadOnlyMemory<char>>(5);
-        var currLineOffset = 0;
-        var lastStart = 0;
-        for (var i = 0; i < span.StartMark - span.StartSpan; i++)
+        public static string FormatCompileErrors(this ParseError self, ReadOnlyMemory<char> resource)
         {
-            switch (errContext[i])
-            {
-                // Reset current line so that mark aligns with the reported error
-                // We cheat here a bit, since we both `\r\n` and `\n` end with '\n'
-                case '\n':
-                    if (i > 0 && errContext[i - 1] == '\r')
-                    {
-                        lines.Add(resource.Slice(lastStart, currLineOffset - 1));
-                    }
-                    else
-                    {
-                        lines.Add(resource.Slice(lastStart, currLineOffset));
-                    }
-
-                    lastStart = currLineOffset + 1;
-                    currLineOffset = 0;
-                    break;
-                default:
-                    currLineOffset++;
-                    break;
-            }
+            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);
         }
 
-        lines.Add(resource.Slice(lastStart, resource.Length - lastStart));
-
-
-        var lastLine = $"{span.Row + lines.Count - 1}".Length;
-        for (var index = 0; index < lines.Count; index++)
+        private static string FormatErrors(string message, ErrorSpan span, ReadOnlyMemory<char> resource)
         {
-            var line = lines[index];
-
-            sb.Append(newLine ?? Environment.NewLine).Append(' ').Append($"{span.Row + index}".PadLeft(lastLine))
-                .Append(" |").Append(line);
+            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();
         }
-
-        sb.Append(newLine ?? Environment.NewLine)
-            .Append(' ', currLineOffset + lastLine + 3)
-            .Append('^', span.EndMark - span.StartMark)
-            .Append($" {message}");
-        return sb.ToString();
     }
 }

Robust.Shared/Localization/LocalizationManager.cs

@@ -47,7 +47,7 @@ namespace Robust.Shared.Localization
 
             if (!TryGetString(messageId, out var msg))
             {
-                _logSawmill.Debug("Unknown messageId ({culture}): {messageId}", _defaultCulture.Name, messageId);
+                _logSawmill.Warning("Unknown messageId ({culture}): {messageId}", _defaultCulture.Name, messageId);
                 msg = messageId;
             }
 
@@ -62,7 +62,7 @@ namespace Robust.Shared.Localization
 
             if (!TryGetString(messageId, out var msg, args0))
             {
-                _logSawmill.Debug("Unknown messageId ({culture}): {messageId}", _defaultCulture.Name, messageId);
+                _logSawmill.Warning("Unknown messageId ({culture}): {messageId}", _defaultCulture.Name, messageId);
                 msg = messageId;
             }
 

Robust.Shared/Map/GridId.cs

@@ -1,6 +1,4 @@
-using System;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
+using System;
 using Robust.Shared.Serialization;
 
 namespace Robust.Shared.Map
@@ -15,14 +13,6 @@ namespace Robust.Shared.Map
 
         internal readonly int Value;
 
-        /// <summary>
-        /// Constructs a new instance of <see cref="GridId"/>.
-        /// </summary>
-        /// <remarks>
-        /// This should NOT be used in regular code, and is only public for special/legacy
-        /// cases. Generally you should only use this for parsing a GridId in console commands
-        /// and immediately check if the grid actually exists in the <see cref="IMapManager"/>.
-        /// </remarks>
         public GridId(int value)
         {
             Value = value;
@@ -67,30 +57,6 @@ namespace Robust.Shared.Map
             return self.Value;
         }
 
-        /// <summary>
-        /// <see cref="GridId"/> is an alias of the <see cref="EntityUid"/> that
-        /// holds the <see cref="IMapGridComponent"/>, so it can be implicitly converted.
-        /// </summary>
-        public static implicit operator EntityUid(GridId self)
-        {
-            // If this throws, you are either using an unallocated gridId,
-            // or using it after the grid was freed. Both of these are bugs.
-            return IoCManager.Resolve<IMapManager>().GetGridEuid(self);
-        }
-
-        /// <summary>
-        /// <see cref="GridId"/> is an alias of the <see cref="EntityUid"/> that
-        /// holds the <see cref="IMapGridComponent"/>.
-        /// </summary>
-        public static implicit operator GridId(EntityUid euid)
-        {
-            // If this throws, you are using an EntityUid that isn't a grid.
-            // This would raise the question, "Why does your code think this entity is a grid?".
-            // Grid-ness is defined by the entity having an IMapGridComponent,
-            // was the component removed without you knowing?
-            return IoCManager.Resolve<IMapManager>().GetGridComp(euid).GridIndex;
-        }
-
         public override string ToString()
         {
             return Value.ToString();

Robust.Shared/Map/IMapManager.cs

@@ -3,14 +3,13 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
-using Robust.Shared.Timing;
 
 namespace Robust.Shared.Map
 {
     /// <summary>
     ///     This manages all of the grids in the world.
     /// </summary>
-    public interface IMapManager : IPauseManager
+    public interface IMapManager
     {
         /// <summary>
         ///     The default <see cref="MapId" /> that is always available. Equivalent to SS13 Null space.

Robust.Shared/Map/MapManager.cs

@@ -1,4 +1,3 @@
-using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -8,24 +7,20 @@ using Robust.Shared.Utility;
 namespace Robust.Shared.Map;
 
 /// <inheritdoc cref="IMapManager" />
-[Virtual]
 internal partial class MapManager : IMapManagerInternal, IEntityEventSubscriber
 {
     [field: Dependency] public IGameTiming GameTiming { get; } = default!;
     [field: Dependency] public IEntityManager EntityManager { get; } = default!;
 
-    [Dependency] private readonly IConsoleHost _conhost = default!;
-
     /// <inheritdoc />
     public void Initialize()
     {
+        InitializeGridTrees();
 #if DEBUG
         DebugTools.Assert(!_dbgGuardInit);
         DebugTools.Assert(!_dbgGuardRunning);
         _dbgGuardInit = true;
 #endif
-        InitializeGridTrees();
-        InitializeMapPausing();
     }
 
     /// <inheritdoc />

Robust.Shared/Physics/Dynamics/Fixture.cs

@@ -190,7 +190,7 @@ namespace Robust.Shared.Physics.Dynamics
         }
 
         [DataField("layer", customTypeSerializer: typeof(FlagSerializer<CollisionLayer>))]
-        internal int _collisionLayer;
+        private int _collisionLayer;
 
         /// <summary>
         ///  Bitmask of the layers this component collides with.
@@ -211,7 +211,7 @@ namespace Robust.Shared.Physics.Dynamics
         }
 
         [DataField("mask", customTypeSerializer: typeof(FlagSerializer<CollisionMask>))]
-        internal int _collisionMask;
+        private int _collisionMask;
 
         public float Area
         {

Robust.Shared/Physics/FixtureSystem.cs

@@ -375,7 +375,9 @@ namespace Robust.Shared.Physics
         public void FixtureUpdate(FixturesComponent component, PhysicsComponent? body = null)
         {
             if (!Resolve(component.Owner, ref body))
+            {
                 return;
+            }
 
             var mask = 0;
             var layer = 0;
@@ -394,7 +396,7 @@ namespace Robust.Shared.Physics
             body.CollisionMask = mask;
             body.CollisionLayer = layer;
             body.Hard = hard;
-            Dirty(component);
+            component.Dirty();
         }
 
         [Serializable, NetSerializable]

Robust.Shared/Physics/SharedBroadphaseSystem.cs

@@ -402,18 +402,23 @@ namespace Robust.Shared.Physics
         public void Refilter(Fixture fixture)
         {
             // TODO: Call this method whenever collisionmask / collisionlayer changes
-            // TODO: This should never becalled when body is null.
-            DebugTools.Assert(fixture.Body != null);
-            if (fixture.Body == null)
-            {
-                return;
-            }
+            if (fixture.Body == null) return;
 
             var body = fixture.Body;
 
-            foreach (var (_, contact) in fixture.Contacts)
+            var node = body.Contacts.First;
+
+            while (node != null)
             {
-                contact.FilterFlag = true;
+                var contact = node.Value;
+                node = node.Next;
+                var fixtureA = contact.FixtureA;
+                var fixtureB = contact.FixtureB;
+
+                if (fixtureA == fixture || fixtureB == fixture)
+                {
+                    contact.FilterFlag = true;
+                }
             }
 
             var broadphase = body.Broadphase;
@@ -421,7 +426,7 @@ namespace Robust.Shared.Physics
             // If nullspace or whatever ignore it.
             if (broadphase == null) return;
 
-            TouchProxies(Transform(fixture.Body.Owner).MapID, broadphase, fixture);
+            TouchProxies(EntityManager.GetComponent<TransformComponent>(fixture.Body.Owner).MapID, broadphase, fixture);
         }
 
         private void TouchProxies(MapId mapId, BroadphaseComponent broadphase, Fixture fixture)

Robust.Shared/Prototypes/IPrototypeManager.cs

@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using Robust.Shared.Serialization.Markdown.Validation;
+using Robust.Shared.Utility;
+
+using YamlDotNet.RepresentationModel;
+
+namespace Robust.Shared.Prototypes
+{
+
+    /// <summary>
+    /// Handle storage and loading of YAML prototypes.
+    /// </summary>
+    public interface IPrototypeManager
+    {
+        void Initialize();
+
+        /// <summary>
+        /// Return an IEnumerable to iterate all prototypes of a certain type.
+        /// </summary>
+        /// <exception cref="KeyNotFoundException">
+        /// Thrown if the type of prototype is not registered.
+        /// </exception>
+        IEnumerable<T> EnumeratePrototypes<T>() where T : class, IPrototype;
+
+        /// <summary>
+        /// Return an IEnumerable to iterate all prototypes of a certain type.
+        /// </summary>
+        /// <exception cref="KeyNotFoundException">
+        /// Thrown if the type of prototype is not registered.
+        /// </exception>
+        IEnumerable<IPrototype> EnumeratePrototypes(Type type);
+
+        /// <summary>
+        /// Return an IEnumerable to iterate all prototypes of a certain variant.
+        /// </summary>
+        /// <exception cref="KeyNotFoundException">
+        /// Thrown if the variant of prototype is not registered.
+        /// </exception>
+        IEnumerable<IPrototype> EnumeratePrototypes(string variant);
+
+        /// <summary>
+        /// Index for a <see cref="IPrototype"/> by ID.
+        /// </summary>
+        /// <exception cref="KeyNotFoundException">
+        /// Thrown if the type of prototype is not registered.
+        /// </exception>
+        T Index<T>(string id) where T : class, IPrototype;
+
+        /// <summary>
+        /// Index for a <see cref="IPrototype"/> by ID.
+        /// </summary>
+        /// <exception cref="KeyNotFoundException">
+        /// Thrown if the ID does not exist or the type of prototype is not registered.
+        /// </exception>
+        IPrototype Index(Type type, string id);
+
+        /// <summary>
+        ///     Returns whether a prototype of type <typeparamref name="T"/> with the specified <param name="id"/> exists.
+        /// </summary>
+        bool HasIndex<T>(string id) where T : class, IPrototype;
+
+        bool TryIndex<T>(string id, [NotNullWhen(true)] out T? prototype) where T : class, IPrototype;
+        bool TryIndex(Type type, string id, [NotNullWhen(true)] out IPrototype? prototype);
+
+        /// <summary>
+        ///     Returns whether a prototype variant <param name="variant"/> exists.
+        /// </summary>
+        /// <param name="variant">Identifier for the prototype variant.</param>
+        /// <returns>Whether the prototype variant exists.</returns>
+        bool HasVariant(string variant);
+
+        /// <summary>
+        ///     Returns the Type for a prototype variant.
+        /// </summary>
+        /// <param name="variant">Identifier for the prototype variant.</param>
+        /// <returns>The specified prototype Type.</returns>
+        /// <exception cref="KeyNotFoundException">
+        ///     Thrown when the specified prototype variant isn't registered or doesn't exist.
+        /// </exception>
+        Type GetVariantType(string variant);
+
+        /// <summary>
+        ///     Attempts to get the Type for a prototype variant.
+        /// </summary>
+        /// <param name="variant">Identifier for the prototype variant.</param>
+        /// <param name="prototype">The specified prototype Type, or null.</param>
+        /// <returns>Whether the prototype type was found and <see cref="prototype"/> isn't null.</returns>
+        bool TryGetVariantType(string variant, [NotNullWhen(true)] out Type? prototype);
+
+        /// <summary>
+        ///     Attempts to get a prototype's variant.
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="variant"></param>
+        /// <returns></returns>
+        bool TryGetVariantFrom(Type type, [NotNullWhen(true)] out string? variant);
+
+        /// <summary>
+        ///     Attempts to get a prototype's variant.
+        /// </summary>
+        /// <param name="prototype">The prototype in question.</param>
+        /// <param name="variant">Identifier for the prototype variant, or null.</param>
+        /// <returns>Whether the prototype variant was successfully retrieved.</returns>
+        bool TryGetVariantFrom(IPrototype prototype, [NotNullWhen(true)] out string? variant);
+
+        /// <summary>
+        ///     Attempts to get a prototype's variant.
+        /// </summary>
+        /// <param name="variant">Identifier for the prototype variant, or null.</param>
+        /// <typeparam name="T">The prototype in question.</typeparam>
+        /// <returns>Whether the prototype variant was successfully retrieved.</returns>
+        bool TryGetVariantFrom<T>([NotNullWhen(true)] out string? variant) where T : class, IPrototype;
+
+        /// <summary>
+        /// Load prototypes from files in a directory, recursively.
+        /// </summary>
+        List<IPrototype> LoadDirectory(ResourcePath path, bool overwrite = false);
+
+        Dictionary<string, HashSet<ErrorNode>> ValidateDirectory(ResourcePath path);
+
+        HashSet<IPrototype> LoadFromString(string str, bool overwrite = false, string actionMessage="");
+
+        void RemoveString(string prototypes);
+
+        /// <summary>
+        /// Clear out all prototypes and reset to a blank slate.
+        /// </summary>
+        void Clear();
+
+        /// <summary>
+        /// Syncs all inter-prototype data. Call this when operations adding new prototypes are done.
+        /// </summary>
+        void Resync();
+
+        /// <summary>
+        ///     Registers a specific prototype name to be ignored.
+        /// </summary>
+        void RegisterIgnore(string name);
+
+        /// <summary>
+        /// Loads a single prototype class type into the manager.
+        /// </summary>
+        /// <param name="protoClass">A prototype class type that implements IPrototype. This type also
+        /// requires a <see cref="PrototypeAttribute"/> with a non-empty class string.</param>
+        void RegisterType(Type protoClass);
+
+        event Action<YamlStream, string>? LoadedData;
+
+        /// <summary>
+        ///     Fired when prototype are reloaded. The event args contain the modified prototypes.
+        /// </summary>
+        /// <remarks>
+        ///     This does NOT fire on initial prototype load.
+        /// </remarks>
+        event Action<PrototypesReloadedEventArgs> PrototypesReloaded;
+    }
+}

Robust.Shared/Prototypes/PrototypeAttribute.cs

@@ -0,0 +1,32 @@
+using System;
+using JetBrains.Annotations;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+
+namespace Robust.Shared.Prototypes
+{
+    /// <summary>
+    /// Quick attribute to give the prototype its type string.
+    /// To prevent needing to instantiate it because interfaces can't declare statics.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, Inherited = false)]
+    [BaseTypeRequired(typeof(IPrototype))]
+    [MeansImplicitUse]
+    [MeansDataDefinition]
+    public sealed class PrototypeAttribute : Attribute
+    {
+        private readonly string type;
+        public string Type => type;
+        public readonly int LoadPriority;
+        public readonly string LoadBefore;
+        public readonly string LoadAfter;
+
+        public PrototypeAttribute(string type, int loadPriority = 1, string loadBefore="" ,string loadAfter= "")
+        {
+            this.type = type;
+            LoadPriority = loadPriority;
+            LoadBefore = loadBefore;
+            LoadAfter = loadAfter;
+        }
+    }
+}

Robust.Shared/Prototypes/PrototypeManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Runtime.Serialization;
 using System.Threading;
 using JetBrains.Annotations;
@@ -25,175 +26,8 @@ using YamlDotNet.RepresentationModel;
 
 namespace Robust.Shared.Prototypes
 {
-    /// <summary>
-    /// Handle storage and loading of YAML prototypes.
-    /// </summary>
-    public interface IPrototypeManager
-    {
-        void Initialize();
 
-        /// <summary>
-        /// Return an IEnumerable to iterate all prototypes of a certain type.
-        /// </summary>
-        /// <exception cref="KeyNotFoundException">
-        /// Thrown if the type of prototype is not registered.
-        /// </exception>
-        IEnumerable<T> EnumeratePrototypes<T>() where T : class, IPrototype;
 
-        /// <summary>
-        /// Return an IEnumerable to iterate all prototypes of a certain type.
-        /// </summary>
-        /// <exception cref="KeyNotFoundException">
-        /// Thrown if the type of prototype is not registered.
-        /// </exception>
-        IEnumerable<IPrototype> EnumeratePrototypes(Type type);
-
-        /// <summary>
-        /// Return an IEnumerable to iterate all prototypes of a certain variant.
-        /// </summary>
-        /// <exception cref="KeyNotFoundException">
-        /// Thrown if the variant of prototype is not registered.
-        /// </exception>
-        IEnumerable<IPrototype> EnumeratePrototypes(string variant);
-
-        /// <summary>
-        /// Index for a <see cref="IPrototype"/> by ID.
-        /// </summary>
-        /// <exception cref="KeyNotFoundException">
-        /// Thrown if the type of prototype is not registered.
-        /// </exception>
-        T Index<T>(string id) where T : class, IPrototype;
-
-        /// <summary>
-        /// Index for a <see cref="IPrototype"/> by ID.
-        /// </summary>
-        /// <exception cref="KeyNotFoundException">
-        /// Thrown if the ID does not exist or the type of prototype is not registered.
-        /// </exception>
-        IPrototype Index(Type type, string id);
-
-        /// <summary>
-        ///     Returns whether a prototype of type <typeparamref name="T"/> with the specified <param name="id"/> exists.
-        /// </summary>
-        bool HasIndex<T>(string id) where T : class, IPrototype;
-        bool TryIndex<T>(string id, [NotNullWhen(true)] out T? prototype) where T : class, IPrototype;
-        bool TryIndex(Type type, string id, [NotNullWhen(true)] out IPrototype? prototype);
-
-        /// <summary>
-        ///     Returns whether a prototype variant <param name="variant"/> exists.
-        /// </summary>
-        /// <param name="variant">Identifier for the prototype variant.</param>
-        /// <returns>Whether the prototype variant exists.</returns>
-        bool HasVariant(string variant);
-
-        /// <summary>
-        ///     Returns the Type for a prototype variant.
-        /// </summary>
-        /// <param name="variant">Identifier for the prototype variant.</param>
-        /// <returns>The specified prototype Type.</returns>
-        /// <exception cref="KeyNotFoundException">
-        ///     Thrown when the specified prototype variant isn't registered or doesn't exist.
-        /// </exception>
-        Type GetVariantType(string variant);
-
-        /// <summary>
-        ///     Attempts to get the Type for a prototype variant.
-        /// </summary>
-        /// <param name="variant">Identifier for the prototype variant.</param>
-        /// <param name="prototype">The specified prototype Type, or null.</param>
-        /// <returns>Whether the prototype type was found and <see cref="prototype"/> isn't null.</returns>
-        bool TryGetVariantType(string variant, [NotNullWhen(true)] out Type? prototype);
-
-        /// <summary>
-        ///     Attempts to get a prototype's variant.
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="variant"></param>
-        /// <returns></returns>
-        bool TryGetVariantFrom(Type type, [NotNullWhen(true)] out string? variant);
-
-        /// <summary>
-        ///     Attempts to get a prototype's variant.
-        /// </summary>
-        /// <param name="prototype">The prototype in question.</param>
-        /// <param name="variant">Identifier for the prototype variant, or null.</param>
-        /// <returns>Whether the prototype variant was successfully retrieved.</returns>
-        bool TryGetVariantFrom(IPrototype prototype, [NotNullWhen(true)] out string? variant);
-
-        /// <summary>
-        ///     Attempts to get a prototype's variant.
-        /// </summary>
-        /// <param name="variant">Identifier for the prototype variant, or null.</param>
-        /// <typeparam name="T">The prototype in question.</typeparam>
-        /// <returns>Whether the prototype variant was successfully retrieved.</returns>
-        bool TryGetVariantFrom<T>([NotNullWhen(true)] out string? variant) where T : class, IPrototype;
-
-        /// <summary>
-        /// Load prototypes from files in a directory, recursively.
-        /// </summary>
-        List<IPrototype> LoadDirectory(ResourcePath path, bool overwrite = false);
-
-        Dictionary<string, HashSet<ErrorNode>> ValidateDirectory(ResourcePath path);
-
-        List<IPrototype> LoadFromStream(TextReader stream, bool overwrite = false);
-
-        List<IPrototype> LoadString(string str, bool overwrite = false);
-
-        void RemoveString(string prototypes);
-
-        /// <summary>
-        /// Clear out all prototypes and reset to a blank slate.
-        /// </summary>
-        void Clear();
-
-        /// <summary>
-        /// Syncs all inter-prototype data. Call this when operations adding new prototypes are done.
-        /// </summary>
-        void Resync();
-
-        /// <summary>
-        ///     Registers a specific prototype name to be ignored.
-        /// </summary>
-        void RegisterIgnore(string name);
-
-        /// <summary>
-        /// Loads a single prototype class type into the manager.
-        /// </summary>
-        /// <param name="protoClass">A prototype class type that implements IPrototype. This type also
-        /// requires a <see cref="PrototypeAttribute"/> with a non-empty class string.</param>
-        void RegisterType(Type protoClass);
-
-        event Action<YamlStream, string>? LoadedData;
-
-        /// <summary>
-        ///     Fired when prototype are reloaded. The event args contain the modified prototypes.
-        /// </summary>
-        /// <remarks>
-        ///     This does NOT fire on initial prototype load.
-        /// </remarks>
-        event Action<PrototypesReloadedEventArgs> PrototypesReloaded;
-    }
-
-    /// <summary>
-    /// Quick attribute to give the prototype its type string.
-    /// To prevent needing to instantiate it because interfaces can't declare statics.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, Inherited = false)]
-    [BaseTypeRequired(typeof(IPrototype))]
-    [MeansImplicitUse]
-    [MeansDataDefinition]
-    public sealed class PrototypeAttribute : Attribute
-    {
-        private readonly string type;
-        public string Type => type;
-        public readonly int LoadPriority = 1;
-
-        public PrototypeAttribute(string type, int loadPriority = 1)
-        {
-            this.type = type;
-            LoadPriority = loadPriority;
-        }
-    }
 
     [Virtual]
     public class PrototypeManager : IPrototypeManager
@@ -204,11 +38,12 @@ namespace Robust.Shared.Prototypes
         [Dependency] protected readonly ITaskManager TaskManager = default!;
         [Dependency] private readonly ISerializationManager _serializationManager = default!;
 
-        private readonly Dictionary<string, Type> _prototypeTypes = new();
+        private readonly Dictionary<string, Type> _types = new();
         private readonly Dictionary<Type, int> _prototypePriorities = new();
 
         private bool _initialized;
         private bool _hasEverBeenReloaded;
+        private int mappingErrors;
 
         #region IPrototypeManager members
 
@@ -216,8 +51,13 @@ namespace Robust.Shared.Prototypes
         private readonly Dictionary<Type, Dictionary<string, DeserializationResult>> _prototypeResults = new();
         private readonly Dictionary<Type, PrototypeInheritanceTree> _inheritanceTrees = new();
 
-        private readonly HashSet<string> _ignoredPrototypeTypes = new();
+        private readonly HashSet<Type> LoadBeforeList = new ();
+        private readonly HashSet<Type> LoadNormalList = new ();
+        private readonly HashSet<Type> LoadAfterList = new ();
 
+        private readonly HashSet<ErrorNode> ErrorNodes = new ();
+
+        private readonly HashSet<string> _ignoredPrototypeTypes = new();
         public virtual void Initialize()
         {
             if (_initialized)
@@ -225,8 +65,9 @@ namespace Robust.Shared.Prototypes
                 throw new InvalidOperationException($"{nameof(PrototypeManager)} has already been initialized.");
             }
 
+            mappingErrors = 0;
+            ReloadTypes();
             _initialized = true;
-            ReloadPrototypeTypes();
         }
 
         public IEnumerable<T> EnumeratePrototypes<T>() where T : class, IPrototype
@@ -283,7 +124,8 @@ namespace Robust.Shared.Prototypes
 
         public void Clear()
         {
-            _prototypeTypes.Clear();
+            mappingErrors = 0;
+            _types.Clear();
             _prototypes.Clear();
             _prototypeResults.Clear();
             _inheritanceTrees.Clear();
@@ -297,7 +139,7 @@ namespace Robust.Shared.Prototypes
         protected void ReloadPrototypes(IEnumerable<ResourcePath> filePaths)
         {
 #if !FULL_RELEASE
-            var changed = filePaths.SelectMany(f => LoadFile(f.ToRootedPath(), true)).ToList();
+            var changed = filePaths.SelectMany(f => LoadFromFile(f.ToRootedPath(), true)).ToList();
             ReloadPrototypes(changed);
 #endif
         }
@@ -374,6 +216,7 @@ namespace Robust.Shared.Prototypes
 #endif
         }
 
+        #region Inheritance Tree
         public void Resync()
         {
             var trees = _inheritanceTrees.Keys.ToList();
@@ -442,174 +285,6 @@ namespace Robust.Shared.Prototypes
             _prototypes[type][id] = (IPrototype) populatedRes.RawValue!;
         }
 
-        /// <inheritdoc />
-        public List<IPrototype> LoadDirectory(ResourcePath path, bool overwrite = false)
-        {
-            var changedPrototypes = new List<IPrototype>();
-
-            _hasEverBeenReloaded = true;
-            var streams = Resources.ContentFindFiles(path).ToList().AsParallel()
-                .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith("."));
-
-            foreach (var resourcePath in streams)
-            {
-                var filePrototypes = LoadFile(resourcePath, overwrite);
-                changedPrototypes.AddRange(filePrototypes);
-            }
-
-            return changedPrototypes;
-        }
-
-        public Dictionary<string, HashSet<ErrorNode>> ValidateDirectory(ResourcePath path)
-        {
-            var streams = Resources.ContentFindFiles(path).ToList().AsParallel()
-                .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith("."));
-
-            var dict = new Dictionary<string, HashSet<ErrorNode>>();
-            foreach (var resourcePath in streams)
-            {
-                using var reader = ReadFile(resourcePath);
-
-                if (reader == null)
-                {
-                    continue;
-                }
-
-                var yamlStream = new YamlStream();
-                yamlStream.Load(reader);
-
-                for (var i = 0; i < yamlStream.Documents.Count; i++)
-                {
-                    var rootNode = (YamlSequenceNode) yamlStream.Documents[i].RootNode;
-                    foreach (YamlMappingNode node in rootNode.Cast<YamlMappingNode>())
-                    {
-                        var type = node.GetNode("type").AsString();
-                        if (!_prototypeTypes.ContainsKey(type))
-                        {
-                            if (_ignoredPrototypeTypes.Contains(type))
-                            {
-                                continue;
-                            }
-
-                            throw new PrototypeLoadException($"Unknown prototype type: '{type}'");
-                        }
-
-                        var mapping = node.ToDataNodeCast<MappingDataNode>();
-                        mapping.Remove("type");
-                        var errorNodes = _serializationManager.ValidateNode(_prototypeTypes[type], mapping).GetErrors()
-                            .ToHashSet();
-                        if (errorNodes.Count == 0) continue;
-                        if (!dict.TryGetValue(resourcePath.ToString(), out var hashSet))
-                            dict[resourcePath.ToString()] = new HashSet<ErrorNode>();
-                        dict[resourcePath.ToString()].UnionWith(errorNodes);
-                    }
-                }
-            }
-
-            return dict;
-        }
-
-        private StreamReader? ReadFile(ResourcePath file, bool @throw = true)
-        {
-            var retries = 0;
-
-            // This might be shit-code, but its pjb-responded-idk-when-asked shit-code.
-            while (true)
-            {
-                try
-                {
-                    var reader = new StreamReader(Resources.ContentFileRead(file), EncodingHelpers.UTF8);
-                    return reader;
-                }
-                catch (IOException e)
-                {
-                    if (retries > 10)
-                    {
-                        if (@throw)
-                        {
-                            throw;
-                        }
-
-                        Logger.Error($"Error reloading prototypes in file {file}.", e);
-                        return null;
-                    }
-
-                    retries++;
-                    Thread.Sleep(10);
-                }
-            }
-        }
-
-        public HashSet<IPrototype> LoadFile(ResourcePath file, bool overwrite = false)
-        {
-            var changedPrototypes = new HashSet<IPrototype>();
-
-            try
-            {
-                using var reader = ReadFile(file, !overwrite);
-
-                if (reader == null)
-                {
-                    return changedPrototypes;
-                }
-
-                var yamlStream = new YamlStream();
-                yamlStream.Load(reader);
-
-                LoadedData?.Invoke(yamlStream, file.ToString());
-
-                for (var i = 0; i < yamlStream.Documents.Count; i++)
-                {
-                    try
-                    {
-                        var documentPrototypes = LoadFromDocument(yamlStream.Documents[i], overwrite);
-                        changedPrototypes.UnionWith(documentPrototypes);
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.ErrorS("eng", $"Exception whilst loading prototypes from {file}#{i}:\n{e}");
-                    }
-                }
-            }
-            catch (YamlException e)
-            {
-                var sawmill = Logger.GetSawmill("eng");
-                sawmill.Error("YamlException whilst loading prototypes from {0}: {1}", file, e.Message);
-            }
-
-            return changedPrototypes;
-        }
-
-        public List<IPrototype> LoadFromStream(TextReader stream, bool overwrite = false)
-        {
-            var changedPrototypes = new List<IPrototype>();
-            _hasEverBeenReloaded = true;
-            var yaml = new YamlStream();
-            yaml.Load(stream);
-
-            for (var i = 0; i < yaml.Documents.Count; i++)
-            {
-                try
-                {
-                    var documentPrototypes = LoadFromDocument(yaml.Documents[i], overwrite);
-                    changedPrototypes.AddRange(documentPrototypes);
-                }
-                catch (Exception e)
-                {
-                    throw new PrototypeLoadException($"Failed to load prototypes from document#{i}", e);
-                }
-            }
-
-            LoadedData?.Invoke(yaml, "anonymous prototypes YAML stream");
-
-            return changedPrototypes;
-        }
-
-        public List<IPrototype> LoadString(string str, bool overwrite = false)
-        {
-            return LoadFromStream(new StringReader(str), overwrite);
-        }
-
         public void RemoveString(string prototypes)
         {
             var reader = new StringReader(prototypes);
@@ -623,7 +298,7 @@ namespace Robust.Shared.Prototypes
                 foreach (var node in root.Cast<YamlMappingNode>())
                 {
                     var typeString = node.GetNode("type").AsString();
-                    var type = _prototypeTypes[typeString];
+                    var type = _types[typeString];
 
                     var id = node.GetNode("id").AsString();
 
@@ -636,63 +311,204 @@ namespace Robust.Shared.Prototypes
                 }
             }
         }
+        #endregion
 
-        #endregion IPrototypeManager members
-
-        private void ReloadPrototypeTypes()
+        public Dictionary<string, HashSet<ErrorNode>> ValidateDirectory(ResourcePath path)
         {
-            Clear();
-            foreach (var type in _reflectionManager.GetAllChildren<IPrototype>())
+            var streams = Resources.ContentFindFiles(path).ToList().AsParallel()
+                .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith("."));
+
+            var dict = new Dictionary<string, HashSet<ErrorNode>>();
+
+            foreach (var resourcePath in streams)
             {
-                RegisterType(type);
+                LoadFromFile(resourcePath, false, true);
+
+                if (!ErrorNodes.Any())
+                    continue;
+
+                if (!dict.TryGetValue(resourcePath.ToString(), out var hashSet))
+                    dict[resourcePath.ToString()] = new HashSet<ErrorNode>();
+
+                dict[resourcePath.ToString()].UnionWith(ErrorNodes);
+
             }
+
+            return dict;
         }
 
-        private HashSet<IPrototype> LoadFromDocument(YamlDocument document, bool overwrite = false)
+    #region Prototype Loading
+
+
+        /// <summary>
+        /// Loads Prototypes from a path.
+        /// </summary>
+        /// <param name="path">path to files to load as prototype.</param>
+        /// <param name="overwrite">Overwrite if prototype already is loaded and exists</param>
+        /// <returns>HashSet of Loaded Prototypes</returns>
+        public List<IPrototype> LoadDirectory(ResourcePath path, bool overwrite = false)
         {
-            var changedPrototypes = new HashSet<IPrototype>();
-            var rootNode = (YamlSequenceNode) document.RootNode;
+            var changedPrototypes = new List<IPrototype>();
 
-            foreach (YamlMappingNode node in rootNode.Cast<YamlMappingNode>())
+            _hasEverBeenReloaded = true;
+            var streams = Resources.ContentFindFiles(path).ToList().AsParallel()
+                .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith("."));
+
+            foreach (var resourcePath in streams)
             {
-                var type = node.GetNode("type").AsString();
-                if (!_prototypeTypes.ContainsKey(type))
-                {
-                    if (_ignoredPrototypeTypes.Contains(type))
-                    {
-                        continue;
-                    }
-
-                    throw new PrototypeLoadException($"Unknown prototype type: '{type}'");
-                }
-
-                var prototypeType = _prototypeTypes[type];
-                var res = _serializationManager.Read(prototypeType, node.ToDataNode(), skipHook: true);
-                var prototype = (IPrototype) res.RawValue!;
-
-                if (!overwrite && _prototypes[prototypeType].ContainsKey(prototype.ID))
-                {
-                    throw new PrototypeLoadException($"Duplicate ID: '{prototype.ID}'");
-                }
-
-                _prototypeResults[prototypeType][prototype.ID] = res;
-                if (prototype is IInheritingPrototype inheritingPrototype)
-                {
-                    _inheritanceTrees[prototypeType].AddId(prototype.ID, inheritingPrototype.Parent, true);
-                }
-                else
-                {
-                    //we call it here since it wont get called when pushing inheritance
-                    res.CallAfterDeserializationHook();
-                }
-
-                _prototypes[prototypeType][prototype.ID] = prototype;
-                changedPrototypes.Add(prototype);
+                var filePrototypes = LoadFromFile(resourcePath, overwrite);
+                changedPrototypes.AddRange(filePrototypes);
             }
 
             return changedPrototypes;
         }
 
+        /// <summary>
+        /// Loads Prototypes from a file.
+        /// </summary>
+        /// <param name="file">file to load as prototype.</param>
+        /// <param name="overwrite">Overwrite if prototype already is loaded and exists</param>
+        ///      /// <param name="validateMapping">toggle true to receive a count of total mapping errors</param>
+        /// <returns>HashSet of Loaded Prototypes</returns>
+        public HashSet<IPrototype> LoadFromFile(ResourcePath file, bool overwrite = false, bool validateMapping = false)
+        {
+            HashSet<IPrototype> LoadedPrototypes = new();
+            try
+            {
+                try
+                {
+                    var reader = new StreamReader(Resources.ContentFileRead(file), EncodingHelpers.UTF8);
+
+                    var yamlStream = new YamlStream();
+                    yamlStream.Load(reader);
+
+                    LoadedPrototypes = LoadFromDocument(yamlStream, overwrite, validateMapping, actionMessage: file.ToString());
+                }
+                catch (IOException e)
+                {
+                    Logger.Error($"Error loading prototypes in file {file}.", e);
+                }
+            }
+            catch (YamlException e)
+            {
+                var sawmill = Logger.GetSawmill("eng");
+                sawmill.Error("Caught YamlException whilst loading prototypes from a File {0}: {1}", file.Filename, e.Message);
+            }
+
+            return LoadedPrototypes;
+        }
+
+        /// <summary>
+        /// Loads Prototypes from a string.
+        /// </summary>
+        /// <param name="str">Input string to load as prototype.</param>
+        /// <param name="overwrite">Overwrite if prototype already is loaded and exists</param>
+        /// <param name="actionMessage">String that will be included in the LoadedData Event</param>
+        /// <returns>HashSet of Loaded Prototypes</returns>
+        public HashSet<IPrototype> LoadFromString(string str, bool overwrite = false, string actionMessage = "")
+        {
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StringReader(str));
+
+            return LoadFromDocument(yamlStream, overwrite, actionMessage: actionMessage);
+        }
+
+        /// <summary>
+        /// Loads YAML Prototypes via a Yaml Stream
+        /// </summary>
+        /// <param name="yamlStream">YamlStream to process</param>
+        /// <param name="mappingErrors">a count of mapping errors. is 0 until you toggle validateMapping on.</param>
+        /// <param name="validateMapping">toggle true to receive a count of total mapping errors</param>
+        /// <param name="overwrite">Overwrite if prototype already is loaded and exists.</param>
+        /// <param name="actionMessage">String that will be included in the LoadedData Event</param>
+        /// <returns>HashSet of Loaded Prototypes</returns>
+        /// <exception cref="PrototypeLoadException">Thrown when Prototype failed to load</exception>
+        private HashSet<IPrototype> LoadFromDocument(YamlStream yamlStream, bool overwrite = false,
+            bool validateMapping = false, string actionMessage = "")
+        {
+            var loadedPrototypes = new HashSet<IPrototype>();
+
+
+            for (var i = 0; i < yamlStream.Documents.Count(); i++)
+            {
+                var prototypeDocument = yamlStream.Documents[i];
+                var rootNode = (YamlSequenceNode) prototypeDocument.RootNode;
+
+                foreach (YamlMappingNode node in rootNode.Cast<YamlMappingNode>())
+                {
+                    var type = node.GetNode("type").AsString();
+                    if (!_types.ContainsKey(type))
+                    {
+                        if (_ignoredPrototypeTypes.Contains(type))
+                        {
+                            continue;
+                        }
+
+                        throw new PrototypeLoadException($"Unknown prototype type: '{type}'");
+                    }
+
+                    var prototypeType = _types[type];
+
+                    var res = _serializationManager.Read(prototypeType, node.ToDataNode(), skipHook: true);
+                    var prototype = (IPrototype) res.RawValue!;
+
+                    if (!overwrite && _prototypes[prototypeType].ContainsKey(prototype.ID))
+                    {
+                        throw new PrototypeLoadException($"Duplicate ID: '{prototype.ID}'");
+                    }
+
+                    _prototypeResults[prototypeType][prototype.ID] = res;
+                    if (prototype is IInheritingPrototype inheritingPrototype)
+                    {
+                        _inheritanceTrees[prototypeType].AddId(prototype.ID, inheritingPrototype.Parent, true);
+                    }
+                    else
+                    {
+                        //we call it here since it wont get called when pushing inheritance
+                        res.CallAfterDeserializationHook();
+                    }
+
+                    _prototypes[prototypeType][prototype.ID] = prototype;
+                    loadedPrototypes.Add(prototype);
+
+                    if (validateMapping)
+                    {
+                        var mapping = node.ToDataNodeCast<MappingDataNode>();
+                        mapping.Remove("type");
+                        var errorNodes = _serializationManager.ValidateNode(_types[type], mapping).GetErrors()
+                            .ToHashSet();
+                        mappingErrors = errorNodes.Count;
+
+                    }
+                }
+            }
+            LoadedData?.Invoke(yamlStream, actionMessage);
+            return loadedPrototypes;
+        }
+        #endregion
+        #endregion IPrototypeManager members
+
+        private void ReloadTypes()
+        {
+            Clear();
+            foreach (var type in _reflectionManager.GetAllChildren<IPrototype>())
+            {
+                var prototypeAttributes = (PrototypeAttribute?) Attribute.GetCustomAttribute(type, typeof(PrototypeAttribute));
+
+                if ( prototypeAttributes!.LoadBefore != string.Empty)
+                    LoadBeforeList.Add(type);
+                else if (prototypeAttributes!.LoadAfter != string.Empty)
+                    LoadAfterList.Add(type);
+                else
+                    LoadNormalList.Add(type);
+
+                RegisterType(type);
+            }
+        }
+
+
+
+
         public bool HasIndex<T>(string id) where T : class, IPrototype
         {
             if (!_prototypes.TryGetValue(typeof(T), out var index))
@@ -723,19 +539,19 @@ namespace Robust.Shared.Prototypes
         /// <inheritdoc />
         public bool HasVariant(string variant)
         {
-            return _prototypeTypes.ContainsKey(variant);
+            return _types.ContainsKey(variant);
         }
 
         /// <inheritdoc />
         public Type GetVariantType(string variant)
         {
-            return _prototypeTypes[variant];
+            return _types[variant];
         }
 
         /// <inheritdoc />
         public bool TryGetVariantType(string variant, [NotNullWhen(true)] out Type? prototype)
         {
-            return _prototypeTypes.TryGetValue(variant, out prototype);
+            return _types.TryGetValue(variant, out prototype);
         }
 
         /// <inheritdoc />
@@ -793,14 +609,14 @@ namespace Robust.Shared.Prototypes
                     "No " + nameof(PrototypeAttribute) + " to give it a type string.");
             }
 
-            if (_prototypeTypes.ContainsKey(attribute.Type))
+            if (_types.ContainsKey(attribute.Type))
             {
                 throw new InvalidImplementationException(type,
                     typeof(IPrototype),
-                    $"Duplicate prototype type ID: {attribute.Type}. Current: {_prototypeTypes[attribute.Type]}");
+                    $"Duplicate prototype type ID: {attribute.Type}. Current: {_types[attribute.Type]}");
             }
 
-            _prototypeTypes[attribute.Type] = type;
+            _types[attribute.Type] = type;
             _prototypePriorities[type] = attribute.LoadPriority;
 
             if (typeof(IPrototype).IsAssignableFrom(type))

Robust.Shared/Random/IRobustRandom.cs

@@ -20,22 +20,6 @@ namespace Robust.Shared.Random
         public Angle NextAngle(Angle minValue, Angle maxValue) => NextFloat() * (maxValue - minValue) + minValue;
         public Angle NextAngle(Angle maxValue) => NextFloat() * maxValue;
 
-        /// <summary>
-        ///     Random vector, created from a uniform distribution of magnitudes and angles.
-        /// </summary>
-        /// <remarks>
-        ///     In general, NextVector2(1) will tend to result in vectors with smaller magnitudes than
-        ///     NextVector2Box(1,1), even if you ignored any vectors with a magnitude larger than one.
-        /// </remarks>
-        public Vector2 NextVector2(float minMagnitude, float maxMagnitude) => NextAngle().RotateVec((NextFloat(minMagnitude, maxMagnitude), 0));
-        public Vector2 NextVector2(float maxMagnitude = 1) => NextVector2(0, maxMagnitude);
-
-        /// <summary>
-        ///     Random vector, created from a uniform distribution of x and y coordinates lying inside some box.
-        /// </summary>
-        public Vector2 NextVector2Box(float minX, float minY, float maxX, float maxY) => new Vector2(NextFloat(minX, maxX), NextFloat(minY, maxY));
-        public Vector2 NextVector2Box(float maxAbsX = 1, float maxAbsY = 1) => NextVector2Box(-maxAbsX, -maxAbsY, maxAbsX, maxAbsY);
-
         void Shuffle<T>(IList<T> list)
         {
             var n = list.Count;

Robust.Shared/Robust.Shared.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="YamlDotNet" Version="9.1.4" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="Linguini.Bundle" Version="0.1.3" />
+    <PackageReference Include="Linguini.Bundle" Version="0.1.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Lidgren.Network\Lidgren.Network.csproj" />

Robust.Shared/SharedIoC.cs

@@ -1,4 +1,4 @@
-using Robust.Shared.Asynchronous;
+using Robust.Shared.Asynchronous;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Exceptions;
@@ -32,7 +32,7 @@ namespace Robust.Shared
             IoCManager.Register<ILocalizationManager, LocalizationManager>();
             IoCManager.Register<ILocalizationManagerInternal, LocalizationManager>();
             IoCManager.Register<ILogManager, LogManager>();
-            IoCManager.Register<IPauseManager, NetworkedMapManager>();
+            IoCManager.Register<IPauseManager, PauseManager>();
             IoCManager.Register<IModLoader, ModLoader>();
             IoCManager.Register<IModLoaderInternal, ModLoader>();
             IoCManager.Register<INetManager, NetManager>();

Robust.Shared/Timing/IPauseManager.cs

@@ -1,20 +1,15 @@
-using System;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 
 namespace Robust.Shared.Timing
 {
-    [Obsolete("Use the same functions on IMapManager.")]
     public interface IPauseManager
     {
         void SetMapPaused(MapId mapId, bool paused);
 
         void DoMapInitialize(MapId mapId);
 
-        [Obsolete("This function does nothing, per-grid pausing isn't a thing anymore.")]
         void DoGridMapInitialize(GridId gridId);
-
-        [Obsolete("This function does nothing, per-grid pausing isn't a thing anymore.")]
         void DoGridMapInitialize(IMapGrid grid);
 
         void AddUninitializedMap(MapId mapId);

Robust.Shared/Timing/PauseManager.cs

@@ -2,121 +2,101 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Map;
 using Robust.Shared.ViewVariables;
 
-namespace Robust.Shared.Map
+namespace Robust.Shared.Timing
 {
-    internal partial class MapManager
+    internal sealed class PauseManager : IPauseManager, IPostInjectInit
     {
+        [Dependency] private readonly IConsoleHost _conhost = default!;
+        [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] private readonly IEntityLookup _entityLookup = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+
         [ViewVariables] private readonly HashSet<MapId> _pausedMaps = new();
         [ViewVariables] private readonly HashSet<MapId> _unInitializedMaps = new();
 
-        /// <inheritdoc />
         public void SetMapPaused(MapId mapId, bool paused)
         {
-            if(!MapExists(mapId))
-                throw new ArgumentException("That map does not exist.");
-
             if (paused)
             {
                 _pausedMaps.Add(mapId);
+
+                foreach (var entity in _entityLookup.GetEntitiesInMap(mapId))
+                {
+                    _entityManager.GetComponent<MetaDataComponent>(entity).EntityPaused = true;
+                }
             }
             else
             {
                 _pausedMaps.Remove(mapId);
-            }
 
-            var mapEnt = GetMapEntityId(mapId);
-            var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
-            var metaQuery = EntityManager.GetEntityQuery<MetaDataComponent>();
-
-            RecursiveSetPaused(mapEnt, paused, in xformQuery, in metaQuery);
-        }
-
-        private static void RecursiveSetPaused(EntityUid entity, bool paused,
-            in EntityQuery<TransformComponent> xformQuery,
-            in EntityQuery<MetaDataComponent> metaQuery)
-        {
-            metaQuery.GetComponent(entity).EntityPaused = paused;
-
-            foreach (var child in xformQuery.GetComponent(entity)._children)
-            {
-                RecursiveSetPaused(child, paused, in xformQuery, in metaQuery);
+                foreach (var entity in _entityLookup.GetEntitiesInMap(mapId))
+                {
+                    _entityManager.GetComponent<MetaDataComponent>(entity).EntityPaused = false;
+                }
             }
         }
 
-        /// <inheritdoc />
         public void DoMapInitialize(MapId mapId)
         {
-            if(!MapExists(mapId))
-                throw new ArgumentException("That map does not exist.");
-
             if (IsMapInitialized(mapId))
                 throw new ArgumentException("That map is already initialized.");
 
             _unInitializedMaps.Remove(mapId);
 
-            var mapEnt = GetMapEntityId(mapId);
-            var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
-            var metaQuery = EntityManager.GetEntityQuery<MetaDataComponent>();
-
-            RecursiveDoMapInit(mapEnt, in xformQuery, in metaQuery);
-        }
-
-        private static void RecursiveDoMapInit(EntityUid entity,
-            in EntityQuery<TransformComponent> xformQuery,
-            in EntityQuery<MetaDataComponent> metaQuery)
-        {
-            // RunMapInit can modify the TransformTree
-            // ToArray caches deleted euids, we check here if they still exist.
-            if(!metaQuery.TryGetComponent(entity, out var meta))
-                return;
-
-            entity.RunMapInit();
-            meta.EntityPaused = false;
-
-            foreach (var child in xformQuery.GetComponent(entity)._children.ToArray())
+            foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesInMap(mapId).ToArray())
             {
-                RecursiveDoMapInit(child, in xformQuery, in metaQuery);
+                entity.RunMapInit();
+
+                // MapInit could have deleted this entity.
+                if(_entityManager.TryGetComponent(entity, out MetaDataComponent? meta))
+                    meta.EntityPaused = false;
             }
         }
 
-        /// <inheritdoc />
         public void DoGridMapInitialize(IMapGrid grid)
         {
-            // NOP
+            DoGridMapInitialize(grid.Index);
         }
 
-        /// <inheritdoc />
         public void DoGridMapInitialize(GridId gridId)
         {
-            // NOP
+            var mapId = _mapManager.GetGrid(gridId).ParentMapId;
+
+            foreach (var entity in _entityLookup.GetEntitiesInMap(mapId))
+            {
+                if (_entityManager.GetComponent<TransformComponent>(entity).GridID != gridId)
+                    continue;
+
+                entity.RunMapInit();
+                _entityManager.GetComponent<MetaDataComponent>(entity).EntityPaused = false;
+            }
         }
 
-        /// <inheritdoc />
         public void AddUninitializedMap(MapId mapId)
         {
             _unInitializedMaps.Add(mapId);
         }
 
-        /// <inheritdoc />
         public bool IsMapPaused(MapId mapId)
         {
             return _pausedMaps.Contains(mapId) || _unInitializedMaps.Contains(mapId);
         }
 
-        /// <inheritdoc />
         public bool IsGridPaused(IMapGrid grid)
         {
             return IsMapPaused(grid.ParentMapId);
         }
 
-        /// <inheritdoc />
         public bool IsGridPaused(GridId gridId)
         {
-            if (TryGetGrid(gridId, out var grid))
+            if (_mapManager.TryGetGrid(gridId, out var grid))
             {
                 return IsGridPaused(grid);
             }
@@ -125,18 +105,15 @@ namespace Robust.Shared.Map
             return true;
         }
 
-        /// <inheritdoc />
         public bool IsMapInitialized(MapId mapId)
         {
             return !_unInitializedMaps.Contains(mapId);
         }
 
-        /// <summary>
-        /// Initializes the map pausing system.
-        /// </summary>
-        private void InitializeMapPausing()
+        /// <inheritdoc />
+        public void PostInject()
         {
-            MapDestroyed += (_, args) =>
+            _mapManager.MapDestroyed += (_, args) =>
             {
                 _pausedMaps.Remove(args.Map);
                 _unInitializedMaps.Add(args.Map);
@@ -153,9 +130,10 @@ namespace Robust.Shared.Map
                         return;
                     }
 
-                    var mapId = new MapId(int.Parse(args[0], CultureInfo.InvariantCulture));
+                    string? arg = args[0];
+                    var mapId = new MapId(int.Parse(arg, CultureInfo.InvariantCulture));
 
-                    if (!MapExists(mapId))
+                    if (!_mapManager.MapExists(mapId))
                     {
                         shell.WriteError("That map does not exist.");
                         return;
@@ -169,9 +147,10 @@ namespace Robust.Shared.Map
                 "querymappaused <map ID>",
                 (shell, _, args) =>
                 {
-                    var mapId = new MapId(int.Parse(args[0], CultureInfo.InvariantCulture));
+                    string? arg = args[0];
+                    var mapId = new MapId(int.Parse(arg, CultureInfo.InvariantCulture));
 
-                    if (!MapExists(mapId))
+                    if (!_mapManager.MapExists(mapId))
                     {
                         shell.WriteError("That map does not exist.");
                         return;
@@ -191,9 +170,10 @@ namespace Robust.Shared.Map
                         return;
                     }
 
-                    var mapId = new MapId(int.Parse(args[0], CultureInfo.InvariantCulture));
+                    string? arg = args[0];
+                    var mapId = new MapId(int.Parse(arg, CultureInfo.InvariantCulture));
 
-                    if (!MapExists(mapId))
+                    if (!_mapManager.MapExists(mapId))
                     {
                         shell.WriteLine("That map does not exist.");
                         return;

Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs

@@ -17,7 +17,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
         {
             var sim = RobustServerSimulation
                 .NewSimulation()
-                .RegisterPrototypes(protoMan => protoMan.LoadString(Prototypes))
+                .RegisterPrototypes(protoMan => protoMan.LoadFromString(Prototypes))
                 .InitializeInstance();
 
             // Adds the map with id 1, and spawns entity 1 as the map entity.

Robust.UnitTesting/Server/GameObjects/Components/Transform_Test.cs

@@ -72,7 +72,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
             IoCManager.Resolve<ISerializationManager>().Initialize();
             var manager = IoCManager.Resolve<IPrototypeManager>();
             manager.RegisterType(typeof(EntityPrototype));
-            manager.LoadFromStream(new StringReader(PROTOTYPES));
+            manager.LoadFromString(PROTOTYPES);
             manager.Resync();
 
             // build the net dream

Robust.UnitTesting/Server/GameObjects/ThrowingEntityDeletion_Test.cs

@@ -51,7 +51,7 @@ namespace Robust.UnitTesting.Server.GameObjects
             IoCManager.Resolve<ISerializationManager>().Initialize();
             var manager = IoCManager.Resolve<IPrototypeManager>();
             manager.RegisterType(typeof(EntityPrototype));
-            manager.LoadFromStream(new StringReader(PROTOTYPES));
+            manager.LoadFromString(PROTOTYPES);
             manager.Resync();
 
             //NOTE: The grids have not moved, so we can assert worldpos == localpos for the test

Robust.UnitTesting/Server/RobustServerSimulation.cs

@@ -207,7 +207,7 @@ namespace Robust.UnitTesting.Server
             container.Register<IIslandManager, IslandManager>();
             container.Register<IManifoldManager, CollisionManager>();
             container.Register<IMapManagerInternal, MapManager>();
-            container.Register<IPauseManager, MapManager>();
+            container.RegisterInstance<IPauseManager>(new Mock<IPauseManager>().Object); // TODO: get timing working similar to RobustIntegrationTest
             container.Register<IPhysicsManager, PhysicsManager>();
 
             _diFactory?.Invoke(container);

Robust.UnitTesting/Shared/GameObjects/IEntityManagerTests.cs

@@ -22,7 +22,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
         {
             var sim = RobustServerSimulation
                 .NewSimulation()
-                .RegisterPrototypes(protoMan => protoMan.LoadString(PROTOTYPE))
+                .RegisterPrototypes(protoMan => protoMan.LoadFromString(PROTOTYPE))
                 .InitializeInstance();
 
             var mapManager = sim.Resolve<IMapManager>();

Robust.UnitTesting/Shared/GameObjects/Systems/AnchoredSystemTests.cs

@@ -34,7 +34,7 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
                 .NewSimulation()
                 .RegisterPrototypes(f=>
                 {
-                    f.LoadString(Prototypes);
+                    f.LoadFromString(Prototypes);
                 })
                 .InitializeInstance();
 

Robust.UnitTesting/Shared/GameObjects/Systems/TransformSystemTests.cs

@@ -47,42 +47,6 @@ namespace Robust.UnitTesting.Shared.GameObjects.Systems
             }
         }
 
-        /// <summary>
-        /// Checks that the MoverCoordinates between parent and children is correct.
-        /// </summary>
-        [Test]
-        public void MoverCoordinatesCorrect()
-        {
-            var sim = SimulationFactory();
-            var entManager = sim.Resolve<IEntityManager>();
-            var xformSystem = sim.Resolve<IEntitySystemManager>().GetEntitySystem<SharedTransformSystem>();
-            var mapId = new MapId(1);
-
-            var parent = entManager.SpawnEntity(null, new MapCoordinates(Vector2.One, mapId));
-            var xform = entManager.GetComponent<TransformComponent>(parent);
-            Assert.That(xform.LocalPosition, Is.EqualTo(Vector2.One));
-
-            var child1 = entManager.SpawnEntity(null, new MapCoordinates(Vector2.One, mapId));
-            var child2 = entManager.SpawnEntity(null, new MapCoordinates(new Vector2(10f, 10f), mapId));
-
-            var child1Xform = entManager.GetComponent<TransformComponent>(child1);
-            var child2Xform = entManager.GetComponent<TransformComponent>(child2);
-            child1Xform.AttachParent(xform);
-            child2Xform.AttachParent(xform);
-
-            var mover1 = xformSystem.GetMoverCoordinates(child1Xform);
-            var mover2 = xformSystem.GetMoverCoordinates(child2Xform);
-
-            Assert.That(mover1.Position, Is.EqualTo(Vector2.One));
-            Assert.That(mover2.Position, Is.EqualTo(new Vector2(10f, 10f)));
-
-            var child3 = entManager.SpawnEntity(null, new MapCoordinates(Vector2.One, mapId));
-            var child3Xform = entManager.GetComponent<TransformComponent>(child3);
-            child3Xform.AttachParent(child2Xform);
-
-            Assert.That(xformSystem.GetMoverCoordinates(child3Xform).Position, Is.EqualTo(Vector2.One));
-        }
-
         private sealed class Subscriber : IEntityEventSubscriber { }
     }
 }

Robust.UnitTesting/Shared/Localization/FormatErrorTest.cs

@@ -1,98 +0,0 @@
-using System;
-using Linguini.Syntax.Parser.Error;
-using NUnit.Framework;
-using Robust.Shared.Localization;
-
-namespace Robust.UnitTesting.Shared.Localization;
-
-[TestFixture]
-[Parallelizable]
-public sealed class TestFormatErrors
-{
-    private const string Res1 = "err1 = $user)";
-    private const string Res2 = "a = b {{\r\n  err = x";
-    private const string Res2Lf = "a = b {{\n  err = x";
-
-    #region ExpectedCrlf
-
-    private const string Expect1Wide1Crlf = "\r\n 99 |err1 = $user)\r\n            ^ Unbalanced closing brace";
-
-    private const string Expect2Wide1Crlf = "\r\n 99 |err1 = $user)\r\n     ^ Unbalanced closing brace";
-
-    private const string Expect1Wide4Crlf =
-        "\r\n 99 |err1 = $user)\r\n             ^^^^ Expected a message field for \"x\"";
-
-    private const string Expect2Wide4Crlf = "\r\n 99 |err1 = $user)\r\n     ^^^^ Expected a message field for \"x\"";
-
-
-    private const string ExpectMulti1Wide1Crlf =
-        "\r\n  99 |a = b {{\r\n 100 |  err = x\r\n        ^ Unbalanced closing brace";
-
-    private const string ExpectMulti1Wide3Crlf =
-        "\r\n  99 |a = b {{\r\n 100 |  err = x\r\n        ^^^ Expected a message field for \"x\"";
-
-    #endregion
-
-    [Test]
-    [TestCase(Expect1Wide1Crlf, Res1, 7)]
-    [TestCase(Expect2Wide1Crlf, Res1, 0)]
-    [TestCase(Expect1Wide4Crlf, Res1, 8, 12)]
-    [TestCase(Expect2Wide4Crlf, Res1, 0, 4)]
-    [TestCase(ExpectMulti1Wide1Crlf, Res2, 12)]
-    [TestCase(ExpectMulti1Wide3Crlf, Res2, 12, 15)]
-    [TestCase(ExpectMulti1Wide1Crlf, Res2Lf, 11)]
-    [TestCase(ExpectMulti1Wide3Crlf, Res2Lf, 11, 14)]
-    public void TestSingleLineTestCrlf(string expected, string resource, int start, int? end = null)
-    {
-        var err = ParseError.UnbalancedClosingBrace(start, 99);
-        if (end != null)
-        {
-            err = ParseError.ExpectedMessageField("x".AsMemory(), start, end.Value, 99);
-        }
-
-        err.Slice = new Range(0, resource.Length);
-        var actual = err.FormatCompileErrors(resource.AsMemory(), "\r\n");
-        Assert.That(actual, Is.EqualTo(expected));
-    }
-
-    #region ExpectedLf
-
-    private const string Expect1Wide1Lf = "\n 99 |err1 = $user)\n            ^ Unbalanced closing brace";
-
-    private const string Expect2Wide1Lf = "\n 99 |err1 = $user)\n     ^ Unbalanced closing brace";
-
-    private const string Expect1Wide4Lf =
-        "\n 99 |err1 = $user)\n             ^^^^ Expected a message field for \"x\"";
-
-    private const string Expect2Wide4Lf = "\n 99 |err1 = $user)\n     ^^^^ Expected a message field for \"x\"";
-
-
-    private const string ExpectMulti1Wide1Lf = "\n  99 |a = b {{\n 100 |  err = x\n        ^ Unbalanced closing brace";
-
-    private const string ExpectMulti1Wide3Lf =
-        "\n  99 |a = b {{\n 100 |  err = x\n        ^^^ Expected a message field for \"x\"";
-
-    #endregion
-
-    [Test]
-    [TestCase(Expect1Wide1Lf, Res1, 7)]
-    [TestCase(Expect2Wide1Lf, Res1, 0)]
-    [TestCase(Expect1Wide4Lf, Res1, 8, 12)]
-    [TestCase(Expect2Wide4Lf, Res1, 0, 4)]
-    [TestCase(ExpectMulti1Wide1Lf, Res2, 12)]
-    [TestCase(ExpectMulti1Wide3Lf, Res2, 12, 15)]
-    [TestCase(ExpectMulti1Wide1Lf, Res2Lf, 11)]
-    [TestCase(ExpectMulti1Wide3Lf, Res2Lf, 11, 14)]
-    public void TestSingleLineTestLf(string expected, string resource, int start, int? end = null)
-    {
-        var err = ParseError.UnbalancedClosingBrace(start, 99);
-        if (end != null)
-        {
-            err = ParseError.ExpectedMessageField("x".AsMemory(), start, end.Value, 99);
-        }
-
-        err.Slice = new Range(0, resource.Length);
-        var actual = err.FormatCompileErrors(resource.AsMemory(), "\n");
-        Assert.That(actual, Is.EqualTo(expected));
-    }
-}

Robust.UnitTesting/Shared/Map/EntityCoordinates_Tests.cs

@@ -43,7 +43,7 @@ namespace Robust.UnitTesting.Shared.Map
             IoCManager.Resolve<ISerializationManager>().Initialize();
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
             prototypeManager.RegisterType(typeof(EntityPrototype));
-            prototypeManager.LoadFromStream(new StringReader(PROTOTYPES));
+            prototypeManager.LoadFromString(PROTOTYPES);
             prototypeManager.Resync();
 
             var factory = IoCManager.Resolve<IComponentFactory>();

Robust.UnitTesting/Shared/Map/MapGrid_Tests.cs

@@ -8,37 +8,44 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
-using Robust.UnitTesting.Server;
+using Robust.Shared.Physics.Broadphase;
+using MapGrid = Robust.Shared.Map.MapGrid;
 
 namespace Robust.UnitTesting.Shared.Map
 {
     [TestFixture, TestOf(typeof(MapGrid))]
-    sealed class MapGrid_Tests
+    sealed class MapGrid_Tests : RobustUnitTest
     {
-        private static ISimulation SimulationFactory()
+        protected override void OverrideIoC()
         {
-            var sim = RobustServerSimulation
-                .NewSimulation()
-                .InitializeInstance();
+            base.OverrideIoC();
 
-            return sim;
+            var mock = new Mock<IEntitySystemManager>();
+            var broady = new BroadPhaseSystem();
+            var physics = new PhysicsSystem();
+            mock.Setup(m => m.GetEntitySystem<SharedBroadphaseSystem>()).Returns(broady);
+            mock.Setup(m => m.GetEntitySystem<SharedPhysicsSystem>()).Returns(physics);
+
+            IoCManager.RegisterInstance<IEntitySystemManager>(mock.Object, true);
+        }
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            IoCManager.Resolve<IComponentFactory>().GenerateNetIds();
         }
 
         [Test]
         public void GetTileRefCoords()
         {
-            var sim = SimulationFactory();
-            var mapMan = sim.Resolve<IMapManager>();
-            var mapId = mapMan.CreateMap();
-            var grid = (IMapGridInternal)mapMan.CreateGrid(mapId, null, 8);
-
+            var grid = MapGridFactory(new GridId(1));
             grid.SetTile(new Vector2i(-9, -1), new Tile(1, 2));
 
             var result = grid.GetTileRef(new Vector2i(-9, -1));
 
             Assert.That(grid.ChunkCount, Is.EqualTo(1));
             Assert.That(grid.GetMapChunks().Keys.ToList()[0], Is.EqualTo(new Vector2i(-2, -1)));
-            Assert.That(result, Is.EqualTo(new TileRef(mapId, grid.Index, new Vector2i(-9,-1), new Tile(1, 2))));
+            Assert.That(result, Is.EqualTo(new TileRef(new MapId(5), new GridId(1), new Vector2i(-9,-1), new Tile(1, 2))));
         }
 
         /// <summary>
@@ -47,11 +54,7 @@ namespace Robust.UnitTesting.Shared.Map
         [Test]
         public void BoundsExpansion()
         {
-            var sim = SimulationFactory();
-            var mapMan = sim.Resolve<IMapManager>();
-            var mapId = mapMan.CreateMap();
-            var grid = (IMapGridInternal)mapMan.CreateGrid(mapId, null, 8);
-            grid.WorldPosition = new Vector2(3, 5);
+            var grid = MapGridFactory(new GridId(1));
 
             grid.SetTile(new Vector2i(-1, -2), new Tile(1));
             grid.SetTile(new Vector2i(1, 2), new Tile(1));
@@ -71,11 +74,7 @@ namespace Robust.UnitTesting.Shared.Map
         [Test]
         public void BoundsContract()
         {
-            var sim = SimulationFactory();
-            var mapMan = sim.Resolve<IMapManager>();
-            var mapId = mapMan.CreateMap();
-            var grid = (IMapGridInternal)mapMan.CreateGrid(mapId, null, 8);
-            grid.WorldPosition = new Vector2(3, 5);
+            var grid = MapGridFactory(new GridId(1));
 
             grid.SetTile(new Vector2i(-1, -2), new Tile(1));
             grid.SetTile(new Vector2i(1, 2), new Tile(1));
@@ -94,10 +93,7 @@ namespace Robust.UnitTesting.Shared.Map
         [Test]
         public void GridTileToChunkIndices()
         {
-            var sim = SimulationFactory();
-            var mapMan = sim.Resolve<IMapManager>();
-            var mapId = mapMan.CreateMap();
-            var grid = (IMapGridInternal)mapMan.CreateGrid(mapId, null, 8);
+            var grid = MapGridFactory(new GridId(1));
 
             var result = grid.GridTileToChunkIndices(new Vector2i(-9, -1));
 
@@ -110,10 +106,7 @@ namespace Robust.UnitTesting.Shared.Map
         [Test]
         public void ToLocalCentered()
         {
-            var sim = SimulationFactory();
-            var mapMan = sim.Resolve<IMapManager>();
-            var mapId = mapMan.CreateMap();
-            var grid = (IMapGridInternal)mapMan.CreateGrid(mapId, null, 8);
+            var grid = MapGridFactory(new GridId(1));
 
             var result = grid.GridTileToLocal(new Vector2i(0, 0)).Position;
 
@@ -124,10 +117,7 @@ namespace Robust.UnitTesting.Shared.Map
         [Test]
         public void TryGetTileRefNoTile()
         {
-            var sim = SimulationFactory();
-            var mapMan = sim.Resolve<IMapManager>();
-            var mapId = mapMan.CreateMap();
-            var grid = (IMapGridInternal)mapMan.CreateGrid(mapId, null, 8);
+            var grid = MapGridFactory(new GridId(1));
 
             var foundTile = grid.TryGetTileRef(new Vector2i(-9, -1), out var tileRef);
 
@@ -139,11 +129,7 @@ namespace Robust.UnitTesting.Shared.Map
         [Test]
         public void TryGetTileRefTileExists()
         {
-            var sim = SimulationFactory();
-            var mapMan = sim.Resolve<IMapManager>();
-            var mapId = mapMan.CreateMap();
-            var grid = (IMapGridInternal)mapMan.CreateGrid(mapId, null, 8);
-
+            var grid = MapGridFactory(new GridId(1));
             grid.SetTile(new Vector2i(-9, -1), new Tile(1, 2));
 
             var foundTile = grid.TryGetTileRef(new Vector2i(-9, -1), out var tileRef);
@@ -151,17 +137,13 @@ namespace Robust.UnitTesting.Shared.Map
             Assert.That(foundTile, Is.True);
             Assert.That(grid.ChunkCount, Is.EqualTo(1));
             Assert.That(grid.GetMapChunks().Keys.ToList()[0], Is.EqualTo(new Vector2i(-2, -1)));
-            Assert.That(tileRef, Is.EqualTo(new TileRef(mapId, grid.Index, new Vector2i(-9, -1), new Tile(1, 2))));
+            Assert.That(tileRef, Is.EqualTo(new TileRef(new MapId(5), new GridId(1), new Vector2i(-9, -1), new Tile(1, 2))));
         }
 
         [Test]
         public void PointCollidesWithGrid()
         {
-            var sim = SimulationFactory();
-            var mapMan = sim.Resolve<IMapManager>();
-            var mapId = mapMan.CreateMap();
-            var grid = (IMapGridInternal)mapMan.CreateGrid(mapId, null, 8);
-
+            var grid = MapGridFactory(new GridId(1));
             grid.SetTile(new Vector2i(19, 23), new Tile(1));
 
             var result = grid.CollidesWithGrid(new Vector2i(19, 23));
@@ -172,16 +154,31 @@ namespace Robust.UnitTesting.Shared.Map
         [Test]
         public void PointNotCollideWithGrid()
         {
-            var sim = SimulationFactory();
-            var mapMan = sim.Resolve<IMapManager>();
-            var mapId = mapMan.CreateMap();
-            var grid = (IMapGridInternal)mapMan.CreateGrid(mapId, null, 8);
-
+            var grid = MapGridFactory(new GridId(1));
             grid.SetTile(new Vector2i(19, 23), new Tile(1));
 
             var result = grid.CollidesWithGrid(new Vector2i(19, 24));
 
             Assert.That(result, Is.False);
         }
+
+        private static IMapGridInternal MapGridFactory(GridId id)
+        {
+            var mapId = new MapId(5);
+            var mapMan = IoCManager.Resolve<IMapManager>();
+
+            if(mapMan.MapExists(mapId))
+                mapMan.DeleteMap(mapId);
+
+            mapMan.CreateMap(mapId);
+
+            if(mapMan.GridExists(id))
+                mapMan.DeleteGrid(id);
+
+            var newGrid = mapMan.CreateGrid(mapId, id, 8);
+            newGrid.WorldPosition = new Vector2(3, 5);
+
+            return (IMapGridInternal)newGrid;
+        }
     }
 }

Robust.UnitTesting/Shared/Map/MapPauseTests.cs

@@ -1,272 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.UnitTesting.Server;
-
-// ReSharper disable AccessToStaticMemberViaDerivedType
-
-namespace Robust.UnitTesting.Shared.Map;
-
-[TestFixture]
-internal sealed class MapPauseTests
-{
-    private static ISimulation SimulationFactory()
-    {
-        var sim = RobustServerSimulation
-            .NewSimulation()
-            .RegisterComponents(factory => factory.RegisterClass<IgnorePauseComponent>())
-            .InitializeInstance();
-
-        return sim;
-    }
-
-    /// <summary>
-    ///     When an entity is on a paused map, it does not get returned by an EntityQuery.
-    /// </summary>
-    [Test]
-    public void Paused_NotIncluded_NotInQuery()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        // arrange
-        var mapId = mapMan.CreateMap();
-        mapMan.SetMapPaused(mapId, true);
-
-        entMan.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-
-        var query = entMan.EntityQuery<TransformComponent>(false).ToList();
-        
-        // 0 ents, map and the spawned one are not returned
-        Assert.That(query.Count, Is.EqualTo(0));
-    }
-
-    /// <summary>
-    ///     When an entity is on an unpaused map, it is returned by an EntityQuery.
-    /// </summary>
-    [Test]
-    public void UnPaused_NotIncluded_InQuery()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        // arrange
-        var mapId = mapMan.CreateMap();
-        mapMan.SetMapPaused(mapId, false);
-
-        var newEnt = entMan.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-
-        var query = entMan.EntityQuery<TransformComponent>(false).ToList();
-
-        // 2 ents, map and the spawned one
-        Assert.That(query.Count, Is.EqualTo(2));
-    }
-
-    /// <summary>
-    ///     When an entity is on a paused map, it is get returned by an EntityQuery when included.
-    /// </summary>
-    [Test]
-    public void Paused_Included_InQuery()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        // arrange
-        var mapId = mapMan.CreateMap();
-        mapMan.SetMapPaused(mapId, true);
-
-        entMan.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-
-        var query = entMan.EntityQuery<TransformComponent>(true).ToList();
-        
-        // 2 ents, map and the spawned one are returned because includePaused
-        Assert.That(query.Count, Is.EqualTo(2));
-    }
-
-    /// <summary>
-    ///     A new child entity added to a paused map will be created paused.
-    /// </summary>
-    [Test]
-    public void Paused_AddEntity_IsPaused()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        // arrange
-        var mapId = mapMan.CreateMap();
-        mapMan.SetMapPaused(mapId, true);
-
-        var newEnt = entMan.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-
-        var metaData = entMan.GetComponent<MetaDataComponent>(newEnt);
-        Assert.That(metaData.EntityPaused, Is.True);
-    }
-
-    /// <summary>
-    ///     A new child entity added to an unpaused map will be created unpaused.
-    /// </summary>
-    [Test]
-    public void UnPaused_AddEntity_IsNotPaused()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        // arrange
-        var mapId = mapMan.CreateMap();
-        mapMan.SetMapPaused(mapId, false);
-
-        var newEnt = entMan.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-
-        var metaData = entMan.GetComponent<MetaDataComponent>(newEnt);
-        Assert.That(metaData.EntityPaused, Is.False);
-    }
-
-    /// <summary>
-    ///     When a new grid is added to a paused map, the grid becomes paused.
-    /// </summary>
-    [Test]
-    public void Paused_AddGrid_GridPaused()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        // arrange
-        var mapId = mapMan.CreateMap();
-        mapMan.SetMapPaused(mapId, true);
-
-        // act
-        var newGrid = mapMan.CreateGrid(mapId);
-
-        // assert
-        Assert.That(mapMan.IsMapPaused(mapId), Is.True);
-        Assert.That(mapMan.IsGridPaused(newGrid.GridEntityId), Is.True);
-
-        var metaData = entMan.GetComponent<MetaDataComponent>(newGrid.GridEntityId);
-        Assert.That(metaData.EntityPaused, Is.True);
-    }
-
-    /// <summary>
-    ///     When a tree of entities are teleported from a paused map
-    ///     to an unpaused map, all of the entities in the tree are unpaused.
-    /// </summary>
-    [Test]
-    public void Paused_TeleportBetweenMaps_Unpaused()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        // arrange
-        var map1 = mapMan.CreateMap();
-        mapMan.SetMapPaused(map1, true);
-
-        var newEnt = entMan.SpawnEntity(null, new MapCoordinates(0, 0, map1));
-        var xform = entMan.GetComponent<TransformComponent>(newEnt);
-
-        var map2 = mapMan.CreateMap();
-        mapMan.SetMapPaused(map2, false);
-
-        // Act
-        xform.ParentUid = mapMan.GetMapEntityId(map2);
-
-        var metaData = entMan.GetComponent<MetaDataComponent>(newEnt);
-        Assert.That(metaData.EntityPaused, Is.False);
-    }
-
-    /// <summary>
-    ///     When a tree of entities are teleported from an unpaused map
-    ///     to a paused map, all of the entitites in the tree are paused.
-    /// </summary>
-    [Test]
-    public void Unpaused_TeleportBetweenMaps_IsPaused()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        // arrange
-        var map1 = mapMan.CreateMap();
-        mapMan.SetMapPaused(map1, false);
-
-        var newEnt = entMan.SpawnEntity(null, new MapCoordinates(0, 0, map1));
-        var xform = entMan.GetComponent<TransformComponent>(newEnt);
-
-        var map2 = mapMan.CreateMap();
-        mapMan.SetMapPaused(map2, true);
-
-        // Act
-        xform.ParentUid = mapMan.GetMapEntityId(map2);
-
-        var metaData = entMan.GetComponent<MetaDataComponent>(newEnt);
-        Assert.That(metaData.EntityPaused, Is.True);
-    }
-
-    /// <summary>
-    ///     When a paused map is unpaused, all of the entities on the map are unpaused.
-    /// </summary>
-    [Test]
-    public void Paused_UnpauseMap_UnpausedEntities()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        var mapId = mapMan.CreateMap();
-        mapMan.SetMapPaused(mapId, true);
-        var newEnt = entMan.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-
-        mapMan.SetMapPaused(mapId, false);
-
-        var metaData = entMan.GetComponent<MetaDataComponent>(newEnt);
-        Assert.That(metaData.EntityPaused, Is.False);
-    }
-
-    /// <summary>
-    ///     When an unpaused map is paused, all of the entities on the map are paused.
-    /// </summary>
-    [Test]
-    public void Unpaused_PauseMap_PausedEntities()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        var mapId = mapMan.CreateMap();
-        mapMan.SetMapPaused(mapId, false);
-        var newEnt = entMan.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-
-        mapMan.SetMapPaused(mapId, true);
-
-        var metaData = entMan.GetComponent<MetaDataComponent>(newEnt);
-        Assert.That(metaData.EntityPaused, Is.True);
-    }
-
-    /// <summary>
-    ///     An entity that has set IgnorePause will not be paused when the map is paused.
-    /// </summary>
-    [Test]
-    public void IgnorePause_PauseMap_NotPaused()
-    {
-        var sim = SimulationFactory();
-        var entMan = sim.Resolve<IEntityManager>();
-        var mapMan = sim.Resolve<IMapManager>();
-
-        var mapId = mapMan.CreateMap();
-        mapMan.SetMapPaused(mapId, false);
-        var newEnt = entMan.SpawnEntity(null, new MapCoordinates(0, 0, mapId));
-
-        entMan.AddComponent<IgnorePauseComponent>(newEnt);
-        mapMan.SetMapPaused(mapId, true);
-
-        var metaData = entMan.GetComponent<MetaDataComponent>(newEnt);
-        Assert.That(metaData.EntityPaused, Is.False);
-    }
-}

Robust.UnitTesting/Shared/Prototypes/HotReloadTest.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -47,7 +48,7 @@ namespace Robust.UnitTesting.Shared.Prototypes
             IoCManager.Resolve<ISerializationManager>().Initialize();
             _prototypes = (PrototypeManager) IoCManager.Resolve<IPrototypeManager>();
             _prototypes.RegisterType(typeof(EntityPrototype));
-            _prototypes.LoadString(InitialPrototypes);
+            _prototypes.LoadFromString(InitialPrototypes);
             _prototypes.Resync();
 
             _maps = IoCManager.Resolve<IMapManager>();
@@ -75,8 +76,8 @@ namespace Robust.UnitTesting.Shared.Prototypes
             Assert.That(entityComponent.Value, Is.EqualTo(5));
             Assert.False(IoCManager.Resolve<IEntityManager>().HasComponent<HotReloadTestTwoComponent>(entity));
 
-            var changedPrototypes = _prototypes.LoadString(ReloadedPrototypes, true);
-            _prototypes.ReloadPrototypes(changedPrototypes);
+            var changedPrototypes = _prototypes.LoadFromString(ReloadedPrototypes, true);
+            _prototypes.ReloadPrototypes(changedPrototypes.ToList());
 
             Assert.True(reloaded);
             reloaded = false;
@@ -87,8 +88,8 @@ namespace Robust.UnitTesting.Shared.Prototypes
             // New components are added
             Assert.True(IoCManager.Resolve<IEntityManager>().HasComponent<HotReloadTestTwoComponent>(entity));
 
-            changedPrototypes = _prototypes.LoadString(InitialPrototypes, true);
-            _prototypes.ReloadPrototypes(changedPrototypes);
+            changedPrototypes = _prototypes.LoadFromString(InitialPrototypes, true);
+            _prototypes.ReloadPrototypes(changedPrototypes.ToList());
 
             Assert.True(reloaded);
             reloaded = false;

Robust.UnitTesting/Shared/Prototypes/PrototypeManager_Test.cs

@@ -27,7 +27,7 @@ namespace Robust.UnitTesting.Shared.Prototypes
             IoCManager.Resolve<ISerializationManager>().Initialize();
             manager = IoCManager.Resolve<IPrototypeManager>();
             manager.RegisterType(typeof(EntityPrototype));
-            manager.LoadString(DOCUMENT);
+            manager.LoadFromString(DOCUMENT);
             manager.Resync();
         }
 
@@ -106,7 +106,7 @@ namespace Robust.UnitTesting.Shared.Prototypes
         [Test]
         public void TestLoadString()
         {
-            manager.LoadString(LoadStringDocument);
+            manager.LoadFromString(LoadStringDocument);
             manager.Resync();
 
             var prototype = manager.Index<EntityPrototype>(LoadStringTestDummyId);

Robust.UnitTesting/Shared/Serialization/InheritanceSerializationTest.cs

@@ -59,7 +59,7 @@ namespace Robust.UnitTesting.Shared.Serialization
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
 
             prototypeManager.RegisterType(typeof(EntityPrototype));
-            prototypeManager.LoadString(Prototypes);
+            prototypeManager.LoadFromString(Prototypes);
             prototypeManager.Resync();
 
             var entityManager = IoCManager.Resolve<IEntityManager>();

Robust.UnitTesting/Shared/Serialization/TypeSerializers/Custom/Prototype/PrototypeIdListSerializerTest.cs

@@ -46,7 +46,7 @@ entitiesImmutableList:
             var protoMan = IoCManager.Resolve<IPrototypeManager>();
 
             protoMan.RegisterType(typeof(EntityPrototype));
-            protoMan.LoadString(Prototypes);
+            protoMan.LoadFromString(Prototypes);
             protoMan.Resync();
         }