Version: 169.0.0

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

MSBuild/Robust.Engine.Version.props

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

RELEASE-NOTES.md

@@ -54,6 +54,42 @@ END TEMPLATE-->
 *None yet*
 
 
+## 169.0.0
+
+### Breaking changes
+
+* Entity<T> has been introduced to hold a component and its owning entity. Some methods that returned and accepted components directly have been removed or obsoleted to reflect this.
+
+### Other
+
+* By-value events may now be subscribed to by-ref.
+* The manifest's assemblyPrefix value is now respected on the server.
+
+
+## 168.0.0
+
+### Breaking changes
+
+* The Component.OnRemove method has been removed. Use SubscribeLocalEvent<TComp, ComponentRemove>(OnRemove) from an EntitySystem instead.
+
+
+## 167.0.0
+
+### Breaking changes
+
+* Remove ComponentExtensions.
+* Remove ContainerHelpers.
+* Change some TransformSystem methods to fix clientside lerping.
+
+### Bugfixes
+
+* Fixed PVS bugs from dropped entity states.
+
+### Other
+
+* Add more joint debug asserts.
+
+
 ## 166.0.0
 
 ### Breaking changes
@@ -81,7 +117,7 @@ END TEMPLATE-->
 
 ### New features
 
-* The YAML validator now checks the default values of ProtoId<T> and EntProtoId data fields. 
+* The YAML validator now checks the default values of ProtoId<T> and EntProtoId data fields.
 
 ### Bugfixes
 

Robust.Analyzers/ByRefEventAnalyzer.cs

@@ -23,16 +23,6 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
         "Make sure that methods subscribing to a ref event have the ref keyword for the event argument."
     );
 
-    private static readonly DiagnosticDescriptor ByValueEventSubscribedByRefRule = new(
-        Diagnostics.IdValueEventRaisedByRef,
-        "Value event subscribed to by-ref",
-        "Tried to subscribe to a value event '{0}' by-ref.",
-        "Usage",
-        DiagnosticSeverity.Error,
-        true,
-        "Make sure that methods subscribing to value events do not have the ref keyword for the event argument."
-    );
-
     private static readonly DiagnosticDescriptor ByRefEventRaisedByValueRule = new(
         Diagnostics.IdByRefEventRaisedByValue,
         "By-ref event raised by value",
@@ -55,7 +45,6 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
 
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(
         ByRefEventSubscribedByValueRule,
-        ByValueEventSubscribedByRefRule,
         ByRefEventRaisedByValueRule,
         ByValueEventRaisedByRefRule
     );
@@ -64,71 +53,9 @@ public sealed class ByRefEventAnalyzer : DiagnosticAnalyzer
     {
         context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
         context.EnableConcurrentExecution();
-        context.RegisterOperationAction(CheckEventSubscription, OperationKind.Invocation);
         context.RegisterOperationAction(CheckEventRaise, OperationKind.Invocation);
     }
 
-    private void CheckEventSubscription(OperationAnalysisContext context)
-    {
-        if (context.Operation is not IInvocationOperation operation)
-            return;
-
-        var subscribeMethods = context.Compilation
-            .GetTypeByMetadataName("Robust.Shared.GameObjects.EntitySystem")?
-            .GetMembers()
-            .Where(m => m.Name.Contains("SubscribeLocalEvent"))
-            .Cast<IMethodSymbol>();
-
-        if (subscribeMethods == null)
-            return;
-
-        if (!subscribeMethods.Any(m => m.Equals(operation.TargetMethod.OriginalDefinition, Default)))
-            return;
-
-        var typeArguments = operation.TargetMethod.TypeArguments;
-        if (typeArguments.Length < 1 || typeArguments.Length > 2)
-            return;
-
-        if (operation.Arguments.First().Value is not IDelegateCreationOperation delegateCreation)
-            return;
-
-        if (delegateCreation.Target is not IMethodReferenceOperation methodReference)
-            return;
-
-        var eventParameter = methodReference.Method.Parameters.LastOrDefault();
-        if (eventParameter == null)
-            return;
-
-        ITypeSymbol eventArgument;
-        switch (typeArguments.Length)
-        {
-            case 1:
-                eventArgument = typeArguments[0];
-                break;
-            case 2:
-                eventArgument = typeArguments[1];
-                break;
-            default:
-                return;
-        }
-
-        var byRefAttribute = context.Compilation.GetTypeByMetadataName(ByRefAttribute);
-        if (byRefAttribute == null)
-            return;
-
-        var isByRefEventType = eventArgument
-            .GetAttributes()
-            .Any(attribute => attribute.AttributeClass?.Equals(byRefAttribute, Default) ?? false);
-        var parameterIsRef = eventParameter.RefKind == RefKind.Ref;
-
-        if (isByRefEventType != parameterIsRef)
-        {
-            var descriptor = isByRefEventType ? ByRefEventSubscribedByValueRule : ByValueEventSubscribedByRefRule;
-            var diagnostic = Diagnostic.Create(descriptor, operation.Syntax.GetLocation(), eventArgument);
-            context.ReportDiagnostic(diagnostic);
-        }
-    }
-
     private void CheckEventRaise(OperationAnalysisContext context)
     {
         if (context.Operation is not IInvocationOperation operation)

Robust.Analyzers/Diagnostics.cs

@@ -18,7 +18,6 @@ public static class Diagnostics
     public const string IdInvalidNotNullableFlagType = "RA0011";
     public const string IdNotNullableFlagValueType = "RA0012";
     public const string IdByRefEventSubscribedByValue = "RA0013";
-    public const string IdValueEventSubscribedByRef = "RA0014";
     public const string IdByRefEventRaisedByValue = "RA0015";
     public const string IdValueEventRaisedByRef = "RA0016";
     public const string IdDataDefinitionPartial = "RA0017";

Robust.Benchmarks/Transform/RecursiveMoveBenchmark.cs

@@ -54,7 +54,7 @@ public class RecursiveMoveBenchmark
         var mapSys = _entMan.System<SharedMapSystem>();
         var mapId = mapMan.CreateMap();
         var map = mapMan.GetMapEntityId(mapId);
-        var gridComp = mapMan.CreateGrid(mapId);
+        var gridComp = mapMan.CreateGridEntity(mapId);
         var grid = gridComp.Owner;
         _gridCoords = new EntityCoordinates(grid, .5f, .5f);
         _mapCoords = new EntityCoordinates(map, 100, 100);

Robust.Client/Console/Commands/AddCompCommand.cs

@@ -26,10 +26,7 @@ namespace Robust.Client.Console.Commands
             var entity = _entityManager.GetEntity(netEntity);
             var componentName = args[1];
 
-            var component = (Component) _componentFactory.GetComponent(componentName);
-
-            component.Owner = entity;
-
+            var component = _componentFactory.GetComponent(componentName);
             _entityManager.AddComponent(entity, component);
         }
     }

Robust.Client/Debugging/DebugAnchoringSystem.cs

@@ -1,6 +1,7 @@
 #if DEBUG
 using System.Numerics;
 using System.Text;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
@@ -8,7 +9,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 
 namespace Robust.Client.Debugging
@@ -19,6 +19,7 @@ namespace Robust.Client.Debugging
         [Dependency] private readonly IInputManager _inputManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterface = default!;
+        [Dependency] private readonly MapSystem _mapSystem = default!;
 
         private Label? _label;
 
@@ -70,7 +71,7 @@ namespace Robust.Client.Debugging
                 return;
             }
 
-            var tile = grid.GetTileRef(spot);
+            var tile = _mapSystem.GetTileRef(gridUid, grid, spot);
             _label.Position = mouseSpot.Position + new Vector2(32, 0);
 
             if (_hovered?.GridId == gridUid && _hovered?.Tile == tile) return;
@@ -79,7 +80,7 @@ namespace Robust.Client.Debugging
 
             var text = new StringBuilder();
 
-            foreach (var ent in grid.GetAnchoredEntities(spot))
+            foreach (var ent in _mapSystem.GetAnchoredEntities(gridUid, grid, spot))
             {
                 if (EntityManager.TryGetComponent<MetaDataComponent>(ent, out var meta))
                 {

Robust.Client/Debugging/DebugPhysicsSystem.cs

@@ -46,7 +46,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -207,6 +206,7 @@ namespace Robust.Client.Debugging
         private readonly Font _font;
 
         private HashSet<Joint> _drawnJoints = new();
+        private List<Entity<MapGridComponent>> _grids = new();
 
         public PhysicsDebugOverlay(IEntityManager entityManager, IEyeManager eyeManager, IInputManager inputManager, IMapManager mapManager, IPlayerManager playerManager, IResourceCache cache, DebugPhysicsSystem system, EntityLookupSystem lookup, SharedPhysicsSystem physicsSystem)
         {
@@ -231,32 +231,33 @@ namespace Robust.Client.Debugging
             {
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, viewBounds))
                 {
-                    if (_entityManager.HasComponent<MapGridComponent>(physBody.Owner)) continue;
+                    if (_entityManager.HasComponent<MapGridComponent>(physBody)) continue;
 
-                    var xform = _physicsSystem.GetPhysicsTransform(physBody.Owner);
+                    var xform = _physicsSystem.GetPhysicsTransform(physBody);
+                    var comp = physBody.Comp;
 
                     const float AlphaModifier = 0.2f;
 
-                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody.Owner).Fixtures.Values)
+                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody).Fixtures.Values)
                     {
                         // Invalid shape - Box2D doesn't check for IsSensor but we will for sanity.
-                        if (physBody.BodyType == BodyType.Dynamic && fixture.Density == 0f && fixture.Hard)
+                        if (comp.BodyType == BodyType.Dynamic && fixture.Density == 0f && fixture.Hard)
                         {
                             DrawShape(worldHandle, fixture, xform, Color.Red.WithAlpha(AlphaModifier));
                         }
-                        else if (!physBody.CanCollide)
+                        else if (!comp.CanCollide)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.5f, 0.5f, 0.3f).WithAlpha(AlphaModifier));
                         }
-                        else if (physBody.BodyType == BodyType.Static)
+                        else if (comp.BodyType == BodyType.Static)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.5f, 0.9f, 0.5f).WithAlpha(AlphaModifier));
                         }
-                        else if ((physBody.BodyType & (BodyType.Kinematic | BodyType.KinematicController)) != 0x0)
+                        else if ((comp.BodyType & (BodyType.Kinematic | BodyType.KinematicController)) != 0x0)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.5f, 0.5f, 0.9f).WithAlpha(AlphaModifier));
                         }
-                        else if (!physBody.Awake)
+                        else if (!comp.Awake)
                         {
                             DrawShape(worldHandle, fixture, xform, new Color(0.6f, 0.6f, 0.6f).WithAlpha(AlphaModifier));
                         }
@@ -275,15 +276,18 @@ namespace Robust.Client.Debugging
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, viewBounds))
                 {
                     var color = Color.Purple.WithAlpha(Alpha);
-                    var transform = _physicsSystem.GetPhysicsTransform(physBody.Owner);
-                    worldHandle.DrawCircle(Transform.Mul(transform, physBody.LocalCenter), 0.2f, color);
+                    var transform = _physicsSystem.GetPhysicsTransform(physBody);
+                    worldHandle.DrawCircle(Transform.Mul(transform, physBody.Comp.LocalCenter), 0.2f, color);
                 }
 
-                foreach (var grid in _mapManager.FindGridsIntersecting(mapId, viewBounds))
+                _grids.Clear();
+                _mapManager.FindGridsIntersecting(mapId, viewBounds, ref _grids);
+
+                foreach (var grid in _grids)
                 {
-                    var physBody = _entityManager.GetComponent<PhysicsComponent>(grid.Owner);
+                    var physBody = _entityManager.GetComponent<PhysicsComponent>(grid);
                     var color = Color.Orange.WithAlpha(Alpha);
-                    var transform = _physicsSystem.GetPhysicsTransform(grid.Owner);
+                    var transform = _physicsSystem.GetPhysicsTransform(grid);
                     worldHandle.DrawCircle(Transform.Mul(transform, physBody.LocalCenter), 1f, color);
                 }
             }
@@ -292,14 +296,14 @@ namespace Robust.Client.Debugging
             {
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, viewBounds))
                 {
-                    if (_entityManager.HasComponent<MapGridComponent>(physBody.Owner)) continue;
+                    if (_entityManager.HasComponent<MapGridComponent>(physBody)) continue;
 
-                    var xform = _physicsSystem.GetPhysicsTransform(physBody.Owner);
+                    var xform = _physicsSystem.GetPhysicsTransform(physBody);
 
                     const float AlphaModifier = 0.2f;
                     Box2? aabb = null;
 
-                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody.Owner).Fixtures.Values)
+                    foreach (var fixture in _entityManager.GetComponent<FixturesComponent>(physBody).Fixtures.Values)
                     {
                         for (var i = 0; i < fixture.Shape.ChildCount; i++)
                         {
@@ -318,10 +322,11 @@ namespace Robust.Client.Debugging
             {
                 _drawnJoints.Clear();
 
-                foreach (var jointComponent in _entityManager.EntityQuery<JointComponent>(true))
+                var query = _entityManager.AllEntityQueryEnumerator<JointComponent>();
+                while (query.MoveNext(out var uid, out var jointComponent))
                 {
                     if (jointComponent.JointCount == 0 ||
-                        !_entityManager.TryGetComponent(jointComponent.Owner, out TransformComponent? xf1) ||
+                        !_entityManager.TryGetComponent(uid, out TransformComponent? xf1) ||
                         !viewAABB.Contains(xf1.WorldPosition)) continue;
 
                     foreach (var (_, joint) in jointComponent.Joints)
@@ -370,28 +375,31 @@ namespace Robust.Client.Debugging
 
             if ((_debugPhysicsSystem.Flags & PhysicsDebugFlags.ShapeInfo) != 0x0)
             {
-                var hoverBodies = new List<PhysicsComponent>();
+                var hoverBodies = new List<Entity<PhysicsComponent>>();
                 var bounds = Box2.UnitCentered.Translated(_eyeManager.PixelToMap(mousePos.Position).Position);
 
                 foreach (var physBody in _physicsSystem.GetCollidingEntities(mapId, bounds))
                 {
-                    if (_entityManager.HasComponent<MapGridComponent>(physBody.Owner)) continue;
-                    hoverBodies.Add(physBody);
+                    var uid = physBody.Owner;
+                    if (_entityManager.HasComponent<MapGridComponent>(uid)) continue;
+                    hoverBodies.Add((uid, physBody));
                 }
 
                 var lineHeight = _font.GetLineHeight(1f);
                 var drawPos = mousePos.Position + new Vector2(20, 0) + new Vector2(0, -(hoverBodies.Count * 4 * lineHeight / 2f));
                 int row = 0;
 
-                foreach (var body in hoverBodies)
+                foreach (var bodyEnt in hoverBodies)
                 {
-                    if (body != hoverBodies[0])
+                    if (bodyEnt != hoverBodies[0])
                     {
                         screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), "------");
                         row++;
                     }
 
-                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {body.Owner}");
+                    var body = bodyEnt.Comp;
+
+                    screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Ent: {bodyEnt.Owner}");
                     row++;
                     screenHandle.DrawString(_font, drawPos + new Vector2(0, row * lineHeight), $"Layer: {Convert.ToString(body.CollisionLayer, 2)}");
                     row++;

Robust.Client/GameController/GameController.RobustModules.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Reflection;
 using System.Runtime.Loader;
 using Robust.Client.WebViewHook;
+using Robust.Shared.ContentPack;
 using Robust.Shared.Log;
 using Robust.Shared.Utility;
 

Robust.Client/GameController/GameController.cs

@@ -287,78 +287,6 @@ namespace Robust.Client
             return true;
         }
 
-        private ResourceManifestData LoadResourceManifest()
-        {
-            // Parses /manifest.yml for game-specific settings that cannot be exclusively set up by content code.
-            if (!_resourceCache.TryContentFileRead("/manifest.yml", out var stream))
-                return ResourceManifestData.Default;
-
-            var yamlStream = new YamlStream();
-            using (stream)
-            {
-                using var streamReader = new StreamReader(stream, EncodingHelpers.UTF8);
-                yamlStream.Load(streamReader);
-            }
-
-            if (yamlStream.Documents.Count == 0)
-                return ResourceManifestData.Default;
-
-            if (yamlStream.Documents.Count != 1 || yamlStream.Documents[0].RootNode is not YamlMappingNode mapping)
-            {
-                throw new InvalidOperationException(
-                    "Expected a single YAML document with root mapping for /manifest.yml");
-            }
-
-            var modules = ReadStringArray(mapping, "modules") ?? Array.Empty<string>();
-
-            string? assemblyPrefix = null;
-            if (mapping.TryGetNode("assemblyPrefix", out var prefixNode))
-                assemblyPrefix = prefixNode.AsString();
-
-            string? defaultWindowTitle = null;
-            if (mapping.TryGetNode("defaultWindowTitle", out var winTitleNode))
-                defaultWindowTitle = winTitleNode.AsString();
-
-            string? windowIconSet = null;
-            if (mapping.TryGetNode("windowIconSet", out var iconSetNode))
-                windowIconSet = iconSetNode.AsString();
-
-            string? splashLogo = null;
-            if (mapping.TryGetNode("splashLogo", out var splashNode))
-                splashLogo = splashNode.AsString();
-
-            bool autoConnect = true;
-            if (mapping.TryGetNode("autoConnect", out var autoConnectNode))
-                autoConnect = autoConnectNode.AsBool();
-
-            var clientAssemblies = ReadStringArray(mapping, "clientAssemblies");
-
-            return new ResourceManifestData(
-                modules,
-                assemblyPrefix,
-                defaultWindowTitle,
-                windowIconSet,
-                splashLogo,
-                autoConnect,
-                clientAssemblies
-            );
-
-            static string[]? ReadStringArray(YamlMappingNode mapping, string key)
-            {
-                if (!mapping.TryGetNode(key, out var node))
-                    return null;
-
-                var sequence = (YamlSequenceNode)node;
-                var array = new string[sequence.Children.Count];
-                for (var i = 0; i < array.Length; i++)
-                {
-                    array[i] = sequence[i].AsString();
-                }
-
-                return array;
-            }
-        }
-
         internal bool StartupSystemSplash(
             GameControllerOptions options,
             Func<ILogHandler>? logHandlerFactory,
@@ -457,7 +385,7 @@ namespace Robust.Client
                 _modLoader.VerifierExtraLoadHandler = VerifierExtraLoadHandler;
             }
 
-            _resourceManifest = LoadResourceManifest();
+            _resourceManifest = ResourceManifestData.LoadResourceManifest(_resourceCache);
 
             {
                 // Handle GameControllerOptions implicit CVar overrides.
@@ -786,20 +714,6 @@ namespace Robust.Client
             _clydeAudio.Shutdown();
         }
 
-        private sealed record ResourceManifestData(
-            string[] Modules,
-            string? AssemblyPrefix,
-            string? DefaultWindowTitle,
-            string? WindowIconSet,
-            string? SplashLogo,
-            bool AutoConnect,
-            string[]? ClientAssemblies
-        )
-        {
-            public static readonly ResourceManifestData Default =
-                new ResourceManifestData(Array.Empty<string>(), null, null, null, null, true, null);
-        }
-
         public event Action<FrameEventArgs>? TickUpdateOverride;
     }
 }

Robust.Client/GameObjects/ClientEntityManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using Prometheus;
 using Robust.Client.GameStates;
 using Robust.Client.Player;
@@ -86,11 +85,17 @@ namespace Robust.Client.GameObjects
         }
 
         /// <inheritdoc />
-        public override void Dirty(EntityUid uid, Component component, MetaDataComponent? meta = null)
+        public override void Dirty(EntityUid uid, IComponent component, MetaDataComponent? meta = null)
+        {
+            Dirty(new Entity<IComponent>(uid, component), meta);
+        }
+
+        /// <inheritdoc />
+        public override void Dirty(Entity<IComponent> ent, MetaDataComponent? meta = null)
         {
             //  Client only dirties during prediction
             if (_gameTiming.InPrediction)
-                base.Dirty(uid, component, meta);
+                base.Dirty(ent, meta);
         }
 
         public override EntityStringRepresentation ToPrettyString(EntityUid uid, MetaDataComponent? metaDataComponent = null)

Robust.Client/GameObjects/Components/Animations/AnimationPlayerComponent.cs

@@ -1,8 +1,6 @@
-using System;
 using System.Collections.Generic;
 using Robust.Client.Animations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using static Robust.Client.Animations.AnimationPlaybackShared;
 
 namespace Robust.Client.GameObjects
@@ -21,42 +19,5 @@ namespace Robust.Client.GameObjects
             = new();
 
         internal bool HasPlayingAnimation = false;
-
-        /// <summary>
-        ///     Start playing an animation.
-        /// </summary>
-        /// <param name="animation">The animation to play.</param>
-        /// <param name="key">
-        ///     The key for this animation play. This key can be used to stop playback short later.
-        /// </param>
-        [Obsolete("Use AnimationPlayerSystem.Play() instead")]
-        public void Play(Animation animation, string key)
-        {
-            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AnimationPlayerSystem>().AddComponent(this);
-            var playback = new AnimationPlayback(animation);
-
-            PlayingAnimations.Add(key, playback);
-        }
-
-        [Obsolete("Use AnimationPlayerSystem.HasRunningAnimation() instead")]
-        public bool HasRunningAnimation(string key)
-        {
-            return PlayingAnimations.ContainsKey(key);
-        }
-
-        [Obsolete("Use AnimationPlayerSystem.Stop() instead")]
-        public void Stop(string key)
-        {
-            PlayingAnimations.Remove(key);
-        }
-
-        [Obsolete("Temporary method until the event is replaced with eventbus")]
-        internal void AnimationComplete(string key)
-        {
-            AnimationCompleted?.Invoke(key);
-        }
-
-        [Obsolete("Use AnimationCompletedEvent instead")]
-        public event Action<string>? AnimationCompleted;
     }
 }

Robust.Client/GameObjects/EntitySystems/AnimationPlayerSystem.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Robust.Client.Animations;
 using Robust.Shared.GameObjects;
@@ -9,7 +10,7 @@ namespace Robust.Client.GameObjects
 {
     public sealed class AnimationPlayerSystem : EntitySystem, IPostInjectInit
     {
-        private readonly List<AnimationPlayerComponent> _activeAnimations = new();
+        private readonly List<Entity<AnimationPlayerComponent>> _activeAnimations = new();
 
         private EntityQuery<MetaDataComponent> _metaQuery;
 
@@ -38,22 +39,22 @@ namespace Robust.Client.GameObjects
                     continue;
                 }
 
-                if (!Update(uid, anim, frameTime))
+                if (!Update(uid, anim.Comp, frameTime))
                 {
                     continue;
                 }
 
                 _activeAnimations.RemoveSwap(i);
                 i--;
-                anim.HasPlayingAnimation = false;
+                anim.Comp.HasPlayingAnimation = false;
             }
         }
 
-        internal void AddComponent(AnimationPlayerComponent component)
+        internal void AddComponent(Entity<AnimationPlayerComponent> ent)
         {
-            if (component.HasPlayingAnimation) return;
-            _activeAnimations.Add(component);
-            component.HasPlayingAnimation = true;
+            if (ent.Comp.HasPlayingAnimation) return;
+            _activeAnimations.Add(ent);
+            ent.Comp.HasPlayingAnimation = true;
         }
 
         private bool Update(EntityUid uid, AnimationPlayerComponent component, float frameTime)
@@ -78,7 +79,6 @@ namespace Robust.Client.GameObjects
             {
                 component.PlayingAnimations.Remove(key);
                 EntityManager.EventBus.RaiseLocalEvent(uid, new AnimationCompletedEvent {Uid = uid, Key = key}, true);
-                component.AnimationComplete(key);
             }
 
             return false;
@@ -89,22 +89,29 @@ namespace Robust.Client.GameObjects
         /// </summary>
         public void Play(EntityUid uid, Animation animation, string key)
         {
-            var component = EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
-            Play(component, animation, key);
+            var component = EnsureComp<AnimationPlayerComponent>(uid);
+            Play(new Entity<AnimationPlayerComponent>(uid, component), animation, key);
         }
 
+        [Obsolete("Use Play(EntityUid<AnimationPlayerComponent> ent, Animation animation, string key) instead")]
         public void Play(EntityUid uid, AnimationPlayerComponent? component, Animation animation, string key)
         {
             component ??= EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
-            Play(component, animation, key);
+            Play(new Entity<AnimationPlayerComponent>(uid, component), animation, key);
         }
 
         /// <summary>
         ///     Start playing an animation.
         /// </summary>
+        [Obsolete("Use Play(EntityUid<AnimationPlayerComponent> ent, Animation animation, string key) instead")]
         public void Play(AnimationPlayerComponent component, Animation animation, string key)
         {
-            AddComponent(component);
+            Play(new Entity<AnimationPlayerComponent>(component.Owner, component), animation, key);
+        }
+
+        public void Play(Entity<AnimationPlayerComponent> ent, Animation animation, string key)
+        {
+            AddComponent(ent);
             var playback = new AnimationPlaybackShared.AnimationPlayback(animation);
 
 #if DEBUG
@@ -120,14 +127,14 @@ namespace Robust.Client.GameObjects
                     return;
                 }
 
-                if (!EntityManager.TryGetComponent(component.Owner, compTrack.ComponentType, out var animatedComp))
+                if (!EntityManager.TryGetComponent(ent, compTrack.ComponentType, out var animatedComp))
                 {
                     _sawmill.Error(
-                        $"Attempted to play a component animation, but the entity {ToPrettyString(component.Owner)} does not have the component to be animated: {compTrack.ComponentType}.");
+                        $"Attempted to play a component animation, but the entity {ToPrettyString(ent)} does not have the component to be animated: {compTrack.ComponentType}.");
                     return;
                 }
 
-                if (IsClientSide(component.Owner) || !animatedComp.NetSyncEnabled)
+                if (IsClientSide(ent) || !animatedComp.NetSyncEnabled)
                     continue;
 
                 var reg = _compFact.GetRegistration(animatedComp);
@@ -140,13 +147,13 @@ namespace Robust.Client.GameObjects
                     if (animatedComp.GetType().GetProperty(compTrack.Property) is { } property &&
                         property.HasCustomAttribute<AutoNetworkedFieldAttribute>())
                     {
-                        _sawmill.Warning($"Playing a component animation on a networked component {reg.Name} belonging to {ToPrettyString(component.Owner)}");
+                        _sawmill.Warning($"Playing a component animation on a networked component {reg.Name} belonging to {ToPrettyString(ent)}");
                     }
                 }
             }
 #endif
 
-            component.PlayingAnimations.Add(key, playback);
+            ent.Comp.PlayingAnimations.Add(key, playback);
         }
 
         public bool HasRunningAnimation(EntityUid uid, string key)

Robust.Client/GameObjects/EntitySystems/GridChunkBoundsDebugSystem.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
@@ -58,6 +59,8 @@ namespace Robust.Client.GameObjects
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
 
+        private List<Entity<MapGridComponent>> _grids = new();
+
         public GridChunkBoundsOverlay(IEntityManager entManager, IEyeManager eyeManager, IMapManager mapManager)
         {
             _entityManager = entManager;
@@ -71,13 +74,15 @@ namespace Robust.Client.GameObjects
             var viewport = args.WorldBounds;
             var worldHandle = args.WorldHandle;
 
-            foreach (var grid in _mapManager.FindGridsIntersecting(currentMap, viewport))
+            _grids.Clear();
+            _mapManager.FindGridsIntersecting(currentMap, viewport, ref _grids);
+            foreach (var grid in _grids)
             {
-                var worldMatrix = _entityManager.GetComponent<TransformComponent>(grid.Owner).WorldMatrix;
+                var worldMatrix = _entityManager.GetComponent<TransformComponent>(grid).WorldMatrix;
                 worldHandle.SetTransform(worldMatrix);
                 var transform = new Transform(Vector2.Zero, Angle.Zero);
 
-                var chunkEnumerator = grid.GetMapChunks(viewport);
+                var chunkEnumerator = grid.Comp.GetMapChunks(viewport);
 
                 while (chunkEnumerator.MoveNext(out var chunk))
                 {

Robust.Client/GameObjects/EntitySystems/TransformSystem.Component.cs

@@ -1,51 +1,41 @@
 using System.Numerics;
+using Robust.Client.Player;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
 namespace Robust.Client.GameObjects;
 
 public sealed partial class TransformSystem
 {
-    public override void SetLocalPosition(TransformComponent xform, Vector2 value)
+    public override void SetLocalPosition(EntityUid uid, Vector2 value, TransformComponent? xform = null)
     {
-        xform.PrevPosition = xform._localPosition;
+        if (!XformQuery.Resolve(uid, ref xform))
+            return;
+
         xform.NextPosition = value;
-        xform.LerpParent = xform.ParentUid;
-        base.SetLocalPosition(xform, value);
-        ActivateLerp(xform);
+        ActivateLerp(uid, xform);
+        base.SetLocalPosition(uid, value, xform);
     }
 
-    public override void SetLocalPositionNoLerp(TransformComponent xform, Vector2 value)
+    public override void SetLocalRotation(EntityUid uid, Angle value, TransformComponent? xform = null)
     {
-        xform.NextPosition = null;
-        xform.LerpParent = EntityUid.Invalid;
-        base.SetLocalPositionNoLerp(xform, value);
+        if (!XformQuery.Resolve(uid, ref xform))
+            return;
+
+        xform.NextRotation = value;
+        ActivateLerp(uid, xform);
+        base.SetLocalRotation(uid, value, xform);
     }
 
-    public override void SetLocalRotationNoLerp(TransformComponent xform, Angle angle)
+    public override void SetLocalPositionRotation(EntityUid uid, Vector2 pos, Angle rot, TransformComponent? xform = null)
     {
-        xform.NextRotation = null;
-        xform.LerpParent = EntityUid.Invalid;
-        base.SetLocalRotationNoLerp(xform, angle);
-    }
+        if (!XformQuery.Resolve(uid, ref xform))
+            return;
 
-    public override void SetLocalRotation(TransformComponent xform, Angle angle)
-    {
-        xform.PrevRotation = xform._localRotation;
-        xform.NextRotation = angle;
-        xform.LerpParent = xform.ParentUid;
-        base.SetLocalRotation(xform, angle);
-        ActivateLerp(xform);
-    }
-
-    public override void SetLocalPositionRotation(TransformComponent xform, Vector2 pos, Angle rot)
-    {
-        xform.PrevPosition = xform._localPosition;
         xform.NextPosition = pos;
-        xform.PrevRotation = xform._localRotation;
         xform.NextRotation = rot;
-        xform.LerpParent = xform.ParentUid;
-        base.SetLocalPositionRotation(xform, pos, rot);
-        ActivateLerp(xform);
+        ActivateLerp(uid, xform);
+        base.SetLocalPositionRotation(uid, pos, rot, xform);
     }
 }

Robust.Client/GameObjects/EntitySystems/TransformSystem.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Numerics;
 using JetBrains.Annotations;
@@ -25,20 +24,15 @@ namespace Robust.Client.GameObjects
         private const float MinInterpolationDistance = 0.001f;
         private const float MinInterpolationDistanceSquared = MinInterpolationDistance * MinInterpolationDistance;
 
-        private const double MinInterpolationAngle = Math.PI / 720;
-
-        // 45 degrees.
-        private const double MaxInterpolationAngle = Math.PI / 4;
-
         [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         // Only keep track of transforms actively lerping.
         // Much faster than iterating 3000+ transforms every frame.
-        [ViewVariables] private readonly List<TransformComponent> _lerpingTransforms = new();
+        [ViewVariables] private readonly List<Entity<TransformComponent>> _lerpingTransforms = new();
 
         public void Reset()
         {
-            foreach (var xform in _lerpingTransforms)
+            foreach (var (_, xform) in _lerpingTransforms)
             {
                 xform.ActivelyLerping = false;
                 xform.NextPosition = null;
@@ -48,21 +42,77 @@ namespace Robust.Client.GameObjects
             _lerpingTransforms.Clear();
         }
 
-        public override void ActivateLerp(TransformComponent xform)
+        public override void ActivateLerp(EntityUid uid, TransformComponent xform)
         {
-            if (xform.ActivelyLerping)
+            // This lerping logic is pretty convoluted and generally assumes that the client does not mispredict.
+            // A more foolproof solution would be to just cache the coordinates at which any given entity was most
+            // recently rendered and using that as the lerp origin. However that'd require enumerating over all entities
+            // every tick which is pretty icky.
+
+            // The general considerations are:
+            // - If the client receives a server state for an entity moving from a->b and predicts nothing else, then it
+            //   should show the entity lerping.
+            // - If the client predicts an entity will move while already lerping due to a state-application, it should
+            //   clear the state's lerp, under the assumption that the client predicted the state and already rendered
+            //   the entity in the final position.
+            // - If the client predicts that an entity moves, then we only lerp if this is the first time that the tick
+            //   was predicted. I.e., we assume the entity was already rendered in it's final of that lerp.
+            // - If the client predicts that an entity should lerp twice in the same tick, then we need to combine them.
+            //   I.e. moving from a->b then b->c, the client should lerp from a->c.
+
+            // If the client predicts an entity moves while already lerping, it should clear the
+            // predict a->b, lerp a->b
+            // predicted a->b, then predict b->c. Lerp b->c
+            // predicted a->b, then predict b->c. Lerp b->c
+            // predicted a->b, predicted b->c, then predict c->d. Lerp c->d
+            // server state a->b, then predicted b->c, lerp b->c
+            // server state a->b, then predicted b->c, then predict d, lerp b->c
+
+            if (_gameTiming.ApplyingState)
+            {
+                if (xform.ActivelyLerping)
+                {
+                    // This should not happen, but can happen if some bad component state application code modifies an entity's coordinates.
+                    Log.Error($"Entity {(ToPrettyString(uid))} tried to lerp twice while applying component states.");
+                    return;
+                }
+
+                _lerpingTransforms.Add((uid, xform));
+                xform.ActivelyLerping = true;
+                xform.PredictedLerp = false;
+                xform.LerpParent = xform.ParentUid;
+                xform.PrevRotation = xform._localRotation;
+                xform.PrevPosition = xform._localPosition;
+                xform.LastLerp = _gameTiming.CurTick;
                 return;
+            }
 
-            xform.ActivelyLerping = true;
-            _lerpingTransforms.Add(xform);
-        }
+            xform.LastLerp = _gameTiming.CurTick;
+            if (!_gameTiming.IsFirstTimePredicted)
+            {
+                xform.ActivelyLerping = false;
+                return;
+            }
 
-        public override void DeactivateLerp(TransformComponent component)
-        {
-            // this should cause the lerp to do nothing
-            component.NextPosition = null;
-            component.NextRotation = null;
-            component.LerpParent = EntityUid.Invalid;
+            if (!xform.ActivelyLerping)
+            {
+                _lerpingTransforms.Add((uid, xform));
+                xform.ActivelyLerping = true;
+                xform.PredictedLerp = true;
+                xform.PrevRotation = xform._localRotation;
+                xform.PrevPosition = xform._localPosition;
+                xform.LerpParent = xform.ParentUid;
+                return;
+            }
+
+            if (!xform.PredictedLerp || xform.LerpParent != xform.ParentUid)
+            {
+                // Existing lerp was not due to prediction, but due to state application. That lerp should already
+                // have been rendered, so we will start a new lerp from the current position.
+                xform.PrevRotation = xform._localRotation;
+                xform.PrevPosition = xform._localPosition;
+                xform.LerpParent = xform.ParentUid;
+            }
         }
 
         public override void FrameUpdate(float frameTime)
@@ -73,12 +123,13 @@ namespace Robust.Client.GameObjects
 
             for (var i = 0; i < _lerpingTransforms.Count; i++)
             {
-                var transform = _lerpingTransforms[i];
+                var (uid, transform) = _lerpingTransforms[i];
                 var found = false;
 
                 // Only lerp if parent didn't change.
                 // E.g. entering lockers would do it.
-                if (transform.LerpParent == transform.ParentUid
+                if (transform.ActivelyLerping
+                    && transform.LerpParent == transform.ParentUid
                     && transform.ParentUid.IsValid()
                     && !transform.Deleted)
                 {
@@ -90,8 +141,7 @@ namespace Robust.Client.GameObjects
 
                         if (distance is > MinInterpolationDistanceSquared and < MaxInterpolationDistanceSquared)
                         {
-                            transform.LocalPosition = Vector2.Lerp(lerpSource, lerpDest, step);
-                            // Setting LocalPosition clears LerpPosition so fix that.
+                            SetLocalPositionNoLerp(uid, Vector2.Lerp(lerpSource, lerpDest, step), transform);
                             transform.NextPosition = lerpDest;
                             found = true;
                         }
@@ -101,15 +151,9 @@ namespace Robust.Client.GameObjects
                     {
                         var lerpDest = transform.NextRotation.Value;
                         var lerpSource = transform.PrevRotation;
-                        var distance = Math.Abs(Angle.ShortestDistance(lerpDest, lerpSource));
-
-                        if (distance is > MinInterpolationAngle and < MaxInterpolationAngle)
-                        {
-                            transform.LocalRotation = Angle.Lerp(lerpSource, lerpDest, step);
-                            // Setting LocalRotation clears LerpAngle so fix that.
-                            transform.NextRotation = lerpDest;
-                            found = true;
-                        }
+                        SetLocalRotationNoLerp(uid, Angle.Lerp(lerpSource, lerpDest, step), transform);
+                        transform.NextRotation = lerpDest;
+                        found = true;
                     }
                 }
 

Robust.Client/GameStates/ClientGameStateManager.cs

@@ -55,7 +55,7 @@ namespace Robust.Client.GameStates
         private readonly Dictionary<EntityUid, HashSet<Type>> _pendingReapplyNetStates = new();
         private readonly HashSet<NetEntity> _stateEnts = new();
         private readonly List<EntityUid> _toDelete = new();
-        private readonly List<Component> _toRemove = new();
+        private readonly List<IComponent> _toRemove = new();
         private readonly Dictionary<NetEntity, Dictionary<ushort, ComponentState>> _outputData = new();
         private readonly List<(EntityUid, TransformComponent)> _queuedBroadphaseUpdates = new();
 
@@ -111,6 +111,13 @@ namespace Robust.Client.GameStates
 
         public event Action<MsgStateLeavePvs>? PvsLeave;
 
+#if DEBUG
+        /// <summary>
+        /// If true, this will cause received game states to be ignored. Used by integration tests.
+        /// </summary>
+        public bool DropStates;
+#endif
+
         /// <inheritdoc />
         public void Initialize()
         {
@@ -203,6 +210,10 @@ namespace Robust.Client.GameStates
 
         private void HandleStateMessage(MsgState message)
         {
+#if DEBUG
+            if (DropStates)
+                return;
+#endif
             // We ONLY ack states that are definitely going to get applied. Otherwise the sever might assume that we
             // applied a state containing entity-creation information, which it would then no longer send to us when
             // we re-encounter this entity
@@ -277,18 +288,15 @@ namespace Robust.Client.GameStates
                     continue;
                 }
 
-                if (PredictionNeedsResetting)
+                try
                 {
-                    try
-                    {
-                        ResetPredictedEntities();
-                    }
-                    catch (Exception e)
-                    {
-                        // avoid exception spam from repeatedly trying to reset the same entity.
-                        _entitySystemManager.GetEntitySystem<ClientDirtySystem>().Reset();
-                        _runtimeLog.LogException(e, "ResetPredictedEntities");
-                    }
+                    ResetPredictedEntities();
+                }
+                catch (Exception e)
+                {
+                    // avoid exception spam from repeatedly trying to reset the same entity.
+                    _entitySystemManager.GetEntitySystem<ClientDirtySystem>().Reset();
+                    _runtimeLog.LogException(e, "ResetPredictedEntities");
                 }
 
                 // If we were waiting for a new state, we are now applying it.
@@ -477,19 +485,21 @@ namespace Robust.Client.GameStates
 
         public void ResetPredictedEntities()
         {
-            PredictionNeedsResetting = false;
-
             using var _ = _prof.Group("ResetPredictedEntities");
             using var __ = _timing.StartStateApplicationArea();
 
+            // This is terrible, and I hate it. This also needs to run even when prediction is disabled.
+            _entitySystemManager.GetEntitySystem<SharedGridTraversalSystem>().QueuedEvents.Clear();
+            _entitySystemManager.GetEntitySystem<TransformSystem>().Reset();
+
+            if (!PredictionNeedsResetting)
+                return;
+
+            PredictionNeedsResetting = false;
             var countReset = 0;
             var system = _entitySystemManager.GetEntitySystem<ClientDirtySystem>();
             var metaQuery = _entityManager.GetEntityQuery<MetaDataComponent>();
-            RemQueue<Component> toRemove = new();
-
-            // This is terrible, and I hate it.
-            _entitySystemManager.GetEntitySystem<SharedGridTraversalSystem>().QueuedEvents.Clear();
-            _entitySystemManager.GetEntitySystem<TransformSystem>().Reset();
+            RemQueue<IComponent> toRemove = new();
 
             foreach (var entity in system.DirtyEntities)
             {
@@ -594,7 +604,7 @@ namespace Robust.Client.GameStates
         ///     Whenever a new entity is created, the server doesn't send full state data, given that much of the data
         ///     can simply be obtained from the entity prototype information. This function basically creates a fake
         ///     initial server state for any newly created entity. It does this by simply using the standard <see
-        ///     cref="IEntityManager.GetComponentState(IEventBus, IComponent)"/>.
+        ///     cref="IEntityManager.GetComponentState"/>.
         /// </remarks>
         private void MergeImplicitData(IEnumerable<NetEntity> createdEntities)
         {
@@ -1177,8 +1187,7 @@ namespace Robust.Client.GameStates
                 {
                     if (!meta.NetComponents.TryGetValue(id, out var comp))
                     {
-                        comp = (Component) _compFactory.GetComponent(id);
-                        comp.Owner = uid;
+                        comp = _compFactory.GetComponent(id);
                         _entityManager.AddComponent(uid, comp, true, metadata: meta);
                     }
 
@@ -1191,8 +1200,7 @@ namespace Robust.Client.GameStates
                 {
                     if (!meta.NetComponents.TryGetValue(compChange.NetID, out var comp))
                     {
-                        comp = (Component) _compFactory.GetComponent(compChange.NetID);
-                        comp.Owner = uid;
+                        comp = _compFactory.GetComponent(compChange.NetID);
                         _entityManager.AddComponent(uid, comp, true, metadata:meta);
                     }
                     else if (compChange.LastModifiedTick <= lastApplied && lastApplied != GameTick.Zero)
@@ -1262,7 +1270,9 @@ namespace Robust.Client.GameStates
                     var handleState = new ComponentHandleState(cur, next);
                     bus.RaiseComponentEvent(comp, ref handleState);
                 }
+#pragma warning disable CS0168 // Variable is declared but never used
                 catch (Exception e)
+#pragma warning restore CS0168 // Variable is declared but never used
                 {
 #if EXCEPTION_TOLERANCE
                     _sawmill.Error($"Failed to apply comp state: entity={_entities.ToPrettyString(uid)}, comp={comp.GetType()}");
@@ -1418,8 +1428,7 @@ namespace Robust.Client.GameStates
             {
                 if (!meta.NetComponents.TryGetValue(id, out var comp))
                 {
-                    comp = (Component) _compFactory.GetComponent(id);
-                    comp.Owner = uid;
+                    comp = _compFactory.GetComponent(id);
                     _entityManager.AddComponent(uid, comp, true, meta);
                 }
 
@@ -1443,6 +1452,9 @@ namespace Robust.Client.GameStates
         }
         #endregion
 
+        public bool IsQueuedForDetach(NetEntity entity)
+            => _processor.IsQueuedForDetach(entity);
+
         void IPostInjectInit.PostInject()
         {
             _sawmill = _logMan.GetSawmill(CVars.NetPredict.Name);

Robust.Client/GameStates/GameStateProcessor.cs

@@ -404,6 +404,18 @@ namespace Robust.Client.GameStates
             return _lastStateFullRep.TryGetValue(entity, out dictionary);
         }
 
+        public bool IsQueuedForDetach(NetEntity entity)
+        {
+            // This isn't fast, but its just meant for use in tests & debug asserts.
+            foreach (var msg in _pvsDetachMessages.Values)
+            {
+                if (msg.Contains(entity))
+                    return true;
+            }
+
+            return false;
+        }
+
         public int CalculateBufferSize(GameTick fromTick)
         {
             bool foundState;

Robust.Client/GameStates/NetInterpOverlay.cs

@@ -1,19 +1,19 @@
+using System;
 using Robust.Shared.Enums;
 using Robust.Client.Graphics;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Containers;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
 
 namespace Robust.Client.GameStates
 {
     internal sealed class NetInterpOverlay : Overlay
     {
+        [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -24,6 +24,11 @@ namespace Robust.Client.GameStates
         private readonly SharedContainerSystem _container;
         private readonly SharedTransformSystem _xform;
 
+        /// <summary>
+        /// When an entity stops lerping the overlay will continue to draw a box around the entity for this amount of time.
+        /// </summary>
+        public static readonly TimeSpan Delay = TimeSpan.FromSeconds(2f);
+
         public NetInterpOverlay(EntityLookupSystem lookup)
         {
             IoCManager.InjectDependencies(this);
@@ -40,8 +45,8 @@ namespace Robust.Client.GameStates
             var worldHandle = (DrawingHandleWorld) handle;
             var viewport = args.WorldAABB;
 
-            var query = _entityManager.AllEntityQueryEnumerator<PhysicsComponent, TransformComponent>();
-            while (query.MoveNext(out var uid, out var physics, out var transform))
+            var query = _entityManager.AllEntityQueryEnumerator<TransformComponent>();
+            while (query.MoveNext(out var uid, out var transform))
             {
                 // if not on the same map, continue
                 if (transform.MapID != _eyeManager.CurrentMap || _container.IsEntityInContainer(uid))
@@ -50,8 +55,8 @@ namespace Robust.Client.GameStates
                 if (transform.GridUid == uid)
                     continue;
 
-                // This entity isn't lerping, no need to draw debug info for it
-                if(transform.NextPosition == null)
+                var delta = (_timing.CurTick.Value - transform.LastLerp.Value) * _timing.TickPeriod;
+                if(!transform.ActivelyLerping && delta > Delay)
                     continue;
 
                 var aabb = _lookup.GetWorldAABB(uid);
@@ -61,7 +66,9 @@ namespace Robust.Client.GameStates
                     continue;
 
                 var (pos, rot) = _xform.GetWorldPositionRotation(transform, _entityManager.GetEntityQuery<TransformComponent>());
-                var boxOffset = transform.NextPosition.Value - transform.LocalPosition;
+                var boxOffset = transform.NextPosition != null
+                    ? transform.NextPosition.Value - transform.LocalPosition
+                    : default;
                 var worldOffset = (rot - transform.LocalRotation).RotateVec(boxOffset);
 
                 var nextPos = pos + worldOffset;

Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs

@@ -4,7 +4,6 @@ using OpenToolkit.Graphics.OpenGL4;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
@@ -41,21 +40,23 @@ namespace Robust.Client.Graphics.Clyde
             gridProgram.SetUniformTextureMaybe(UniILightTexture, TextureUnit.Texture1);
             gridProgram.SetUniform(UniIModUV, new Vector4(0, 0, 1, 1));
 
-            foreach (var mapGrid in _mapManager.FindGridsIntersecting(mapId, worldBounds))
+            var grids = new List<Entity<MapGridComponent>>();
+            _mapManager.FindGridsIntersecting(mapId, worldBounds, ref grids);
+            foreach (var mapGrid in grids)
             {
-                if (!_mapChunkData.ContainsKey(mapGrid.Owner))
+                if (!_mapChunkData.ContainsKey(mapGrid))
                     continue;
 
-                var transform = _entityManager.GetComponent<TransformComponent>(mapGrid.Owner);
+                var transform = _entityManager.GetComponent<TransformComponent>(mapGrid);
                 gridProgram.SetUniform(UniIModelMatrix, transform.WorldMatrix);
-                var enumerator = mapGrid.GetMapChunks(worldBounds);
+                var enumerator = mapGrid.Comp.GetMapChunks(worldBounds);
 
                 while (enumerator.MoveNext(out var chunk))
                 {
                     if (_isChunkDirty(mapGrid, chunk))
                         _updateChunkMesh(mapGrid, chunk);
 
-                    var datum = _mapChunkData[mapGrid.Owner][chunk.Indices];
+                    var datum = _mapChunkData[mapGrid][chunk.Indices];
 
                     if (datum.TileCount == 0)
                         continue;
@@ -70,9 +71,9 @@ namespace Robust.Client.Graphics.Clyde
             }
         }
 
-        private void _updateChunkMesh(MapGridComponent grid, MapChunk chunk)
+        private void _updateChunkMesh(Entity<MapGridComponent> grid, MapChunk chunk)
         {
-            var data = _mapChunkData[grid.Owner];
+            var data = _mapChunkData[grid];
 
             if (!data.TryGetValue(chunk.Indices, out var datum))
             {
@@ -83,7 +84,7 @@ namespace Robust.Client.Graphics.Clyde
             Span<Vertex2D> vertexBuffer = stackalloc Vertex2D[_verticesPerChunk(chunk)];
 
             var i = 0;
-            var cSz = grid.ChunkSize;
+            var cSz = grid.Comp.ChunkSize;
             var cScaled = chunk.Indices * cSz;
             for (ushort x = 0; x < cSz; x++)
             {
@@ -130,7 +131,7 @@ namespace Robust.Client.Graphics.Clyde
             datum.TileCount = i;
         }
 
-        private unsafe MapChunkData _initChunkBuffers(MapGridComponent grid, MapChunk chunk)
+        private unsafe MapChunkData _initChunkBuffers(Entity<MapGridComponent> grid, MapChunk chunk)
         {
             var vao = GenVertexArray();
             BindVertexArray(vao);
@@ -158,19 +159,19 @@ namespace Robust.Client.Graphics.Clyde
                 Dirty = true
             };
 
-            _mapChunkData[grid.Owner].Add(chunk.Indices, datum);
+            _mapChunkData[grid].Add(chunk.Indices, datum);
             return datum;
         }
 
-        private bool _isChunkDirty(MapGridComponent grid, MapChunk chunk)
+        private bool _isChunkDirty(Entity<MapGridComponent> grid, MapChunk chunk)
         {
-            var data = _mapChunkData[grid.Owner];
+            var data = _mapChunkData[grid];
             return !data.TryGetValue(chunk.Indices, out var datum) || datum.Dirty;
         }
 
-        public void _setChunkDirty(MapGridComponent grid, Vector2i chunk)
+        public void _setChunkDirty(Entity<MapGridComponent> grid, Vector2i chunk)
         {
-            var data = _mapChunkData.GetOrNew(grid.Owner);
+            var data = _mapChunkData.GetOrNew(grid);
             if (data.TryGetValue(chunk, out var datum))
             {
                 datum.Dirty = true;
@@ -184,7 +185,7 @@ namespace Robust.Client.Graphics.Clyde
             {
                 var grid = args.Grid;
                 var chunk = grid.GridTileToChunkIndices(pos);
-                _setChunkDirty(grid, chunk);
+                _setChunkDirty((args.GridEnt, grid), chunk);
             }
         }
 
@@ -192,7 +193,7 @@ namespace Robust.Client.Graphics.Clyde
         {
             var grid = _mapManager.GetGrid(args.NewTile.GridUid);
             var chunk = grid.GridTileToChunkIndices(new Vector2i(args.NewTile.X, args.NewTile.Y));
-            _setChunkDirty(grid, chunk);
+            _setChunkDirty((args.NewTile.GridUid, grid), chunk);
         }
 
         private void _updateOnGridCreated(GridStartupEvent ev)

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

@@ -350,7 +350,7 @@ namespace Robust.Client.Graphics.Clyde
                         _renderHandle.Viewport(Box2i.FromDimensions(-flippedPos, screenSize));
 
                         if (entry.Sprite.RaiseShaderEvent)
-                            _entityManager.EventBus.RaiseLocalEvent(entry.Sprite.Owner,
+                            _entityManager.EventBus.RaiseLocalEvent(entry.Uid,
                                 new BeforePostShaderRenderEvent(entry.Sprite, viewport), false);
                     }
                 }

Robust.Client/Graphics/Clyde/Clyde.Sprite.cs

@@ -1,11 +1,3 @@
-using Robust.Client.ComponentTrees;
-using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using Robust.Shared.Physics;
-using Robust.Shared.Threading;
-using Robust.Shared.Utility;
 using System;
 using System.Buffers;
 using System.Collections.Generic;
@@ -14,7 +6,15 @@ using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 using System.Threading.Tasks;
+using Robust.Client.ComponentTrees;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Graphics;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Physics;
+using Robust.Shared.Threading;
+using Robust.Shared.Utility;
 
 namespace Robust.Client.Graphics.Clyde;
 
@@ -260,7 +260,7 @@ internal partial class Clyde
             if (cmp != 0)
                 return cmp;
 
-            return a.Sprite.Owner.CompareTo(b.Sprite.Owner);
+            return a.Uid.CompareTo(b.Uid);
         }
     }
 }

Robust.Client/Graphics/Clyde/Clyde.cs

@@ -17,11 +17,9 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
+using Robust.Shared.Maths;
 using Robust.Shared.Profiling;
 using Robust.Shared.Timing;
-using SixLabors.ImageSharp;
-using Color = Robust.Shared.Maths.Color;
-using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute;
 using TextureWrapMode = Robust.Shared.Graphics.TextureWrapMode;
 
 namespace Robust.Client.Graphics.Clyde

Robust.Client/Map/TileEdgeOverlay.cs

@@ -1,12 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
-using Direction = Robust.Shared.Maths.Direction;
 
 namespace Robust.Client.Map;
 
@@ -22,6 +23,8 @@ public sealed class TileEdgeOverlay : Overlay
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities;
 
+    private List<Entity<MapGridComponent>> _grids = new();
+
     public TileEdgeOverlay(IEntityManager entManager, IMapManager mapManager, IResourceCache resource, ITileDefinitionManager tileDefManager)
     {
         _entManager = entManager;
@@ -36,16 +39,18 @@ public sealed class TileEdgeOverlay : Overlay
         if (args.MapId == MapId.Nullspace)
             return;
 
-        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
+        _grids.Clear();
+        _mapManager.FindGridsIntersecting(args.MapId, args.WorldBounds, ref _grids);
 
-        foreach (var grid in _mapManager.FindGridsIntersecting(args.MapId, args.WorldBounds))
+        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
+        foreach (var grid in _grids)
         {
-            var tileSize = grid.TileSize;
+            var tileSize = grid.Comp.TileSize;
             var tileDimensions = new Vector2(tileSize, tileSize);
-            var xform = xformQuery.GetComponent(grid.Owner);
+            var xform = xformQuery.GetComponent(grid);
             args.WorldHandle.SetTransform(xform.WorldMatrix);
 
-            foreach (var tileRef in grid.GetTilesIntersecting(args.WorldBounds, false))
+            foreach (var tileRef in grid.Comp.GetTilesIntersecting(args.WorldBounds, false))
             {
                 var tileDef = _tileDefManager[tileRef.Tile.TypeId];
 
@@ -61,7 +66,7 @@ public sealed class TileEdgeOverlay : Overlay
                             continue;
 
                         var neighborIndices = new Vector2i(tileRef.GridIndices.X + x, tileRef.GridIndices.Y + y);
-                        var neighborTile = grid.GetTileRef(neighborIndices);
+                        var neighborTile = grid.Comp.GetTileRef(neighborIndices);
                         var neighborDef = _tileDefManager[neighborTile.Tile.TypeId];
 
                         // If it's the same tile then no edge to be drawn.

Robust.Client/Physics/PhysicsSystem.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
-using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Physics;
@@ -26,7 +25,7 @@ namespace Robust.Client.Physics
 
         protected override void Cleanup(PhysicsMapComponent component, float frameTime)
         {
-            var toRemove = new List<PhysicsComponent>();
+            var toRemove = new List<Entity<PhysicsComponent>>();
 
             // Because we're not predicting 99% of bodies its sleep timer never gets incremented so we'll just do it ourselves.
             // (and serializing it over the network isn't necessary?)
@@ -38,13 +37,13 @@ namespace Robust.Client.Physics
                 body.SleepTime += frameTime;
                 if (body.SleepTime > TimeToSleep)
                 {
-                    toRemove.Add(body);
+                    toRemove.Add(new Entity<PhysicsComponent>(body.Owner, body));
                 }
             }
 
             foreach (var body in toRemove)
             {
-                SetAwake(body.Owner, body, false);
+                SetAwake(body, false);
             }
 
             base.Cleanup(component, frameTime);
@@ -82,11 +81,8 @@ namespace Robust.Client.Physics
                     continue;
                 }
 
-                xform.PrevPosition = position;
-                xform.PrevRotation = rotation;
-                xform.LerpParent = parentUid;
-                xform.NextPosition = xform.LocalPosition;
-                xform.NextRotation = xform.LocalRotation;
+                // Transform system will handle lerping.
+                _transform.SetLocalPositionRotation(uid, xform.LocalPosition, xform.LocalRotation, xform);
             }
 
             component.LerpData.Clear();

Robust.Client/UserInterface/Controls/SpriteView.cs

@@ -7,7 +7,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using Direction = Robust.Shared.Maths.Direction;
 
 namespace Robust.Client.UserInterface.Controls
 {
@@ -18,18 +17,14 @@ namespace Robust.Client.UserInterface.Controls
         IEntityManager _entMan;
 
         [ViewVariables]
-        private SpriteComponent? _sprite;
-        public SpriteComponent? Sprite
-        {
-            get => _sprite;
-            [Obsolete("Use SetEntity()")]
-            set => SetEntity(value?.Owner);
-        }
+        public SpriteComponent? Sprite { get; private set; }
 
 
         [ViewVariables]
         public EntityUid? Entity { get; private set; }
 
+        public Entity<SpriteComponent>? Ent => Entity == null || Sprite == null ? null : (Entity.Value, Sprite);
+
         /// <summary>
         /// This field configures automatic scaling of the sprite. This automatic scaling is done before
         /// applying the explicitly set scale <see cref="SpriteView.Scale"/>.
@@ -124,14 +119,22 @@ namespace Robust.Client.UserInterface.Controls
         public SpriteView()
         {
             _entMan = IoCManager.Resolve<IEntityManager>();
-            _entMan.TryGetComponent(Entity, out _sprite);
+            if (_entMan.TryGetComponent(Entity, out SpriteComponent? sprite))
+            {
+                Sprite = sprite;
+            }
+
             RectClipContent = true;
         }
 
         public void SetEntity(EntityUid? uid)
         {
             Entity = uid;
-            _entMan.TryGetComponent(Entity, out _sprite);
+
+            if (_entMan.TryGetComponent(Entity, out SpriteComponent? sprite))
+            {
+                Sprite = sprite;
+            }
         }
 
         protected override Vector2 MeasureOverride(Vector2 availableSize)
@@ -143,13 +146,13 @@ namespace Robust.Client.UserInterface.Controls
 
         private void UpdateSize()
         {
-            if (Entity == null || _sprite == null)
+            if (Entity == null || Sprite == null)
             {
                 _spriteSize = default;
                 return;
             }
 
-            var spriteBox = _sprite.CalculateRotatedBoundingBox(default,  _worldRotation ?? Angle.Zero, _eyeRotation)
+            var spriteBox = Sprite.CalculateRotatedBoundingBox(default,  _worldRotation ?? Angle.Zero, _eyeRotation)
                 .CalcBoundingBox();
 
             if (!SpriteOffset)
@@ -191,10 +194,10 @@ namespace Robust.Client.UserInterface.Controls
 
         internal override void DrawInternal(IRenderHandle renderHandle)
         {
-            if (Entity is not {} uid || _sprite == null)
+            if (Entity is not {} uid || Sprite == null)
                 return;
 
-            if (_sprite.Deleted)
+            if (Sprite.Deleted)
             {
                 SetEntity(null);
                 return;
@@ -214,11 +217,11 @@ namespace Robust.Client.UserInterface.Controls
 
             var offset = SpriteOffset
                 ? Vector2.Zero
-                : - (-_eyeRotation).RotateVec(_sprite.Offset) * new Vector2(1, -1) * EyeManager.PixelsPerMeter;
+                : - (-_eyeRotation).RotateVec(Sprite.Offset) * new Vector2(1, -1) * EyeManager.PixelsPerMeter;
 
             var position = PixelSize / 2 + offset * stretch * UIScale;
             var scale = Scale * UIScale * stretch;
-            renderHandle.DrawEntity(uid, position, scale, _worldRotation, _eyeRotation, OverrideDirection, _sprite);
+            renderHandle.DrawEntity(uid, position, scale, _worldRotation, _eyeRotation, OverrideDirection, Sprite);
         }
     }
 }

Robust.Client/UserInterface/CustomControls/DebugMonitorControls/DebugCoordsPanel.cs

@@ -117,7 +117,7 @@ Mouse Pos:
     {playerWorldOffset}
     {playerCoordinates}
     Rotation: {playerRotation.Degrees:F2}°
-    EntId: {entityTransform.Owner}
+    EntId: {controlledEntity}
     GridUid: {entityTransform.GridUid}
     Grid Rotation: {gridRotation.Degrees:F2}°");
             }

Robust.Client/ViewVariables/Editors/VVPropEditorEntityCoordinates.cs

@@ -5,7 +5,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
+using Robust.Shared.Map.Components;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
 namespace Robust.Client.ViewVariables.Editors
@@ -67,13 +67,13 @@ namespace Robust.Client.ViewVariables.Editors
                 var xVal = float.Parse(x.Text, CultureInfo.InvariantCulture);
                 var yVal = float.Parse(y.Text, CultureInfo.InvariantCulture);
 
-                if (!mapManager.TryGetGrid(gridVal, out var grid))
+                if (!entityManager.HasComponent<MapGridComponent>(gridVal))
                 {
                     ValueChanged(new EntityCoordinates(EntityUid.Invalid, new(xVal, yVal)));
                     return;
                 }
 
-                ValueChanged(new EntityCoordinates(grid.Owner, new(xVal, yVal)));
+                ValueChanged(new EntityCoordinates(gridVal, new(xVal, yVal)));
             }
 
             if (!ReadOnly)

Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs

@@ -120,7 +120,11 @@ namespace Robust.Client.ViewVariables.Instances
                     };
                     top.HorizontalExpand = true;
                     hBox.AddChild(top);
-                    hBox.AddChild(new SpriteView {Sprite = sprite, OverrideDirection = Direction.South});
+
+                    var view = new SpriteView { OverrideDirection = Direction.South };
+                    view.SetEntity(_entity);
+                    hBox.AddChild(view);
+
                     vBoxContainer.AddChild(hBox);
                 }
                 else
@@ -431,8 +435,7 @@ namespace Robust.Client.ViewVariables.Instances
 
             try
             {
-                var comp = (Component) componentFactory.GetComponent(registration.Type);
-                comp.Owner = _entity;
+                var comp = componentFactory.GetComponent(registration.Type);
                 _entityManager.AddComponent(_entity, comp);
             }
             catch (Exception e)

Robust.Server/BaseServer.cs

@@ -306,7 +306,9 @@ namespace Robust.Server
             _modLoader.SetUseLoadContext(!ContentStart);
             _modLoader.SetEnableSandboxing(Options.Sandboxing);
 
-            if (!_modLoader.TryLoadModulesFrom(Options.AssemblyDirectory, Options.ContentModulePrefix))
+            var resourceManifest = ResourceManifestData.LoadResourceManifest(_resources);
+
+            if (!_modLoader.TryLoadModulesFrom(Options.AssemblyDirectory, resourceManifest.AssemblyPrefix ?? Options.ContentModulePrefix))
             {
                 _logger.Fatal("Errors while loading content assemblies.");
                 return true;

Robust.Server/Console/Commands/AddComponentCommand.cs

@@ -1,5 +1,4 @@
-using System;
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -47,11 +46,7 @@ namespace Robust.Server.Console.Commands
                 shell.WriteLine($"Entity {_entityManager.GetComponent<MetaDataComponent>(uid.Value).EntityName} already has a {componentName} component.");
             }
 
-            var component = (Component) _componentFactory.GetComponent(registration.Type);
-
-#pragma warning disable CS0618
-            component.Owner = uid.Value;
-#pragma warning restore CS0618
+            var component = _componentFactory.GetComponent(registration.Type);
             _entityManager.AddComponent(uid.Value, component);
 
             shell.WriteLine($"Added {componentName} component to entity {_entityManager.GetComponent<MetaDataComponent>(uid.Value).EntityName}.");

Robust.Server/GameObjects/Components/VisibilityComponent.cs

@@ -1,5 +1,4 @@
 using System;
-using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
@@ -22,7 +21,7 @@ namespace Robust.Server.GameObjects
         public int LayerVV
         {
             get => Layer;
-            set => EntitySystem.Get<VisibilitySystem>().SetLayer(this, value);
+            set => EntitySystem.Get<VisibilitySystem>().SetLayer(Owner, this, value);
         }
     }
 }

Robust.Server/GameObjects/EntitySystems/MapLoaderSystem.cs

@@ -6,7 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Numerics;
 using Robust.Server.Maps;
-using Robust.Shared.Collections;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -733,7 +732,7 @@ public sealed class MapLoaderSystem : EntitySystem
             return;
 
         // get ents that the grids will bind to
-        var gridComps = new MapGridComponent[yamlGrids.Count];
+        var gridComps = new Entity<MapGridComponent>[yamlGrids.Count];
         var gridQuery = _serverEntityManager.GetEntityQuery<MapGridComponent>();
 
         // linear search for new grid comps
@@ -745,7 +744,7 @@ public sealed class MapLoaderSystem : EntitySystem
             // These should actually be new, pre-init
             DebugTools.Assert(gridComp.LifeStage == ComponentLifeStage.Added);
 
-            gridComps[gridComp.GridIndex] = gridComp;
+            gridComps[gridComp.GridIndex] = new Entity<MapGridComponent>(uid, gridComp);
         }
 
         for (var index = 0; index < yamlGrids.Count; index++)
@@ -764,18 +763,18 @@ public sealed class MapLoaderSystem : EntitySystem
             MappingDataNode yamlGridInfo = (MappingDataNode)yamlGrid["settings"];
             SequenceDataNode yamlGridChunks = (SequenceDataNode)yamlGrid["chunks"];
 
-            var grid = AllocateMapGrid(gridComp, yamlGridInfo);
-            var gridUid = grid.Owner;
+            AllocateMapGrid(gridComp, yamlGridInfo);
+            var gridUid = gridComp.Owner;
 
             foreach (var chunkNode in yamlGridChunks.Cast<MappingDataNode>())
             {
                 var (chunkOffsetX, chunkOffsetY) = _serManager.Read<Vector2i>(chunkNode["ind"]);
-                _serManager.Read(chunkNode, _context, instanceProvider: () => _mapSystem.GetOrAddChunk(gridUid, grid, chunkOffsetX, chunkOffsetY), notNullableOverride: true);
+                _serManager.Read(chunkNode, _context, instanceProvider: () => _mapSystem.GetOrAddChunk(gridUid, gridComp, chunkOffsetX, chunkOffsetY), notNullableOverride: true);
             }
         }
     }
 
-    private static MapGridComponent AllocateMapGrid(MapGridComponent gridComp, MappingDataNode yamlGridInfo)
+    private static void AllocateMapGrid(MapGridComponent gridComp, MappingDataNode yamlGridInfo)
     {
         // sane defaults
         ushort csz = 16;
@@ -795,8 +794,6 @@ public sealed class MapLoaderSystem : EntitySystem
 
         gridComp.ChunkSize = csz;
         gridComp.TileSize = tsz;
-
-        return gridComp;
     }
 
     private void StartupEntities(MapData data)

Robust.Server/GameStates/PvsSystem.cs

@@ -188,6 +188,7 @@ internal sealed partial class PvsSystem : EntitySystem
         Log.Warning(sb.ToString());
 
         sessionData.LastSeenAt.Clear();
+        sessionData.LastLeftView.Clear();
 
         if (sessionData.Overflow != null)
         {
@@ -256,6 +257,7 @@ internal sealed partial class PvsSystem : EntitySystem
         foreach (var sessionData in PlayerData.Values)
         {
             sessionData.LastSeenAt.Remove(metadata.NetEntity);
+            sessionData.LastLeftView.Remove(metadata.NetEntity);
             if (sessionData.SentEntities.TryGetValue(previousTick, out var ents))
                 ents.Remove(metadata.NetEntity);
         }
@@ -703,6 +705,7 @@ internal sealed partial class PvsSystem : EntitySystem
         sessionData.SentEntities.TryGetValue(toTick - 1, out var lastSent);
         var lastAcked = sessionData.LastAcked?.Data;
         var lastSeen = sessionData.LastSeenAt;
+        var lastLeft = sessionData.LastLeftView;
         var visibleEnts = _visSetPool.Get();
 
         if (visibleEnts.Count != 0)
@@ -730,7 +733,7 @@ internal sealed partial class PvsSystem : EntitySystem
 
             foreach (var rootNode in cache.Value.tree.RootNodes)
             {
-                RecursivelyAddTreeNode(in rootNode, cache.Value.tree, lastAcked, lastSent, visibleEnts, lastSeen, cache.Value.metadata, stack, in fromTick,
+                RecursivelyAddTreeNode(in rootNode, cache.Value.tree, lastAcked, lastSent, visibleEnts, lastSeen, lastLeft, cache.Value.metadata, stack, in fromTick,
                         ref newEntityCount, ref enteredEntityCount, ref entStateCount,  in newEntityBudget, in enteredEntityBudget);
             }
         }
@@ -741,7 +744,7 @@ internal sealed partial class PvsSystem : EntitySystem
         {
             var netEntity = globalEnumerator.Current;
             var uid = GetEntity(netEntity);
-            RecursivelyAddOverride(in uid, lastAcked, lastSent, visibleEnts, lastSeen, in fromTick,
+            RecursivelyAddOverride(in uid, lastAcked, lastSent, visibleEnts, lastSeen, lastLeft, in fromTick,
                 ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget);
         }
         globalEnumerator.Dispose();
@@ -751,7 +754,7 @@ internal sealed partial class PvsSystem : EntitySystem
         {
             var netEntity = globalRecursiveEnumerator.Current;
             var uid = GetEntity(netEntity);
-            RecursivelyAddOverride(in uid, lastAcked, lastSent, visibleEnts, lastSeen, in fromTick,
+            RecursivelyAddOverride(in uid, lastAcked, lastSent, visibleEnts, lastSeen, lastLeft, in fromTick,
                 ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget, true);
         }
         globalRecursiveEnumerator.Dispose();
@@ -761,14 +764,14 @@ internal sealed partial class PvsSystem : EntitySystem
         {
             var netEntity = sessionOverrides.Current;
             var uid = GetEntity(netEntity);
-            RecursivelyAddOverride(in uid, lastAcked, lastSent, visibleEnts, lastSeen,in fromTick,
+            RecursivelyAddOverride(in uid, lastAcked, lastSent, visibleEnts, lastSeen, lastLeft, in fromTick,
                 ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget, true);
         }
         sessionOverrides.Dispose();
 
         foreach (var viewerEntity in viewers)
         {
-            RecursivelyAddOverride(in viewerEntity, lastAcked, lastSent, visibleEnts, lastSeen, in fromTick,
+            RecursivelyAddOverride(in viewerEntity, lastAcked, lastSent, visibleEnts, lastSeen, lastLeft, in fromTick,
                 ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget);
         }
 
@@ -778,7 +781,7 @@ internal sealed partial class PvsSystem : EntitySystem
         {
             foreach (var entityUid in expandEvent.Entities)
             {
-                RecursivelyAddOverride(in entityUid, lastAcked, lastSent, visibleEnts, lastSeen, in fromTick,
+                RecursivelyAddOverride(in entityUid, lastAcked, lastSent, visibleEnts, lastSeen, lastLeft, in fromTick,
                     ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget);
             }
         }
@@ -787,7 +790,7 @@ internal sealed partial class PvsSystem : EntitySystem
         {
             foreach (var entityUid in expandEvent.RecursiveEntities)
             {
-                RecursivelyAddOverride(in entityUid, lastAcked, lastSent, visibleEnts, lastSeen,in fromTick,
+                RecursivelyAddOverride(in entityUid, lastAcked, lastSent, visibleEnts, lastSeen, lastLeft, in fromTick,
                     ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget, true);
             }
         }
@@ -826,7 +829,7 @@ internal sealed partial class PvsSystem : EntitySystem
         }
 
         // tell a client to detach entities that have left their view
-        var leftView = ProcessLeavePVS(visibleEnts, lastSent);
+        var leftView = ProcessLeavePvs(visibleEnts, lastSent, lastLeft);
 
         if (sessionData.SentEntities.Add(toTick, visibleEnts, out var oldEntry))
         {
@@ -863,18 +866,26 @@ internal sealed partial class PvsSystem : EntitySystem
     ///     Figure out what entities are no longer visible to the client. These entities are sent reliably to the client
     ///     in a separate net message.
     /// </summary>
-    private List<NetEntity>? ProcessLeavePVS(
+    private List<NetEntity>? ProcessLeavePvs(
         Dictionary<NetEntity, PvsEntityVisibility> visibleEnts,
-        Dictionary<NetEntity, PvsEntityVisibility>? lastSent)
+        Dictionary<NetEntity, PvsEntityVisibility>? lastSent,
+        Dictionary<NetEntity, GameTick> lastLeft)
     {
         if (lastSent == null)
             return null;
 
-        var leftView = new List<NetEntity>();
+        var tick = _gameTiming.CurTick;
+        var minSize = Math.Max(0, lastSent.Count - lastSent.Count);
+        var leftView = new List<NetEntity>(minSize);
+
         foreach (var netEntity in lastSent.Keys)
         {
             if (!visibleEnts.ContainsKey(netEntity))
+            {
                 leftView.Add(netEntity);
+                lastLeft[netEntity] = tick;
+            }
+
         }
 
         return leftView.Count > 0 ? leftView : null;
@@ -886,6 +897,7 @@ internal sealed partial class PvsSystem : EntitySystem
         Dictionary<NetEntity, PvsEntityVisibility>? lastSent,
         Dictionary<NetEntity, PvsEntityVisibility> toSend,
         Dictionary<NetEntity, GameTick> lastSeen,
+        Dictionary<NetEntity, GameTick> lastLeft,
         Dictionary<NetEntity, MetaDataComponent> metaDataCache,
         Stack<NetEntity> stack,
         in GameTick fromTick,
@@ -908,7 +920,7 @@ internal sealed partial class PvsSystem : EntitySystem
             ref var value = ref CollectionsMarshal.GetValueRefOrAddDefault(toSend, currentNodeIndex, out var exists);
             if (!exists)
             {
-                var (entered, shouldAdd) = ProcessEntry(in currentNodeIndex, lastAcked, lastSent, lastSeen,
+                var (entered, shouldAdd) = ProcessEntry(in currentNodeIndex, lastAcked, lastSent, lastSeen, lastLeft, fromTick,
                     ref newEntityCount, ref enteredEntityCount, newEntityBudget, enteredEntityBudget);
 
                 if (!shouldAdd)
@@ -938,6 +950,7 @@ internal sealed partial class PvsSystem : EntitySystem
         Dictionary<NetEntity, PvsEntityVisibility>? lastSent,
         Dictionary<NetEntity, PvsEntityVisibility> toSend,
         Dictionary<NetEntity, GameTick> lastSeen,
+        Dictionary<NetEntity, GameTick> lastLeft,
         in GameTick fromTick,
         ref int newEntityCount,
         ref int enteredEntityCount,
@@ -953,7 +966,7 @@ internal sealed partial class PvsSystem : EntitySystem
 
         var xform = _xformQuery.GetComponent(uid);
         var parent = xform.ParentUid;
-        if (parent.IsValid() && !RecursivelyAddOverride(in parent, lastAcked, lastSent, toSend, lastSeen, in fromTick,
+        if (parent.IsValid() && !RecursivelyAddOverride(in parent, lastAcked, lastSent, toSend, lastSeen, lastLeft, in fromTick,
                 ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget,
                 in enteredEntityBudget))
         {
@@ -963,7 +976,6 @@ internal sealed partial class PvsSystem : EntitySystem
         var metadata = _metaQuery.GetComponent(uid);
         var netEntity = metadata.NetEntity;
 
-        //did we already get added?
         // Note that we check this AFTER adding parents. This is because while this entity may already have been added
         // to the toSend set, it doesn't guarantee that its parents have been. E.g., if a player ghost just teleported
         // to follow a far away entity, the player's own entity is still being sent, but we need to ensure that we also
@@ -971,17 +983,13 @@ internal sealed partial class PvsSystem : EntitySystem
         ref var value = ref CollectionsMarshal.GetValueRefOrAddDefault(toSend, netEntity, out var exists);
         if (!exists)
         {
-            // TODO PERFORMANCE.
-            // ProcessEntry() unnecessarily checks lastSent.ContainsKey() and maybe lastSeen.Contains(). Given that at this
-            // point the budgets are just ignored, this should just bypass those checks. But then again 99% of the time this
-            // is just the player's own entity + maybe a singularity. So currently not all that performance intensive.
-            var (entered, _) = ProcessEntry(in netEntity, lastAcked, lastSent, lastSeen, ref newEntityCount, ref enteredEntityCount, newEntityBudget, enteredEntityBudget);
+            var (entered, _) = ProcessEntry(in netEntity, lastAcked, lastSent, lastSeen, lastLeft, fromTick, ref newEntityCount, ref enteredEntityCount, newEntityBudget, enteredEntityBudget);
             AddToSendSet(in netEntity, metadata, ref value, toSend, fromTick, in entered, ref entStateCount);
         }
 
         if (addChildren)
         {
-            RecursivelyAddChildren(xform, lastAcked, lastSent, toSend, lastSeen, fromTick, ref newEntityCount,
+            RecursivelyAddChildren(xform, lastAcked, lastSent, toSend, lastSeen, lastLeft, fromTick, ref newEntityCount,
                 ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget);
         }
 
@@ -993,6 +1001,7 @@ internal sealed partial class PvsSystem : EntitySystem
         Dictionary<NetEntity, PvsEntityVisibility>? lastSent,
         Dictionary<NetEntity, PvsEntityVisibility> toSend,
         Dictionary<NetEntity, GameTick> lastSeen,
+        Dictionary<NetEntity, GameTick> lastLeft,
         in GameTick fromTick,
         ref int newEntityCount,
         ref int enteredEntityCount,
@@ -1011,22 +1020,23 @@ internal sealed partial class PvsSystem : EntitySystem
             ref var value = ref CollectionsMarshal.GetValueRefOrAddDefault(toSend, childNetEntity, out var exists);
             if (!exists)
             {
-                var (entered, _) = ProcessEntry(in childNetEntity, lastAcked, lastSent, lastSeen, ref newEntityCount,
+                var (entered, _) = ProcessEntry(in childNetEntity, lastAcked, lastSent, lastSeen, lastLeft, fromTick, ref newEntityCount,
                     ref enteredEntityCount, newEntityBudget, enteredEntityBudget);
 
                 AddToSendSet(in childNetEntity, metadata, ref value, toSend, fromTick, in entered, ref entStateCount);
             }
 
-            RecursivelyAddChildren(childXform, lastAcked, lastSent, toSend, lastSeen, fromTick, ref newEntityCount,
+            RecursivelyAddChildren(childXform, lastAcked, lastSent, toSend, lastSeen, lastLeft, fromTick, ref newEntityCount,
                 ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget);
         }
     }
 
-    private (bool Entered, bool ShouldAdd) ProcessEntry(
-        in NetEntity netEntity,
+    private (bool Entered, bool ShouldAdd) ProcessEntry(in NetEntity netEntity,
         Dictionary<NetEntity, PvsEntityVisibility>? lastAcked,
         Dictionary<NetEntity, PvsEntityVisibility>? lastSent,
         Dictionary<NetEntity, GameTick> lastSeen,
+        Dictionary<NetEntity, GameTick> lastLeft,
+        GameTick fromTick,
         ref int newEntityCount,
         ref int enteredEntityCount,
         in int newEntityBudget,
@@ -1034,16 +1044,15 @@ internal sealed partial class PvsSystem : EntitySystem
     {
         var enteredSinceLastSent = lastSent == null || !lastSent.ContainsKey(netEntity);
 
-        var entered = enteredSinceLastSent || // OR, entered since last ack:
-                        lastAcked == null || !lastAcked.ContainsKey(netEntity);
+        var entered = enteredSinceLastSent
+                      || lastAcked == null
+                      || !lastAcked.ContainsKey(netEntity) // entered since last acked
+                      || lastLeft.GetValueOrDefault(netEntity) >= fromTick; // Just in case a packet was lost. I love dictionary lookups
 
         // If the entity is entering, but we already sent this entering entity in the last message, we won't add it to
         // the budget. Chances are the packet will arrive in a nice and orderly fashion, and the client will stick to
         // their requested budget. However this can cause issues if a packet gets dropped, because a player may create
         // 2x or more times the normal entity creation budget.
-        //
-        // The fix for that would be to just also give the PVS budget a client-side aspect that controls entity creation
-        // rate.
         if (enteredSinceLastSent)
         {
             if (newEntityCount >= newEntityBudget || enteredEntityCount >= enteredEntityBudget)
@@ -1374,6 +1383,11 @@ Transform last modified: {Transform(uid).LastModifiedTick}");
         /// </summary>
         public readonly Dictionary<NetEntity, GameTick> LastSeenAt = new();
 
+        /// <summary>
+        ///     Tick at which an entity last left a player's PVS view.
+        /// </summary>
+        public readonly Dictionary<NetEntity, GameTick> LastLeftView = new();
+
         /// <summary>
         ///     <see cref="SentEntities"/> overflow in case a player's last ack is more than <see cref="DirtyBufferSize"/> ticks behind the current tick.
         /// </summary>

Robust.Server/Physics/GridFixtureSystem.cs

@@ -260,7 +260,7 @@ namespace Robust.Server.Physics
                 for (var i = 0; i < grids.Count - 1; i++)
                 {
                     var group = grids[i];
-                    var newGrid = _mapManager.CreateGrid(mapId);
+                    var newGrid = _mapManager.CreateGridEntity(mapId);
                     var newGridUid = newGrid.Owner;
                     var newGridXform = xformQuery.GetComponent(newGridUid);
                     newGrids[i] = newGridUid;
@@ -287,7 +287,7 @@ namespace Robust.Server.Physics
                         }
                     }
 
-                    newGrid.SetTiles(tileData);
+                    newGrid.Comp.SetTiles(tileData);
                     DebugTools.Assert(_mapManager.IsGrid(newGridUid), "A split grid had no tiles?");
 
                     // Set tiles on new grid + update anchored entities

Robust.Server/Placement/PlacementManager.cs

@@ -199,11 +199,11 @@ namespace Robust.Server.Placement
             }
             else if (tileType != 0) // create a new grid
             {
-                var newGrid = _mapManager.CreateGrid(coordinates.GetMapId(_entityManager));
-                var newGridXform = _entityManager.GetComponent<TransformComponent>(newGrid.Owner);
-                newGridXform.WorldPosition = coordinates.Position - newGrid.TileSizeHalfVector; // assume bottom left tile origin
-                var tilePos = newGrid.WorldToTile(coordinates.Position);
-                newGrid.SetTile(tilePos, new Tile(tileType));
+                var newGrid = _mapManager.CreateGridEntity(coordinates.GetMapId(_entityManager));
+                var newGridXform = _entityManager.GetComponent<TransformComponent>(newGrid);
+                newGridXform.WorldPosition = coordinates.Position - newGrid.Comp.TileSizeHalfVector; // assume bottom left tile origin
+                var tilePos = newGrid.Comp.WorldToTile(coordinates.Position);
+                newGrid.Comp.SetTile(tilePos, new Tile(tileType));
 
                 var placementEraseEvent = new PlacementTileEvent(tileType, coordinates, placingUserId);
                 _entityManager.EventBus.RaiseEvent(EventSource.Local, placementEraseEvent);

Robust.Shared.Scripting/ScriptGlobalsShared.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Numerics;
 using System.Reflection;
 using System.Text;
@@ -188,10 +187,10 @@ namespace Robust.Shared.Scripting
         }
 
         #region EntityManager proxy methods
-        public T Comp<T>(EntityUid uid) where T : Component
+        public T Comp<T>(EntityUid uid) where T : IComponent
             => ent.GetComponent<T>(uid);
 
-        public bool TryComp<T>(EntityUid uid, out T? comp) where T : Component
+        public bool TryComp<T>(EntityUid uid, out T? comp) where T : IComponent
             => ent.TryGetComponent(uid, out comp);
 
         public bool HasComp<T>(EntityUid uid)

Robust.Shared/Analyzers/ComponentNetworkGeneratorAuxiliary.cs

@@ -10,7 +10,7 @@ namespace Robust.Shared.Analyzers;
 ///     component state replication beyond just directly setting variables should not use this attribute.
 /// </summary>
 [AttributeUsage(AttributeTargets.Class, Inherited = false)]
-[BaseTypeRequired(typeof(Component))]
+[BaseTypeRequired(typeof(IComponent))]
 public sealed class AutoGenerateComponentStateAttribute : Attribute
 {
     /// <summary>

Robust.Shared/Configuration/ConfigurationCommands.cs

@@ -132,6 +132,11 @@ namespace Robust.Shared.Configuration
                 return long.Parse(input);
             }
 
+            if (type == typeof(ushort))
+            {
+                return ushort.Parse(input);
+            }
+
             throw new NotSupportedException();
         }
     }

Robust.Shared/Configuration/ConfigurationManager.cs

@@ -617,6 +617,11 @@ namespace Robust.Shared.Configuration
                 return long.Parse(value);
             }
 
+            if (type == typeof(ushort))
+            {
+                return ushort.Parse(value);
+            }
+
             // Must be a string.
             return value;
         }

Robust.Shared/Console/Commands/MapCommands.cs

@@ -148,7 +148,7 @@ internal sealed class ListMapsCommand : LocalizedCommands
                 mapId, _map.IsMapInitialized(mapId),
                 _map.IsMapPaused(mapId),
                 _map.GetMapEntityId(mapId),
-                string.Join(",", _map.GetAllMapGrids(mapId).Select(grid => grid.Owner)));
+                string.Join(",", _map.GetAllGrids(mapId).Select(grid => grid.Owner)));
         }
 
         shell.WriteLine(msg.ToString());

Robust.Shared/Console/CompletionHelper.cs

@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
@@ -173,7 +171,7 @@ public static class CompletionHelper
         }
     }
 
-    public static IEnumerable<CompletionOption> Components<T>(string text, IEntityManager? entManager = null) where T : Component
+    public static IEnumerable<CompletionOption> Components<T>(string text, IEntityManager? entManager = null) where T : IComponent
     {
         IoCManager.Resolve(ref entManager);
 

Robust.Shared/Console/IConsoleCommand.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
@@ -9,7 +8,7 @@ namespace Robust.Shared.Console
     /// Basic interface to handle console commands. Any class implementing this will be
     /// registered with the console system through reflection.
     /// </summary>
-    [UsedImplicitly(ImplicitUseTargetFlags.WithInheritors), Obsolete("New commands should utilize ToolshedCommand.")]
+    [UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)]
     public interface IConsoleCommand
     {
         /// <summary>

Robust.Shared/Console/LocalizedCommands.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Robust.Shared.IoC;
@@ -6,7 +5,6 @@ using Robust.Shared.Localization;
 
 namespace Robust.Shared.Console;
 
-[Obsolete("You should use ToolshedCommand instead.")]
 public abstract class LocalizedCommands : IConsoleCommand
 {
     [Dependency] protected readonly ILocalizationManager LocalizationManager = default!;

Robust.Shared/Containers/BaseContainer.cs

@@ -1,5 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Network;
@@ -9,12 +14,6 @@ using Robust.Shared.Physics.Systems;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using Robust.Shared.Log;
-using Robust.Shared.Serialization;
 
 namespace Robust.Shared.Containers
 {
@@ -62,7 +61,7 @@ namespace Robust.Shared.Containers
         /// The entity that owns this container.
         /// </summary>
         [ViewVariables]
-        public EntityUid Owner => Manager.Owner;
+        public EntityUid Owner { get; internal set; }
 
         /// <summary>
         /// Should the contents of this container be shown? False for closed containers like lockers, true for
@@ -77,10 +76,7 @@ namespace Robust.Shared.Containers
             DebugTools.AssertNull(ID);
             ID = id;
             Manager = component;
-
-            // TODO fix container init.
-            // Eventually, we want an owner field, but currently it needs to use component.Owner
-            // Owner = owner;
+            Owner = owner;
         }
 
         /// <summary>
@@ -107,10 +103,9 @@ namespace Robust.Shared.Containers
             bool force = false)
         {
             IoCManager.Resolve(ref entMan);
-            DebugTools.Assert(transform == null || transform.Owner == toinsert);
-            DebugTools.Assert(ownerTransform == null || ownerTransform.Owner == Owner);
-            DebugTools.Assert(ownerTransform == null || ownerTransform.Owner == Owner);
-            DebugTools.Assert(physics == null || physics.Owner == toinsert);
+            DebugTools.AssertOwner(toinsert, transform);
+            DebugTools.AssertOwner(Owner, ownerTransform);
+            DebugTools.AssertOwner(toinsert, physics);
             DebugTools.Assert(!ExpectedEntities.Contains(entMan.GetNetEntity(toinsert)));
             DebugTools.Assert(Manager.Containers.ContainsKey(ID));
 
@@ -298,8 +293,8 @@ namespace Robust.Shared.Containers
             IoCManager.Resolve(ref entMan);
             DebugTools.AssertNotNull(Manager);
             DebugTools.Assert(entMan.EntityExists(toRemove));
-            DebugTools.Assert(xform == null || xform.Owner == toRemove);
-            DebugTools.Assert(meta == null || meta.Owner == toRemove);
+            DebugTools.AssertOwner(toRemove, xform);
+            DebugTools.AssertOwner(toRemove, meta);
 
             xform ??= entMan.GetComponent<TransformComponent>(toRemove);
             meta ??= entMan.GetComponent<MetaDataComponent>(toRemove);
@@ -337,7 +332,7 @@ namespace Robust.Shared.Containers
             else if (reparent)
             {
                 // Container ECS when.
-                sys.AttachParentToContainerOrGrid(xform);
+                sys.AttachParentToContainerOrGrid((toRemove, xform));
                 if (localRotation != null)
                     entMan.EntitySysManager.GetEntitySystem<SharedTransformSystem>().SetLocalRotation(xform, localRotation.Value);
             }

Robust.Shared/Containers/ContainerHelpers.cs

@@ -1,191 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using JetBrains.Annotations;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Utility;
-
-namespace Robust.Shared.Containers
-{
-    /// <summary>
-    /// Helper functions for the container system.
-    /// </summary>
-    [PublicAPI]
-    public static class ContainerHelpers
-    {
-        /// <summary>
-        /// Am I inside a container? Only checks the direct parent. To see if the entity, or any parent entity, is
-        /// inside a container, use <see cref="ContainerSystem.IsEntityOrParentInContainer"/>
-        /// </summary>
-        /// <param name="entity">Entity that might be inside a container.</param>
-        /// <returns>If the entity is inside of a container.</returns>
-        [Obsolete("Use ContainerSystem.IsEntityInContainer() instead")]
-        public static bool IsInContainer(this EntityUid entity,
-            IEntityManager? entMan = null)
-        {
-            IoCManager.Resolve(ref entMan);
-            return (entMan.GetComponent<MetaDataComponent>(entity).Flags & MetaDataFlags.InContainer) == MetaDataFlags.InContainer;
-        }
-
-        /// <summary>
-        /// Tries to find the container manager that this entity is inside (if any).
-        /// </summary>
-        /// <param name="entity">Entity that might be inside a container.</param>
-        /// <param name="manager">The container manager that this entity is inside of.</param>
-        /// <returns>If a container manager was found.</returns>
-        public static bool TryGetContainerMan(this EntityUid entity, [NotNullWhen(true)] out ContainerManagerComponent? manager, IEntityManager? entMan = null)
-        {
-            IoCManager.Resolve(ref entMan);
-            DebugTools.Assert(entMan.EntityExists(entity));
-
-            var parent = entMan.GetComponent<TransformComponent>(entity).ParentUid;
-            if (parent.IsValid() && TryGetManagerComp(parent, out manager, entMan) && manager.ContainsEntity(entity))
-                return true;
-
-            manager = default;
-            return false;
-        }
-
-        /// <summary>
-        /// Tries to find the container that this entity is inside (if any).
-        /// </summary>
-        /// <param name="entity">Entity that might be inside a container.</param>
-        /// <param name="container">The container that this entity is inside of.</param>
-        /// <returns>If a container was found.</returns>
-        [Obsolete("Use ContainerSystem.TryGetContainingContainer() instead")]
-        public static bool TryGetContainer(this EntityUid entity, [NotNullWhen(true)] out BaseContainer? container, IEntityManager? entMan = null)
-        {
-            IoCManager.Resolve(ref entMan);
-            DebugTools.Assert(entMan.EntityExists(entity));
-
-            if (TryGetContainerMan(entity, out var manager, entMan))
-                return manager.TryGetContainer(entity, out container);
-
-            container = default;
-            return false;
-        }
-
-        /// <summary>
-        /// Attempts to remove an entity from its container, if any.
-        /// <see cref="SharedContainerSystem.TryRemoveFromContainer"/>
-        /// </summary>
-        /// <param name="entity">Entity that might be inside a container.</param>
-        /// <param name="force">Whether to forcibly remove the entity from the container.</param>
-        /// <param name="wasInContainer">Whether the entity was actually inside a container or not.</param>
-        /// <returns>If the entity could be removed. Also returns false if it wasn't inside a container.</returns>
-        [Obsolete("Use SharedContainerSystem.TryRemoveFromContainer() instead")]
-        public static bool TryRemoveFromContainer(this EntityUid entity, bool force, out bool wasInContainer, IEntityManager? entMan = null)
-        {
-            return IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedContainerSystem>()
-                .TryRemoveFromContainer(entity, force, out wasInContainer);
-        }
-
-        /// <summary>
-        /// Attempts to remove an entity from its container, if any.
-        /// <see cref="SharedContainerSystem.TryRemoveFromContainer"/>
-        /// </summary>
-        /// <param name="entity">Entity that might be inside a container.</param>
-        /// <param name="force">Whether to forcibly remove the entity from the container.</param>
-        /// <returns>If the entity could be removed. Also returns false if it wasn't inside a container.</returns>
-        [Obsolete("Use SharedContainerSystem.TryRemoveFromContainer() instead")]
-        public static bool TryRemoveFromContainer(this EntityUid entity, bool force = false, IEntityManager? entMan = null)
-        {
-            return IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedContainerSystem>()
-                .TryRemoveFromContainer(entity, force);
-        }
-
-        /// <summary>
-        /// Attempts to remove all entities in a container.
-        /// <see cref="SharedContainerSystem.EmptyContainer"/>
-        /// </summary>
-        [Obsolete("Use SharedContainerSystem.EmptyContainer() instead")]
-        public static void EmptyContainer(this BaseContainer container, bool force = false, EntityCoordinates? moveTo = null,
-            bool attachToGridOrMap = false, IEntityManager? entMan = null)
-        {
-            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedContainerSystem>()
-                .EmptyContainer(container, force, moveTo, attachToGridOrMap);
-        }
-
-        /// <summary>
-        /// Attempts to remove and delete all entities in a container.
-        /// <see cref="SharedContainerSystem.CleanContainer"/>
-        /// </summary>
-        [Obsolete("Use SharedContainerSystem.CleanContainer() instead")]
-        public static void CleanContainer(this BaseContainer container, IEntityManager? entMan = null)
-        {
-            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedContainerSystem>()
-                .CleanContainer(container);
-        }
-
-        /// <summary>
-        /// <see cref="SharedContainerSystem.AttachParentToContainerOrGrid"/>
-        /// </summary>
-        [Obsolete("Use SharedContainerSystem.AttachParentToContainerOrGrid() instead")]
-        public static void AttachParentToContainerOrGrid(this TransformComponent transform, IEntityManager? entMan = null)
-        {
-            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SharedContainerSystem>()
-                .AttachParentToContainerOrGrid(transform);
-        }
-
-        /// <summary>
-        /// <see cref="SharedContainerSystem.TryGetManagerComp"/>
-        /// </summary>
-        [Obsolete("Use SharedContainerSystem.TryGetManagerComp() instead")]
-        private static bool TryGetManagerComp(this EntityUid entity, [NotNullWhen(true)] out ContainerManagerComponent? manager, IEntityManager? entMan = null)
-        {
-            IoCManager.Resolve(ref entMan);
-            return entMan.System<SharedContainerSystem>()
-                .TryGetManagerComp(entity, out manager);
-        }
-
-        /// <summary>
-        /// Shortcut method to make creation of containers easier.
-        /// Creates a new container on the entity and gives it back to you.
-        /// </summary>
-        /// <param name="entity">The entity to create the container for.</param>
-        /// <param name="containerId"></param>
-        /// <returns>The new container.</returns>
-        /// <exception cref="ArgumentException">Thrown if there already is a container with the specified ID.</exception>
-        /// <seealso cref="BaseContainerManager.MakeContainer{T}(string)" />
-        [Obsolete("Use ContainerSystem.MakeContainer() instead")]
-        public static T CreateContainer<T>(this EntityUid entity, string containerId, IEntityManager? entMan = null)
-            where T : BaseContainer
-        {
-            IoCManager.Resolve(ref entMan);
-            var containermanager = entMan.EnsureComponent<ContainerManagerComponent>(entity);
-            return containermanager.MakeContainer<T>(containerId);
-        }
-
-        [Obsolete("Use ContainerSystem.EnsureContainer() instead")]
-        public static T EnsureContainer<T>(this EntityUid entity, string containerId, IEntityManager? entMan = null)
-            where T : BaseContainer
-        {
-            IoCManager.Resolve(ref entMan);
-            return EnsureContainer<T>(entity, containerId, out _, entMan);
-        }
-
-        [Obsolete("Use ContainerSystem.EnsureContainer() instead")]
-        public static T EnsureContainer<T>(this EntityUid entity, string containerId, out bool alreadyExisted, IEntityManager? entMan = null)
-            where T : BaseContainer
-        {
-            IoCManager.Resolve(ref entMan);
-            var containerManager = entMan.EnsureComponent<ContainerManagerComponent>(entity);
-
-            if (!containerManager.TryGetContainer(containerId, out var existing))
-            {
-                alreadyExisted = false;
-                return containerManager.MakeContainer<T>(containerId);
-            }
-
-            if (!(existing is T container))
-            {
-                throw new InvalidOperationException(
-                    $"The container exists but is of a different type: {existing.GetType()}");
-            }
-
-            alreadyExisted = true;
-            return container;
-        }
-    }
-}

Robust.Shared/Containers/ContainerManagerComponent.cs

@@ -7,7 +7,6 @@ using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
@@ -22,7 +21,6 @@ namespace Robust.Shared.Containers
     {
         [Dependency] private readonly IDynamicTypeFactoryInternal _dynFactory = default!;
         [Dependency] private readonly IEntityManager _entMan = default!;
-        [Dependency] private readonly INetManager _netMan = default!;
 
         [DataField("containers")]
         public Dictionary<string, BaseContainer> Containers = new();
@@ -30,54 +28,37 @@ namespace Robust.Shared.Containers
         void ISerializationHooks.AfterDeserialization()
         {
             // TODO custom type serializer
-            // TODO set owner uid on init.
             foreach (var (id, container) in Containers)
             {
                 container.Manager = this;
+                container.Owner = Owner;
                 container.ID = id;
             }
         }
 
-        /// <inheritdoc />
-        protected internal override void OnRemove()
-        {
-            base.OnRemove();
-
-            foreach (var container in Containers.Values)
-            {
-                container.Shutdown(_entMan, _netMan);
-            }
-
-            Containers.Clear();
-        }
-
-        /// <inheritdoc />
-        public T MakeContainer<T>(string id)
+        public T MakeContainer<T>(EntityUid uid, string id)
             where T : BaseContainer
         {
             if (HasContainer(id))
                 throw new ArgumentException($"Container with specified ID already exists: '{id}'");
 
             var container = _dynFactory.CreateInstanceUnchecked<T>(typeof(T), inject: false);
-            container.Init(id, Owner, this);
+            container.Init(id, uid, this);
             Containers[id] = container;
             _entMan.Dirty(this);
             return container;
         }
 
-        /// <inheritdoc />
         public BaseContainer GetContainer(string id)
         {
             return Containers[id];
         }
 
-        /// <inheritdoc />
         public bool HasContainer(string id)
         {
             return Containers.ContainsKey(id);
         }
 
-        /// <inheritdoc />
         public bool TryGetContainer(string id, [NotNullWhen(true)] out BaseContainer? container)
         {
             var ret = Containers.TryGetValue(id, out var cont);
@@ -85,7 +66,6 @@ namespace Robust.Shared.Containers
             return ret;
         }
 
-        /// <inheritdoc />
         public bool TryGetContainer(EntityUid entity, [NotNullWhen(true)] out BaseContainer? container)
         {
             foreach (var contain in Containers.Values)
@@ -101,7 +81,6 @@ namespace Robust.Shared.Containers
             return false;
         }
 
-        /// <inheritdoc />
         public bool ContainsEntity(EntityUid entity)
         {
             foreach (var container in Containers.Values)
@@ -112,7 +91,6 @@ namespace Robust.Shared.Containers
             return false;
         }
 
-        /// <inheritdoc />
         public bool Remove(EntityUid toremove,
             TransformComponent? xform = null,
             MetaDataComponent? meta = null,
@@ -227,7 +205,9 @@ namespace Robust.Shared.Containers
 
             object IEnumerator.Current => Current;
 
-            public void Dispose() { }
+            public void Dispose()
+            {
+            }
         }
     }
 }

Robust.Shared/Containers/SharedContainerSystem.cs

@@ -8,6 +8,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
+using Robust.Shared.Network;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Utility;
@@ -16,6 +17,7 @@ namespace Robust.Shared.Containers
 {
     public abstract partial class SharedContainerSystem
     {
+        [Dependency] private readonly INetManager _net = default!;
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
         [Dependency] private readonly EntityLookupSystem _lookup = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
@@ -34,6 +36,7 @@ namespace Robust.Shared.Containers
             SubscribeLocalEvent<EntParentChangedMessage>(OnParentChanged);
             SubscribeLocalEvent<ContainerManagerComponent, ComponentStartup>(OnStartupValidation);
             SubscribeLocalEvent<ContainerManagerComponent, ComponentGetState>(OnContainerGetState);
+            SubscribeLocalEvent<ContainerManagerComponent, ComponentRemove>(OnContainerManagerRemove);
 
             _gridQuery = GetEntityQuery<MapGridComponent>();
             _mapQuery = GetEntityQuery<MapComponent>();
@@ -62,6 +65,16 @@ namespace Robust.Shared.Containers
             args.State = new ContainerManagerComponent.ContainerManagerComponentState(containerSet);
         }
 
+        private void OnContainerManagerRemove(EntityUid uid, ContainerManagerComponent component, ComponentRemove args)
+        {
+            foreach (var container in component.Containers.Values)
+            {
+                container.Shutdown(EntityManager, _net);
+            }
+
+            component.Containers.Clear();
+        }
+
         // TODO: Make ContainerManagerComponent ECS and make these proxy methods the real deal.
 
         #region Proxy Methods
@@ -70,16 +83,16 @@ namespace Robust.Shared.Containers
             where T : BaseContainer
         {
             if (!Resolve(uid, ref containerManager, false))
-                containerManager = EntityManager.AddComponent<ContainerManagerComponent>(uid); // Happy Vera.
+                containerManager = AddComp<ContainerManagerComponent>(uid); // Happy Vera.
 
-            return containerManager.MakeContainer<T>(id);
+            return containerManager.MakeContainer<T>(uid, id);
         }
 
         public T EnsureContainer<T>(EntityUid uid, string id, out bool alreadyExisted, ContainerManagerComponent? containerManager = null)
             where T : BaseContainer
         {
             if (!Resolve(uid, ref containerManager, false))
-                containerManager = EntityManager.AddComponent<ContainerManagerComponent>(uid);
+                containerManager = AddComp<ContainerManagerComponent>(uid);
 
             if (TryGetContainer(uid, id, out var container, containerManager))
             {
@@ -128,7 +141,7 @@ namespace Robust.Shared.Containers
 
         public bool TryGetContainingContainer(EntityUid uid, EntityUid containedUid, [NotNullWhen(true)] out BaseContainer? container, ContainerManagerComponent? containerManager = null, bool skipExistCheck = false)
         {
-            if (Resolve(uid, ref containerManager, false) && (skipExistCheck || EntityManager.EntityExists(containedUid)))
+            if (Resolve(uid, ref containerManager, false) && (skipExistCheck || Exists(containedUid)))
                 return containerManager.TryGetContainer(containedUid, out container);
 
             container = null;
@@ -137,7 +150,7 @@ namespace Robust.Shared.Containers
 
         public bool ContainsEntity(EntityUid uid, EntityUid containedUid, ContainerManagerComponent? containerManager = null)
         {
-            if (!Resolve(uid, ref containerManager, false) || !EntityManager.EntityExists(containedUid))
+            if (!Resolve(uid, ref containerManager, false) || !Exists(containedUid))
                 return false;
 
             return containerManager.ContainsEntity(containedUid);
@@ -215,7 +228,7 @@ namespace Robust.Shared.Containers
         {
             if (meta == null)
             {
-                metas ??= EntityManager.GetEntityQuery<MetaDataComponent>();
+                metas ??= GetEntityQuery<MetaDataComponent>();
                 meta = metas.Value.GetComponent(uid);
             }
 
@@ -224,7 +237,7 @@ namespace Robust.Shared.Containers
 
             if (xform == null)
             {
-                xforms ??= EntityManager.GetEntityQuery<TransformComponent>();
+                xforms ??= GetEntityQuery<TransformComponent>();
                 xform = xforms.Value.GetComponent(uid);
             }
 
@@ -242,7 +255,7 @@ namespace Robust.Shared.Containers
             EntityQuery<T> entityQuery,
             [NotNullWhen(true)] ref T? foundComponent,
             MetaDataComponent? meta = null,
-            TransformComponent? xform = null) where T : Component
+            TransformComponent? xform = null) where T : IComponent
         {
             if (!MetaQuery.Resolve(uid, ref meta))
                 return false;
@@ -270,7 +283,7 @@ namespace Robust.Shared.Containers
             EntityQuery<T> entityQuery,
             List<T> foundComponents,
             MetaDataComponent? meta = null,
-            TransformComponent? xform = null) where T : Component
+            TransformComponent? xform = null) where T : IComponent
         {
             if (!MetaQuery.Resolve(uid, ref meta))
                 return foundComponents.Any();
@@ -284,7 +297,7 @@ namespace Robust.Shared.Containers
             if (!xform.ParentUid.Valid)
                 return foundComponents.Any();
 
-            if (EntityManager.TryGetComponent(xform.ParentUid, out T? foundComponent))
+            if (TryComp(xform.ParentUid, out T? foundComponent))
                 foundComponents.Add(foundComponent);
 
             return TryFindComponentsOnEntityContainerOrParent(xform.ParentUid, entityQuery, foundComponents);
@@ -381,7 +394,7 @@ namespace Robust.Shared.Containers
         /// </summary>
         public bool TryGetOuterContainer(EntityUid uid, TransformComponent xform, [NotNullWhen(true)] out BaseContainer? container)
         {
-            var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
+            var xformQuery = GetEntityQuery<TransformComponent>();
             return TryGetOuterContainer(uid, xform, out container, xformQuery);
         }
 
@@ -393,8 +406,8 @@ namespace Robust.Shared.Containers
             if (!uid.IsValid())
                 return false;
 
-            var conQuery = EntityManager.GetEntityQuery<ContainerManagerComponent>();
-            var metaQuery = EntityManager.GetEntityQuery<MetaDataComponent>();
+            var conQuery = GetEntityQuery<ContainerManagerComponent>();
+            var metaQuery = GetEntityQuery<MetaDataComponent>();
             var child = uid;
             var parent = xform.ParentUid;
 
@@ -488,20 +501,26 @@ namespace Robust.Shared.Containers
             }
         }
 
+        [Obsolete("Use AttachParentToContainerOrGrid(EntityUid<TransformComponent>) instead")]
         public void AttachParentToContainerOrGrid(TransformComponent transform)
+        {
+            AttachParentToContainerOrGrid(new Entity<TransformComponent>(transform.Owner, transform));
+        }
+
+        public void AttachParentToContainerOrGrid(Entity<TransformComponent> transform)
         {
             // TODO make this check upwards for any container, and parent to that.
             // Currently this just checks the direct parent, so entities will still teleport through containers.
 
-            if (!transform.ParentUid.IsValid()
-                || !TryGetContainingContainer(transform.ParentUid, out var container)
+            if (!transform.Comp.ParentUid.IsValid()
+                || !TryGetContainingContainer(transform.Comp.ParentUid, out var container)
                 || !TryInsertIntoContainer(transform, container))
-                transform.AttachToGridOrMap();
+                transform.Comp.AttachToGridOrMap();
         }
 
-        private bool TryInsertIntoContainer(TransformComponent transform, BaseContainer container)
+        private bool TryInsertIntoContainer(Entity<TransformComponent> transform, BaseContainer container)
         {
-            if (container.Insert(transform.Owner)) return true;
+            if (container.Insert(transform)) return true;
 
             if (Transform(container.Owner).ParentUid.IsValid()
                 && TryGetContainingContainer(container.Owner, out var newContainer))

Robust.Shared/ContentPack/ResourceManifestData.cs

@@ -0,0 +1,92 @@
+using System;
+using System.IO;
+using Robust.Shared.Utility;
+using YamlDotNet.RepresentationModel;
+
+namespace Robust.Shared.ContentPack;
+
+internal sealed record ResourceManifestData(
+    string[] Modules,
+    string? AssemblyPrefix,
+    string? DefaultWindowTitle,
+    string? WindowIconSet,
+    string? SplashLogo,
+    bool AutoConnect,
+    string[]? ClientAssemblies
+)
+{
+    public static readonly ResourceManifestData Default =
+        new ResourceManifestData(Array.Empty<string>(), null, null, null, null, true, null);
+
+    public static ResourceManifestData LoadResourceManifest(IResourceManager res)
+    {
+        // Parses /manifest.yml for game-specific settings that cannot be exclusively set up by content code.
+        if (!res.TryContentFileRead("/manifest.yml", out var stream))
+            return ResourceManifestData.Default;
+
+        var yamlStream = new YamlStream();
+        using (stream)
+        {
+            using var streamReader = new StreamReader(stream, EncodingHelpers.UTF8);
+            yamlStream.Load(streamReader);
+        }
+
+        if (yamlStream.Documents.Count == 0)
+            return ResourceManifestData.Default;
+
+        if (yamlStream.Documents.Count != 1 || yamlStream.Documents[0].RootNode is not YamlMappingNode mapping)
+        {
+            throw new InvalidOperationException(
+                "Expected a single YAML document with root mapping for /manifest.yml");
+        }
+
+        var modules = ReadStringArray(mapping, "modules") ?? Array.Empty<string>();
+
+        string? assemblyPrefix = null;
+        if (mapping.TryGetNode("assemblyPrefix", out var prefixNode))
+            assemblyPrefix = prefixNode.AsString();
+
+        string? defaultWindowTitle = null;
+        if (mapping.TryGetNode("defaultWindowTitle", out var winTitleNode))
+            defaultWindowTitle = winTitleNode.AsString();
+
+        string? windowIconSet = null;
+        if (mapping.TryGetNode("windowIconSet", out var iconSetNode))
+            windowIconSet = iconSetNode.AsString();
+
+        string? splashLogo = null;
+        if (mapping.TryGetNode("splashLogo", out var splashNode))
+            splashLogo = splashNode.AsString();
+
+        bool autoConnect = true;
+        if (mapping.TryGetNode("autoConnect", out var autoConnectNode))
+            autoConnect = autoConnectNode.AsBool();
+
+        var clientAssemblies = ReadStringArray(mapping, "clientAssemblies");
+
+        return new ResourceManifestData(
+            modules,
+            assemblyPrefix,
+            defaultWindowTitle,
+            windowIconSet,
+            splashLogo,
+            autoConnect,
+            clientAssemblies
+        );
+
+        static string[]? ReadStringArray(YamlMappingNode mapping, string key)
+        {
+            if (!mapping.TryGetNode(key, out var node))
+                return null;
+
+            var sequence = (YamlSequenceNode)node;
+            var array = new string[sequence.Children.Count];
+            for (var i = 0; i < array.Length; i++)
+            {
+                array[i] = sequence[i].AsString();
+            }
+
+            return array;
+        }
+    }
+}

Robust.Shared/GameObjects/Component.cs

@@ -1,5 +1,4 @@
 using System;
-using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Reflection;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -8,7 +7,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Robust.Shared.GameObjects
 {
-    /// <inheritdoc />
+    /// <inheritdoc cref="IComponent"/>
     [Reflect(false)]
     [ImplicitDataDefinitionForInheritors]
     public abstract partial class Component : IComponent
@@ -17,7 +16,8 @@ namespace Robust.Shared.GameObjects
         [ViewVariables(VVAccess.ReadWrite)]
         private bool _netSync { get; set; } = true;
 
-        internal bool Networked = true;
+        [Obsolete("Do not use from content")]
+        public bool Networked { get; set; } = true;
 
         /// <inheritdoc />
         public bool NetSyncEnabled
@@ -33,19 +33,10 @@ namespace Robust.Shared.GameObjects
 
         /// <inheritdoc />
         [ViewVariables]
-        public ComponentLifeStage LifeStage { get; internal set; } = ComponentLifeStage.PreAdd;
+        public ComponentLifeStage LifeStage { get; [Obsolete("Do not use from content")] set; } = ComponentLifeStage.PreAdd;
 
-        /// <summary>
-        ///     If true, and if this is a networked component, then component data will only be sent to players if their
-        ///     controlled entity is the owner of this component. This is less performance intensive than <see cref="SessionSpecific"/>.
-        /// </summary>
         public virtual bool SendOnlyToOwner => false;
 
-        /// <summary>
-        ///     If true, and if this is a networked component, then this component will cause <see
-        ///     cref="ComponentGetStateAttemptEvent"/> events to be raised to check whether a given player should
-        ///     receive this component's state.
-        /// </summary>
         public virtual bool SessionSpecific => false;
 
         /// <inheritdoc />
@@ -62,21 +53,11 @@ namespace Robust.Shared.GameObjects
 
         /// <inheritdoc />
         [ViewVariables]
-        public GameTick CreationTick { get; internal set; }
+        public GameTick CreationTick { get; [Obsolete("Do not use from content")] set; }
 
         /// <inheritdoc />
         [ViewVariables]
-        public GameTick LastModifiedTick { get; internal set; }
-
-        /// <summary>
-        /// Called when the component is removed from an entity.
-        /// Shuts down the component.
-        /// The component has already been marked as deleted in the component manager.
-        /// </summary>
-        protected internal virtual void OnRemove()
-        {
-            LifeStage = ComponentLifeStage.Deleted;
-        }
+        public GameTick LastModifiedTick { get; [Obsolete("Do not use from content")] set; }
 
         /// <inheritdoc />
         [Obsolete]
@@ -88,13 +69,15 @@ namespace Robust.Shared.GameObjects
 
         // these two methods clear the LastModifiedTick/CreationTick to mark it as "not different from prototype load".
         // This is used as optimization in the game state system to avoid sending redundant component data.
-        internal virtual void ClearTicks()
+        [Obsolete("Do not use from content")]
+        public virtual void ClearTicks()
         {
             LastModifiedTick = GameTick.Zero;
             ClearCreationTick();
         }
 
-        internal void ClearCreationTick()
+        [Obsolete("Do not use from content")]
+        public void ClearCreationTick()
         {
             CreationTick = GameTick.Zero;
         }

Robust.Shared/GameObjects/ComponentEventArgs.cs

@@ -9,7 +9,7 @@ namespace Robust.Shared.GameObjects
         /// <summary>
         /// Component that this event relates to.
         /// </summary>
-        public Component Component { get; }
+        public IComponent Component { get; }
 
         /// <summary>
         /// EntityUid of the entity this component belongs to.
@@ -21,7 +21,7 @@ namespace Robust.Shared.GameObjects
         /// </summary>
         /// <param name="component">The relevant component</param>
         /// <param name="owner">EntityUid of the entity this component belongs to.</param>
-        public ComponentEventArgs(Component component, EntityUid owner)
+        public ComponentEventArgs(IComponent component, EntityUid owner)
         {
             Component = component;
             Owner = owner;

Robust.Shared/GameObjects/ComponentExt.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using JetBrains.Annotations;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-
-namespace Robust.Shared.GameObjects
-{
-    [PublicAPI]
-    public static class ComponentExt
-    {
-        /// <summary>
-        ///     Convenience wrapper to implement "create component if it does not already exist".
-        ///     Always gives you back a component, and creates it if it does not exist yet.
-        /// </summary>
-        /// <param name="entity">The entity to fetch or create the component on.</param>
-        /// <typeparam name="T">The type of the component to fetch or create.</typeparam>
-        /// <returns>The existing component, or the new component if none existed yet.</returns>
-        [Obsolete]
-        public static T EnsureComponent<T>(this EntityUid entity) where T : Component, new()
-        {
-            var entMan = IoCManager.Resolve<IEntityManager>();
-            if (entMan.TryGetComponent(entity, out T? component))
-            {
-                return component;
-            }
-
-            return entMan.AddComponent<T>(entity);
-        }
-
-        /// <summary>
-        ///     Convenience wrapper to implement "create component if it does not already exist".
-        ///     Always gives you back a component, and creates it if it does not exist yet.
-        /// </summary>
-        /// <param name="entity">The entity to fetch or create the component on.</param>
-        /// <typeparam name="T">The type of the component to fetch or create.</typeparam>
-        /// <param name="warning">
-        ///     The custom warning message to log if the component did not exist already.
-        ///     Defaults to a predetermined warning if null.
-        /// </param>
-        /// <returns>The existing component, or the new component if none existed yet.</returns>
-        [Obsolete]
-        public static T EnsureComponentWarn<T>(this EntityUid entity, string? warning = null) where T : Component, new()
-        {
-            var entMan = IoCManager.Resolve<IEntityManager>();
-            if (entMan.TryGetComponent(entity, out T? component))
-            {
-                return component;
-            }
-
-            warning ??= $"Entity {entity} at {entMan.GetComponent<TransformComponent>(entity).MapPosition} did not have a {typeof(T)}";
-
-            Logger.Warning(warning);
-
-            return entMan.AddComponent<T>(entity);
-        }
-
-        [Obsolete]
-        public static IComponent SetAndDirtyIfChanged<TValue>(
-            this IComponent comp,
-            ref TValue backingField,
-            TValue value)
-        {
-            if (EqualityComparer<TValue>.Default.Equals(backingField, value))
-            {
-                return comp;
-            }
-
-            backingField = value;
-            comp.Dirty();
-
-            return comp;
-        }
-    }
-}

Robust.Shared/GameObjects/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.IoC;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Shared.GameObjects;
@@ -33,14 +32,6 @@ public sealed partial class AppearanceComponent : Component
 
     [ViewVariables] internal Dictionary<Enum, object> AppearanceData = new();
 
-    [Dependency] private readonly IEntitySystemManager _sysMan = default!;
-
-    [Obsolete("Use SharedAppearanceSystem instead")]
-    public void SetData(Enum key, object value)
-    {
-        _sysMan.GetEntitySystem<SharedAppearanceSystem>().SetData(Owner, key, value, this);
-    }
-
     [Obsolete("Use SharedAppearanceSystem instead")]
     public bool TryGetData<T>(Enum key, [NotNullWhen(true)] out T data)
     {

Robust.Shared/GameObjects/Components/MetaDataComponent.cs

@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System;
+using System.Collections.Generic;
 using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
@@ -7,8 +8,6 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Collections.Generic;
 
 namespace Robust.Shared.GameObjects
 {
@@ -68,7 +67,7 @@ namespace Robust.Shared.GameObjects
         /// The components attached to the entity that are currently networked.
         /// </summary>
         [ViewVariables]
-        internal readonly Dictionary<ushort, Component> NetComponents = new();
+        internal readonly Dictionary<ushort, IComponent> NetComponents = new();
 
         /// <summary>
         /// Network identifier for this entity.
@@ -199,7 +198,8 @@ namespace Robust.Shared.GameObjects
         public bool EntityInitializing => EntityLifeStage == EntityLifeStage.Initializing;
         public bool EntityDeleted => EntityLifeStage >= EntityLifeStage.Deleted;
 
-        internal override void ClearTicks()
+        [Obsolete("Do not use from content")]
+        public override void ClearTicks()
         {
             // Do not clear modified ticks.
             // MetaDataComponent is used in the game state system to carry initial data like prototype ID.

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

@@ -85,8 +85,9 @@ namespace Robust.Shared.GameObjects
         [ViewVariables]
         public Angle PrevRotation { get; internal set; }
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        internal bool ActivelyLerping { get; set; }
+        [ViewVariables] public bool ActivelyLerping;
+
+        [ViewVariables] public GameTick LastLerp = GameTick.Zero;
 
         [ViewVariables] internal readonly HashSet<EntityUid> _children = new();
 
@@ -397,7 +398,8 @@ namespace Robust.Shared.GameObjects
 
         [ViewVariables] public int ChildCount => _children.Count;
 
-        [ViewVariables] internal EntityUid LerpParent { get; set; }
+        [ViewVariables] public EntityUid LerpParent;
+        public bool PredictedLerp;
 
         /// <summary>
         /// Detaches this entity from its parent.

Robust.Shared/GameObjects/Entity.cs

@@ -0,0 +1,584 @@
+using Robust.Shared.Utility;
+
+namespace Robust.Shared.GameObjects;
+
+public record struct Entity<T>
+    where T : IComponent?
+{
+    public EntityUid Owner;
+    public T Comp;
+
+    public Entity(EntityUid owner, T comp)
+    {
+        DebugTools.AssertOwner(owner, comp);
+
+        Owner = owner;
+        Comp = comp;
+    }
+
+    public static implicit operator Entity<T>((EntityUid Owner, T Comp) tuple)
+    {
+        return new Entity<T>(tuple.Owner, tuple.Comp);
+    }
+
+    public static implicit operator Entity<T?>(EntityUid owner)
+    {
+        return new Entity<T?>(owner, default);
+    }
+
+    public static implicit operator EntityUid(Entity<T> ent)
+    {
+        return ent.Owner;
+    }
+
+    public static implicit operator T(Entity<T> ent)
+    {
+        return ent.Comp;
+    }
+
+    public readonly void Deconstruct(out EntityUid owner, out T comp)
+    {
+        owner = Owner;
+        comp = Comp;
+    }
+}
+
+public record struct Entity<T1, T2>
+    where T1 : IComponent? where T2 : IComponent?
+{
+    public EntityUid Owner;
+    public T1 Comp1;
+    public T2 Comp2;
+
+    public Entity(EntityUid owner, T1 comp1, T2 comp2)
+    {
+        DebugTools.AssertOwner(owner, comp1);
+        DebugTools.AssertOwner(owner, comp2);
+
+        Owner = owner;
+        Comp1 = comp1;
+        Comp2 = comp2;
+    }
+
+    public static implicit operator Entity<T1, T2>((EntityUid Owner, T1 Comp1, T2 Comp2) tuple)
+    {
+        return new Entity<T1, T2>(tuple.Owner, tuple.Comp1, tuple.Comp2);
+    }
+
+    public static implicit operator Entity<T1?, T2?>(EntityUid owner)
+    {
+        return new Entity<T1?, T2?>(owner, default, default);
+    }
+
+    public static implicit operator EntityUid(Entity<T1, T2> ent)
+    {
+        return ent.Owner;
+    }
+
+    public static implicit operator T1(Entity<T1, T2> ent)
+    {
+        return ent.Comp1;
+    }
+
+    public static implicit operator T2(Entity<T1, T2> ent)
+    {
+        return ent.Comp2;
+    }
+
+    public readonly void Deconstruct(out EntityUid owner, out T1 comp1, out T2 comp2)
+    {
+        owner = Owner;
+        comp1 = Comp1;
+        comp2 = Comp2;
+    }
+}
+
+public record struct Entity<T1, T2, T3>
+    where T1 : IComponent? where T2 : IComponent? where T3 : IComponent?
+{
+    public EntityUid Owner;
+    public T1 Comp1;
+    public T2 Comp2;
+    public T3 Comp3;
+
+    public Entity(EntityUid owner, T1 comp1, T2 comp2, T3 comp3)
+    {
+        DebugTools.AssertOwner(owner, comp1);
+        DebugTools.AssertOwner(owner, comp2);
+        DebugTools.AssertOwner(owner, comp3);
+
+        Owner = owner;
+        Comp1 = comp1;
+        Comp2 = comp2;
+        Comp3 = comp3;
+    }
+
+    public static implicit operator Entity<T1, T2, T3>((EntityUid Owner, T1 Comp1, T2 Comp2, T3 Comp3) tuple)
+    {
+        return new Entity<T1, T2, T3>(tuple.Owner, tuple.Comp1, tuple.Comp2, tuple.Comp3);
+    }
+
+    public static implicit operator Entity<T1?, T2?, T3?>(EntityUid owner)
+    {
+        return new Entity<T1?, T2?, T3?>(owner, default, default, default);
+    }
+
+    public static implicit operator EntityUid(Entity<T1, T2, T3> ent)
+    {
+        return ent.Owner;
+    }
+
+    public static implicit operator T1(Entity<T1, T2, T3> ent)
+    {
+        return ent.Comp1;
+    }
+
+    public static implicit operator T2(Entity<T1, T2, T3> ent)
+    {
+        return ent.Comp2;
+    }
+
+    public static implicit operator T3(Entity<T1, T2, T3> ent)
+    {
+        return ent.Comp3;
+    }
+
+    public readonly void Deconstruct(out EntityUid owner, out T1 comp1, out T2 comp2, out T3 comp3)
+    {
+        owner = Owner;
+        comp1 = Comp1;
+        comp2 = Comp2;
+        comp3 = Comp3;
+    }
+}
+
+public record struct Entity<T1, T2, T3, T4>
+    where T1 : IComponent? where T2 : IComponent? where T3 : IComponent? where T4 : IComponent?
+{
+    public EntityUid Owner;
+    public T1 Comp1;
+    public T2 Comp2;
+    public T3 Comp3;
+    public T4 Comp4;
+
+    public Entity(EntityUid owner, T1 comp1, T2 comp2, T3 comp3, T4 comp4)
+    {
+        DebugTools.AssertOwner(owner, comp1);
+        DebugTools.AssertOwner(owner, comp2);
+        DebugTools.AssertOwner(owner, comp3);
+        DebugTools.AssertOwner(owner, comp4);
+
+        Owner = owner;
+        Comp1 = comp1;
+        Comp2 = comp2;
+        Comp3 = comp3;
+        Comp4 = comp4;
+    }
+
+    public static implicit operator Entity<T1, T2, T3, T4>((EntityUid Owner, T1 Comp1, T2 Comp2, T3 Comp3, T4 Comp4) tuple)
+    {
+        return new Entity<T1, T2, T3, T4>(tuple.Owner, tuple.Comp1, tuple.Comp2, tuple.Comp3, tuple.Comp4);
+    }
+
+    public static implicit operator Entity<T1?, T2?, T3?, T4?>(EntityUid owner)
+    {
+        return new Entity<T1?, T2?, T3?, T4?>(owner, default, default, default, default);
+    }
+
+    public static implicit operator EntityUid(Entity<T1, T2, T3, T4> ent)
+    {
+        return ent.Owner;
+    }
+
+    public static implicit operator T1(Entity<T1, T2, T3, T4> ent)
+    {
+        return ent.Comp1;
+    }
+
+    public static implicit operator T2(Entity<T1, T2, T3, T4> ent)
+    {
+        return ent.Comp2;
+    }
+
+    public static implicit operator T3(Entity<T1, T2, T3, T4> ent)
+    {
+        return ent.Comp3;
+    }
+
+    public static implicit operator T4(Entity<T1, T2, T3, T4> ent)
+    {
+        return ent.Comp4;
+    }
+
+    public readonly void Deconstruct(out EntityUid owner, out T1 comp1, out T2 comp2, out T3 comp3, out T4 comp4)
+    {
+        owner = Owner;
+        comp1 = Comp1;
+        comp2 = Comp2;
+        comp3 = Comp3;
+        comp4 = Comp4;
+    }
+}
+
+public record struct Entity<T1, T2, T3, T4, T5>
+    where T1 : IComponent? where T2 : IComponent? where T3 : IComponent? where T4 : IComponent? where T5 : IComponent?
+{
+    public EntityUid Owner;
+    public T1 Comp1;
+    public T2 Comp2;
+    public T3 Comp3;
+    public T4 Comp4;
+    public T5 Comp5;
+
+    public Entity(EntityUid owner, T1 comp1, T2 comp2, T3 comp3, T4 comp4, T5 comp5)
+    {
+        DebugTools.AssertOwner(owner, comp1);
+        DebugTools.AssertOwner(owner, comp2);
+        DebugTools.AssertOwner(owner, comp3);
+        DebugTools.AssertOwner(owner, comp4);
+        DebugTools.AssertOwner(owner, comp5);
+
+        Owner = owner;
+        Comp1 = comp1;
+        Comp2 = comp2;
+        Comp3 = comp3;
+        Comp4 = comp4;
+        Comp5 = comp5;
+    }
+
+    public static implicit operator Entity<T1, T2, T3, T4, T5>((EntityUid Owner, T1 Comp1, T2 Comp2, T3 Comp3, T4 Comp4, T5 Comp5) tuple)
+    {
+        return new Entity<T1, T2, T3, T4, T5>(tuple.Owner, tuple.Comp1, tuple.Comp2, tuple.Comp3, tuple.Comp4, tuple.Comp5);
+    }
+
+    public static implicit operator Entity<T1?, T2?, T3?, T4?, T5?>(EntityUid owner)
+    {
+        return new Entity<T1?, T2?, T3?, T4?, T5?>(owner, default, default, default, default, default);
+    }
+
+    public static implicit operator EntityUid(Entity<T1, T2, T3, T4, T5> ent)
+    {
+        return ent.Owner;
+    }
+
+    public static implicit operator T1(Entity<T1, T2, T3, T4, T5> ent)
+    {
+        return ent.Comp1;
+    }
+
+    public static implicit operator T2(Entity<T1, T2, T3, T4, T5> ent)
+    {
+        return ent.Comp2;
+    }
+
+    public static implicit operator T3(Entity<T1, T2, T3, T4, T5> ent)
+    {
+        return ent.Comp3;
+    }
+
+    public static implicit operator T4(Entity<T1, T2, T3, T4, T5> ent)
+    {
+        return ent.Comp4;
+    }
+
+    public static implicit operator T5(Entity<T1, T2, T3, T4, T5> ent)
+    {
+        return ent.Comp5;
+    }
+
+    public readonly void Deconstruct(out EntityUid owner, out T1 comp1, out T2 comp2, out T3 comp3, out T4 comp4, out T5 comp5)
+    {
+        owner = Owner;
+        comp1 = Comp1;
+        comp2 = Comp2;
+        comp3 = Comp3;
+        comp4 = Comp4;
+        comp5 = Comp5;
+    }
+}
+
+public record struct Entity<T1, T2, T3, T4, T5, T6>
+    where T1 : IComponent? where T2 : IComponent? where T3 : IComponent? where T4 : IComponent? where T5 : IComponent? where T6 : IComponent?
+{
+    public EntityUid Owner;
+    public T1 Comp1;
+    public T2 Comp2;
+    public T3 Comp3;
+    public T4 Comp4;
+    public T5 Comp5;
+    public T6 Comp6;
+
+    public Entity(EntityUid owner, T1 comp1, T2 comp2, T3 comp3, T4 comp4, T5 comp5, T6 comp6)
+    {
+        DebugTools.AssertOwner(owner, comp1);
+        DebugTools.AssertOwner(owner, comp2);
+        DebugTools.AssertOwner(owner, comp3);
+        DebugTools.AssertOwner(owner, comp4);
+        DebugTools.AssertOwner(owner, comp5);
+        DebugTools.AssertOwner(owner, comp6);
+
+        Owner = owner;
+        Comp1 = comp1;
+        Comp2 = comp2;
+        Comp3 = comp3;
+        Comp4 = comp4;
+        Comp5 = comp5;
+        Comp6 = comp6;
+    }
+
+    public static implicit operator Entity<T1, T2, T3, T4, T5, T6>((EntityUid Owner, T1 Comp1, T2 Comp2, T3 Comp3, T4 Comp4, T5 Comp5, T6 Comp6) tuple)
+    {
+        return new Entity<T1, T2, T3, T4, T5, T6>(tuple.Owner, tuple.Comp1, tuple.Comp2, tuple.Comp3, tuple.Comp4, tuple.Comp5, tuple.Comp6);
+    }
+
+    public static implicit operator Entity<T1?, T2?, T3?, T4?, T5?, T6?>(EntityUid owner)
+    {
+        return new Entity<T1?, T2?, T3?, T4?, T5?, T6?>(owner, default, default, default, default, default, default);
+    }
+
+    public static implicit operator EntityUid(Entity<T1, T2, T3, T4, T5, T6> ent)
+    {
+        return ent.Owner;
+    }
+
+    public static implicit operator T1(Entity<T1, T2, T3, T4, T5, T6> ent)
+    {
+        return ent.Comp1;
+    }
+
+    public static implicit operator T2(Entity<T1, T2, T3, T4, T5, T6> ent)
+    {
+        return ent.Comp2;
+    }
+
+    public static implicit operator T3(Entity<T1, T2, T3, T4, T5, T6> ent)
+    {
+        return ent.Comp3;
+    }
+
+    public static implicit operator T4(Entity<T1, T2, T3, T4, T5, T6> ent)
+    {
+        return ent.Comp4;
+    }
+
+    public static implicit operator T5(Entity<T1, T2, T3, T4, T5, T6> ent)
+    {
+        return ent.Comp5;
+    }
+
+    public static implicit operator T6(Entity<T1, T2, T3, T4, T5, T6> ent)
+    {
+        return ent.Comp6;
+    }
+
+    public readonly void Deconstruct(out EntityUid owner, out T1 comp1, out T2 comp2, out T3 comp3, out T4 comp4, out T5 comp5, out T6 comp6)
+    {
+        owner = Owner;
+        comp1 = Comp1;
+        comp2 = Comp2;
+        comp3 = Comp3;
+        comp4 = Comp4;
+        comp5 = Comp5;
+        comp6 = Comp6;
+    }
+}
+
+public record struct Entity<T1, T2, T3, T4, T5, T6, T7>
+    where T1 : IComponent? where T2 : IComponent? where T3 : IComponent? where T4 : IComponent? where T5 : IComponent? where T6 : IComponent? where T7 : IComponent?
+{
+    public EntityUid Owner;
+    public T1 Comp1;
+    public T2 Comp2;
+    public T3 Comp3;
+    public T4 Comp4;
+    public T5 Comp5;
+    public T6 Comp6;
+    public T7 Comp7;
+
+    public Entity(EntityUid owner, T1 comp1, T2 comp2, T3 comp3, T4 comp4, T5 comp5, T6 comp6, T7 comp7)
+    {
+        DebugTools.AssertOwner(owner, comp1);
+        DebugTools.AssertOwner(owner, comp2);
+        DebugTools.AssertOwner(owner, comp3);
+        DebugTools.AssertOwner(owner, comp4);
+        DebugTools.AssertOwner(owner, comp5);
+        DebugTools.AssertOwner(owner, comp6);
+        DebugTools.AssertOwner(owner, comp7);
+
+        Owner = owner;
+        Comp1 = comp1;
+        Comp2 = comp2;
+        Comp3 = comp3;
+        Comp4 = comp4;
+        Comp5 = comp5;
+        Comp6 = comp6;
+        Comp7 = comp7;
+    }
+
+    public static implicit operator Entity<T1, T2, T3, T4, T5, T6, T7>((EntityUid Owner, T1 Comp1, T2 Comp2, T3 Comp3, T4 Comp4, T5 Comp5, T6 Comp6, T7 Comp7) tuple)
+    {
+        return new Entity<T1, T2, T3, T4, T5, T6, T7>(tuple.Owner, tuple.Comp1, tuple.Comp2, tuple.Comp3, tuple.Comp4, tuple.Comp5, tuple.Comp6, tuple.Comp7);
+    }
+
+    public static implicit operator Entity<T1?, T2?, T3?, T4?, T5?, T6?, T7?>(EntityUid owner)
+    {
+        return new Entity<T1?, T2?, T3?, T4?, T5?, T6?, T7?>(owner, default, default, default, default, default, default, default);
+    }
+
+    public static implicit operator EntityUid(Entity<T1, T2, T3, T4, T5, T6, T7> ent)
+    {
+        return ent.Owner;
+    }
+
+    public static implicit operator T1(Entity<T1, T2, T3, T4, T5, T6, T7> ent)
+    {
+        return ent.Comp1;
+    }
+
+    public static implicit operator T2(Entity<T1, T2, T3, T4, T5, T6, T7> ent)
+    {
+        return ent.Comp2;
+    }
+
+    public static implicit operator T3(Entity<T1, T2, T3, T4, T5, T6, T7> ent)
+    {
+        return ent.Comp3;
+    }
+
+    public static implicit operator T4(Entity<T1, T2, T3, T4, T5, T6, T7> ent)
+    {
+        return ent.Comp4;
+    }
+
+    public static implicit operator T5(Entity<T1, T2, T3, T4, T5, T6, T7> ent)
+    {
+        return ent.Comp5;
+    }
+
+    public static implicit operator T6(Entity<T1, T2, T3, T4, T5, T6, T7> ent)
+    {
+        return ent.Comp6;
+    }
+
+    public static implicit operator T7(Entity<T1, T2, T3, T4, T5, T6, T7> ent)
+    {
+        return ent.Comp7;
+    }
+
+    public readonly void Deconstruct(out EntityUid owner, out T1 comp1, out T2 comp2, out T3 comp3, out T4 comp4, out T5 comp5, out T6 comp6, out T7 comp7)
+    {
+        owner = Owner;
+        comp1 = Comp1;
+        comp2 = Comp2;
+        comp3 = Comp3;
+        comp4 = Comp4;
+        comp5 = Comp5;
+        comp6 = Comp6;
+        comp7 = Comp7;
+    }
+}
+
+public record struct Entity<T1, T2, T3, T4, T5, T6, T7, T8>
+    where T1 : IComponent? where T2 : IComponent? where T3 : IComponent? where T4 : IComponent? where T5 : IComponent? where T6 : IComponent? where T7 : IComponent? where T8 : IComponent?
+{
+    public EntityUid Owner;
+    public T1 Comp1;
+    public T2 Comp2;
+    public T3 Comp3;
+    public T4 Comp4;
+    public T5 Comp5;
+    public T6 Comp6;
+    public T7 Comp7;
+    public T8 Comp8;
+
+    public Entity(EntityUid owner, T1 comp1, T2 comp2, T3 comp3, T4 comp4, T5 comp5, T6 comp6, T7 comp7, T8 comp8)
+    {
+        DebugTools.AssertOwner(owner, comp1);
+        DebugTools.AssertOwner(owner, comp2);
+        DebugTools.AssertOwner(owner, comp3);
+        DebugTools.AssertOwner(owner, comp4);
+        DebugTools.AssertOwner(owner, comp5);
+        DebugTools.AssertOwner(owner, comp6);
+        DebugTools.AssertOwner(owner, comp7);
+        DebugTools.AssertOwner(owner, comp8);
+
+        Owner = owner;
+        Comp1 = comp1;
+        Comp2 = comp2;
+        Comp3 = comp3;
+        Comp4 = comp4;
+        Comp5 = comp5;
+        Comp6 = comp6;
+        Comp7 = comp7;
+        Comp8 = comp8;
+    }
+
+    public static implicit operator Entity<T1, T2, T3, T4, T5, T6, T7, T8>((EntityUid Owner, T1 Comp1, T2 Comp2, T3 Comp3, T4 Comp4, T5 Comp5, T6 Comp6, T7 Comp7, T8 Comp8) tuple)
+    {
+        return new Entity<T1, T2, T3, T4, T5, T6, T7, T8>(tuple.Owner, tuple.Comp1, tuple.Comp2, tuple.Comp3, tuple.Comp4, tuple.Comp5, tuple.Comp6, tuple.Comp7, tuple.Comp8);
+    }
+
+    public static implicit operator Entity<T1?, T2?, T3?, T4?, T5?, T6?, T7?, T8?>(EntityUid owner)
+    {
+        return new Entity<T1?, T2?, T3?, T4?, T5?, T6?, T7?, T8?>(owner, default, default, default, default, default, default, default, default);
+    }
+
+    public static implicit operator EntityUid(Entity<T1, T2, T3, T4, T5, T6, T7, T8> ent)
+    {
+        return ent.Owner;
+    }
+
+    public static implicit operator T1(Entity<T1, T2, T3, T4, T5, T6, T7, T8> ent)
+    {
+        return ent.Comp1;
+    }
+
+    public static implicit operator T2(Entity<T1, T2, T3, T4, T5, T6, T7, T8> ent)
+    {
+        return ent.Comp2;
+    }
+
+    public static implicit operator T3(Entity<T1, T2, T3, T4, T5, T6, T7, T8> ent)
+    {
+        return ent.Comp3;
+    }
+
+    public static implicit operator T4(Entity<T1, T2, T3, T4, T5, T6, T7, T8> ent)
+    {
+        return ent.Comp4;
+    }
+
+    public static implicit operator T5(Entity<T1, T2, T3, T4, T5, T6, T7, T8> ent)
+    {
+        return ent.Comp5;
+    }
+
+    public static implicit operator T6(Entity<T1, T2, T3, T4, T5, T6, T7, T8> ent)
+    {
+        return ent.Comp6;
+    }
+
+    public static implicit operator T7(Entity<T1, T2, T3, T4, T5, T6, T7, T8> ent)
+    {
+        return ent.Comp7;
+    }
+
+    public static implicit operator T8(Entity<T1, T2, T3, T4, T5, T6, T7, T8> ent)
+    {
+        return ent.Comp8;
+    }
+
+    public readonly void Deconstruct(out EntityUid owner, out T1 comp1, out T2 comp2, out T3 comp3, out T4 comp4, out T5 comp5, out T6 comp6, out T7 comp7, out T8 comp8)
+    {
+        owner = Owner;
+        comp1 = Comp1;
+        comp2 = Comp2;
+        comp3 = Comp3;
+        comp4 = Comp4;
+        comp5 = Comp5;
+        comp6 = Comp6;
+        comp7 = Comp7;
+        comp8 = Comp8;
+    }
+}
+

Robust.Shared/GameObjects/EntityEventBus.Broadcast.cs

@@ -20,9 +20,13 @@ namespace Robust.Shared.GameObjects
         /// <param name="source"></param>
         /// <param name="subscriber">Subscriber that owns the handler.</param>
         /// <param name="eventHandler">Delegate that handles the event.</param>
+        /// <seealso cref="SubscribeEvent{T}(EventSource, IEntityEventSubscriber, EntityEventRefHandler{T})"/>
+        // [Obsolete("Subscribe to the event by ref instead (EntityEventRefHandler)")]
         void SubscribeEvent<T>(EventSource source, IEntityEventSubscriber subscriber,
             EntityEventHandler<T> eventHandler) where T : notnull;
 
+        /// <seealso cref="SubscribeEvent{T}(EventSource, IEntityEventSubscriber, EntityEventRefHandler{T})"/>
+        // [Obsolete("Subscribe to the event by ref instead (EntityEventRefHandler)")]
         void SubscribeEvent<T>(
             EventSource source,
             IEntityEventSubscriber subscriber,
@@ -133,7 +137,7 @@ namespace Robust.Shared.GameObjects
                 var type = args.GetType();
                 ref var unitRef = ref ExtractUnitRef(ref args, type);
 
-                ProcessSingleEvent(source, ref unitRef, type, false);
+                ProcessSingleEvent(source, ref unitRef, type);
             }
         }
 
@@ -260,7 +264,7 @@ namespace Robust.Shared.GameObjects
             var eventType = toRaise.GetType();
             ref var unitRef = ref ExtractUnitRef(ref toRaise, eventType);
 
-            ProcessSingleEvent(source, ref unitRef, eventType, false);
+            ProcessSingleEvent(source, ref unitRef, eventType);
         }
 
         public void RaiseEvent<T>(EventSource source, T toRaise) where T : notnull
@@ -268,7 +272,7 @@ namespace Robust.Shared.GameObjects
             if (source == EventSource.None)
                 throw new ArgumentOutOfRangeException(nameof(source));
 
-            ProcessSingleEvent(source, ref Unsafe.As<T, Unit>(ref toRaise), typeof(T), false);
+            ProcessSingleEvent(source, ref Unsafe.As<T, Unit>(ref toRaise), typeof(T));
         }
 
         public void RaiseEvent<T>(EventSource source, ref T toRaise) where T : notnull
@@ -276,7 +280,7 @@ namespace Robust.Shared.GameObjects
             if (source == EventSource.None)
                 throw new ArgumentOutOfRangeException(nameof(source));
 
-            ProcessSingleEvent(source, ref Unsafe.As<T, Unit>(ref toRaise), typeof(T), true);
+            ProcessSingleEvent(source, ref Unsafe.As<T, Unit>(ref toRaise), typeof(T));
         }
 
         /// <inheritdoc />
@@ -301,7 +305,7 @@ namespace Robust.Shared.GameObjects
                 inverse.Remove(eventType);
         }
 
-        private void ProcessSingleEvent(EventSource source, ref Unit unitRef, Type eventType, bool byRef)
+        private void ProcessSingleEvent(EventSource source, ref Unit unitRef, Type eventType)
         {
             if (!_eventData.TryGetValue(eventType, out var subs))
                 return;
@@ -314,20 +318,16 @@ namespace Robust.Shared.GameObjects
                 // This means ordered broadcast events have no overhead over non-ordered ones.
             }
 
-            ProcessSingleEventCore(source, ref unitRef, subs, byRef);
+            ProcessSingleEventCore(source, ref unitRef, subs);
         }
 
         private static void ProcessSingleEventCore(
             EventSource source,
             ref Unit unitRef,
-            EventData subs,
-            bool byRef)
+            EventData subs)
         {
             foreach (var handler in subs.BroadcastRegistrations)
             {
-                if (handler.ReferenceEvent != byRef)
-                    ThrowByRefMisMatch();
-
                 if ((handler.Mask & source) != 0)
                     handler.Handler(ref unitRef);
             }

Robust.Shared/GameObjects/EntityEventBus.Common.cs

@@ -39,10 +39,6 @@ internal sealed partial class EntityEventBus : IEventBus
 
     public bool IgnoreUnregisteredComponents;
 
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    private static void ThrowByRefMisMatch() =>
-        throw new InvalidOperationException("Mismatching by-ref ness on event!");
-
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static ref Unit ExtractUnitRef(ref object obj, Type objType)
     {

Robust.Shared/GameObjects/EntityEventBus.Directed.cs

@@ -46,6 +46,12 @@ namespace Robust.Shared.GameObjects
             where TComp : IComponent
             where TEvent : notnull;
 
+        void SubscribeLocalEvent<TComp, TEvent>(
+            EntityEventRefHandler<TComp, TEvent> handler,
+            Type orderType, Type[]? before = null, Type[]? after = null)
+            where TComp : IComponent
+            where TEvent : notnull;
+
         #endregion
 
         void UnsubscribeLocalEvent<TComp, TEvent>()
@@ -137,8 +143,7 @@ namespace Robust.Shared.GameObjects
                 component.Owner,
                 component,
                 CompIdx.Index(component.GetType()),
-                ref unitRef,
-                false);
+                ref unitRef);
         }
 
         void IDirectedEventBus.RaiseComponentEvent<TEvent>(IComponent component, CompIdx type, TEvent args)
@@ -149,8 +154,7 @@ namespace Robust.Shared.GameObjects
                 component.Owner,
                 component,
                 type,
-                ref unitRef,
-                false);
+                ref unitRef);
         }
 
         /// <inheritdoc />
@@ -162,8 +166,7 @@ namespace Robust.Shared.GameObjects
                 component.Owner,
                 component,
                 CompIdx.Index(component.GetType()),
-                ref unitRef,
-                true);
+                ref unitRef);
         }
 
         public void OnlyCallOnRobustUnitTestISwearToGodPleaseSomebodyKillThisNightmare()
@@ -178,7 +181,7 @@ namespace Robust.Shared.GameObjects
             var type = typeof(TEvent);
             ref var unitRef = ref Unsafe.As<TEvent, Unit>(ref args);
 
-            RaiseLocalEventCore(uid, ref unitRef, type, broadcast, false);
+            RaiseLocalEventCore(uid, ref unitRef, type, broadcast);
         }
 
         /// <inheritdoc />
@@ -187,7 +190,7 @@ namespace Robust.Shared.GameObjects
             var type = args.GetType();
             ref var unitRef = ref Unsafe.As<object, Unit>(ref args);
 
-            RaiseLocalEventCore(uid, ref unitRef, type, broadcast, false);
+            RaiseLocalEventCore(uid, ref unitRef, type, broadcast);
         }
 
         public void RaiseLocalEvent<TEvent>(EntityUid uid, ref TEvent args, bool broadcast = false)
@@ -196,7 +199,7 @@ namespace Robust.Shared.GameObjects
             var type = typeof(TEvent);
             ref var unitRef = ref Unsafe.As<TEvent, Unit>(ref args);
 
-            RaiseLocalEventCore(uid, ref unitRef, type, broadcast, true);
+            RaiseLocalEventCore(uid, ref unitRef, type, broadcast);
         }
 
         public void RaiseLocalEvent(EntityUid uid, ref object args, bool broadcast = false)
@@ -204,25 +207,25 @@ namespace Robust.Shared.GameObjects
             var type = args.GetType();
             ref var unitRef = ref Unsafe.As<object, Unit>(ref args);
 
-            RaiseLocalEventCore(uid, ref unitRef, type, broadcast, true);
+            RaiseLocalEventCore(uid, ref unitRef, type, broadcast);
         }
 
-        private void RaiseLocalEventCore(EntityUid uid, ref Unit unitRef, Type type, bool broadcast, bool byRef)
+        private void RaiseLocalEventCore(EntityUid uid, ref Unit unitRef, Type type, bool broadcast)
         {
             if (!_eventData.TryGetValue(type, out var subs))
                 return;
 
             if (subs.IsOrdered)
             {
-                RaiseLocalOrdered(uid, type, subs, ref unitRef, broadcast, byRef);
+                RaiseLocalOrdered(uid, type, subs, ref unitRef, broadcast);
                 return;
             }
 
-            EntDispatch(uid, type, ref unitRef, byRef);
+            EntDispatch(uid, type, ref unitRef);
 
             // we also broadcast it so the call site does not have to.
             if (broadcast)
-                ProcessSingleEventCore(EventSource.Local, ref unitRef, subs, byRef);
+                ProcessSingleEventCore(EventSource.Local, ref unitRef, subs);
         }
 
         /// <inheritdoc />
@@ -238,8 +241,7 @@ namespace Robust.Shared.GameObjects
                 typeof(TComp),
                 typeof(TEvent),
                 EventHandler,
-                null,
-                false);
+                null);
         }
 
         public void SubscribeLocalEvent<TComp, TEvent>(
@@ -260,8 +262,7 @@ namespace Robust.Shared.GameObjects
                 typeof(TComp),
                 typeof(TEvent),
                 EventHandler,
-                orderData,
-                false);
+                orderData);
 
             RegisterCommon(typeof(TEvent), orderData, out _);
         }
@@ -277,8 +278,7 @@ namespace Robust.Shared.GameObjects
                 typeof(TComp),
                 typeof(TEvent),
                 EventHandler,
-                null,
-                true);
+                null);
         }
 
         public void SubscribeLocalEvent<TComp, TEvent>(ComponentEventRefHandler<TComp, TEvent> handler, Type orderType,
@@ -295,8 +295,26 @@ namespace Robust.Shared.GameObjects
                 typeof(TComp),
                 typeof(TEvent),
                 EventHandler,
-                orderData,
-                true);
+                orderData);
+
+            RegisterCommon(typeof(TEvent), orderData, out _);
+        }
+
+        public void SubscribeLocalEvent<TComp, TEvent>(EntityEventRefHandler<TComp, TEvent> handler, Type orderType,
+            Type[]? before = null,
+            Type[]? after = null) where TComp : IComponent where TEvent : notnull
+        {
+            void EventHandler(EntityUid uid, IComponent comp, ref TEvent args)
+                => handler(new Entity<TComp>(uid, (TComp) comp), ref args);
+
+            var orderData = new OrderingData(orderType, before ?? Array.Empty<Type>(), after ?? Array.Empty<Type>());
+
+            EntSubscribe<TEvent>(
+                CompIdx.Index<TComp>(),
+                typeof(TComp),
+                typeof(TEvent),
+                EventHandler,
+                orderData);
 
             RegisterCommon(typeof(TEvent), orderData, out _);
         }
@@ -345,12 +363,6 @@ namespace Robust.Shared.GameObjects
             if (_subscriptionLock)
                 throw new InvalidOperationException("Subscription locked.");
 
-            var referenceEvent = eventType.HasCustomAttribute<ByRefEventAttribute>();
-
-            if (referenceEvent != registration.ReferenceEvent)
-                throw new InvalidOperationException(
-                    $"Attempted to subscribe by-ref and by-value to the same directed event! comp={compTypeObj.Name}, event={eventType.Name} eventIsByRef={referenceEvent} subscriptionIsByRef={registration.ReferenceEvent}");
-
             if (compType.Value >= _entSubscriptions.Length || _entSubscriptions[compType.Value] is not { } compSubs)
             {
                 if (IgnoreUnregisteredComponents)
@@ -377,7 +389,7 @@ namespace Robust.Shared.GameObjects
             Type compTypeObj,
             Type eventType,
             DirectedEventHandler<TEvent> handler,
-            OrderingData? order, bool byReference)
+            OrderingData? order)
             where TEvent : notnull
         {
             EntAddSubscription(compType, compTypeObj, eventType, new DirectedRegistration(handler, order,
@@ -385,7 +397,7 @@ namespace Robust.Shared.GameObjects
                 {
                     ref var tev = ref Unsafe.As<Unit, TEvent>(ref ev);
                     handler(uid, comp, ref tev);
-                }, byReference));
+                }));
         }
 
         private void EntUnsubscribe(CompIdx compType, Type eventType)
@@ -525,7 +537,7 @@ namespace Robust.Shared.GameObjects
             }
         }
 
-        private void EntDispatch(EntityUid euid, Type eventType, ref Unit args, bool dispatchByReference)
+        private void EntDispatch(EntityUid euid, Type eventType, ref Unit args)
         {
             if (!EntTryGetSubscriptions(eventType, euid, out var enumerator))
                 return;
@@ -535,9 +547,6 @@ namespace Robust.Shared.GameObjects
                 if (component.Deleted)
                     continue;
 
-                if (reg.ReferenceEvent != dispatchByReference)
-                    ThrowByRefMisMatch();
-
                 reg.Handler(euid, component, ref args);
             }
         }
@@ -545,22 +554,18 @@ namespace Robust.Shared.GameObjects
         private void EntCollectOrdered(
             EntityUid euid,
             Type eventType,
-            ref ValueList<OrderedEventDispatch> found,
-            bool byRef)
+            ref ValueList<OrderedEventDispatch> found)
         {
             if (!EntTryGetSubscriptions(eventType, euid, out var enumerator))
                 return;
 
             while (enumerator.MoveNext(out var component, out var reg))
             {
-                if (reg.ReferenceEvent != byRef)
-                    ThrowByRefMisMatch();
-
                 found.Add(new OrderedEventDispatch((ref Unit ev) =>
                 {
                     if (!component.Deleted)
                         reg.Handler(euid, component, ref ev);
-                    }, reg.Order));
+                }, reg.Order));
             }
         }
 
@@ -568,8 +573,7 @@ namespace Robust.Shared.GameObjects
             EntityUid euid,
             IComponent component,
             CompIdx baseType,
-            ref Unit args,
-            bool dispatchByReference)
+            ref Unit args)
             where TEvent : notnull
         {
             var compSubs = _entSubscriptions[baseType.Value]!;
@@ -577,9 +581,6 @@ namespace Robust.Shared.GameObjects
             if (!compSubs.TryGetValue(typeof(TEvent), out var reg))
                 return;
 
-            if (reg.ReferenceEvent != dispatchByReference)
-                ThrowByRefMisMatch();
-
             reg.Handler(euid, component, ref args);
         }
 
@@ -690,17 +691,14 @@ namespace Robust.Shared.GameObjects
         {
             public readonly Delegate Original;
             public readonly DirectedEventHandler Handler;
-            public readonly bool ReferenceEvent;
 
             public DirectedRegistration(
                 Delegate original,
                 OrderingData? ordering,
-                DirectedEventHandler handler,
-                bool referenceEvent) : base(ordering)
+                DirectedEventHandler handler) : base(ordering)
             {
                 Original = original;
                 Handler = handler;
-                ReferenceEvent = referenceEvent;
             }
 
             public void SetOrder(int order)
@@ -736,6 +734,8 @@ namespace Robust.Shared.GameObjects
         }
     }
 
+    /// <seealso cref="ComponentEventRefHandler{TComp, TEvent}"/>
+    // [Obsolete("Use ComponentEventRefHandler instead")]
     public delegate void ComponentEventHandler<in TComp, in TEvent>(EntityUid uid, TComp component, TEvent args)
         where TComp : IComponent
         where TEvent : notnull;
@@ -743,4 +743,8 @@ namespace Robust.Shared.GameObjects
     public delegate void ComponentEventRefHandler<in TComp, TEvent>(EntityUid uid, TComp component, ref TEvent args)
         where TComp : IComponent
         where TEvent : notnull;
+
+    public delegate void EntityEventRefHandler<TComp, TEvent>(Entity<TComp> ent, ref TEvent args)
+        where TComp : IComponent
+        where TEvent : notnull;
 }

Robust.Shared/GameObjects/EntityEventBus.Ordering.cs

@@ -11,14 +11,10 @@ namespace Robust.Shared.GameObjects
         private static void CollectBroadcastOrdered(
             EventSource source,
             EventData sub,
-            ref ValueList<OrderedEventDispatch> found,
-            bool byRef)
+            ref ValueList<OrderedEventDispatch> found)
         {
             foreach (var handler in sub.BroadcastRegistrations)
             {
-                if (handler.ReferenceEvent != byRef)
-                    ThrowByRefMisMatch();
-
                 if ((handler.Mask & source) != 0)
                     found.Add(new OrderedEventDispatch(handler.Handler, handler.Order));
             }
@@ -29,8 +25,7 @@ namespace Robust.Shared.GameObjects
             Type eventType,
             EventData subs,
             ref Unit unitRef,
-            bool broadcast,
-            bool byRef)
+            bool broadcast)
         {
             if (!subs.OrderingUpToDate)
                 UpdateOrderSeq(eventType, subs);
@@ -38,9 +33,9 @@ namespace Robust.Shared.GameObjects
             var found = new ValueList<OrderedEventDispatch>();
 
             if (broadcast)
-                CollectBroadcastOrdered(EventSource.Local, subs, ref found, byRef);
+                CollectBroadcastOrdered(EventSource.Local, subs, ref found);
 
-            EntCollectOrdered(uid, eventType, ref found, byRef);
+            EntCollectOrdered(uid, eventType, ref found);
 
             DispatchOrderedEvents(ref unitRef, ref found);
         }

Robust.Shared/GameObjects/EntityManager.Components.cs

@@ -36,15 +36,15 @@ namespace Robust.Shared.GameObjects
 
         private static readonly ComponentState DefaultComponentState = new();
 
-        private readonly Dictionary<Type, Dictionary<EntityUid, Component>> _entTraitDict
+        private readonly Dictionary<Type, Dictionary<EntityUid, IComponent>> _entTraitDict
             = new();
 
-        private Dictionary<EntityUid, Component>[] _entTraitArray
-            = Array.Empty<Dictionary<EntityUid, Component>>();
+        private Dictionary<EntityUid, IComponent>[] _entTraitArray
+            = Array.Empty<Dictionary<EntityUid, IComponent>>();
 
-        private readonly HashSet<Component> _deleteSet = new(TypeCapacity);
+        private readonly HashSet<IComponent> _deleteSet = new(TypeCapacity);
 
-        private UniqueIndexHkm<EntityUid, Component> _entCompIndex =
+        private UniqueIndexHkm<EntityUid, IComponent> _entCompIndex =
             new(ComponentCollectionCapacity);
 
         /// <inheritdoc />
@@ -78,7 +78,7 @@ namespace Robust.Shared.GameObjects
 
         private void AddComponentRefType(CompIdx type)
         {
-            var dict = new Dictionary<EntityUid, Component>();
+            var dict = new Dictionary<EntityUid, IComponent>();
             _entTraitDict.Add(_componentFactory.IdxToType(type), dict);
             CompIdx.AssignArray(ref _entTraitArray, type, dict);
         }
@@ -91,7 +91,7 @@ namespace Robust.Shared.GameObjects
         #region Component Management
 
         /// <inheritdoc />
-        public int Count<T>() where T : Component
+        public int Count<T>() where T : IComponent
         {
             var dict = _entTraitDict[typeof(T)];
             return dict.Count;
@@ -106,15 +106,13 @@ namespace Robust.Shared.GameObjects
 
         public void InitializeComponents(EntityUid uid, MetaDataComponent? metadata = null)
         {
-#pragma warning disable CS0618 // Type or member is obsolete
-            DebugTools.Assert(metadata == null || metadata.Owner == uid);
-#pragma warning restore CS0618 // Type or member is obsolete
+            DebugTools.AssertOwner(uid, metadata);
             metadata ??= GetComponent<MetaDataComponent>(uid);
             DebugTools.Assert(metadata.EntityLifeStage == EntityLifeStage.PreInit);
             metadata.EntityLifeStage = EntityLifeStage.Initializing;
 
             // Initialize() can modify the collection of components. Copy them.
-            FixedArray32<Component?> compsFixed = default;
+            FixedArray32<IComponent?> compsFixed = default;
 
             var comps = compsFixed.AsSpan;
             CopyComponentsInto(ref comps, uid);
@@ -145,7 +143,7 @@ namespace Robust.Shared.GameObjects
         {
             // Startup() can modify _components
             // This code can only handle additions to the list. Is there a better way? Probably not.
-            FixedArray32<Component?> compsFixed = default;
+            FixedArray32<IComponent?> compsFixed = default;
 
             var comps = compsFixed.AsSpan;
             CopyComponentsInto(ref comps, uid);
@@ -172,28 +170,22 @@ namespace Robust.Shared.GameObjects
             }
         }
 
-        public Component AddComponent(EntityUid uid, ushort netId, MetaDataComponent? meta = null)
+        public IComponent AddComponent(EntityUid uid, ushort netId, MetaDataComponent? meta = null)
         {
-            var newComponent = (Component)_componentFactory.GetComponent(netId);
-#pragma warning disable CS0618 // Type or member is obsolete
-            newComponent.Owner = uid;
-#pragma warning restore CS0618 // Type or member is obsolete
+            var newComponent = _componentFactory.GetComponent(netId);
             AddComponent(uid, newComponent, metadata: meta);
             return newComponent;
         }
 
-        public T AddComponent<T>(EntityUid uid) where T : Component, new()
+        public T AddComponent<T>(EntityUid uid) where T : IComponent, new()
         {
             var newComponent = _componentFactory.GetComponent<T>();
-#pragma warning disable CS0618 // Type or member is obsolete
-            newComponent.Owner = uid;
-#pragma warning restore CS0618 // Type or member is obsolete
             AddComponent(uid, newComponent);
             return newComponent;
         }
 
         public readonly struct CompInitializeHandle<T> : IDisposable
-            where T : Component
+            where T : IComponent
         {
             private readonly IEntityManager _entMan;
             private readonly EntityUid _owner;
@@ -230,7 +222,7 @@ namespace Robust.Shared.GameObjects
 
         /// <inheritdoc />
         [Obsolete]
-        public CompInitializeHandle<T> AddComponentUninitialized<T>(EntityUid uid) where T : Component, new()
+        public CompInitializeHandle<T> AddComponentUninitialized<T>(EntityUid uid) where T : IComponent, new()
         {
             var reg = _componentFactory.GetRegistration<T>();
             var newComponent = (T)_componentFactory.GetComponent(reg);
@@ -247,7 +239,7 @@ namespace Robust.Shared.GameObjects
         }
 
         /// <inheritdoc />
-        public void AddComponent<T>(EntityUid uid, T component, bool overwrite = false, MetaDataComponent? metadata = null) where T : Component
+        public void AddComponent<T>(EntityUid uid, T component, bool overwrite = false, MetaDataComponent? metadata = null) where T : IComponent
         {
             if (!uid.IsValid() || !EntityExists(uid))
                 throw new ArgumentException($"Entity {uid} is not valid.", nameof(uid));
@@ -268,14 +260,14 @@ namespace Robust.Shared.GameObjects
             AddComponentInternal(uid, component, overwrite, false, metadata);
         }
 
-        private void AddComponentInternal<T>(EntityUid uid, T component, bool overwrite, bool skipInit, MetaDataComponent? metadata = null) where T : Component
+        private void AddComponentInternal<T>(EntityUid uid, T component, bool overwrite, bool skipInit, MetaDataComponent? metadata = null) where T : IComponent
         {
             // get interface aliases for mapping
             var reg = _componentFactory.GetRegistration(component);
             AddComponentInternal(uid, component, reg, overwrite, skipInit, metadata);
         }
 
-        private void AddComponentInternal<T>(EntityUid uid, T component, ComponentRegistration reg, bool overwrite, bool skipInit, MetaDataComponent? metadata = null) where T : Component
+        private void AddComponentInternal<T>(EntityUid uid, T component, ComponentRegistration reg, bool overwrite, bool skipInit, MetaDataComponent? metadata = null) where T : IComponent
         {
             // We can't use typeof(T) here in case T is just Component
             DebugTools.Assert(component is MetaDataComponent ||
@@ -365,7 +357,7 @@ namespace Robust.Shared.GameObjects
             if (!TryGetComponent(uid, type, out var comp))
                 return false;
 
-            RemoveComponentImmediate((Component)comp, uid, false, meta);
+            RemoveComponentImmediate(comp, uid, false, meta);
             return true;
         }
 
@@ -379,20 +371,13 @@ namespace Robust.Shared.GameObjects
             if (!TryGetComponent(uid, netId, out var comp, meta))
                 return false;
 
-            RemoveComponentImmediate((Component)comp, uid, false, meta);
+            RemoveComponentImmediate(comp, uid, false, meta);
             return true;
         }
 
         /// <inheritdoc />
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void RemoveComponent(EntityUid uid, IComponent component, MetaDataComponent? meta = null)
-        {
-            RemoveComponent(uid, (Component)component, meta);
-        }
-
-        /// <inheritdoc />
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void RemoveComponent(EntityUid uid, Component component, MetaDataComponent? meta = null)
         {
             RemoveComponentImmediate(component, uid, false, meta);
         }
@@ -410,7 +395,7 @@ namespace Robust.Shared.GameObjects
             if (!TryGetComponent(uid, type, out var comp))
                 return false;
 
-            RemoveComponentDeferred((Component)comp, uid, false);
+            RemoveComponentDeferred(comp, uid, false);
             return true;
         }
 
@@ -424,14 +409,14 @@ namespace Robust.Shared.GameObjects
             if (!TryGetComponent(uid, netId, out var comp, meta))
                 return false;
 
-            RemoveComponentDeferred((Component)comp, uid, false);
+            RemoveComponentDeferred(comp, uid, false);
             return true;
         }
 
         /// <inheritdoc />
         public void RemoveComponentDeferred(EntityUid owner, IComponent component)
         {
-            RemoveComponentDeferred((Component)component, owner, false);
+            RemoveComponentDeferred(component, owner, false);
         }
 
         /// <inheritdoc />
@@ -440,7 +425,7 @@ namespace Robust.Shared.GameObjects
             RemoveComponentDeferred(component, owner, false);
         }
 
-        private static IEnumerable<Component> InSafeOrder(IEnumerable<Component> comps, bool forCreation = false)
+        private static IEnumerable<IComponent> InSafeOrder(IEnumerable<IComponent> comps, bool forCreation = false)
         {
             static int Sequence(IComponent x)
                 => x switch
@@ -489,11 +474,13 @@ namespace Robust.Shared.GameObjects
             _entCompIndex.Remove(uid);
         }
 
-        private void RemoveComponentDeferred(Component component, EntityUid uid, bool terminating)
+        private void RemoveComponentDeferred(IComponent component, EntityUid uid, bool terminating)
         {
             if (component == null) throw new ArgumentNullException(nameof(component));
 
+#pragma warning disable CS0618 // Type or member is obsolete
             if (component.Owner != uid)
+#pragma warning restore CS0618 // Type or member is obsolete
                 throw new InvalidOperationException("Component is not owned by entity.");
 
             if (component.Deleted) return;
@@ -527,7 +514,7 @@ namespace Robust.Shared.GameObjects
 #endif
         }
 
-        private void RemoveComponentImmediate(Component component, EntityUid uid, bool terminating,
+        private void RemoveComponentImmediate(IComponent component, EntityUid uid, bool terminating,
             MetaDataComponent? meta)
         {
             if (component.Deleted)
@@ -602,7 +589,7 @@ namespace Robust.Shared.GameObjects
             _deleteSet.Clear();
         }
 
-        private void DeleteComponent(EntityUid entityUid, Component component, bool terminating, MetaDataComponent? metadata = null)
+        private void DeleteComponent(EntityUid entityUid, IComponent component, bool terminating, MetaDataComponent? metadata = null)
         {
             if (!MetaQuery.ResolveInternal(entityUid, ref metadata))
                 return;
@@ -643,7 +630,7 @@ namespace Robust.Shared.GameObjects
         {
             var dict = _entTraitArray[CompIdx.ArrayIndex<T>()];
             DebugTools.Assert(dict != null, $"Unknown component: {typeof(T).Name}");
-            return dict!.TryGetValue(uid, out var comp) && !comp.Deleted;
+            return dict.TryGetValue(uid, out var comp) && !comp.Deleted;
         }
 
         /// <inheritdoc />
@@ -699,15 +686,14 @@ namespace Robust.Shared.GameObjects
 
         /// <inheritdoc />
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public T EnsureComponent<T>(EntityUid uid) where T : Component, new()
+        public T EnsureComponent<T>(EntityUid uid) where T : IComponent, new()
         {
             if (TryGetComponent<T>(uid, out var component))
             {
                 // Check for deferred component removal.
                 if (component.LifeStage <= ComponentLifeStage.Running)
                     return component;
-                else
-                    RemoveComponent(uid, component);
+                RemoveComponent(uid, component);
             }
 
             return AddComponent<T>(uid);
@@ -715,7 +701,7 @@ namespace Robust.Shared.GameObjects
 
         /// <inheritdoc />
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool EnsureComponent<T>(EntityUid entity, out T component) where T : Component, new()
+        public bool EnsureComponent<T>(EntityUid entity, out T component) where T : IComponent, new()
         {
             if (TryGetComponent<T>(entity, out var comp))
             {
@@ -725,8 +711,8 @@ namespace Robust.Shared.GameObjects
                     component = comp;
                     return true;
                 }
-                else
-                    RemoveComponent(entity, comp);
+
+                RemoveComponent(entity, comp);
             }
 
             component = AddComponent<T>(entity);
@@ -739,11 +725,11 @@ namespace Robust.Shared.GameObjects
         {
             var dict = _entTraitArray[CompIdx.ArrayIndex<T>()];
             DebugTools.Assert(dict != null, $"Unknown component: {typeof(T).Name}");
-            if (dict!.TryGetValue(uid, out var comp))
+            if (dict.TryGetValue(uid, out var comp))
             {
-                if (!comp!.Deleted)
+                if (!comp.Deleted)
                 {
-                    return (T)(IComponent) comp;
+                    return (T)comp;
                 }
             }
 
@@ -802,11 +788,11 @@ namespace Robust.Shared.GameObjects
         {
             var dict = _entTraitArray[CompIdx.ArrayIndex<T>()];
             DebugTools.Assert(dict != null, $"Unknown component: {typeof(T).Name}");
-            if (dict!.TryGetValue(uid, out var comp))
+            if (dict.TryGetValue(uid, out var comp))
             {
                 if (!comp.Deleted)
                 {
-                    component = (T)(IComponent)comp;
+                    component = (T)comp;
                     return true;
                 }
             }
@@ -922,25 +908,25 @@ namespace Robust.Shared.GameObjects
             return TryGetComponent(uid.Value, netId, out component, meta);
         }
 
-        public EntityQuery<TComp1> GetEntityQuery<TComp1>() where TComp1 : Component
+        public EntityQuery<TComp1> GetEntityQuery<TComp1>() where TComp1 : IComponent
         {
             var comps = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
             DebugTools.Assert(comps != null, $"Unknown component: {typeof(TComp1).Name}");
-            return new EntityQuery<TComp1>(comps!, _resolveSawmill);
+            return new EntityQuery<TComp1>(comps, _resolveSawmill);
         }
 
-        public EntityQuery<Component> GetEntityQuery(Type type)
+        public EntityQuery<IComponent> GetEntityQuery(Type type)
         {
             var comps = _entTraitArray[CompIdx.ArrayIndex(type)];
             DebugTools.Assert(comps != null, $"Unknown component: {type.Name}");
-            return new EntityQuery<Component>(comps!, _resolveSawmill);
+            return new EntityQuery<IComponent>(comps, _resolveSawmill);
         }
 
         /// <inheritdoc />
         public IEnumerable<IComponent> GetComponents(EntityUid uid)
         {
             // ReSharper disable once LoopCanBeConvertedToQuery
-            foreach (Component comp in _entCompIndex[uid].ToArray())
+            foreach (var comp in _entCompIndex[uid].ToArray())
             {
                 if (comp.Deleted) continue;
 
@@ -957,14 +943,14 @@ namespace Robust.Shared.GameObjects
 
         /// <summary>
         /// Copy the components for an entity into the given span,
-        /// or re-allocate the span as an array if there's not enough space.
+        /// or re-allocate the span as an array if there's not enough space.º
         /// </summary>
-        private void CopyComponentsInto(ref Span<Component?> comps, EntityUid uid)
+        private void CopyComponentsInto(ref Span<IComponent?> comps, EntityUid uid)
         {
             var set = _entCompIndex[uid];
             if (set.Count > comps.Length)
             {
-                comps = new Component[set.Count];
+                comps = new IComponent[set.Count];
             }
 
             var i = 0;
@@ -1003,7 +989,7 @@ namespace Robust.Shared.GameObjects
 
         #region Join Functions
 
-        public (EntityUid Uid, T Component)[] AllComponents<T>() where T : Component
+        public (EntityUid Uid, T Component)[] AllComponents<T>() where T : IComponent
         {
             var query = AllEntityQueryEnumerator<T>();
             var comps = new (EntityUid Uid, T Component)[Count<T>()];
@@ -1018,7 +1004,7 @@ namespace Robust.Shared.GameObjects
             return comps;
         }
 
-        public List<(EntityUid Uid, T Component)> AllComponentsList<T>() where T : Component
+        public List<(EntityUid Uid, T Component)> AllComponentsList<T>() where T : IComponent
         {
             var query = AllEntityQueryEnumerator<T>();
             var comps = new List<(EntityUid Uid, T Component)>(Count<T>());
@@ -1032,15 +1018,15 @@ namespace Robust.Shared.GameObjects
         }
 
         public AllEntityQueryEnumerator<TComp1> AllEntityQueryEnumerator<TComp1>()
-        where TComp1 : Component
+        where TComp1 : IComponent
         {
             var trait1 = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
             return new AllEntityQueryEnumerator<TComp1>(trait1);
         }
 
         public AllEntityQueryEnumerator<TComp1, TComp2> AllEntityQueryEnumerator<TComp1, TComp2>()
-            where TComp1 : Component
-            where TComp2 : Component
+            where TComp1 : IComponent
+            where TComp2 : IComponent
         {
             var trait1 = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
             var trait2 = _entTraitArray[CompIdx.ArrayIndex<TComp2>()];
@@ -1048,9 +1034,9 @@ namespace Robust.Shared.GameObjects
         }
 
         public AllEntityQueryEnumerator<TComp1, TComp2, TComp3> AllEntityQueryEnumerator<TComp1, TComp2, TComp3>()
-            where TComp1 : Component
-            where TComp2 : Component
-            where TComp3 : Component
+            where TComp1 : IComponent
+            where TComp2 : IComponent
+            where TComp3 : IComponent
         {
             var trait1 = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
             var trait2 = _entTraitArray[CompIdx.ArrayIndex<TComp2>()];
@@ -1059,10 +1045,10 @@ namespace Robust.Shared.GameObjects
         }
 
         public AllEntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4> AllEntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4>()
-            where TComp1 : Component
-            where TComp2 : Component
-            where TComp3 : Component
-            where TComp4 : Component
+            where TComp1 : IComponent
+            where TComp2 : IComponent
+            where TComp3 : IComponent
+            where TComp4 : IComponent
         {
             var trait1 = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
             var trait2 = _entTraitArray[CompIdx.ArrayIndex<TComp2>()];
@@ -1072,15 +1058,15 @@ namespace Robust.Shared.GameObjects
         }
 
         public EntityQueryEnumerator<TComp1> EntityQueryEnumerator<TComp1>()
-            where TComp1 : Component
+            where TComp1 : IComponent
         {
             var trait1 = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
             return new EntityQueryEnumerator<TComp1>(trait1, MetaQuery);
         }
 
         public EntityQueryEnumerator<TComp1, TComp2> EntityQueryEnumerator<TComp1, TComp2>()
-            where TComp1 : Component
-            where TComp2 : Component
+            where TComp1 : IComponent
+            where TComp2 : IComponent
         {
             var trait1 = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
             var trait2 = _entTraitArray[CompIdx.ArrayIndex<TComp2>()];
@@ -1088,9 +1074,9 @@ namespace Robust.Shared.GameObjects
         }
 
         public EntityQueryEnumerator<TComp1, TComp2, TComp3> EntityQueryEnumerator<TComp1, TComp2, TComp3>()
-            where TComp1 : Component
-            where TComp2 : Component
-            where TComp3 : Component
+            where TComp1 : IComponent
+            where TComp2 : IComponent
+            where TComp3 : IComponent
         {
             var trait1 = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
             var trait2 = _entTraitArray[CompIdx.ArrayIndex<TComp2>()];
@@ -1099,10 +1085,10 @@ namespace Robust.Shared.GameObjects
         }
 
         public EntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4> EntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4>()
-            where TComp1 : Component
-            where TComp2 : Component
-            where TComp3 : Component
-            where TComp4 : Component
+            where TComp1 : IComponent
+            where TComp2 : IComponent
+            where TComp3 : IComponent
+            where TComp4 : IComponent
         {
             var trait1 = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
             var trait2 = _entTraitArray[CompIdx.ArrayIndex<TComp2>()];
@@ -1120,22 +1106,22 @@ namespace Robust.Shared.GameObjects
 
             if (includePaused)
             {
-                foreach (var t1Comp in comps!.Values)
+                foreach (var t1Comp in comps.Values)
                 {
                     if (t1Comp.Deleted) continue;
 
-                    yield return (T)(object)t1Comp;
+                    yield return (T)t1Comp;
                 }
             }
             else
             {
-                foreach (var t1Comp in comps.Values)
+                foreach (var (uid, t1Comp) in comps)
                 {
-                    if (t1Comp.Deleted || !MetaQuery.TryGetComponentInternal(t1Comp.Owner, out var metaComp)) continue;
+                    if (t1Comp.Deleted || !MetaQuery.TryGetComponentInternal(uid, out var metaComp)) continue;
 
                     if (metaComp.EntityPaused) continue;
 
-                    yield return (T)(object)t1Comp;
+                    yield return (T)t1Comp;
                 }
             }
         }
@@ -1158,8 +1144,8 @@ namespace Robust.Shared.GameObjects
                         continue;
 
                     yield return (
-                        (TComp1)(object)t1Comp,
-                        (TComp2)(object)t2Comp);
+                        (TComp1) t1Comp,
+                        (TComp2) t2Comp);
                 }
             }
             else
@@ -1172,15 +1158,15 @@ namespace Robust.Shared.GameObjects
                     if (!trait2.TryGetValue(uid, out var t2Comp) || t2Comp.Deleted)
                         continue;
 
-                    if (t1Comp.Deleted || !metaComps.TryGetValue(t1Comp.Owner, out var metaComp)) continue;
+                    if (t1Comp.Deleted || !metaComps.TryGetValue(uid, out var metaComp)) continue;
 
                     var meta = (MetaDataComponent)metaComp;
 
                     if (meta.EntityPaused) continue;
 
                     yield return (
-                        (TComp1)(object)t1Comp,
-                        (TComp2)(object)t2Comp);
+                        (TComp1) t1Comp,
+                        (TComp2) t2Comp);
                 }
             }
         }
@@ -1206,9 +1192,9 @@ namespace Robust.Shared.GameObjects
                         continue;
 
                     yield return (
-                        (TComp1)(object)t1Comp,
-                        (TComp2)(object)t2Comp,
-                        (TComp3)(object)t3Comp);
+                        (TComp1) t1Comp,
+                        (TComp2) t2Comp,
+                        (TComp3) t3Comp);
                 }
             }
             else
@@ -1224,16 +1210,16 @@ namespace Robust.Shared.GameObjects
                     if (!trait3.TryGetValue(uid, out var t3Comp) || t3Comp.Deleted)
                         continue;
 
-                    if (t1Comp.Deleted || !metaComps.TryGetValue(t1Comp.Owner, out var metaComp)) continue;
+                    if (t1Comp.Deleted || !metaComps.TryGetValue(uid, out var metaComp)) continue;
 
                     var meta = (MetaDataComponent)metaComp;
 
                     if (meta.EntityPaused) continue;
 
                     yield return (
-                        (TComp1)(object)t1Comp,
-                        (TComp2)(object)t2Comp,
-                        (TComp3)(object)t3Comp);
+                        (TComp1) t1Comp,
+                        (TComp2) t2Comp,
+                        (TComp3) t3Comp);
                 }
             }
         }
@@ -1265,10 +1251,10 @@ namespace Robust.Shared.GameObjects
                         continue;
 
                     yield return (
-                        (TComp1)(object)t1Comp,
-                        (TComp2)(object)t2Comp,
-                        (TComp3)(object)t3Comp,
-                        (TComp4)(object)t4Comp);
+                        (TComp1) t1Comp,
+                        (TComp2) t2Comp,
+                        (TComp3) t3Comp,
+                        (TComp4) t4Comp);
                 }
             }
             else
@@ -1287,17 +1273,17 @@ namespace Robust.Shared.GameObjects
                     if (!trait4.TryGetValue(uid, out var t4Comp) || t4Comp.Deleted)
                         continue;
 
-                    if (t1Comp.Deleted || !metaComps.TryGetValue(t1Comp.Owner, out var metaComp)) continue;
+                    if (t1Comp.Deleted || !metaComps.TryGetValue(uid, out var metaComp)) continue;
 
                     var meta = (MetaDataComponent)metaComp;
 
                     if (meta.EntityPaused) continue;
 
                     yield return (
-                        (TComp1)(object)t1Comp,
-                        (TComp2)(object)t2Comp,
-                        (TComp3)(object)t3Comp,
-                        (TComp4)(object)t4Comp);
+                        (TComp1) t1Comp,
+                        (TComp2) t2Comp,
+                        (TComp3) t3Comp,
+                        (TComp4) t4Comp);
                 }
             }
         }
@@ -1305,7 +1291,7 @@ namespace Robust.Shared.GameObjects
         #endregion
 
         /// <inheritdoc />
-        public IEnumerable<(EntityUid Uid, Component Component)> GetAllComponents(Type type, bool includePaused = false)
+        public IEnumerable<(EntityUid Uid, IComponent Component)> GetAllComponents(Type type, bool includePaused = false)
         {
             var comps = _entTraitDict[type];
 
@@ -1363,23 +1349,23 @@ namespace Robust.Shared.GameObjects
 
     public readonly struct NetComponentEnumerable
     {
-        private readonly Dictionary<ushort, Component> _dictionary;
+        private readonly Dictionary<ushort, IComponent> _dictionary;
 
-        public NetComponentEnumerable(Dictionary<ushort, Component> dictionary) => _dictionary = dictionary;
+        public NetComponentEnumerable(Dictionary<ushort, IComponent> dictionary) => _dictionary = dictionary;
         public NetComponentEnumerator GetEnumerator() => new(_dictionary);
     }
 
     public struct NetComponentEnumerator
     {
         // DO NOT MAKE THIS READONLY
-        private Dictionary<ushort, Component>.Enumerator _dictEnum;
+        private Dictionary<ushort, IComponent>.Enumerator _dictEnum;
 
-        public NetComponentEnumerator(Dictionary<ushort, Component> dictionary) =>
+        public NetComponentEnumerator(Dictionary<ushort, IComponent> dictionary) =>
             _dictEnum = dictionary.GetEnumerator();
 
         public bool MoveNext() => _dictEnum.MoveNext();
 
-        public (ushort netId, Component component) Current
+        public (ushort netId, IComponent component) Current
         {
             get
             {
@@ -1389,12 +1375,12 @@ namespace Robust.Shared.GameObjects
         }
     }
 
-    public readonly struct EntityQuery<TComp1> where TComp1 : Component
+    public readonly struct EntityQuery<TComp1> where TComp1 : IComponent
     {
-        private readonly Dictionary<EntityUid, Component> _traitDict;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict;
         private readonly ISawmill _sawmill;
 
-        public EntityQuery(Dictionary<EntityUid, Component> traitDict, ISawmill sawmill)
+        public EntityQuery(Dictionary<EntityUid, IComponent> traitDict, ISawmill sawmill)
         {
             _traitDict = traitDict;
             _sawmill = sawmill;
@@ -1457,9 +1443,7 @@ namespace Robust.Shared.GameObjects
         {
             if (component != null)
             {
-#pragma warning disable CS0618 // Type or member is obsolete
-                DebugTools.Assert(uid == component.Owner, "Specified Entity is not the component's Owner!");
-#pragma warning restore CS0618 // Type or member is obsolete
+                DebugTools.AssertOwner(uid, component);
                 return true;
             }
 
@@ -1482,7 +1466,7 @@ namespace Robust.Shared.GameObjects
             if (TryGetComponent(uid, out var comp))
                 return comp;
 
-            return null;
+            return default;
         }
 
         #region Internal
@@ -1534,7 +1518,7 @@ namespace Robust.Shared.GameObjects
         }
 
         /// <summary>
-        /// Elides the component.Deleted check of <see cref="HasComponent"/>
+        /// Elides the component.Deleted check of <see cref="HasComponent(EntityUid)"/>
         /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         [Pure]
@@ -1552,9 +1536,7 @@ namespace Robust.Shared.GameObjects
         {
             if (component != null)
             {
-#pragma warning disable CS0618 // Type or member is obsolete
-                DebugTools.Assert(uid == component.Owner, "Specified Entity is not the component's Owner!");
-#pragma warning restore CS0618 // Type or member is obsolete
+                DebugTools.AssertOwner(uid, component);
                 return true;
             }
 
@@ -1579,7 +1561,7 @@ namespace Robust.Shared.GameObjects
             if (TryGetComponent(uid, out var comp))
                 return comp;
 
-            return null;
+            return default;
         }
 
         #endregion
@@ -1591,13 +1573,13 @@ namespace Robust.Shared.GameObjects
     /// Returns all matching unpaused components.
     /// </summary>
     public struct EntityQueryEnumerator<TComp1> : IDisposable
-        where TComp1 : Component
+        where TComp1 : IComponent
     {
-        private Dictionary<EntityUid, Component>.Enumerator _traitDict;
+        private Dictionary<EntityUid, IComponent>.Enumerator _traitDict;
         private readonly EntityQuery<MetaDataComponent> _metaQuery;
 
         public EntityQueryEnumerator(
-            Dictionary<EntityUid, Component> traitDict,
+            Dictionary<EntityUid, IComponent> traitDict,
             EntityQuery<MetaDataComponent> metaQuery)
         {
             _traitDict = traitDict.GetEnumerator();
@@ -1611,7 +1593,7 @@ namespace Robust.Shared.GameObjects
                 if (!_traitDict.MoveNext())
                 {
                     uid = default;
-                    comp1 = null;
+                    comp1 = default;
                     return false;
                 }
 
@@ -1649,16 +1631,16 @@ namespace Robust.Shared.GameObjects
     /// Returns all matching unpaused components.
     /// </summary>
     public struct EntityQueryEnumerator<TComp1, TComp2> : IDisposable
-        where TComp1 : Component
-        where TComp2 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
     {
-        private Dictionary<EntityUid, Component>.Enumerator _traitDict;
-        private readonly Dictionary<EntityUid, Component> _traitDict2;
+        private Dictionary<EntityUid, IComponent>.Enumerator _traitDict;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict2;
         private readonly EntityQuery<MetaDataComponent> _metaQuery;
 
         public EntityQueryEnumerator(
-            Dictionary<EntityUid, Component> traitDict,
-            Dictionary<EntityUid, Component> traitDict2,
+            Dictionary<EntityUid, IComponent> traitDict,
+            Dictionary<EntityUid, IComponent> traitDict2,
             EntityQuery<MetaDataComponent> metaQuery)
         {
             _traitDict = traitDict.GetEnumerator();
@@ -1673,8 +1655,8 @@ namespace Robust.Shared.GameObjects
                 if (!_traitDict.MoveNext())
                 {
                     uid = default;
-                    comp1 = null;
-                    comp2 = null;
+                    comp1 = default;
+                    comp2 = default;
                     return false;
                 }
 
@@ -1718,19 +1700,19 @@ namespace Robust.Shared.GameObjects
     /// Returns all matching unpaused components.
     /// </summary>
     public struct EntityQueryEnumerator<TComp1, TComp2, TComp3> : IDisposable
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
+        where TComp3 : IComponent
     {
-        private Dictionary<EntityUid, Component>.Enumerator _traitDict;
-        private readonly Dictionary<EntityUid, Component> _traitDict2;
-        private readonly Dictionary<EntityUid, Component> _traitDict3;
+        private Dictionary<EntityUid, IComponent>.Enumerator _traitDict;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict2;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict3;
         private readonly EntityQuery<MetaDataComponent> _metaQuery;
 
         public EntityQueryEnumerator(
-            Dictionary<EntityUid, Component> traitDict,
-            Dictionary<EntityUid, Component> traitDict2,
-            Dictionary<EntityUid, Component> traitDict3,
+            Dictionary<EntityUid, IComponent> traitDict,
+            Dictionary<EntityUid, IComponent> traitDict2,
+            Dictionary<EntityUid, IComponent> traitDict3,
             EntityQuery<MetaDataComponent> metaQuery)
         {
             _traitDict = traitDict.GetEnumerator();
@@ -1746,9 +1728,9 @@ namespace Robust.Shared.GameObjects
                 if (!_traitDict.MoveNext())
                 {
                     uid = default;
-                    comp1 = null;
-                    comp2 = null;
-                    comp3 = null;
+                    comp1 = default;
+                    comp2 = default;
+                    comp3 = default;
                     return false;
                 }
 
@@ -1801,22 +1783,22 @@ namespace Robust.Shared.GameObjects
     /// Returns all matching unpaused components.
     /// </summary>
     public struct EntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4> : IDisposable
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
-        where TComp4 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
+        where TComp3 : IComponent
+        where TComp4 : IComponent
     {
-        private Dictionary<EntityUid, Component>.Enumerator _traitDict;
-        private readonly Dictionary<EntityUid, Component> _traitDict2;
-        private readonly Dictionary<EntityUid, Component> _traitDict3;
-        private readonly Dictionary<EntityUid, Component> _traitDict4;
+        private Dictionary<EntityUid, IComponent>.Enumerator _traitDict;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict2;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict3;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict4;
         private readonly EntityQuery<MetaDataComponent> _metaQuery;
 
         public EntityQueryEnumerator(
-            Dictionary<EntityUid, Component> traitDict,
-            Dictionary<EntityUid, Component> traitDict2,
-            Dictionary<EntityUid, Component> traitDict3,
-            Dictionary<EntityUid, Component> traitDict4,
+            Dictionary<EntityUid, IComponent> traitDict,
+            Dictionary<EntityUid, IComponent> traitDict2,
+            Dictionary<EntityUid, IComponent> traitDict3,
+            Dictionary<EntityUid, IComponent> traitDict4,
             EntityQuery<MetaDataComponent> metaQuery)
         {
             _traitDict = traitDict.GetEnumerator();
@@ -1833,10 +1815,10 @@ namespace Robust.Shared.GameObjects
                 if (!_traitDict.MoveNext())
                 {
                     uid = default;
-                    comp1 = null;
-                    comp2 = null;
-                    comp3 = null;
-                    comp4 = null;
+                    comp1 = default;
+                    comp2 = default;
+                    comp3 = default;
+                    comp4 = default;
                     return false;
                 }
 
@@ -1900,12 +1882,12 @@ namespace Robust.Shared.GameObjects
     /// Returns all matching components, paused or not.
     /// </summary>
     public struct AllEntityQueryEnumerator<TComp1> : IDisposable
-        where TComp1 : Component
+        where TComp1 : IComponent
     {
-        private Dictionary<EntityUid, Component>.Enumerator _traitDict;
+        private Dictionary<EntityUid, IComponent>.Enumerator _traitDict;
 
         public AllEntityQueryEnumerator(
-            Dictionary<EntityUid, Component> traitDict)
+            Dictionary<EntityUid, IComponent> traitDict)
         {
             _traitDict = traitDict.GetEnumerator();
         }
@@ -1917,7 +1899,7 @@ namespace Robust.Shared.GameObjects
                 if (!_traitDict.MoveNext())
                 {
                     uid = default;
-                    comp1 = null;
+                    comp1 = default;
                     return false;
                 }
 
@@ -1950,15 +1932,15 @@ namespace Robust.Shared.GameObjects
     /// Returns all matching components, paused or not.
     /// </summary>
     public struct AllEntityQueryEnumerator<TComp1, TComp2> : IDisposable
-        where TComp1 : Component
-        where TComp2 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
     {
-        private Dictionary<EntityUid, Component>.Enumerator _traitDict;
-        private readonly Dictionary<EntityUid, Component> _traitDict2;
+        private Dictionary<EntityUid, IComponent>.Enumerator _traitDict;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict2;
 
         public AllEntityQueryEnumerator(
-            Dictionary<EntityUid, Component> traitDict,
-            Dictionary<EntityUid, Component> traitDict2)
+            Dictionary<EntityUid, IComponent> traitDict,
+            Dictionary<EntityUid, IComponent> traitDict2)
         {
             _traitDict = traitDict.GetEnumerator();
             _traitDict2 = traitDict2;
@@ -1971,8 +1953,8 @@ namespace Robust.Shared.GameObjects
                 if (!_traitDict.MoveNext())
                 {
                     uid = default;
-                    comp1 = null;
-                    comp2 = null;
+                    comp1 = default;
+                    comp2 = default;
                     return false;
                 }
 
@@ -2011,18 +1993,18 @@ namespace Robust.Shared.GameObjects
     /// Returns all matching components, paused or not.
     /// </summary>
     public struct AllEntityQueryEnumerator<TComp1, TComp2, TComp3> : IDisposable
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
+        where TComp3 : IComponent
     {
-        private Dictionary<EntityUid, Component>.Enumerator _traitDict;
-        private readonly Dictionary<EntityUid, Component> _traitDict2;
-        private readonly Dictionary<EntityUid, Component> _traitDict3;
+        private Dictionary<EntityUid, IComponent>.Enumerator _traitDict;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict2;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict3;
 
         public AllEntityQueryEnumerator(
-            Dictionary<EntityUid, Component> traitDict,
-            Dictionary<EntityUid, Component> traitDict2,
-            Dictionary<EntityUid, Component> traitDict3)
+            Dictionary<EntityUid, IComponent> traitDict,
+            Dictionary<EntityUid, IComponent> traitDict2,
+            Dictionary<EntityUid, IComponent> traitDict3)
         {
             _traitDict = traitDict.GetEnumerator();
             _traitDict2 = traitDict2;
@@ -2036,9 +2018,9 @@ namespace Robust.Shared.GameObjects
                 if (!_traitDict.MoveNext())
                 {
                     uid = default;
-                    comp1 = null;
-                    comp2 = null;
-                    comp3 = null;
+                    comp1 = default;
+                    comp2 = default;
+                    comp3 = default;
                     return false;
                 }
 
@@ -2086,21 +2068,21 @@ namespace Robust.Shared.GameObjects
     /// Returns all matching components, paused or not.
     /// </summary>
     public struct AllEntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4> : IDisposable
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
-        where TComp4 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
+        where TComp3 : IComponent
+        where TComp4 : IComponent
     {
-        private Dictionary<EntityUid, Component>.Enumerator _traitDict;
-        private readonly Dictionary<EntityUid, Component> _traitDict2;
-        private readonly Dictionary<EntityUid, Component> _traitDict3;
-        private readonly Dictionary<EntityUid, Component> _traitDict4;
+        private Dictionary<EntityUid, IComponent>.Enumerator _traitDict;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict2;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict3;
+        private readonly Dictionary<EntityUid, IComponent> _traitDict4;
 
         public AllEntityQueryEnumerator(
-            Dictionary<EntityUid, Component> traitDict,
-            Dictionary<EntityUid, Component> traitDict2,
-            Dictionary<EntityUid, Component> traitDict3,
-            Dictionary<EntityUid, Component> traitDict4)
+            Dictionary<EntityUid, IComponent> traitDict,
+            Dictionary<EntityUid, IComponent> traitDict2,
+            Dictionary<EntityUid, IComponent> traitDict3,
+            Dictionary<EntityUid, IComponent> traitDict4)
         {
             _traitDict = traitDict.GetEnumerator();
             _traitDict2 = traitDict2;
@@ -2115,10 +2097,10 @@ namespace Robust.Shared.GameObjects
                 if (!_traitDict.MoveNext())
                 {
                     uid = default;
-                    comp1 = null;
-                    comp2 = null;
-                    comp3 = null;
-                    comp4 = null;
+                    comp1 = default;
+                    comp2 = default;
+                    comp3 = default;
+                    comp4 = default;
                     return false;
                 }
 

Robust.Shared/GameObjects/EntityManager.LifeCycle.cs

@@ -14,7 +14,7 @@ public partial class EntityManager
     /// Increases the life stage from <see cref="ComponentLifeStage.PreAdd" /> to <see cref="ComponentLifeStage.Added" />,
     /// after raising a <see cref="ComponentAdd"/> event.
     /// </summary>
-    internal void LifeAddToEntity(Component component, CompIdx type)
+    internal void LifeAddToEntity(IComponent component, CompIdx type)
     {
         DebugTools.Assert(component.LifeStage == ComponentLifeStage.PreAdd);
 
@@ -30,7 +30,7 @@ public partial class EntityManager
     /// Increases the life stage from <see cref="ComponentLifeStage.Added" /> to <see cref="ComponentLifeStage.Initialized" />,
     /// calling <see cref="Initialize" />.
     /// </summary>
-    internal void LifeInitialize(Component component, CompIdx type)
+    internal void LifeInitialize(IComponent component, CompIdx type)
     {
         DebugTools.Assert(component.LifeStage == ComponentLifeStage.Added);
 
@@ -43,7 +43,7 @@ public partial class EntityManager
     /// Increases the life stage from <see cref="ComponentLifeStage.Initialized" /> to
     /// <see cref="ComponentLifeStage.Running" />, calling <see cref="Startup" />.
     /// </summary>
-    internal void LifeStartup(Component component)
+    internal void LifeStartup(IComponent component)
     {
         DebugTools.Assert(component.LifeStage == ComponentLifeStage.Initialized);
 
@@ -59,7 +59,7 @@ public partial class EntityManager
     /// <remarks>
     /// Components are allowed to remove themselves in their own Startup function.
     /// </remarks>
-    internal void LifeShutdown(Component component)
+    internal void LifeShutdown(IComponent component)
     {
         DebugTools.Assert(component.LifeStage is >= ComponentLifeStage.Initializing and < ComponentLifeStage.Stopping);
 
@@ -79,21 +79,13 @@ public partial class EntityManager
     /// Increases the life stage from <see cref="ComponentLifeStage.Stopped" /> to <see cref="ComponentLifeStage.Deleted" />,
     /// calling <see cref="Component.OnRemove" />.
     /// </summary>
-    internal void LifeRemoveFromEntity(Component component)
+    internal void LifeRemoveFromEntity(IComponent component)
     {
         // can be called at any time after PreAdd, including inside other life stage events.
         DebugTools.Assert(component.LifeStage != ComponentLifeStage.PreAdd);
 
         component.LifeStage = ComponentLifeStage.Removing;
         EventBus.RaiseComponentEvent(component, CompRemoveInstance);
-
-        component.OnRemove();
-
-#if DEBUG
-        if (component.LifeStage != ComponentLifeStage.Deleted)
-        {
-            DebugTools.Assert($"Component {component.GetType().Name} did not call base {nameof(component.OnRemove)} in derived method.");
-        }
-#endif
+        component.LifeStage = ComponentLifeStage.Deleted;
     }
 }

Robust.Shared/GameObjects/EntityManager.cs

@@ -18,7 +18,7 @@ namespace Robust.Shared.GameObjects
 {
     public delegate void EntityUidQueryCallback(EntityUid uid);
 
-    public delegate void ComponentQueryCallback<T>(EntityUid uid, T component) where T : Component;
+    public delegate void ComponentQueryCallback<T>(EntityUid uid, T component) where T : IComponent;
 
     /// <inheritdoc />
     [Virtual]
@@ -387,19 +387,27 @@ namespace Robust.Shared.GameObjects
 
         /// <inheritdoc />
         [Obsolete("use override with an EntityUid")]
-        public void Dirty(Component component, MetaDataComponent? meta = null)
+        public void Dirty(IComponent component, MetaDataComponent? meta = null)
         {
             Dirty(component.Owner, component, meta);
         }
 
         /// <inheritdoc />
-        public virtual void Dirty(EntityUid uid, Component component, MetaDataComponent? meta = null)
+        public virtual void Dirty(EntityUid uid, IComponent component, MetaDataComponent? meta = null)
         {
-            if (component.LifeStage >= ComponentLifeStage.Removing || !component.NetSyncEnabled)
+            Dirty(new Entity<IComponent>(uid, component), meta);
+        }
+
+        public virtual void Dirty(Entity<IComponent> ent, MetaDataComponent? meta = null)
+        {
+            if (ent.Comp.LifeStage >= ComponentLifeStage.Removing || !ent.Comp.NetSyncEnabled)
                 return;
 
-            DirtyEntity(uid, meta);
-            component.LastModifiedTick = CurrentTick;
+            DebugTools.AssertOwner(ent, ent.Comp);
+            DirtyEntity(ent, meta);
+#pragma warning disable CS0618 // Type or member is obsolete
+            ent.Comp.LastModifiedTick = CurrentTick;
+#pragma warning restore CS0618 // Type or member is obsolete
         }
 
         /// <summary>
@@ -658,7 +666,9 @@ namespace Robust.Shared.GameObjects
 
             // allocate the required TransformComponent
             var xformComp = Unsafe.As<TransformComponent>(_componentFactory.GetComponent(_xformReg));
+#pragma warning disable CS0618 // Type or member is obsolete
             xformComp.Owner = uid;
+#pragma warning restore CS0618 // Type or member is obsolete
             AddComponentInternal(uid, xformComp, false, true, metadata);
 
             return uid;

Robust.Shared/GameObjects/EntityManagerExt.cs

@@ -3,21 +3,21 @@
     public static class EntityManagerExt
     {
         public static T? GetComponentOrNull<T>(this IEntityManager entityManager, EntityUid entityUid)
-            where T : class, IComponent
+            where T : IComponent
         {
             if (entityManager.TryGetComponent(entityUid, out T? component))
                 return component;
 
-            return null;
+            return default;
         }
 
         public static T? GetComponentOrNull<T>(this IEntityManager entityManager, EntityUid? entityUid)
-            where T : class, IComponent
+            where T : IComponent
         {
             if (entityUid.HasValue && entityManager.TryGetComponent(entityUid.Value, out T? component))
                 return component;
 
-            return null;
+            return default;
         }
     }
 }

Robust.Shared/GameObjects/EntitySystem.Proxy.cs

@@ -206,7 +206,7 @@ public partial class EntitySystem
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     [Obsolete("Use Dirty(EntityUid, Component, MetaDataComponent?")]
-    protected void Dirty(Component component, MetaDataComponent? meta = null)
+    protected void Dirty(IComponent component, MetaDataComponent? meta = null)
     {
         EntityManager.Dirty(component, meta);
     }
@@ -215,11 +215,20 @@ public partial class EntitySystem
     ///     Marks a component as dirty. This also implicitly dirties the entity this component belongs to.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected void Dirty(EntityUid uid, Component component, MetaDataComponent? meta = null)
+    protected void Dirty(EntityUid uid, IComponent component, MetaDataComponent? meta = null)
     {
         EntityManager.Dirty(uid, component, meta);
     }
 
+    /// <summary>
+    ///     Marks a component as dirty. This also implicitly dirties the entity this component belongs to.
+    /// </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    protected void Dirty<T>(Entity<T> ent, MetaDataComponent? meta = null) where T : IComponent
+    {
+        EntityManager.Dirty(ent.Owner, ent.Comp, meta);
+    }
+
     /// <summary>
     ///     Retrieves the name of an entity.
     /// </summary>
@@ -396,7 +405,7 @@ public partial class EntitySystem
         return true;
     }
 
-    /// <inheritdoc cref="IEntityManager.ToPrettyString"/>
+    /// <inheritdoc cref="IEntityManager.ToPrettyString(EntityUid, MetaDataComponent?)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     [return: NotNullIfNotNull("uid")]
     protected EntityStringRepresentation? ToPrettyString(EntityUid? uid, MetaDataComponent? metadata = null)
@@ -404,7 +413,7 @@ public partial class EntitySystem
         return EntityManager.ToPrettyString(uid, metadata);
     }
 
-    /// <inheritdoc cref="IEntityManager.ToPrettyString"/>
+    /// <inheritdoc cref="IEntityManager.ToPrettyString(EntityUid, MetaDataComponent?)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     [return: NotNullIfNotNull("netEntity")]
     protected EntityStringRepresentation? ToPrettyString(NetEntity? netEntity)
@@ -412,17 +421,17 @@ public partial class EntitySystem
         return EntityManager.ToPrettyString(netEntity);
     }
 
-    /// <inheritdoc cref="IEntityManager.ToPrettyString"/>
+    /// <inheritdoc cref="IEntityManager.ToPrettyString(EntityUid, MetaDataComponent?)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected EntityStringRepresentation ToPrettyString(EntityUid uid, MetaDataComponent? metadata)
         => EntityManager.ToPrettyString(uid, metadata);
 
-    /// <inheritdoc cref="IEntityManager.ToPrettyString"/>
+    /// <inheritdoc cref="IEntityManager.ToPrettyString(EntityUid, MetaDataComponent?)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected EntityStringRepresentation ToPrettyString(EntityUid uid)
         => EntityManager.ToPrettyString(uid);
 
-    /// <inheritdoc cref="IEntityManager.ToPrettyString"/>
+    /// <inheritdoc cref="IEntityManager.ToPrettyString(EntityUid, MetaDataComponent?)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected EntityStringRepresentation ToPrettyString(NetEntity netEntity)
         => EntityManager.ToPrettyString(netEntity);
@@ -433,7 +442,7 @@ public partial class EntitySystem
 
     /// <inheritdoc cref="IEntityManager.GetComponent&lt;T&gt;"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected T Comp<T>(EntityUid uid) where T : Component
+    protected T Comp<T>(EntityUid uid) where T : IComponent
     {
         return EntityManager.GetComponent<T>(uid);
     }
@@ -442,7 +451,7 @@ public partial class EntitySystem
     ///     Returns the component of a specific type, or null when it's missing or the entity does not exist.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected T? CompOrNull<T>(EntityUid uid) where T : class, IComponent
+    protected T? CompOrNull<T>(EntityUid uid) where T : IComponent
     {
         return EntityManager.GetComponentOrNull<T>(uid);
     }
@@ -451,14 +460,14 @@ public partial class EntitySystem
     ///     Returns the component of a specific type, or null when it's missing or the entity does not exist.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected T? CompOrNull<T>(EntityUid? uid) where T : class, IComponent
+    protected T? CompOrNull<T>(EntityUid? uid) where T : IComponent
     {
-        return uid.HasValue ? EntityManager.GetComponentOrNull<T>(uid.Value) : null;
+        return uid.HasValue ? EntityManager.GetComponentOrNull<T>(uid.Value) : default;
     }
 
     /// <inheritdoc cref="IEntityManager.TryGetComponent&lt;T&gt;(EntityUid, out T)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected bool TryComp<T>(EntityUid uid, [NotNullWhen(true)] out T? comp)
+    protected bool TryComp<T>(EntityUid uid, [NotNullWhen(true)] out T? comp) where T : IComponent
     {
         return EntityManager.TryGetComponent(uid, out comp);
     }
@@ -479,7 +488,7 @@ public partial class EntitySystem
 
     /// <inheritdoc cref="IEntityManager.TryGetComponent&lt;T&gt;(EntityUid?, out T)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected bool TryComp<T>([NotNullWhen(true)] EntityUid? uid, [NotNullWhen(true)] out T? comp)
+    protected bool TryComp<T>([NotNullWhen(true)] EntityUid? uid, [NotNullWhen(true)] out T? comp) where T : IComponent
     {
         if (!uid.HasValue)
         {
@@ -614,14 +623,14 @@ public partial class EntitySystem
 
     /// <inheritdoc cref="IEntityManager.AddComponent&lt;T&gt;(EntityUid, T, bool)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected void AddComp<T>(EntityUid uid, T component, bool overwrite = false) where T : Component
+    protected void AddComp<T>(EntityUid uid, T component, bool overwrite = false) where T : IComponent
     {
         EntityManager.AddComponent(uid, component, overwrite);
     }
 
     /// <inheritdoc cref="IEntityManager.EnsureComponent&lt;T&gt;(EntityUid)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected T EnsureComp<T>(EntityUid uid) where T : Component, new()
+    protected T EnsureComp<T>(EntityUid uid) where T : IComponent, new()
     {
         return EntityManager.EnsureComponent<T>(uid);
     }
@@ -632,7 +641,7 @@ public partial class EntitySystem
 
     /// <inheritdoc cref="IEntityManager.RemoveComponentDeferred&lt;T&gt;(EntityUid)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected bool RemCompDeferred<T>(EntityUid uid) where T : class, IComponent
+    protected bool RemCompDeferred<T>(EntityUid uid) where T : IComponent
     {
         return EntityManager.RemoveComponentDeferred<T>(uid);
     }
@@ -663,7 +672,7 @@ public partial class EntitySystem
 
     /// <inheritdoc cref="IEntityManager.Count" />
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected int Count<T>() where T : Component
+    protected int Count<T>() where T : IComponent
     {
         return EntityManager.Count<T>();
     }
@@ -681,7 +690,7 @@ public partial class EntitySystem
 
     /// <inheritdoc cref="IEntityManager.RemoveComponent&lt;T&gt;(EntityUid)"/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected bool RemComp<T>(EntityUid uid) where T : class, IComponent
+    protected bool RemComp<T>(EntityUid uid) where T : IComponent
     {
         return EntityManager.RemoveComponent<T>(uid);
     }
@@ -819,34 +828,34 @@ public partial class EntitySystem
     #region All Entity Query
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected AllEntityQueryEnumerator<TComp1> AllEntityQuery<TComp1>() where TComp1 : Component
+    protected AllEntityQueryEnumerator<TComp1> AllEntityQuery<TComp1>() where TComp1 : IComponent
     {
         return EntityManager.AllEntityQueryEnumerator<TComp1>();
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected AllEntityQueryEnumerator<TComp1, TComp2> AllEntityQuery<TComp1, TComp2>()
-        where TComp1 : Component
-        where TComp2 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
     {
         return EntityManager.AllEntityQueryEnumerator<TComp1, TComp2>();
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected AllEntityQueryEnumerator<TComp1, TComp2, TComp3> AllEntityQuery<TComp1, TComp2, TComp3>()
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
+        where TComp3 : IComponent
     {
         return EntityManager.AllEntityQueryEnumerator<TComp1, TComp2, TComp3>();
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected AllEntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4> AllEntityQuery<TComp1, TComp2, TComp3, TComp4>()
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
-        where TComp4 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
+        where TComp3 : IComponent
+        where TComp4 : IComponent
     {
         return EntityManager.AllEntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4>();
     }
@@ -856,34 +865,34 @@ public partial class EntitySystem
     #region Get Entity Query
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected EntityQueryEnumerator<TComp1> EntityQueryEnumerator<TComp1>() where TComp1 : Component
+    protected EntityQueryEnumerator<TComp1> EntityQueryEnumerator<TComp1>() where TComp1 : IComponent
     {
         return EntityManager.EntityQueryEnumerator<TComp1>();
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected EntityQueryEnumerator<TComp1, TComp2> EntityQueryEnumerator<TComp1, TComp2>()
-        where TComp1 : Component
-        where TComp2 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
     {
         return EntityManager.EntityQueryEnumerator<TComp1, TComp2>();
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected EntityQueryEnumerator<TComp1, TComp2, TComp3> EntityQueryEnumerator<TComp1, TComp2, TComp3>()
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
+        where TComp3 : IComponent
     {
         return EntityManager.EntityQueryEnumerator<TComp1, TComp2, TComp3>();
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected EntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4> EntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4>()
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
-        where TComp4 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
+        where TComp3 : IComponent
+        where TComp4 : IComponent
     {
         return EntityManager.EntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4>();
     }
@@ -897,7 +906,7 @@ public partial class EntitySystem
     /// </remarks>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     [Pure]
-    protected EntityQuery<T> GetEntityQuery<T>() where T : Component
+    protected EntityQuery<T> GetEntityQuery<T>() where T : IComponent
     {
         return EntityManager.GetEntityQuery<T>();
     }
@@ -906,7 +915,7 @@ public partial class EntitySystem
     /// If you need the EntityUid, use <see cref="EntityQueryEnumerator{TComp1}"/>
     /// </remarks>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected IEnumerable<TComp1> EntityQuery<TComp1>(bool includePaused = false) where TComp1 : Component
+    protected IEnumerable<TComp1> EntityQuery<TComp1>(bool includePaused = false) where TComp1 : IComponent
     {
         return EntityManager.EntityQuery<TComp1>(includePaused);
     }
@@ -916,8 +925,8 @@ public partial class EntitySystem
     /// </remarks>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected IEnumerable<(TComp1, TComp2)> EntityQuery<TComp1, TComp2>(bool includePaused = false)
-        where TComp1 : Component
-        where TComp2 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
     {
         return EntityManager.EntityQuery<TComp1, TComp2>(includePaused);
     }
@@ -927,9 +936,9 @@ public partial class EntitySystem
     /// </remarks>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected IEnumerable<(TComp1, TComp2, TComp3)> EntityQuery<TComp1, TComp2, TComp3>(bool includePaused = false)
-        where TComp1 : Component
-        where TComp2 : Component
-        where TComp3 : Component
+        where TComp1 : IComponent
+        where TComp2 : IComponent
+        where TComp3 : IComponent
     {
         return EntityManager.EntityQuery<TComp1, TComp2, TComp3>(includePaused);
     }
@@ -939,10 +948,10 @@ public partial class EntitySystem
     /// </remarks>
     [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
+        where TComp1 : IComponent
+        where TComp2 : IComponent
+        where TComp3 : IComponent
+        where TComp4 : IComponent
     {
         return EntityManager.EntityQuery<TComp1, TComp2, TComp3, TComp4>(includePaused);
     }

Robust.Shared/GameObjects/EntitySystem.Resolve.cs

@@ -19,7 +19,7 @@ namespace Robust.Shared.GameObjects
         protected bool Resolve<TComp>(EntityUid uid, [NotNullWhen(true)] ref TComp? component, bool logMissing = true)
             where TComp : IComponent
         {
-            DebugTools.Assert(component == null || uid == component.Owner, "Specified Entity is not the component's Owner!");
+            DebugTools.AssertOwner(uid, component);
 
             if (component != null && !component.Deleted)
                 return true;

Robust.Shared/GameObjects/EntitySystem.Subscriptions.cs

@@ -24,6 +24,8 @@ namespace Robust.Shared.GameObjects
             SubEvent(EventSource.Network, handler, before, after);
         }
 
+        /// <seealso cref="SubscribeLocalEvent{T}(EntityEventRefHandler{T}, Type[], Type[])"/>
+        // [Obsolete("Subscribe to the event by ref instead (EntityEventRefHandler)")]
         protected void SubscribeLocalEvent<T>(
             EntityEventHandler<T> handler,
             Type[]? before = null, Type[]? after = null)
@@ -72,6 +74,8 @@ namespace Robust.Shared.GameObjects
             SubSessionEvent(EventSource.All, handler, before, after);
         }
 
+        /// <seealso cref="SubEvent{T}(EventSource, EntityEventRefHandler{T}, Type[], Type[])"/>
+        // [Obsolete("Subscribe to the event by ref instead (EntityEventRefHandler)")]
         private void SubEvent<T>(
             EventSource src,
             EntityEventHandler<T> handler,
@@ -108,6 +112,8 @@ namespace Robust.Shared.GameObjects
             _subscriptions.Add(new SubBroadcast<EntitySessionMessage<T>>(src));
         }
 
+        /// <seealso cref="SubscribeLocalEvent{TComp, TEvent}(ComponentEventRefHandler{TComp, TEvent}, Type[], Type[])"/>
+        // [Obsolete("Subscribe to the event by ref instead (ComponentEventRefHandler)")]
         protected void SubscribeLocalEvent<TComp, TEvent>(
             ComponentEventHandler<TComp, TEvent> handler,
             Type[]? before = null, Type[]? after = null)
@@ -132,6 +138,18 @@ namespace Robust.Shared.GameObjects
             _subscriptions.Add(new SubLocal<TComp, TEvent>());
         }
 
+        protected void SubscribeLocalEvent<TComp, TEvent>(
+            EntityEventRefHandler<TComp, TEvent> handler,
+            Type[]? before = null, Type[]? after = null)
+            where TComp : IComponent
+            where TEvent : notnull
+        {
+            EntityManager.EventBus.SubscribeLocalEvent(handler, GetType(), before, after);
+
+            _subscriptions ??= new();
+            _subscriptions.Add(new SubLocal<TComp, TEvent>());
+        }
+
         private void ShutdownSubscriptions()
         {
             if (_subscriptions == null)

Robust.Shared/GameObjects/EntityUid.cs

@@ -4,7 +4,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Shared.GameObjects
@@ -153,7 +152,7 @@ namespace Robust.Shared.GameObjects
             set
             {
                 if (MetaData is {} metaData)
-                    metaData.EntityName = value;
+                    IoCManager.Resolve<IEntityManager>().System<MetaDataSystem>().SetEntityName(this, value, metaData);
             }
         }
 
@@ -163,8 +162,11 @@ namespace Robust.Shared.GameObjects
             get => MetaData?.EntityDescription ?? string.Empty;
             set
             {
-                if (MetaData is {} metaData)
-                    metaData.EntityDescription = value;
+                if (MetaData is { } metaData)
+                {
+                    var entManager = IoCManager.Resolve<IEntityManager>();
+                    entManager.System<MetaDataSystem>().SetEntityDescription(this, value, metaData);
+                }
             }
         }
 

Robust.Shared/GameObjects/IComponent.cs

@@ -1,5 +1,5 @@
+using System;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 
@@ -7,7 +7,6 @@ namespace Robust.Shared.GameObjects
 {
     /// <remarks>
     ///     Base component for the ECS system.
-    ///     All discoverable implementations of IComponent must override the <see cref="Name" />.
     ///     Instances are dynamically instantiated by a <c>ComponentFactory</c>, and will have their IoC Dependencies resolved.
     /// </remarks>
     [ImplicitDataDefinitionForInheritors]
@@ -17,7 +16,10 @@ namespace Robust.Shared.GameObjects
         ///     The current lifetime stage of this component. You can use this to check
         ///     if the component is initialized or being deleted.
         /// </summary>
-        ComponentLifeStage LifeStage { get; }
+        ComponentLifeStage LifeStage { get; [Obsolete("Do not use from content")] set; }
+
+        [Obsolete("Do not use from content")]
+        bool Networked { get; set; }
 
         /// <summary>
         ///     Whether this component should be synchronized with clients when modified.
@@ -28,11 +30,25 @@ namespace Robust.Shared.GameObjects
         /// </summary>
         bool NetSyncEnabled { get; set; }
 
+        /// <summary>
+        ///     If true, and if this is a networked component, then component data will only be sent to players if their
+        ///     controlled entity is the owner of this component. This is less performance intensive than <see cref="SessionSpecific"/>.
+        /// </summary>
+        bool SendOnlyToOwner { get; }
+
+        /// <summary>
+        ///     If true, and if this is a networked component, then this component will cause <see
+        ///     cref="ComponentGetStateAttemptEvent"/> events to be raised to check whether a given player should
+        ///     receive this component's state.
+        /// </summary>
+        bool SessionSpecific { get; }
+
         /// <summary>
         ///     Entity that this component is attached to.
         /// </summary>
         /// <seealso cref="EntityQueryEnumerator{TComp1}"/>
-        EntityUid Owner { get; }
+        [Obsolete("Update your API to allow accessing Owner through other means")]
+        EntityUid Owner { get; set; }
 
         /// <summary>
         /// Component has been (or is currently being) initialized.
@@ -57,11 +73,17 @@ namespace Robust.Shared.GameObjects
         /// <summary>
         ///     This is the tick the component was created.
         /// </summary>
-        GameTick CreationTick { get; }
+        GameTick CreationTick { get; [Obsolete("Do not use from content")] set; }
 
         /// <summary>
         ///     This is the last game tick Dirty() was called.
         /// </summary>
-        GameTick LastModifiedTick { get; }
+        GameTick LastModifiedTick { get; [Obsolete("Do not use from content")] set; }
+
+        [Obsolete("Do not use from content")]
+        void ClearTicks();
+
+        [Obsolete("Do not use from content")]
+        void ClearCreationTick();
     }
 }

Robust.Shared/GameObjects/IEntityManager.Components.cs

@@ -31,7 +31,7 @@ namespace Robust.Shared.GameObjects
         /// <summary>
         /// Gets the number of a specific component.
         /// </summary>
-        public int Count<T>() where T : Component;
+        public int Count<T>() where T : IComponent;
 
         /// <summary>
         /// Gets the number of a specific component.
@@ -44,12 +44,12 @@ namespace Robust.Shared.GameObjects
         /// </summary>
         /// <typeparam name="T">Concrete component type to add.</typeparam>
         /// <returns>The newly added component.</returns>
-        T AddComponent<T>(EntityUid uid) where T : Component, new();
+        T AddComponent<T>(EntityUid uid) where T : IComponent, new();
 
         /// <summary>
         ///     Adds a Component with a given network id to an entity.
         /// </summary>
-        Component AddComponent(EntityUid uid, ushort netId, MetaDataComponent? meta = null);
+        IComponent AddComponent(EntityUid uid, ushort netId, MetaDataComponent? meta = null);
 
         /// <summary>
         ///     Adds an uninitialized Component type to an entity.
@@ -62,7 +62,7 @@ namespace Robust.Shared.GameObjects
         /// <param name="uid">Entity being modified.</param>
         /// <returns>Component initialization handle. When you are done setting up the component, make sure to dispose this.</returns>
         [Obsolete]
-        EntityManager.CompInitializeHandle<T> AddComponentUninitialized<T>(EntityUid uid) where T : Component, new();
+        EntityManager.CompInitializeHandle<T> AddComponentUninitialized<T>(EntityUid uid) where T : IComponent, new();
 
         /// <summary>
         ///     Adds a Component to an entity. If the entity is already Initialized, the component will
@@ -71,7 +71,7 @@ namespace Robust.Shared.GameObjects
         /// <param name="uid">Entity being modified.</param>
         /// <param name="component">Component to add.</param>
         /// <param name="overwrite">Should it overwrite existing components?</param>
-        void AddComponent<T>(EntityUid uid, T component, bool overwrite = false, MetaDataComponent? metadata = null) where T : Component;
+        void AddComponent<T>(EntityUid uid, T component, bool overwrite = false, MetaDataComponent? metadata = null) where T : IComponent;
 
         /// <summary>
         ///     Removes the component with the specified reference type,
@@ -214,7 +214,7 @@ namespace Robust.Shared.GameObjects
         /// <param name="uid">Entity to modify.</param>
         /// <typeparam name="T">Component to add.</typeparam>
         /// <returns>The component in question</returns>
-        T EnsureComponent<T>(EntityUid uid) where T : Component, new();
+        T EnsureComponent<T>(EntityUid uid) where T : IComponent, new();
 
         /// <summary>
         ///     This method will always return a component for a certain entity, adding it if it's not there already.
@@ -223,7 +223,7 @@ namespace Robust.Shared.GameObjects
         /// <param name="component">The output component after being ensured.</param>
         /// <typeparam name="T">Component to add.</typeparam>
         /// <returns>True if the component already existed</returns>
-        bool EnsureComponent<T>(EntityUid uid, out T component) where T : Component, new();
+        bool EnsureComponent<T>(EntityUid uid, out T component) where T : IComponent, new();
 
         /// <summary>
         ///     Returns the component of a specific type.
@@ -334,9 +334,9 @@ namespace Robust.Shared.GameObjects
         /// <summary>
         /// Returns a cached struct enumerator with the specified component.
         /// </summary>
-        EntityQuery<TComp1> GetEntityQuery<TComp1>() where TComp1 : Component;
+        EntityQuery<TComp1> GetEntityQuery<TComp1>() where TComp1 : IComponent;
 
-        EntityQuery<Component> GetEntityQuery(Type type);
+        EntityQuery<IComponent> GetEntityQuery(Type type);
 
         /// <summary>
         ///     Returns ALL component type instances on an entity. A single component instance
@@ -398,49 +398,49 @@ namespace Robust.Shared.GameObjects
         /// Returns all instances of a component in an array.
         /// Use sparingly.
         /// </summary>
-        (EntityUid Uid, T Component)[] AllComponents<T>() where T : Component;
+        (EntityUid Uid, T Component)[] AllComponents<T>() where T : IComponent;
 
         /// <summary>
         /// Returns all instances of a component in a List.
         /// Use sparingly.
         /// </summary>
-        List<(EntityUid Uid, T Component)> AllComponentsList<T>() where T : Component;
+        List<(EntityUid Uid, T Component)> AllComponentsList<T>() where T : IComponent;
 
         AllEntityQueryEnumerator<TComp1> AllEntityQueryEnumerator<TComp1>()
-            where TComp1 : Component;
+            where TComp1 : IComponent;
 
         AllEntityQueryEnumerator<TComp1, TComp2> AllEntityQueryEnumerator<TComp1, TComp2>()
-            where TComp1 : Component
-            where TComp2 : Component;
+            where TComp1 : IComponent
+            where TComp2 : IComponent;
 
         AllEntityQueryEnumerator<TComp1, TComp2, TComp3> AllEntityQueryEnumerator<TComp1, TComp2, TComp3>()
-            where TComp1 : Component
-            where TComp2 : Component
-            where TComp3 : Component;
+            where TComp1 : IComponent
+            where TComp2 : IComponent
+            where TComp3 : IComponent;
 
         AllEntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4> AllEntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4>()
-            where TComp1 : Component
-            where TComp2 : Component
-            where TComp3 : Component
-            where TComp4 : Component;
+            where TComp1 : IComponent
+            where TComp2 : IComponent
+            where TComp3 : IComponent
+            where TComp4 : IComponent;
 
         EntityQueryEnumerator<TComp1> EntityQueryEnumerator<TComp1>()
-            where TComp1 : Component;
+            where TComp1 : IComponent;
 
         EntityQueryEnumerator<TComp1, TComp2> EntityQueryEnumerator<TComp1, TComp2>()
-            where TComp1 : Component
-            where TComp2 : Component;
+            where TComp1 : IComponent
+            where TComp2 : IComponent;
 
         EntityQueryEnumerator<TComp1, TComp2, TComp3> EntityQueryEnumerator<TComp1, TComp2, TComp3>()
-            where TComp1 : Component
-            where TComp2 : Component
-            where TComp3 : Component;
+            where TComp1 : IComponent
+            where TComp2 : IComponent
+            where TComp3 : IComponent;
 
         EntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4> EntityQueryEnumerator<TComp1, TComp2, TComp3, TComp4>()
-            where TComp1 : Component
-            where TComp2 : Component
-            where TComp3 : Component
-            where TComp4 : Component;
+            where TComp1 : IComponent
+            where TComp2 : IComponent
+            where TComp3 : IComponent
+            where TComp4 : IComponent;
 
         /// <summary>
         ///     Returns ALL component instances of a specified type.
@@ -491,7 +491,7 @@ namespace Robust.Shared.GameObjects
         /// <param name="type">A trait or component type to check for.</param>
         /// <param name="includePaused"></param>
         /// <returns>All components that are the specified type.</returns>
-        IEnumerable<(EntityUid Uid, Component Component)> GetAllComponents(Type type, bool includePaused = false);
+        IEnumerable<(EntityUid Uid, IComponent Component)> GetAllComponents(Type type, bool includePaused = false);
 
         /// <summary>
         ///     Culls all components from the collection that are marked as deleted. This needs to be called often.

Robust.Shared/GameObjects/IEntityManager.cs

@@ -83,9 +83,11 @@ namespace Robust.Shared.GameObjects
 
         public void DirtyEntity(EntityUid uid, MetaDataComponent? metadata = null);
 
-        public void Dirty(Component component, MetaDataComponent? metadata = null);
+        public void Dirty(IComponent component, MetaDataComponent? metadata = null);
 
-        public void Dirty(EntityUid uid, Component component, MetaDataComponent? meta = null);
+        public void Dirty(EntityUid uid, IComponent component, MetaDataComponent? meta = null);
+
+        public void Dirty(Entity<IComponent> ent, MetaDataComponent? meta = null);
 
         public void QueueDeleteEntity(EntityUid? uid);
 

Robust.Shared/GameObjects/NetEntity.cs

@@ -184,8 +184,11 @@ public readonly struct NetEntity : IEquatable<NetEntity>, IComparable<NetEntity>
         get => MetaData?.EntityName ?? string.Empty;
         set
         {
-            if (MetaData is {} metaData)
-                metaData.EntityName = value;
+            if (MetaData is { } metaData)
+            {
+                var entManager = IoCManager.Resolve<IEntityManager>();
+                entManager.System<MetaDataSystem>().SetEntityName(entManager.GetEntity(this), value, metaData);
+            }
         }
     }
 
@@ -195,8 +198,11 @@ public readonly struct NetEntity : IEquatable<NetEntity>, IComparable<NetEntity>
         get => MetaData?.EntityDescription ?? string.Empty;
         set
         {
-            if (MetaData is {} metaData)
-                metaData.EntityDescription = value;
+            if (MetaData is { } metaData)
+            {
+                var entManager = IoCManager.Resolve<IEntityManager>();
+                entManager.System<MetaDataSystem>().SetEntityDescription(entManager.GetEntity(this), value, metaData);
+            }
         }
     }
 

Robust.Shared/GameObjects/Systems/EntityLookup.Queries.cs

@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using Robust.Shared.Collections;
-using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
@@ -273,9 +272,14 @@ public sealed partial class EntityLookupSystem
 
     public HashSet<EntityUid> GetEntitiesIntersecting(MapId mapId, Box2 worldAABB, LookupFlags flags = DefaultFlags)
     {
-        if (mapId == MapId.Nullspace) return new HashSet<EntityUid>();
-
         var intersecting = new HashSet<EntityUid>();
+        GetEntitiesIntersecting(mapId, worldAABB, intersecting, flags);
+        return intersecting;
+    }
+
+    public void GetEntitiesIntersecting(MapId mapId, Box2 worldAABB, HashSet<EntityUid> intersecting, LookupFlags flags = DefaultFlags)
+    {
+        if (mapId == MapId.Nullspace) return;
 
         // Get grid entities
         var state = (this, _map, intersecting, worldAABB, _transform, flags);
@@ -309,8 +313,6 @@ public sealed partial class EntityLookupSystem
         var localAABB = _transform.GetInvWorldMatrix(mapUid).TransformBox(worldAABB);
         AddEntitiesIntersecting(mapUid, intersecting, localAABB, flags);
         AddContained(intersecting, flags);
-
-        return intersecting;
     }
 
     #endregion
@@ -546,16 +548,23 @@ public sealed partial class EntityLookupSystem
 
     public HashSet<EntityUid> GetEntitiesInRange(MapId mapId, Vector2 worldPos, float range,
         LookupFlags flags = DefaultFlags)
+    {
+        var entities = new HashSet<EntityUid>();
+        GetEntitiesInRange(mapId, worldPos, range, entities, flags);
+        return entities;
+    }
+
+    public void GetEntitiesInRange(MapId mapId, Vector2 worldPos, float range, HashSet<EntityUid> entities, LookupFlags flags = DefaultFlags)
     {
         DebugTools.Assert(range > 0, "Range must be a positive float");
 
         if (mapId == MapId.Nullspace)
-            return new HashSet<EntityUid>();
+            return;
 
         // TODO: Actual circles
         var rangeVec = new Vector2(range, range);
         var worldAABB = new Box2(worldPos - rangeVec, worldPos + rangeVec);
-        return GetEntitiesIntersecting(mapId, worldAABB, flags);
+        GetEntitiesIntersecting(mapId, worldAABB, entities, flags);
     }
 
     #endregion

Robust.Shared/GameObjects/Systems/EntityLookupSystem.ComponentQueries.cs

@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Numerics;
 using Robust.Shared.Collections;
-using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Utility;
 
@@ -21,7 +20,19 @@ public sealed partial class EntityLookupSystem
         HashSet<T> intersecting,
         Box2 worldAABB,
         LookupFlags flags,
-        EntityQuery<T> query) where T : Component
+        EntityQuery<T> query) where T : IComponent
+    {
+        var intersectingEntities = new HashSet<Entity<T>>();
+        AddEntitiesIntersecting(lookupUid, intersectingEntities, worldAABB, flags, query);
+        intersecting.UnionWith(intersectingEntities.Select(e => e.Comp));
+    }
+
+    private void AddEntitiesIntersecting<T>(
+        EntityUid lookupUid,
+        HashSet<Entity<T>> intersecting,
+        Box2 worldAABB,
+        LookupFlags flags,
+        EntityQuery<T> query) where T : IComponent
     {
         var lookup = _broadQuery.GetComponent(lookupUid);
         var invMatrix = _transform.GetInvWorldMatrix(lookupUid);
@@ -30,48 +41,48 @@ public sealed partial class EntityLookupSystem
 
         if ((flags & LookupFlags.Dynamic) != 0x0)
         {
-            lookup.DynamicTree.QueryAabb(ref state, static (ref (HashSet<T> intersecting, EntityQuery<T> query) tuple, in FixtureProxy value) =>
+            lookup.DynamicTree.QueryAabb(ref state, static (ref (HashSet<Entity<T>> intersecting, EntityQuery<T> query) tuple, in FixtureProxy value) =>
             {
                 if (!tuple.query.TryGetComponent(value.Entity, out var comp))
                     return true;
 
-                tuple.intersecting.Add(comp);
+                tuple.intersecting.Add((value.Entity, comp));
                 return true;
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
 
         if ((flags & (LookupFlags.Static)) != 0x0)
         {
-            lookup.StaticTree.QueryAabb(ref state, static (ref (HashSet<T> intersecting, EntityQuery<T> query) tuple, in FixtureProxy value) =>
+            lookup.StaticTree.QueryAabb(ref state, static (ref (HashSet<Entity<T>> intersecting, EntityQuery<T> query) tuple, in FixtureProxy value) =>
             {
                 if (!tuple.query.TryGetComponent(value.Entity, out var comp))
                     return true;
 
-                tuple.intersecting.Add(comp);
+                tuple.intersecting.Add((value.Entity, comp));
                 return true;
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
 
         if ((flags & LookupFlags.StaticSundries) == LookupFlags.StaticSundries)
         {
-            lookup.StaticSundriesTree.QueryAabb(ref state, static (ref (HashSet<T> intersecting, EntityQuery<T> query) tuple, in EntityUid value) =>
+            lookup.StaticSundriesTree.QueryAabb(ref state, static (ref (HashSet<Entity<T>> intersecting, EntityQuery<T> query) tuple, in EntityUid value) =>
             {
                 if (!tuple.query.TryGetComponent(value, out var comp))
                     return true;
 
-                tuple.intersecting.Add(comp);
+                tuple.intersecting.Add((value, comp));
                 return true;
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
 
         if ((flags & LookupFlags.Sundries) != 0x0)
         {
-            lookup.SundriesTree.QueryAabb(ref state, static (ref (HashSet<T> intersecting, EntityQuery<T> query) tuple, in EntityUid value) =>
+            lookup.SundriesTree.QueryAabb(ref state, static (ref (HashSet<Entity<T>> intersecting, EntityQuery<T> query) tuple, in EntityUid value) =>
             {
                 if (!tuple.query.TryGetComponent(value, out var comp))
                     return true;
 
-                tuple.intersecting.Add(comp);
+                tuple.intersecting.Add((value, comp));
                 return true;
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
@@ -82,7 +93,7 @@ public sealed partial class EntityLookupSystem
         Box2 worldAABB,
         LookupFlags flags,
         EntityQuery<T> query,
-        EntityUid? ignored = null) where T : Component
+        EntityUid? ignored = null) where T : IComponent
     {
         var lookup = _broadQuery.GetComponent(lookupUid);
         var invMatrix = _transform.GetInvWorldMatrix(lookupUid);
@@ -153,7 +164,7 @@ public sealed partial class EntityLookupSystem
         return state.found;
     }
 
-    private void RecursiveAdd<T>(EntityUid uid, ref ValueList<T> toAdd, EntityQuery<T> query) where T : Component
+    private void RecursiveAdd<T>(EntityUid uid, ref ValueList<T> toAdd, EntityQuery<T> query) where T : IComponent
     {
         var childEnumerator = _xformQuery.GetComponent(uid).ChildEnumerator;
 
@@ -168,15 +179,38 @@ public sealed partial class EntityLookupSystem
         }
     }
 
-    private void AddContained<T>(HashSet<T> intersecting, LookupFlags flags, EntityQuery<T> query) where T : Component
+    private void RecursiveAdd<T>(EntityUid uid, ref ValueList<Entity<T>> toAdd, EntityQuery<T> query) where T : IComponent
+    {
+        var childEnumerator = _xformQuery.GetComponent(uid).ChildEnumerator;
+
+        while (childEnumerator.MoveNext(out var child))
+        {
+            if (query.TryGetComponent(child.Value, out var compies))
+            {
+                toAdd.Add((child.Value, compies));
+            }
+
+            RecursiveAdd(child.Value, ref toAdd, query);
+        }
+    }
+
+    [Obsolete]
+    private void AddContained<T>(HashSet<T> intersecting, LookupFlags flags, EntityQuery<T> query) where T : IComponent
+    {
+        var intersectingEntities = new HashSet<Entity<T>>();
+        AddContained(intersectingEntities, flags, query);
+        intersecting.UnionWith(intersectingEntities.Select(e => e.Comp));
+    }
+
+    private void AddContained<T>(HashSet<Entity<T>> intersecting, LookupFlags flags, EntityQuery<T> query) where T : IComponent
     {
         if ((flags & LookupFlags.Contained) == 0x0) return;
 
-        var toAdd = new ValueList<T>();
+        var toAdd = new ValueList<Entity<T>>();
 
         foreach (var comp in intersecting)
         {
-            if (!_containerQuery.TryGetComponent(comp.Owner, out var conManager)) continue;
+            if (!_containerQuery.TryGetComponent(comp, out var conManager)) continue;
 
             foreach (var con in conManager.GetAllContainers())
             {
@@ -184,7 +218,7 @@ public sealed partial class EntityLookupSystem
                 {
                     if (query.TryGetComponent(contained, out var compies))
                     {
-                        toAdd.Add(compies);
+                        toAdd.Add((contained, compies));
                     }
 
                     RecursiveAdd(contained, ref toAdd, query);
@@ -209,7 +243,7 @@ public sealed partial class EntityLookupSystem
     /// <summary>
     /// Should we just iterate every component and check position or do bounds checks.
     /// </summary>
-    private bool UseBoundsQuery<T>(float area) where T : Component
+    private bool UseBoundsQuery<T>(float area) where T : IComponent
     {
         // If the component has a low count we'll just do an estimate if it's faster to iterate every comp directly
         // Might be useful to have some way to expose this to content?
@@ -224,7 +258,7 @@ public sealed partial class EntityLookupSystem
 
     public bool AnyComponentsIntersecting(Type type, MapId mapId, Box2 worldAABB, EntityUid? ignored = null, LookupFlags flags = DefaultFlags)
     {
-        DebugTools.Assert(typeof(Component).IsAssignableFrom(type));
+        DebugTools.Assert(typeof(IComponent).IsAssignableFrom(type));
         if (mapId == MapId.Nullspace) return false;
 
         if (!UseBoundsQuery(type, worldAABB.Height * worldAABB.Width))
@@ -256,7 +290,7 @@ public sealed partial class EntityLookupSystem
                     (EntityLookupSystem system,
                     Box2 worldAABB,
                     LookupFlags flags,
-                    EntityQuery<Component> query,
+                    EntityQuery<IComponent> query,
                     EntityUid? ignored,
                     bool found) tuple) =>
                 {
@@ -274,13 +308,20 @@ public sealed partial class EntityLookupSystem
         return false;
     }
 
-    public HashSet<Component> GetComponentsIntersecting(Type type, MapId mapId, Box2 worldAABB, LookupFlags flags = DefaultFlags)
+    [Obsolete]
+    public HashSet<IComponent> GetComponentsIntersecting(Type type, MapId mapId, Box2 worldAABB, LookupFlags flags = DefaultFlags)
     {
-        DebugTools.Assert(typeof(Component).IsAssignableFrom(type));
-        if (mapId == MapId.Nullspace)
-            return new HashSet<Component>();
+        var intersectingEntities = new HashSet<Entity<IComponent>>();
+        GetEntitiesIntersecting(type, mapId, worldAABB, intersectingEntities, flags);
+        var intersecting = new HashSet<IComponent>(intersectingEntities.Select(e => e.Comp));
+        return intersecting;
+    }
 
-        var intersecting = new HashSet<Component>();
+    public void GetEntitiesIntersecting(Type type, MapId mapId, Box2 worldAABB, HashSet<Entity<IComponent>> intersecting, LookupFlags flags = DefaultFlags)
+    {
+        DebugTools.Assert(typeof(IComponent).IsAssignableFrom(type));
+        if (mapId == MapId.Nullspace)
+            return;
 
         if (!UseBoundsQuery(type, worldAABB.Height * worldAABB.Width))
         {
@@ -296,7 +337,7 @@ public sealed partial class EntityLookupSystem
                     continue;
                 }
 
-                intersecting.Add(comp);
+                intersecting.Add((uid, comp));
             }
         }
         else
@@ -311,36 +352,40 @@ public sealed partial class EntityLookupSystem
                     ref (EntityLookupSystem system,
                         Box2 worldAABB,
                         LookupFlags flags,
-                        EntityQuery<Component> query,
-                        HashSet<Component> intersecting) tuple) =>
+                        EntityQuery<IComponent> query,
+                        HashSet<Entity<IComponent>> intersecting) tuple) =>
                 {
-                    tuple.system.AddComponentsIntersecting(uid, tuple.intersecting, tuple.worldAABB, tuple.flags, tuple.query);
+                    tuple.system.AddEntitiesIntersecting(uid, tuple.intersecting, tuple.worldAABB, tuple.flags, tuple.query);
                     return true;
                 }, (flags & LookupFlags.Approximate) != 0x0);
 
             // Get map entities
             var mapUid = _mapManager.GetMapEntityId(mapId);
-            AddComponentsIntersecting(mapUid, intersecting, worldAABB, flags, query);
+            AddEntitiesIntersecting(mapUid, intersecting, worldAABB, flags, query);
             AddContained(intersecting, flags, query);
         }
-
-        return intersecting;
     }
 
-    public HashSet<T> GetComponentsIntersecting<T>(MapId mapId, Box2 worldAABB, LookupFlags flags = DefaultFlags) where T : Component
+    [Obsolete]
+    public HashSet<T> GetComponentsIntersecting<T>(MapId mapId, Box2 worldAABB, LookupFlags flags = DefaultFlags) where T : IComponent
     {
-        if (mapId == MapId.Nullspace) return new HashSet<T>();
+        var intersectingEntities = new HashSet<Entity<T>>();
+        GetEntitiesIntersecting(mapId, worldAABB, intersectingEntities, flags);
+        return new HashSet<T>(intersectingEntities.Select(e => e.Comp));
+    }
 
-        var intersecting = new HashSet<T>();
+    public void GetEntitiesIntersecting<T>(MapId mapId, Box2 worldAABB, HashSet<Entity<T>> entities, LookupFlags flags = DefaultFlags) where T : IComponent
+    {
+        if (mapId == MapId.Nullspace) return;
 
         if (!UseBoundsQuery<T>(worldAABB.Height * worldAABB.Width))
         {
             var query = AllEntityQuery<T, TransformComponent>();
 
-            while (query.MoveNext(out var comp, out var xform))
+            while (query.MoveNext(out var uid, out var comp, out var xform))
             {
                 if (xform.MapID != mapId || !worldAABB.Contains(_transform.GetWorldPosition(xform))) continue;
-                intersecting.Add(comp);
+                entities.Add((uid, comp));
             }
         }
         else
@@ -348,60 +393,93 @@ public sealed partial class EntityLookupSystem
             var query = GetEntityQuery<T>();
 
             // Get grid entities
-            var state = (this, worldAABB, flags, query, intersecting);
+            var state = (this, worldAABB, flags, query, entities);
 
             _mapManager.FindGridsIntersecting(mapId, worldAABB, ref state,
                 static (EntityUid uid, MapGridComponent grid,
-                ref (EntityLookupSystem system,
-                    Box2 worldAABB,
-                    LookupFlags flags,
-                    EntityQuery<T> query,
-                    HashSet<T> intersecting) tuple) =>
-            {
-                tuple.system.AddComponentsIntersecting(uid, tuple.intersecting, tuple.worldAABB, tuple.flags, tuple.query);
-                return true;
-            }, (flags & LookupFlags.Approximate) != 0x0);
+                    ref (EntityLookupSystem system,
+                        Box2 worldAABB,
+                        LookupFlags flags,
+                        EntityQuery<T> query,
+                        HashSet<Entity<T>> intersecting) tuple) =>
+                {
+                    tuple.system.AddEntitiesIntersecting(uid, tuple.intersecting, tuple.worldAABB, tuple.flags, tuple.query);
+                    return true;
+                }, (flags & LookupFlags.Approximate) != 0x0);
 
             // Get map entities
             var mapUid = _mapManager.GetMapEntityId(mapId);
-            AddComponentsIntersecting(mapUid, intersecting, worldAABB, flags, query);
-            AddContained(intersecting, flags, query);
+            AddEntitiesIntersecting(mapUid, entities, worldAABB, flags, query);
+            AddContained(entities, flags, query);
         }
-
-        return intersecting;
     }
 
     #endregion
 
     #region EntityCoordinates
 
-    public HashSet<T> GetComponentsInRange<T>(EntityCoordinates coordinates, float range) where T : Component
+    public HashSet<T> GetComponentsInRange<T>(EntityCoordinates coordinates, float range) where T : IComponent
     {
         var mapPos = coordinates.ToMap(EntityManager, _transform);
         return GetComponentsInRange<T>(mapPos, range);
     }
+
+    public void GetEntitiesInRange<T>(EntityCoordinates coordinates, float range, HashSet<Entity<T>> entities) where T : IComponent
+    {
+        var mapPos = coordinates.ToMap(EntityManager, _transform);
+        GetEntitiesInRange(mapPos, range, entities);
+    }
+
+    public HashSet<Entity<T>> GetEntitiesInRange<T>(EntityCoordinates coordinates, float range) where T : IComponent
+    {
+        var entities = new HashSet<Entity<T>>();
+        GetEntitiesInRange(coordinates, range, entities);
+        return entities;
+    }
+
     #endregion
 
     #region MapCoordinates
 
-    public HashSet<Component> GetComponentsInRange(Type type, MapCoordinates coordinates, float range)
+    [Obsolete]
+    public HashSet<IComponent> GetComponentsInRange(Type type, MapCoordinates coordinates, float range)
     {
-        DebugTools.Assert(typeof(Component).IsAssignableFrom(type));
+        DebugTools.Assert(typeof(IComponent).IsAssignableFrom(type));
         return GetComponentsInRange(type, coordinates.MapId, coordinates.Position, range);
     }
 
-    public HashSet<T> GetComponentsInRange<T>(MapCoordinates coordinates, float range) where T : Component
+    public HashSet<Entity<IComponent>> GetEntitiesInRange(Type type, MapCoordinates coordinates, float range)
+    {
+        DebugTools.Assert(typeof(IComponent).IsAssignableFrom(type));
+        var entities = new HashSet<Entity<IComponent>>();
+        GetEntitiesInRange(type, coordinates.MapId, coordinates.Position, range, entities);
+        return entities;
+    }
+
+    public HashSet<T> GetComponentsInRange<T>(MapCoordinates coordinates, float range) where T : IComponent
     {
         return GetComponentsInRange<T>(coordinates.MapId, coordinates.Position, range);
     }
 
+    public void GetEntitiesInRange<T>(MapCoordinates coordinates, float range, HashSet<Entity<T>> entities) where T : IComponent
+    {
+        GetEntitiesInRange(coordinates.MapId, coordinates.Position, range, entities);
+    }
+
+    public HashSet<Entity<T>> GetEntitiesInRange<T>(MapCoordinates coordinates, float range) where T : IComponent
+    {
+        var entities = new HashSet<Entity<T>>();
+        GetEntitiesInRange(coordinates.MapId, coordinates.Position, range, entities);
+        return entities;
+    }
+
     #endregion
 
     #region MapId
 
     public bool AnyComponentsInRange(Type type, MapId mapId, Vector2 worldPos, float range)
     {
-        DebugTools.Assert(typeof(Component).IsAssignableFrom(type));
+        DebugTools.Assert(typeof(IComponent).IsAssignableFrom(type));
         DebugTools.Assert(range > 0, "Range must be a positive float");
 
         if (mapId == MapId.Nullspace) return false;
@@ -413,31 +491,47 @@ public sealed partial class EntityLookupSystem
         return AnyComponentsIntersecting(type, mapId, worldAABB);
     }
 
-    public HashSet<Component> GetComponentsInRange(Type type, MapId mapId, Vector2 worldPos, float range)
+    [Obsolete]
+    public HashSet<IComponent> GetComponentsInRange(Type type, MapId mapId, Vector2 worldPos, float range)
     {
-        DebugTools.Assert(typeof(Component).IsAssignableFrom(type));
-        DebugTools.Assert(range > 0, "Range must be a positive float");
-
-        if (mapId == MapId.Nullspace) return new HashSet<Component>();
-
-        // TODO: Actual circles
-        var rangeVec = new Vector2(range, range);
-
-        var worldAABB = new Box2(worldPos - rangeVec, worldPos + rangeVec);
-        return GetComponentsIntersecting(type, mapId, worldAABB);
+        var entities = new HashSet<Entity<IComponent>>();
+        GetEntitiesInRange(type, mapId, worldPos, range, entities);
+        return new HashSet<IComponent>(entities.Select(e => e.Comp));
     }
 
-    public HashSet<T> GetComponentsInRange<T>(MapId mapId, Vector2 worldPos, float range) where T : Component
+    public void GetEntitiesInRange(Type type, MapId mapId, Vector2 worldPos, float range, HashSet<Entity<IComponent>> entities)
     {
+        DebugTools.Assert(typeof(IComponent).IsAssignableFrom(type));
         DebugTools.Assert(range > 0, "Range must be a positive float");
 
-        if (mapId == MapId.Nullspace) return new HashSet<T>();
+        if (mapId == MapId.Nullspace) return;
 
         // TODO: Actual circles
         var rangeVec = new Vector2(range, range);
 
         var worldAABB = new Box2(worldPos - rangeVec, worldPos + rangeVec);
-        return GetComponentsIntersecting<T>(mapId, worldAABB);
+        GetEntitiesIntersecting(type, mapId, worldAABB, entities);
+    }
+
+    [Obsolete]
+    public HashSet<T> GetComponentsInRange<T>(MapId mapId, Vector2 worldPos, float range) where T : IComponent
+    {
+        var entities = new HashSet<Entity<T>>();
+        GetEntitiesInRange(mapId, worldPos, range, entities);
+        return new HashSet<T>(entities.Select(e => e.Comp));
+    }
+
+    public void GetEntitiesInRange<T>(MapId mapId, Vector2 worldPos, float range, HashSet<Entity<T>> entities) where T : IComponent
+    {
+        DebugTools.Assert(range > 0, "Range must be a positive float");
+
+        if (mapId == MapId.Nullspace) return;
+
+        // TODO: Actual circles
+        var rangeVec = new Vector2(range, range);
+
+        var worldAABB = new Box2(worldPos - rangeVec, worldPos + rangeVec);
+        GetEntitiesIntersecting(mapId, worldAABB, entities);
     }
 
     #endregion

Robust.Shared/GameObjects/Systems/PrototypeReloadSystem.cs

@@ -31,14 +31,15 @@ internal sealed class PrototypeReloadSystem : EntitySystem
         if (!eventArgs.ByType.TryGetValue(typeof(EntityPrototype), out var set))
             return;
 
-        foreach (var metadata in EntityQuery<MetaDataComponent>())
+        var query = EntityQueryEnumerator<MetaDataComponent>();
+        while (query.MoveNext(out var uid, out var metadata))
         {
             var id = metadata.EntityPrototype?.ID;
             if (id == null || !set.Modified.ContainsKey(id))
                 continue;
 
             var proto = _prototypes.Index<EntityPrototype>(id);
-            UpdateEntity(metadata.Owner, metadata, proto);
+            UpdateEntity(uid, metadata, proto);
         }
     }
 
@@ -77,8 +78,7 @@ internal sealed class PrototypeReloadSystem : EntitySystem
                      .Except(oldPrototypeComponents))
         {
             var data = newPrototype.Components[name];
-            var component = (Component)_componentFactory.GetComponent(name);
-            component.Owner = entity;
+            var component = _componentFactory.GetComponent(name);
             EntityManager.AddComponent(entity, component);
         }
 

Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs

@@ -6,12 +6,12 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Map.Enumerators;
 using Robust.Shared.Map.Events;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -296,7 +296,7 @@ public abstract partial class SharedMapSystem
 
         MapManager.SuppressOnTileChanged = false;
         if (modified.Count != 0)
-            RaiseLocalEvent(uid, new GridModifiedEvent(component, modified), true);
+            RaiseLocalEvent(uid, new GridModifiedEvent(uid, component, modified), true);
     }
 
     private void OnGridGetState(EntityUid uid, MapGridComponent component, ref ComponentGetState args)

Robust.Shared/GameObjects/Systems/SharedMapSystem.cs

@@ -1,11 +1,9 @@
-using JetBrains.Annotations;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using System.Collections.Generic;
 using Robust.Shared.GameStates;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using System.Linq;
+using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
@@ -156,6 +154,11 @@ namespace Robust.Shared.GameObjects
     /// </summary>
     public sealed class GridModifiedEvent : EntityEventArgs
     {
+        /// <summary>
+        ///     The id of the grid being changed.
+        /// </summary>
+        public EntityUid GridEnt { get; }
+
         /// <summary>
         ///     Grid being changed.
         /// </summary>
@@ -169,8 +172,9 @@ namespace Robust.Shared.GameObjects
         /// <summary>
         ///     Creates a new instance of this class.
         /// </summary>
-        public GridModifiedEvent(MapGridComponent grid, IReadOnlyCollection<(Vector2i position, Tile tile)> modified)
+        public GridModifiedEvent(EntityUid gridEnt, MapGridComponent grid, IReadOnlyCollection<(Vector2i position, Tile tile)> modified)
         {
+            GridEnt = gridEnt;
             Grid = grid;
             Modified = modified;
         }

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

@@ -149,7 +149,7 @@ public abstract partial class SharedTransformSystem
     /// </summary>
     public bool ContainsEntity(TransformComponent xform, EntityUid entity)
     {
-        return ContainsEntity(xform, entity, _xformQuery);
+        return ContainsEntity(xform, entity, XformQuery);
     }
 
     /// <inheritdoc cref="ContainsEntity(Robust.Shared.GameObjects.TransformComponent,Robust.Shared.GameObjects.EntityUid)"/>
@@ -161,7 +161,7 @@ public abstract partial class SharedTransformSystem
     /// <inheritdoc cref="ContainsEntity(Robust.Shared.GameObjects.TransformComponent,Robust.Shared.GameObjects.EntityUid)"/>
     public bool ContainsEntity(TransformComponent xform, TransformComponent entityTransform)
     {
-        return ContainsEntity(xform, entityTransform, _xformQuery);
+        return ContainsEntity(xform, entityTransform, XformQuery);
     }
 
     /// <inheritdoc cref="ContainsEntity(Robust.Shared.GameObjects.TransformComponent,Robust.Shared.GameObjects.EntityUid)"/>
@@ -222,7 +222,7 @@ public abstract partial class SharedTransformSystem
 
         if (!component._mapIdInitialized)
         {
-            FindMapIdAndSet(uid, component, EntityManager, _xformQuery, _mapManager);
+            FindMapIdAndSet(uid, component, EntityManager, XformQuery, _mapManager);
             component._mapIdInitialized = true;
         }
 
@@ -232,7 +232,7 @@ public abstract partial class SharedTransformSystem
             // Note that _children is a HashSet<EntityUid>,
             // so duplicate additions (which will happen) don't matter.
 
-            var parentXform = _xformQuery.GetComponent(component.ParentUid);
+            var parentXform = XformQuery.GetComponent(component.ParentUid);
             if (parentXform.LifeStage > ComponentLifeStage.Running || LifeStage(component.ParentUid) > EntityLifeStage.MapInitialized)
             {
                 var msg = $"Attempted to re-parent to a terminating object. Entity: {ToPrettyString(component.ParentUid)}, new parent: {ToPrettyString(uid)}";
@@ -298,7 +298,7 @@ public abstract partial class SharedTransformSystem
         if (!xform._parent.IsValid())
             return;
 
-        var parentXform = _xformQuery.GetComponent(xform._parent);
+        var parentXform = XformQuery.GetComponent(xform._parent);
         InitializeGridUid(xform._parent, parentXform);
         xform._gridUid = parentXform._gridUid;
     }
@@ -356,7 +356,7 @@ public abstract partial class SharedTransformSystem
         DebugTools.Assert(!HasComp<MapGridComponent>(uid));
         DebugTools.Assert(gridId == null || HasComp<MapGridComponent>(gridId));
 
-        xformQuery ??= _xformQuery;
+        xformQuery ??= XformQuery;
         SetGridIdRecursive(uid, xform, gridId, xformQuery.Value);
     }
 
@@ -379,27 +379,26 @@ public abstract partial class SharedTransformSystem
 
     #region Local Position
 
-    public void SetLocalPosition(EntityUid uid, Vector2 value, TransformComponent? xform = null)
+    [Obsolete("use override with EntityUid")]
+    public void SetLocalPosition(TransformComponent xform, Vector2 value)
     {
-        if (!Resolve(uid, ref xform)) return;
-        SetLocalPosition(xform, value);
+        SetLocalPosition(xform.Owner, value, xform);
     }
 
-    public virtual void SetLocalPosition(TransformComponent xform, Vector2 value)
-    {
-#pragma warning disable CS0618
-        xform.LocalPosition = value;
-#pragma warning restore CS0618
-    }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public virtual void SetLocalPosition(EntityUid uid, Vector2 value, TransformComponent? xform = null)
+        => SetLocalPositionNoLerp(uid, value, xform);
+
+
+    [Obsolete("use override with EntityUid")]
+    public void SetLocalPositionNoLerp(TransformComponent xform, Vector2 value)
+        => SetLocalPositionNoLerp(xform.Owner, value, xform);
 
     public void SetLocalPositionNoLerp(EntityUid uid, Vector2 value, TransformComponent? xform = null)
     {
-        if (!Resolve(uid, ref xform)) return;
-        SetLocalPositionNoLerp(xform, value);
-    }
+        if (!XformQuery.Resolve(uid, ref xform))
+            return;
 
-    public virtual void SetLocalPositionNoLerp(TransformComponent xform, Vector2 value)
-    {
 #pragma warning disable CS0618
         xform.LocalPosition = value;
 #pragma warning restore CS0618
@@ -409,27 +408,24 @@ public abstract partial class SharedTransformSystem
 
     #region Local Rotation
 
-    public void SetLocalRotationNoLerp(EntityUid uid, Angle angle)
+    public void SetLocalRotationNoLerp(EntityUid uid, Angle value, TransformComponent? xform = null)
     {
-        SetLocalRotationNoLerp(_xformQuery.GetComponent(uid), angle);
-    }
+        if (!XformQuery.Resolve(uid, ref xform))
+            return;
 
-    public virtual void SetLocalRotationNoLerp(TransformComponent xform, Angle angle)
-    {
-        xform.LocalRotation = angle;
-    }
-
-    public void SetLocalRotation(EntityUid uid, Angle value, TransformComponent? xform = null)
-    {
-        if (!Resolve(uid, ref xform)) return;
-        SetLocalRotation(xform, value);
-    }
-
-    public virtual void SetLocalRotation(TransformComponent xform, Angle value)
-    {
         xform.LocalRotation = value;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public virtual void SetLocalRotation(EntityUid uid, Angle value, TransformComponent? xform = null)
+        => SetLocalRotationNoLerp(uid, value, xform);
+
+    [Obsolete("use override with EntityUid")]
+    public void SetLocalRotation(TransformComponent xform, Angle value)
+    {
+        SetLocalRotation(xform.Owner, value, xform);
+    }
+
     #endregion
 
     #region Coordinates
@@ -487,7 +483,7 @@ public abstract partial class SharedTransformSystem
 
             if (value.EntityId.IsValid())
             {
-                if (!_xformQuery.Resolve(value.EntityId, ref newParent, false))
+                if (!XformQuery.Resolve(value.EntityId, ref newParent, false))
                 {
                     DetachParentToNull(uid, xform);
                     if (_netMan.IsServer || IsClientSide(uid))
@@ -525,13 +521,13 @@ public abstract partial class SharedTransformSystem
                         }
 
                         recursiveUid = recursiveXform.ParentUid;
-                        recursiveXform = _xformQuery.GetComponent(recursiveUid);
+                        recursiveXform = XformQuery.GetComponent(recursiveUid);
                     }
                 }
             }
 
             if (xform._parent.IsValid())
-                _xformQuery.Resolve(xform._parent, ref oldParent);
+                XformQuery.Resolve(xform._parent, ref oldParent);
 
             oldParent?._children.Remove(uid);
             newParent?._children.Add(uid);
@@ -541,7 +537,7 @@ public abstract partial class SharedTransformSystem
 
             if (newParent != null)
             {
-                xform.ChangeMapId(newParent.MapID, _xformQuery);
+                xform.ChangeMapId(newParent.MapID, XformQuery);
 
                 if (!xform._gridInitialized)
                     InitializeGridUid(uid, xform);
@@ -554,11 +550,11 @@ public abstract partial class SharedTransformSystem
             }
             else
             {
-                xform.ChangeMapId(MapId.Nullspace, _xformQuery);
+                xform.ChangeMapId(MapId.Nullspace, XformQuery);
                 if (!xform._gridInitialized)
                     InitializeGridUid(uid, xform);
                 else
-                    SetGridId(uid, xform, null, _xformQuery);
+                    SetGridId(uid, xform, null, XformQuery);
             }
 
             if (xform.Initialized)
@@ -593,7 +589,7 @@ public abstract partial class SharedTransformSystem
 
     public void ReparentChildren(EntityUid oldUid, EntityUid uid)
     {
-        ReparentChildren(oldUid, uid, _xformQuery);
+        ReparentChildren(oldUid, uid, XformQuery);
     }
 
     /// <summary>
@@ -620,29 +616,29 @@ public abstract partial class SharedTransformSystem
 
     public TransformComponent? GetParent(EntityUid uid)
     {
-        return GetParent(_xformQuery.GetComponent(uid));
+        return GetParent(XformQuery.GetComponent(uid));
     }
 
     public TransformComponent? GetParent(TransformComponent xform)
     {
         if (!xform.ParentUid.IsValid())
             return null;
-        return _xformQuery.GetComponent(xform.ParentUid);
+        return XformQuery.GetComponent(xform.ParentUid);
     }
 
     public EntityUid GetParentUid(EntityUid uid)
     {
-        return _xformQuery.GetComponent(uid).ParentUid;
+        return XformQuery.GetComponent(uid).ParentUid;
     }
 
     public void SetParent(EntityUid uid, EntityUid parent)
     {
-        SetParent(uid, _xformQuery.GetComponent(uid), parent, _xformQuery);
+        SetParent(uid, XformQuery.GetComponent(uid), parent, XformQuery);
     }
 
     public void SetParent(EntityUid uid, TransformComponent xform, EntityUid parent, TransformComponent? parentXform = null)
     {
-        SetParent(uid, xform, parent, _xformQuery, parentXform);
+        SetParent(uid, xform, parent, XformQuery, parentXform);
     }
 
     public void SetParent(EntityUid uid, TransformComponent xform, EntityUid parent, EntityQuery<TransformComponent> xformQuery, TransformComponent? parentXform = null)
@@ -671,9 +667,7 @@ public abstract partial class SharedTransformSystem
     #endregion
 
     #region States
-    public virtual void ActivateLerp(TransformComponent xform) { }
-
-    public virtual void DeactivateLerp(TransformComponent xform) { }
+    public virtual void ActivateLerp(EntityUid uid, TransformComponent xform) { }
 
     internal void OnGetState(EntityUid uid, TransformComponent component, ref ComponentGetState args)
     {
@@ -745,24 +739,18 @@ public abstract partial class SharedTransformSystem
                 RaiseLocalEvent(uid, ref ev, true);
             }
 
-            xform.PrevPosition = newState.LocalPosition;
-            xform.PrevRotation = newState.Rotation;
             xform._noLocalRotation = newState.NoLocalRotation;
 
             DebugTools.Assert(xform.ParentUid == parent, "Transform state failed to set parent");
             DebugTools.Assert(xform.Anchored == newState.Anchored, "Transform state failed to set anchored");
         }
 
-        if (args.Next is TransformComponentState nextTransform)
+        if (args.Next is TransformComponentState nextTransform
+            && nextTransform.ParentID == GetNetEntity(xform.ParentUid))
         {
             xform.NextPosition = nextTransform.LocalPosition;
             xform.NextRotation = nextTransform.Rotation;
-            xform.LerpParent = GetEntity(nextTransform.ParentID);
-            ActivateLerp(xform);
-        }
-        else
-        {
-            DeactivateLerp(xform);
+            ActivateLerp(uid, xform);
         }
     }
 
@@ -773,7 +761,7 @@ public abstract partial class SharedTransformSystem
     [Pure]
     public Matrix3 GetWorldMatrix(EntityUid uid)
     {
-        return GetWorldMatrix(_xformQuery.GetComponent(uid), _xformQuery);
+        return GetWorldMatrix(XformQuery.GetComponent(uid), XformQuery);
     }
 
     // Temporary until it's moved here
@@ -781,7 +769,7 @@ public abstract partial class SharedTransformSystem
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public Matrix3 GetWorldMatrix(TransformComponent component)
     {
-        return GetWorldMatrix(component, _xformQuery);
+        return GetWorldMatrix(component, XformQuery);
     }
 
     [Pure]
@@ -807,7 +795,7 @@ public abstract partial class SharedTransformSystem
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public Vector2 GetWorldPosition(EntityUid uid)
     {
-        return GetWorldPosition(_xformQuery.GetComponent(uid));
+        return GetWorldPosition(XformQuery.GetComponent(uid));
     }
 
     // Temporary until it's moved here
@@ -819,7 +807,7 @@ public abstract partial class SharedTransformSystem
 
         while (component.ParentUid != component.MapUid && component.ParentUid.IsValid())
         {
-            component = _xformQuery.GetComponent(component.ParentUid);
+            component = XformQuery.GetComponent(component.ParentUid);
             pos = component._localRotation.RotateVec(pos) + component._localPosition;
         }
 
@@ -842,7 +830,7 @@ public abstract partial class SharedTransformSystem
     [Pure]
     public (Vector2 WorldPosition, Angle WorldRotation) GetWorldPositionRotation(EntityUid uid)
     {
-        return GetWorldPositionRotation(_xformQuery.GetComponent(uid));
+        return GetWorldPositionRotation(XformQuery.GetComponent(uid));
     }
 
     [Pure]
@@ -853,7 +841,7 @@ public abstract partial class SharedTransformSystem
 
         while (component.ParentUid != component.MapUid && component.ParentUid.IsValid())
         {
-            component = _xformQuery.GetComponent(component.ParentUid);
+            component = XformQuery.GetComponent(component.ParentUid);
             pos = component._localRotation.RotateVec(pos) + component._localPosition;
             angle += component._localRotation;
         }
@@ -947,7 +935,7 @@ public abstract partial class SharedTransformSystem
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void SetWorldPosition(TransformComponent component, Vector2 worldPos)
     {
-        SetWorldPosition(component, worldPos, _xformQuery);
+        SetWorldPosition(component, worldPos, XformQuery);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -973,7 +961,7 @@ public abstract partial class SharedTransformSystem
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public Angle GetWorldRotation(EntityUid uid)
     {
-        return GetWorldRotation(_xformQuery.GetComponent(uid), _xformQuery);
+        return GetWorldRotation(XformQuery.GetComponent(uid), XformQuery);
     }
 
     // Temporary until it's moved here
@@ -981,7 +969,7 @@ public abstract partial class SharedTransformSystem
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public Angle GetWorldRotation(TransformComponent component)
     {
-        return GetWorldRotation(component, _xformQuery);
+        return GetWorldRotation(component, XformQuery);
     }
 
     [Pure]
@@ -1040,43 +1028,47 @@ public abstract partial class SharedTransformSystem
     #region Set Position+Rotation
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void SetWorldPositionRotation(EntityUid uid, Vector2 worldPos, Angle worldRot, EntityQuery<TransformComponent> xformQuery)
-    {
-        var component = xformQuery.GetComponent(uid);
-        SetWorldPositionRotation(component, worldPos, worldRot, xformQuery);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [Obsolete("Use override with EntityUid")]
     public void SetWorldPositionRotation(TransformComponent component, Vector2 worldPos, Angle worldRot)
     {
-        SetWorldPositionRotation(component, worldPos, worldRot, _xformQuery);
+        SetWorldPositionRotation(component.Owner, worldPos, worldRot, component);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public void SetWorldPositionRotation(TransformComponent component, Vector2 worldPos, Angle worldRot, EntityQuery<TransformComponent> xformQuery)
+    public void SetWorldPositionRotation(EntityUid uid, Vector2 worldPos, Angle worldRot, TransformComponent? component = null)
     {
+        if (!XformQuery.Resolve(uid, ref component))
+            return;
+
         if (!component._parent.IsValid())
         {
             DebugTools.Assert("Parent is invalid while attempting to set WorldPosition - did you try to move root node?");
             return;
         }
 
-        var (curWorldPos, curWorldRot) = GetWorldPositionRotation(component, xformQuery);
+        var (curWorldPos, curWorldRot) = GetWorldPositionRotation(component);
 
         var negativeParentWorldRot = component.LocalRotation - curWorldRot;
 
         var newLocalPos = component.LocalPosition + negativeParentWorldRot.RotateVec(worldPos - curWorldPos);
         var newLocalRot = component.LocalRotation + worldRot - curWorldRot;
 
-        SetLocalPositionRotation(component, newLocalPos, newLocalRot);
+        SetLocalPositionRotation(uid, newLocalPos, newLocalRot, component);
     }
 
+    [Obsolete("Use override with EntityUid")]
+    public void SetLocalPositionRotation(TransformComponent xform, Vector2 pos, Angle rot)
+        => SetLocalPositionRotation(xform.Owner, pos, rot, xform);
+
     /// <summary>
     ///     Simultaneously set the position and rotation. This is better than setting individually, as it reduces the number of move events and matrix rebuilding operations.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public virtual void SetLocalPositionRotation(TransformComponent xform, Vector2 pos, Angle rot)
+    public virtual void SetLocalPositionRotation(EntityUid uid, Vector2 pos, Angle rot, TransformComponent? xform = null)
     {
+        if (!XformQuery.Resolve(uid, ref xform))
+            return;
+
         if (!xform._parent.IsValid())
         {
             DebugTools.Assert("Parent is invalid while attempting to set WorldPosition - did you try to move root node?");
@@ -1097,14 +1089,14 @@ public abstract partial class SharedTransformSystem
 
         DebugTools.Assert(!xform.NoLocalRotation || xform.LocalRotation == 0);
 
-        Dirty(xform.Owner, xform);
+        Dirty(uid, xform);
         xform.MatricesDirty = true;
 
         if (!xform.Initialized)
             return;
 
-        var moveEvent = new MoveEvent(xform.Owner, oldPosition, xform.Coordinates, oldRotation, rot, xform, _gameTiming.ApplyingState);
-        RaiseLocalEvent(xform.Owner, ref moveEvent, true);
+        var moveEvent = new MoveEvent(uid, oldPosition, xform.Coordinates, oldRotation, rot, xform, _gameTiming.ApplyingState);
+        RaiseLocalEvent(uid, ref moveEvent, true);
     }
 
     #endregion
@@ -1114,14 +1106,14 @@ public abstract partial class SharedTransformSystem
     [Pure]
     public Matrix3 GetInvWorldMatrix(EntityUid uid)
     {
-        return GetInvWorldMatrix(_xformQuery.GetComponent(uid), _xformQuery);
+        return GetInvWorldMatrix(XformQuery.GetComponent(uid), XformQuery);
     }
 
     [Pure]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public Matrix3 GetInvWorldMatrix(TransformComponent component)
     {
-        return GetInvWorldMatrix(component, _xformQuery);
+        return GetInvWorldMatrix(component, XformQuery);
     }
 
     [Pure]
@@ -1146,14 +1138,14 @@ public abstract partial class SharedTransformSystem
     public (Vector2 WorldPosition, Angle WorldRotation, Matrix3 WorldMatrix)
         GetWorldPositionRotationMatrix(EntityUid uid)
     {
-        return GetWorldPositionRotationMatrix(_xformQuery.GetComponent(uid), _xformQuery);
+        return GetWorldPositionRotationMatrix(XformQuery.GetComponent(uid), XformQuery);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public (Vector2 WorldPosition, Angle WorldRotation, Matrix3 WorldMatrix)
         GetWorldPositionRotationMatrix(TransformComponent xform)
     {
-        return GetWorldPositionRotationMatrix(xform, _xformQuery);
+        return GetWorldPositionRotationMatrix(xform, XformQuery);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -1177,13 +1169,13 @@ public abstract partial class SharedTransformSystem
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public (Vector2 WorldPosition, Angle WorldRotation, Matrix3 InvWorldMatrix) GetWorldPositionRotationInvMatrix(EntityUid uid)
     {
-        return GetWorldPositionRotationInvMatrix(_xformQuery.GetComponent(uid));
+        return GetWorldPositionRotationInvMatrix(XformQuery.GetComponent(uid));
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public (Vector2 WorldPosition, Angle WorldRotation, Matrix3 InvWorldMatrix) GetWorldPositionRotationInvMatrix(TransformComponent xform)
     {
-        return GetWorldPositionRotationInvMatrix(xform, _xformQuery);
+        return GetWorldPositionRotationInvMatrix(xform, XformQuery);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -1207,14 +1199,14 @@ public abstract partial class SharedTransformSystem
     public (Vector2 WorldPosition, Angle WorldRotation, Matrix3 WorldMatrix, Matrix3 InvWorldMatrix)
         GetWorldPositionRotationMatrixWithInv(EntityUid uid)
     {
-        return GetWorldPositionRotationMatrixWithInv(_xformQuery.GetComponent(uid), _xformQuery);
+        return GetWorldPositionRotationMatrixWithInv(XformQuery.GetComponent(uid), XformQuery);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public (Vector2 WorldPosition, Angle WorldRotation, Matrix3 WorldMatrix, Matrix3 InvWorldMatrix)
         GetWorldPositionRotationMatrixWithInv(TransformComponent xform)
     {
-        return GetWorldPositionRotationMatrixWithInv(xform, _xformQuery);
+        return GetWorldPositionRotationMatrixWithInv(xform, XformQuery);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -1237,8 +1229,8 @@ public abstract partial class SharedTransformSystem
     #region AttachToGridOrMap
     public void AttachToGridOrMap(EntityUid uid, TransformComponent? xform = null)
     {
-        if (_xformQuery.Resolve(uid, ref xform))
-            AttachToGridOrMap(uid, xform, _xformQuery);
+        if (XformQuery.Resolve(uid, ref xform))
+            AttachToGridOrMap(uid, xform, XformQuery);
     }
 
     public void AttachToGridOrMap(EntityUid uid, TransformComponent xform, EntityQuery<TransformComponent> query)
@@ -1278,15 +1270,15 @@ public abstract partial class SharedTransformSystem
     {
         coordinates = null;
 
-        if (!_xformQuery.Resolve(uid, ref xform))
+        if (!XformQuery.Resolve(uid, ref xform))
             return false;
 
         if (!xform.ParentUid.IsValid())
             return false;
 
         EntityUid newParent;
-        var oldPos = GetWorldPosition(xform, _xformQuery);
-        if (_mapManager.TryFindGridAt(xform.MapID, oldPos, _xformQuery, out var gridUid, out _))
+        var oldPos = GetWorldPosition(xform, XformQuery);
+        if (_mapManager.TryFindGridAt(xform.MapID, oldPos, XformQuery, out var gridUid, out _))
         {
             newParent = gridUid;
         }
@@ -1299,7 +1291,7 @@ public abstract partial class SharedTransformSystem
             return false;
         }
 
-        coordinates = new(newParent, GetInvWorldMatrix(newParent, _xformQuery).Transform(oldPos));
+        coordinates = new(newParent, GetInvWorldMatrix(newParent, XformQuery).Transform(oldPos));
         return true;
     }
     #endregion
@@ -1308,7 +1300,7 @@ public abstract partial class SharedTransformSystem
 
     public void DetachParentToNull(EntityUid uid, TransformComponent xform)
     {
-        _xformQuery.TryGetComponent(xform.ParentUid, out var oldXform);
+        XformQuery.TryGetComponent(xform.ParentUid, out var oldXform);
         DetachParentToNull(uid, xform, oldXform);
     }
 
@@ -1369,7 +1361,7 @@ public abstract partial class SharedTransformSystem
     {
         if (LifeStage(uid) > EntityLifeStage.Initialized)
         {
-            SetGridId(uid, component, uid, _xformQuery);
+            SetGridId(uid, component, uid, XformQuery);
             return;
         }
         component._gridInitialized = true;
@@ -1383,10 +1375,10 @@ public abstract partial class SharedTransformSystem
     public void PlaceNextToOrDrop(EntityUid uid, EntityUid target,
         TransformComponent? xform = null, TransformComponent? targetXform = null)
     {
-        if (!_xformQuery.Resolve(target, ref targetXform))
+        if (!XformQuery.Resolve(target, ref targetXform))
             return;
 
-        if (!_xformQuery.Resolve(uid, ref xform))
+        if (!XformQuery.Resolve(uid, ref xform))
             return;
 
         var meta = _metaQuery.GetComponent(target);

Robust.Shared/GameObjects/Systems/SharedTransformSystem.cs

@@ -26,7 +26,7 @@ namespace Robust.Shared.GameObjects
 
         private EntityQuery<MapGridComponent> _gridQuery;
         private EntityQuery<MetaDataComponent> _metaQuery;
-        private EntityQuery<TransformComponent> _xformQuery;
+        protected EntityQuery<TransformComponent> XformQuery;
 
         private readonly Queue<MoveEvent> _gridMoves = new();
         private readonly Queue<MoveEvent> _otherMoves = new();
@@ -39,7 +39,7 @@ namespace Robust.Shared.GameObjects
 
             _gridQuery = GetEntityQuery<MapGridComponent>();
             _metaQuery = GetEntityQuery<MetaDataComponent>();
-            _xformQuery = GetEntityQuery<TransformComponent>();
+            XformQuery = GetEntityQuery<TransformComponent>();
 
             SubscribeLocalEvent<TileChangedEvent>(MapManagerOnTileChanged);
             SubscribeLocalEvent<TransformComponent, ComponentInit>(OnCompInit);
@@ -85,17 +85,17 @@ namespace Robust.Shared.GameObjects
             if (!TryComp(gridId, out BroadphaseComponent? lookup) || !_mapManager.TryGetGrid(gridId, out var grid))
                 return;
 
-            if (!_xformQuery.TryGetComponent(gridId, out var gridXform))
+            if (!XformQuery.TryGetComponent(gridId, out var gridXform))
                 return;
 
-            if (!_xformQuery.TryGetComponent(gridXform.MapUid, out var mapTransform))
+            if (!XformQuery.TryGetComponent(gridXform.MapUid, out var mapTransform))
                 return;
 
             var aabb = _lookup.GetLocalBounds(tileIndices, grid.TileSize);
 
             foreach (var entity in _lookup.GetEntitiesIntersecting(lookup, aabb, LookupFlags.Uncontained | LookupFlags.Approximate))
             {
-                if (!_xformQuery.TryGetComponent(entity, out var xform) || xform.ParentUid != gridId)
+                if (!XformQuery.TryGetComponent(entity, out var xform) || xform.ParentUid != gridId)
                     continue;
 
                 if (!aabb.Contains(xform.LocalPosition))
@@ -148,7 +148,7 @@ namespace Robust.Shared.GameObjects
 
         public EntityCoordinates GetMoverCoordinates(EntityUid uid)
         {
-            return GetMoverCoordinates(uid, _xformQuery.GetComponent(uid));
+            return GetMoverCoordinates(uid, XformQuery.GetComponent(uid));
         }
 
         public EntityCoordinates GetMoverCoordinates(EntityUid uid, TransformComponent xform)
@@ -168,11 +168,11 @@ namespace Robust.Shared.GameObjects
             DebugTools.Assert(!_mapManager.IsGrid(uid) && !_mapManager.IsMap(uid));
 
             // Not parented to grid so convert their pos back to the grid.
-            var worldPos = GetWorldPosition(xform, _xformQuery);
+            var worldPos = GetWorldPosition(xform, XformQuery);
 
             return xform.GridUid == null
                 ? new EntityCoordinates(xform.MapUid ?? xform.ParentUid, worldPos)
-                : new EntityCoordinates(xform.GridUid.Value, _xformQuery.GetComponent(xform.GridUid.Value).InvLocalMatrix.Transform(worldPos));
+                : new EntityCoordinates(xform.GridUid.Value, XformQuery.GetComponent(xform.GridUid.Value).InvLocalMatrix.Transform(worldPos));
         }
 
         public EntityCoordinates GetMoverCoordinates(EntityCoordinates coordinates, EntityQuery<TransformComponent> xformQuery)
@@ -191,7 +191,7 @@ namespace Robust.Shared.GameObjects
             if (!parentUid.IsValid())
                 return coordinates;
 
-            var parentXform = _xformQuery.GetComponent(parentUid);
+            var parentXform = XformQuery.GetComponent(parentUid);
 
             // GriddUid is only set after init.
             if (!parentXform._gridInitialized)
@@ -209,11 +209,11 @@ namespace Robust.Shared.GameObjects
             DebugTools.Assert(!_mapManager.IsGrid(parentUid) && !_mapManager.IsMap(parentUid));
 
             // Not parented to grid so convert their pos back to the grid.
-            var worldPos = GetWorldMatrix(parentXform, _xformQuery).Transform(coordinates.Position);
+            var worldPos = GetWorldMatrix(parentXform, XformQuery).Transform(coordinates.Position);
 
             return parentXform.GridUid == null
                 ? new EntityCoordinates(mapId ?? parentUid, worldPos)
-                : new EntityCoordinates(parentXform.GridUid.Value, _xformQuery.GetComponent(parentXform.GridUid.Value).InvLocalMatrix.Transform(worldPos));
+                : new EntityCoordinates(parentXform.GridUid.Value, XformQuery.GetComponent(parentXform.GridUid.Value).InvLocalMatrix.Transform(worldPos));
         }
 
         /// <summary>
@@ -231,15 +231,15 @@ namespace Robust.Shared.GameObjects
 
             // Is the entity directly parented to the grid?
             if (xform.GridUid == xform.ParentUid)
-                return (xform.Coordinates, GetWorldRotation(xform, _xformQuery));
+                return (xform.Coordinates, GetWorldRotation(xform, XformQuery));
 
             DebugTools.Assert(!_mapManager.IsGrid(uid) && !_mapManager.IsMap(uid));
 
-            var (pos, worldRot) = GetWorldPositionRotation(xform, _xformQuery);
+            var (pos, worldRot) = GetWorldPositionRotation(xform, XformQuery);
 
             var coords = xform.GridUid == null
                 ? new EntityCoordinates(xform.MapUid ?? xform.ParentUid, pos)
-                : new EntityCoordinates(xform.GridUid.Value, _xformQuery.GetComponent(xform.GridUid.Value).InvLocalMatrix.Transform(pos));
+                : new EntityCoordinates(xform.GridUid.Value, XformQuery.GetComponent(xform.GridUid.Value).InvLocalMatrix.Transform(pos));
 
             return (coords, worldRot);
         }

Robust.Shared/Map/Components/MapGridComponent.cs

@@ -25,7 +25,7 @@ namespace Robust.Shared.Map.Components
 
         // This field is used for deserialization internally in the map loader.
         // If you want to remove this, you would have to restructure the map save file.
-        [DataField("index")] internal int GridIndex = 0;
+        [DataField("index")] internal int GridIndex;
         // the grid section now writes the grid's EntityUID. as long as existing maps get updated (just a load+save),
         // this can be removed
 
@@ -75,70 +75,83 @@ namespace Robust.Shared.Map.Components
 
         #region TileAccess
 
+        [Obsolete("Use the MapSystem method")]
         public TileRef GetTileRef(MapCoordinates coords)
         {
             return MapSystem.GetTileRef(Owner, this, coords);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public TileRef GetTileRef(EntityCoordinates coords)
         {
             return MapSystem.GetTileRef(Owner, this, coords);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public TileRef GetTileRef(Vector2i tileCoordinates)
         {
             return MapSystem.GetTileRef(Owner, this, tileCoordinates);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<TileRef> GetAllTiles(bool ignoreEmpty = true)
         {
             return MapSystem.GetAllTiles(Owner, this, ignoreEmpty);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public GridTileEnumerator GetAllTilesEnumerator(bool ignoreEmpty = true)
         {
             return MapSystem.GetAllTilesEnumerator(Owner, this, ignoreEmpty);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public void SetTile(EntityCoordinates coords, Tile tile)
         {
             MapSystem.SetTile(Owner, this, coords, tile);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public void SetTile(Vector2i gridIndices, Tile tile)
         {
             MapSystem.SetTile(Owner, this, gridIndices, tile);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public void SetTiles(List<(Vector2i GridIndices, Tile Tile)> tiles)
         {
             MapSystem.SetTiles(Owner, this, tiles);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<TileRef> GetLocalTilesIntersecting(Box2Rotated localArea, bool ignoreEmpty = true,
             Predicate<TileRef>? predicate = null)
         {
             return MapSystem.GetLocalTilesIntersecting(Owner, this, localArea, ignoreEmpty, predicate);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<TileRef> GetTilesIntersecting(Box2Rotated worldArea, bool ignoreEmpty = true,
             Predicate<TileRef>? predicate = null)
         {
             return MapSystem.GetTilesIntersecting(Owner, this, worldArea, ignoreEmpty, predicate);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<TileRef> GetTilesIntersecting(Box2 worldArea, bool ignoreEmpty = true,
             Predicate<TileRef>? predicate = null)
         {
             return MapSystem.GetTilesIntersecting(Owner, this, worldArea, ignoreEmpty, predicate);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<TileRef> GetLocalTilesIntersecting(Box2 localArea, bool ignoreEmpty = true,
             Predicate<TileRef>? predicate = null)
         {
             return MapSystem.GetLocalTilesIntersecting(Owner, this, localArea, ignoreEmpty, predicate);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<TileRef> GetTilesIntersecting(Circle worldArea, bool ignoreEmpty = true,
             Predicate<TileRef>? predicate = null)
         {
@@ -149,16 +162,19 @@ namespace Robust.Shared.Map.Components
 
         #region ChunkAccess
 
+        [Obsolete("Use the MapSystem method")]
         internal bool TryGetChunk(Vector2i chunkIndices, [NotNullWhen(true)] out MapChunk? chunk)
         {
             return MapSystem.TryGetChunk(Owner, this, chunkIndices, out chunk);
         }
 
+        [Obsolete("Use the MapSystem method")]
         internal IReadOnlyDictionary<Vector2i, MapChunk> GetMapChunks()
         {
             return MapSystem.GetMapChunks(Owner, this);
         }
 
+        [Obsolete("Use the MapSystem method")]
         internal ChunkEnumerator GetMapChunks(Box2Rotated worldArea)
         {
             return MapSystem.GetMapChunks(Owner, this, worldArea);
@@ -168,56 +184,67 @@ namespace Robust.Shared.Map.Components
 
         #region SnapGridAccess
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<EntityUid> GetAnchoredEntities(MapCoordinates coords)
         {
             return MapSystem.GetAnchoredEntities(Owner, this, coords);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<EntityUid> GetAnchoredEntities(Vector2i pos)
         {
             return MapSystem.GetAnchoredEntities(Owner, this, pos);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public AnchoredEntitiesEnumerator GetAnchoredEntitiesEnumerator(Vector2i pos)
         {
             return MapSystem.GetAnchoredEntitiesEnumerator(Owner, this, pos);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<EntityUid> GetLocalAnchoredEntities(Box2 localAABB)
         {
             return MapSystem.GetLocalAnchoredEntities(Owner, this, localAABB);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<EntityUid> GetAnchoredEntities(Box2 worldAABB)
         {
             return MapSystem.GetAnchoredEntities(Owner, this, worldAABB);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public Vector2i TileIndicesFor(EntityCoordinates coords)
         {
             return MapSystem.TileIndicesFor(Owner, this, coords);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public Vector2i TileIndicesFor(MapCoordinates worldPos)
         {
             return MapSystem.TileIndicesFor(Owner, this, worldPos);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<EntityUid> GetInDir(EntityCoordinates position, Direction dir)
         {
             return MapSystem.GetInDir(Owner, this, position, dir);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<EntityUid> GetLocal(EntityCoordinates coords)
         {
             return MapSystem.GetLocal(Owner, this, coords);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<EntityUid> GetCardinalNeighborCells(EntityCoordinates coords)
         {
             return MapSystem.GetCardinalNeighborCells(Owner, this, coords);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public IEnumerable<EntityUid> GetCellsInSquareArea(EntityCoordinates coords, int n)
         {
             return MapSystem.GetCellsInSquareArea(Owner, this, coords, n);
@@ -225,66 +252,79 @@ namespace Robust.Shared.Map.Components
 
         #endregion
 
+        [Obsolete("Use the MapSystem method")]
         public Vector2 WorldToLocal(Vector2 posWorld)
         {
             return MapSystem.WorldToLocal(Owner, this, posWorld);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public EntityCoordinates MapToGrid(MapCoordinates posWorld)
         {
             return MapSystem.MapToGrid(Owner, posWorld);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public Vector2 LocalToWorld(Vector2 posLocal)
         {
             return MapSystem.LocalToWorld(Owner, this, posLocal);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public Vector2i WorldToTile(Vector2 posWorld)
         {
             return MapSystem.WorldToTile(Owner, this, posWorld);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public Vector2i LocalToTile(EntityCoordinates coordinates)
         {
             return MapSystem.LocalToTile(Owner, this, coordinates);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public Vector2i CoordinatesToTile(EntityCoordinates coords)
         {
             return MapSystem.CoordinatesToTile(Owner, this, coords);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public bool CollidesWithGrid(Vector2i indices)
         {
             return MapSystem.CollidesWithGrid(Owner, this, indices);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public Vector2i GridTileToChunkIndices(Vector2i gridTile)
         {
             return MapSystem.GridTileToChunkIndices(Owner, this, gridTile);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public EntityCoordinates GridTileToLocal(Vector2i gridTile)
         {
             return MapSystem.GridTileToLocal(Owner, this, gridTile);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public Vector2 GridTileToWorldPos(Vector2i gridTile)
         {
             return MapSystem.GridTileToWorldPos(Owner, this, gridTile);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public MapCoordinates GridTileToWorld(Vector2i gridTile)
         {
             return MapSystem.GridTileToWorld(Owner, this, gridTile);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public bool TryGetTileRef(Vector2i indices, out TileRef tile)
         {
             return MapSystem.TryGetTileRef(Owner, this, indices, out tile);
         }
 
+        [Obsolete("Use the MapSystem method")]
         public bool TryGetTileRef(EntityCoordinates coords, out TileRef tile)
         {
             return MapSystem.TryGetTileRef(Owner, this, coords, out tile);

Robust.Shared/Map/IMapManager.cs

@@ -87,11 +87,21 @@ namespace Robust.Shared.Map
         MapGridComponent CreateGrid(MapId currentMapId, ushort chunkSize = 16);
         MapGridComponent CreateGrid(MapId currentMapId, in GridCreateOptions options);
         MapGridComponent CreateGrid(MapId currentMapId);
+        Entity<MapGridComponent> CreateGridEntity(MapId currentMapId, GridCreateOptions? options = null);
+
+        [Obsolete("Use GetComponent<MapGridComponent>(uid)")]
         MapGridComponent GetGrid(EntityUid gridId);
+
+        [Obsolete("Use TryGetComponent(uid, out MapGridComponent? grid)")]
         bool TryGetGrid([NotNullWhen(true)] EntityUid? euid, [NotNullWhen(true)] out MapGridComponent? grid);
+
+        [Obsolete("Use HasComponent<MapGridComponent>(uid)")]
         bool GridExists([NotNullWhen(true)] EntityUid? euid);
+
         IEnumerable<MapGridComponent> GetAllMapGrids(MapId mapId);
 
+        IEnumerable<Entity<MapGridComponent>> GetAllGrids(MapId mapId);
+
         /// <summary>
         /// Attempts to find the map grid under the map location.
         /// </summary>
@@ -131,10 +141,13 @@ namespace Robust.Shared.Map
 
         void FindGridsIntersecting<TState>(MapId mapId, Box2 worldAABB, ref TState state, GridCallback<TState> callback, bool approx = false, bool includeMap = true);
 
+        void FindGridsIntersecting(MapId mapId, Box2 worldAABB, ref List<Entity<MapGridComponent>> state, bool approx = false, bool includeMap = true);
+
         void FindGridsIntersecting(MapId mapId, Box2Rotated worldBounds, GridCallback callback, bool approx = false, bool includeMap = true);
 
         void FindGridsIntersecting<TState>(MapId mapId, Box2Rotated worldBounds, ref TState state, GridCallback<TState> callback, bool approx = false, bool includeMap = true);
 
+        void FindGridsIntersecting(MapId mapId, Box2Rotated worldBounds, ref List<Entity<MapGridComponent>> state, bool approx = false, bool includeMap = true);
 
         /// <summary>
         /// Returns the grids intersecting this AABB.

Robust.Shared/Map/MapManager.GridCollection.cs

@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Log;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 
 // All the obsolete warnings about GridId are probably useless here.
@@ -47,6 +44,12 @@ internal partial class MapManager
         return CreateGrid(currentMapId, GridCreateOptions.Default);
     }
 
+    public Entity<MapGridComponent> CreateGridEntity(MapId currentMapId, GridCreateOptions? options = null)
+    {
+        options ??= GridCreateOptions.Default;
+        return CreateGrid(currentMapId, options.Value.ChunkSize, default);
+    }
+
     [Obsolete("Use GetComponent<MapGridComponent>(uid)")]
     public MapGridComponent GetGrid(EntityUid gridId)
     {
@@ -61,6 +64,7 @@ internal partial class MapManager
         return EntityManager.HasComponent<MapGridComponent>(uid);
     }
 
+    [Obsolete("Use TryGetComponent(uid, out MapGridComponent? grid)")]
     public bool TryGetGrid([NotNullWhen(true)] EntityUid? euid, [MaybeNullWhen(false)] out MapGridComponent grid)
     {
         if (EntityManager.TryGetComponent(euid, out MapGridComponent? comp))
@@ -81,11 +85,24 @@ internal partial class MapManager
 
     public IEnumerable<MapGridComponent> GetAllMapGrids(MapId mapId)
     {
-        var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
+        var query = EntityManager.AllEntityQueryEnumerator<MapGridComponent, TransformComponent>();
+        while (query.MoveNext(out var grid, out var xform))
+        {
+            if (xform.MapID != mapId)
+                yield return grid;
+        }
+    }
 
-        return EntityManager.EntityQuery<MapGridComponent>(true)
-            .Where(c => xformQuery.GetComponent(c.Owner).MapID == mapId)
-            .Select(c => c);
+    public IEnumerable<Entity<MapGridComponent>> GetAllGrids(MapId mapId)
+    {
+        var query = EntityManager.AllEntityQueryEnumerator<MapGridComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out var grid, out var xform))
+        {
+            if (xform.MapID != mapId)
+                continue;
+
+            yield return (uid, grid);
+        }
     }
 
     public virtual void DeleteGrid(EntityUid euid)
@@ -135,7 +152,7 @@ internal partial class MapManager
         EntityManager.EventBus.RaiseLocalEvent(euid, ref ev, true);
     }
 
-    protected MapGridComponent CreateGrid(MapId currentMapId, ushort chunkSize, EntityUid forcedGridEuid)
+    protected Entity<MapGridComponent> CreateGrid(MapId currentMapId, ushort chunkSize, EntityUid forcedGridEuid)
     {
         var gridEnt = EntityManager.CreateEntityUninitialized(null, forcedGridEuid);
 
@@ -155,6 +172,6 @@ internal partial class MapManager
         EntityManager.System<MetaDataSystem>().SetEntityName(gridEnt, $"grid", meta);
         EntityManager.InitializeComponents(gridEnt, meta);
         EntityManager.StartComponents(gridEnt);
-        return grid;
+        return (gridEnt, grid);
     }
 }

Robust.Shared/Map/MapManager.MapCollection.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Log;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Utility;
 
@@ -211,22 +209,21 @@ internal partial class MapManager
 
         if (actualId != MapId.Nullspace) // nullspace isn't bound to an entity
         {
-            var mapComps = EntityManager.EntityQuery<MapComponent>(true);
-
-            MapComponent? result = null;
-            foreach (var mapComp in mapComps)
+            Entity<MapComponent> result = default;
+            var query = EntityManager.AllEntityQueryEnumerator<MapComponent>();
+            while (query.MoveNext(out var uid, out var map))
             {
-                if (mapComp.MapId != actualId)
+                if (map.MapId != actualId)
                     continue;
 
-                result = mapComp;
+                result = (uid, map);
                 break;
             }
 
-            if (result != null)
+            if (result != default)
             {
                 DebugTools.Assert(mapId != null);
-                _mapEntities.Add(actualId, result.Owner);
+                _mapEntities.Add(actualId, result);
                 _sawmill.Debug($"Rebinding map {actualId} to entity {result.Owner}");
             }
             else

Robust.Shared/Map/MapManager.Queries.cs

@@ -96,6 +96,17 @@ internal partial class MapManager
         state = state2.state;
     }
 
+    public void FindGridsIntersecting(MapId mapId, Box2 worldAABB, ref List<Entity<MapGridComponent>> state,
+        bool approx = false, bool includeMap = true)
+    {
+        FindGridsIntersecting(mapId, worldAABB, ref state, static (EntityUid uid, MapGridComponent grid,
+            ref List<Entity<MapGridComponent>> list) =>
+        {
+            list.Add((uid, grid));
+            return true;
+        }, approx, includeMap);
+    }
+
     public void FindGridsIntersecting(MapId mapId, Box2Rotated worldBounds, GridCallback callback, bool approx = false,
         bool includeMap = true)
     {
@@ -108,6 +119,17 @@ internal partial class MapManager
         FindGridsIntersecting(mapId, worldBounds.CalcBoundingBox(), ref state, callback, approx, includeMap);
     }
 
+    public void FindGridsIntersecting(MapId mapId, Box2Rotated worldBounds, ref List<Entity<MapGridComponent>> state,
+        bool approx = false, bool includeMap = true)
+    {
+        FindGridsIntersecting(mapId, worldBounds, ref state, static (EntityUid uid, MapGridComponent grid,
+            ref List<Entity<MapGridComponent>> list) =>
+        {
+            list.Add((uid, grid));
+            return true;
+        }, approx, includeMap);
+    }
+
     private bool IsIntersecting(
         Box2 aabb,
         EntityUid gridUid,

Robust.Shared/Physics/ComponentTreeEntry.cs

@@ -1,5 +1,5 @@
-using Robust.Shared.GameObjects;
 using System;
+using Robust.Shared.GameObjects;
 
 namespace Robust.Shared.Physics;
 
@@ -9,7 +9,7 @@ namespace Robust.Shared.Physics;
 ///     overriden, such that we can remove entries without needing to fetch the transform component of a possible
 ///     deleted entity.
 /// </summary>
-public readonly struct ComponentTreeEntry<T> : IEquatable<ComponentTreeEntry<T>>, IComparable<ComponentTreeEntry<T>> where T : Component
+public readonly struct ComponentTreeEntry<T> : IEquatable<ComponentTreeEntry<T>>, IComparable<ComponentTreeEntry<T>> where T : IComponent
 {
     public T Component { get; init; }
     public TransformComponent Transform { get; init; }

Robust.Shared/Physics/Events/CollisionLayerChangeEvent.cs

@@ -9,9 +9,9 @@ namespace Robust.Shared.Physics.Events
     [ByRefEvent]
     public readonly struct CollisionLayerChangeEvent
     {
-        public readonly PhysicsComponent Body;
+        public readonly Entity<PhysicsComponent> Body;
 
-        public CollisionLayerChangeEvent(PhysicsComponent body)
+        public CollisionLayerChangeEvent(Entity<PhysicsComponent> body)
         {
             Body = body;
         }

Robust.Shared/Physics/Systems/FixtureSystem.cs

@@ -5,7 +5,6 @@ using Robust.Shared.Collections;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Dynamics;
@@ -354,7 +353,7 @@ namespace Robust.Shared.Physics.Systems
 
             if (oldLayer != layer)
             {
-                var ev = new CollisionLayerChangeEvent(body);
+                var ev = new CollisionLayerChangeEvent((uid, body));
                 RaiseLocalEvent(ref ev);
             }
 

Robust.Shared/Physics/Systems/SharedJointSystem.Relay.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics.Joints;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
@@ -110,5 +109,29 @@ public abstract partial class SharedJointSystem
         }
 
         Dirty(uid, component);
+
+#if DEBUG
+        if (component.Relay == null)
+            return;
+
+        if (TryComp(uid, out JointComponent? jointComp))
+        {
+            foreach (var joint in jointComp.Joints.Values)
+            {
+                DebugTools.AssertNotEqual(joint.BodyAUid, component.Relay);
+                DebugTools.AssertNotEqual(joint.BodyBUid, component.Relay);
+
+            }
+        }
+
+        if (TryComp(component.Relay, out JointComponent? relayJointComp))
+        {
+            foreach (var joint in relayJointComp.Joints.Values)
+            {
+                DebugTools.AssertNotEqual(joint.BodyAUid, uid);
+                DebugTools.AssertNotEqual(joint.BodyBUid, uid);
+            }
+        }
+#endif
     }
 }

Robust.Shared/Physics/Systems/SharedJointSystem.cs

@@ -26,7 +26,7 @@ public abstract partial class SharedJointSystem : EntitySystem
 
     // To avoid issues with component states we'll queue up all dirty joints and check it every tick to see if
     // we can delete the component.
-    private readonly HashSet<JointComponent> _dirtyJoints = new();
+    private readonly HashSet<Entity<JointComponent>> _dirtyJoints = new();
     protected readonly HashSet<Joint> AddedJoints = new();
     protected readonly List<Joint> ToRemove = new();
 
@@ -115,8 +115,8 @@ public abstract partial class SharedJointSystem : EntitySystem
 
         foreach (var joint in _dirtyJoints)
         {
-            if (joint.Deleted || joint.JointCount != 0) continue;
-            EntityManager.RemoveComponent<JointComponent>(joint.Owner);
+            if (joint.Comp.Deleted || joint.Comp.JointCount != 0) continue;
+            EntityManager.RemoveComponent<JointComponent>(joint);
         }
 
         _dirtyJoints.Clear();
@@ -139,7 +139,10 @@ public abstract partial class SharedJointSystem : EntitySystem
 
         jointComponentA ??= EnsureComp<JointComponent>(aUid);
         jointComponentB ??= EnsureComp<JointComponent>(bUid);
-        DebugTools.Assert(jointComponentA.Owner == aUid && jointComponentB.Owner == bUid);
+        DebugTools.AssertOwner(aUid, jointComponentA);
+        DebugTools.AssertOwner(bUid, jointComponentB);
+        DebugTools.AssertNotEqual(jointComponentA.Relay, bUid);
+        DebugTools.AssertNotEqual(jointComponentB.Relay, aUid);
 
         var jointsA = jointComponentA.Joints;
         var jointsB = jointComponentB.Joints;
@@ -190,14 +193,14 @@ public abstract partial class SharedJointSystem : EntitySystem
 
         _physics.WakeBody(aUid, body: bodyA);
         _physics.WakeBody(bUid, body: bodyB);
-        Dirty(bodyA);
-        Dirty(bodyB);
-        Dirty(jointComponentA);
-        Dirty(jointComponentB);
+        Dirty(aUid, bodyA);
+        Dirty(bUid, bodyB);
+        Dirty(aUid, jointComponentA);
+        Dirty(bUid, jointComponentB);
 
         // Also flag these for checking juusssttt in case.
-        _dirtyJoints.Add(jointComponentA);
-        _dirtyJoints.Add(jointComponentB);
+        _dirtyJoints.Add((aUid, jointComponentA));
+        _dirtyJoints.Add((bUid, jointComponentB));
         // Note: creating a joint doesn't wake the bodies.
 
         // Raise broadcast last so we can do both sides of directed first.
@@ -520,12 +523,12 @@ public abstract partial class SharedJointSystem : EntitySystem
 
         // Originally I logged these but because of prediction the client can just nuke them multiple times in a row
         // because each body has its own JointComponent, bleh.
-        if (!EntityManager.TryGetComponent<JointComponent>(bodyAUid, out var jointComponentA))
+        if (!TryComp<JointComponent>(bodyAUid, out var jointComponentA))
         {
             return;
         }
 
-        if (!EntityManager.TryGetComponent<JointComponent>(bodyBUid, out var jointComponentB))
+        if (!TryComp<JointComponent>(bodyBUid, out var jointComponentB))
         {
             return;
         }
@@ -557,12 +560,12 @@ public abstract partial class SharedJointSystem : EntitySystem
 
         if (!jointComponentA.Deleted)
         {
-            Dirty(jointComponentA);
+            Dirty(bodyAUid, jointComponentA);
         }
 
         if (!jointComponentB.Deleted)
         {
-            Dirty(jointComponentB);
+            Dirty(bodyBUid, jointComponentB);
         }
 
         if (jointComponentA.Deleted && jointComponentB.Deleted)
@@ -597,8 +600,8 @@ public abstract partial class SharedJointSystem : EntitySystem
         }
 
         // We can't just check up front due to how prediction works.
-        _dirtyJoints.Add(jointComponentA);
-        _dirtyJoints.Add(jointComponentB);
+        _dirtyJoints.Add((bodyAUid, jointComponentA));
+        _dirtyJoints.Add((bodyBUid, jointComponentB));
     }
 
     #endregion

Robust.Shared/Physics/Systems/SharedPhysicsSystem.Components.cs

@@ -22,6 +22,7 @@
  * PhysicsComponent is heavily modified from Box2D.
  */
 
+using System;
 using System.Numerics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
@@ -371,8 +372,16 @@ public partial class SharedPhysicsSystem
             Dirty(body);
     }
 
+    [Obsolete("Use SetAwake with EntityUid<PhysicsComponent>")]
     public void SetAwake(EntityUid uid, PhysicsComponent body, bool value, bool updateSleepTime = true)
     {
+        SetAwake(new Entity<PhysicsComponent>(uid, body), value, updateSleepTime);
+    }
+
+    public void SetAwake(Entity<PhysicsComponent> ent, bool value, bool updateSleepTime = true)
+    {
+        var uid = ent.Owner;
+        var body = ent.Comp;
         if (body.Awake == value)
             return;
 
@@ -396,7 +405,7 @@ public partial class SharedPhysicsSystem
         if (updateSleepTime)
             SetSleepTime(body, 0);
 
-        Dirty(body);
+        Dirty(ent);
     }
 
     public void TrySetBodyType(EntityUid uid, BodyType value, FixturesComponent? manager = null, PhysicsComponent? body = null, TransformComponent? xform = null)

Robust.Shared/Physics/Systems/SharedPhysicsSystem.Island.cs

@@ -423,16 +423,19 @@ public abstract partial class SharedPhysicsSystem
 
                             var uidA = joint.BodyAUid;
                             var uidB = joint.BodyBUid;
+                            DebugTools.AssertNotEqual(uidA, uidB);
 
                             if (jointQuery.TryGetComponent(uidA, out var jointCompA) &&
                                 jointCompA.Relay != null)
                             {
+                                DebugTools.AssertNotEqual(uidB, jointCompA.Relay.Value);
                                 uidA = jointCompA.Relay.Value;
                             }
 
                             if (jointQuery.TryGetComponent(uidB, out var jointCompB) &&
                                 jointCompB.Relay != null)
                             {
+                                DebugTools.AssertNotEqual(uidA, jointCompB.Relay.Value);
                                 uidB = jointCompB.Relay.Value;
                             }
 

Robust.Shared/Physics/Systems/SharedPhysicsSystem.Queries.cs

@@ -150,11 +150,12 @@ namespace Robust.Shared.Physics.Systems
         /// <summary>
         /// Get all entities colliding with a certain body.
         /// </summary>
-        public IEnumerable<PhysicsComponent> GetCollidingEntities(MapId mapId, in Box2Rotated worldBounds)
+        public IEnumerable<Entity<PhysicsComponent>> GetCollidingEntities(MapId mapId, in Box2Rotated worldBounds)
         {
-            if (mapId == MapId.Nullspace) return Array.Empty<PhysicsComponent>();
+            if (mapId == MapId.Nullspace)
+                return Array.Empty<Entity<PhysicsComponent>>();
 
-            var bodies = new HashSet<PhysicsComponent>();
+            var bodies = new HashSet<Entity<PhysicsComponent>>();
 
             foreach (var (uid, broadphase) in _broadphase.GetBroadphases(mapId, worldBounds.CalcBoundingBox()))
             {
@@ -162,12 +163,12 @@ namespace Robust.Shared.Physics.Systems
 
                 foreach (var proxy in broadphase.StaticTree.QueryAabb(gridAABB, false))
                 {
-                    bodies.Add(proxy.Body);
+                    bodies.Add(new Entity<PhysicsComponent>(proxy.Entity, proxy.Body));
                 }
 
                 foreach (var proxy in broadphase.DynamicTree.QueryAabb(gridAABB, false))
                 {
-                    bodies.Add(proxy.Body);
+                    bodies.Add(new Entity<PhysicsComponent>(proxy.Entity, proxy.Body));
                 }
             }
 

Robust.Shared/Prototypes/EntityPrototype.cs

@@ -11,7 +11,6 @@ using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 using Robust.Shared.ViewVariables;
 
 namespace Robust.Shared.Prototypes
@@ -250,8 +249,7 @@ namespace Robust.Shared.Prototypes
 
             if (!entityManager.TryGetComponent(entity, compReg.Idx, out var component))
             {
-                var newComponent = (Component) factory.GetComponent(compName);
-                newComponent.Owner = entity;
+                var newComponent = factory.GetComponent(compName);
                 entityManager.AddComponent(entity, newComponent);
                 component = newComponent;
             }

Robust.Shared/Toolshed/Commands/Entities/Components/CompCommand.cs

@@ -28,7 +28,7 @@ internal sealed class CompCommand : ToolshedCommand
 
     [CommandImplementation("add")]
     public EntityUid Add<T>([PipedArgument] EntityUid input)
-        where T: Component, new()
+        where T: IComponent, new()
     {
         AddComp<T>(input);
         return input;
@@ -36,13 +36,13 @@ internal sealed class CompCommand : ToolshedCommand
 
     [CommandImplementation("add")]
     public IEnumerable<EntityUid> Add<T>([PipedArgument] IEnumerable<EntityUid> input)
-        where T : Component, new()
+        where T : IComponent, new()
         => input.Select(Add<T>);
 
 
     [CommandImplementation("rm")]
     public EntityUid Rm<T>([PipedArgument] EntityUid input)
-        where T: Component, new()
+        where T: IComponent, new()
     {
         RemComp<T>(input);
         return input;
@@ -50,12 +50,12 @@ internal sealed class CompCommand : ToolshedCommand
 
     [CommandImplementation("rm")]
     public IEnumerable<EntityUid> Rm<T>([PipedArgument] IEnumerable<EntityUid> input)
-        where T : Component, new()
+        where T : IComponent, new()
         => input.Select(Rm<T>);
 
     [CommandImplementation("ensure")]
     public EntityUid Ensure<T>([PipedArgument] EntityUid input)
-        where T: Component, new()
+        where T: IComponent, new()
     {
         EnsureComp<T>(input);
         return input;
@@ -63,7 +63,7 @@ internal sealed class CompCommand : ToolshedCommand
 
     [CommandImplementation("ensure")]
     public IEnumerable<EntityUid> Ensure<T>([PipedArgument] IEnumerable<EntityUid> input)
-        where T : Component, new()
+        where T : IComponent, new()
         => input.Select(Ensure<T>);
 
     [CommandImplementation("has")]

Robust.Shared/Toolshed/ToolshedCommand.Entities.cs

@@ -126,7 +126,7 @@ public abstract partial class ToolshedCommand
     /// </summary>
     [PublicAPI, MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected T AddComp<T>(EntityUid entity)
-        where T : Component, new()
+        where T : IComponent, new()
         => EntityManager.AddComponent<T>(entity);
 
     /// <summary>
@@ -142,7 +142,7 @@ public abstract partial class ToolshedCommand
     /// </summary>
     [PublicAPI, MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected T EnsureComp<T>(EntityUid entity)
-        where T: Component, new()
+        where T: IComponent, new()
         => EntityManager.EnsureComponent<T>(entity);
 
     /// <summary>
@@ -159,6 +159,6 @@ public abstract partial class ToolshedCommand
     /// </summary>
     [PublicAPI, MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected EntityQuery<T> GetEntityQuery<T>()
-        where T : Component
+        where T : IComponent
         => EntityManager.GetEntityQuery<T>();
 }

Robust.Shared/Utility/DebugTools.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Data;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
@@ -98,7 +97,9 @@ namespace Robust.Shared.Utility
 
             // Whenever .owner is removed this will need to be replaced by something.
             // As long as components are just reference types, we could just get the component and check if the references are equal?
+#pragma warning disable CS0618 // Type or member is obsolete
             if (component.Owner != uid)
+#pragma warning restore CS0618 // Type or member is obsolete
                 throw new DebugAssertException($"Entity {uid} is not the owner of the component. Component: {component.GetType().Name}");
         }
 

Robust.Shared/ViewVariables/ViewVariablesManager.TypeHandlers.cs

@@ -34,7 +34,7 @@ internal abstract partial class ViewVariablesManager
             || !_entMan.TryGetComponent(uid, registration.Idx, out var component))
             return null;
 
-        return new ViewVariablesComponentPath((Component) component, uid);
+        return new ViewVariablesComponentPath(component, uid);
     }
 
     private IEnumerable<string> EntityComponentList(EntityUid uid)

Robust.Shared/ViewVariables/ViewVariablesPath.cs

@@ -263,11 +263,11 @@ public sealed class ViewVariablesInstancePath : ViewVariablesPath
 
 public sealed class ViewVariablesComponentPath : ViewVariablesPath
 {
-    public readonly Component Component;
+    public readonly IComponent Component;
     public readonly EntityUid Owner;
     public override Type Type => Component?.GetType() ?? typeof(void);
 
-    public ViewVariablesComponentPath(Component component, EntityUid owner)
+    public ViewVariablesComponentPath(IComponent component, EntityUid owner)
     {
         Component = component;
         Owner = owner;

Robust.UnitTesting/Client/GameObjects/Components/TransformComponentTests.cs

@@ -26,10 +26,10 @@ namespace Robust.UnitTesting.Client.GameObjects.Components
             mapManager.CreateMap(TestMapId);
 
             // Adds two grids to use in tests.
-            var gridA = mapManager.CreateGrid(TestMapId);
-            var gridB = mapManager.CreateGrid(TestMapId);
+            var gridA = mapManager.CreateGridEntity(TestMapId);
+            var gridB = mapManager.CreateGridEntity(TestMapId);
 
-            return (sim, gridA.Owner, gridB.Owner);
+            return (sim, gridA, gridB);
         }
 
         /// <summary>
@@ -47,18 +47,18 @@ namespace Robust.UnitTesting.Client.GameObjects.Components
             var gridB = mapMan.GetGrid(gridIdB);
 
             // Arrange
-            var initialPos = new EntityCoordinates(gridA.Owner, new Vector2(0, 0));
+            var initialPos = new EntityCoordinates(gridIdA, new Vector2(0, 0));
             var parent = entMan.SpawnEntity(null, initialPos);
             var child = entMan.SpawnEntity(null, initialPos);
             var parentTrans = entMan.GetComponent<TransformComponent>(parent);
             var childTrans = entMan.GetComponent<TransformComponent>(child);
             ComponentHandleState handleState;
 
-            var compState = new TransformComponentState(new Vector2(5, 5), new Angle(0), entMan.GetNetEntity(gridB.Owner), false, false);
+            var compState = new TransformComponentState(new Vector2(5, 5), new Angle(0), entMan.GetNetEntity(gridIdB), false, false);
             handleState = new ComponentHandleState(compState, null);
             xformSystem.OnHandleState(parent, parentTrans, ref handleState);
 
-            compState = new TransformComponentState(new Vector2(6, 6), new Angle(0), entMan.GetNetEntity(gridB.Owner), false, false);
+            compState = new TransformComponentState(new Vector2(6, 6), new Angle(0), entMan.GetNetEntity(gridIdB), false, false);
             handleState = new ComponentHandleState(compState, null);
             xformSystem.OnHandleState(child, childTrans, ref handleState);
             // World pos should be 6, 6 now.
@@ -90,7 +90,7 @@ namespace Robust.UnitTesting.Client.GameObjects.Components
             var gridB = mapMan.GetGrid(gridIdB);
 
             // Arrange
-            var initalPos = new EntityCoordinates(gridA.Owner, new Vector2(0, 0));
+            var initalPos = new EntityCoordinates(gridIdA, new Vector2(0, 0));
             var node1 = entMan.SpawnEntity(null, initalPos);
             var node2 = entMan.SpawnEntity(null, initalPos);
             var node3 = entMan.SpawnEntity(null, initalPos);
@@ -103,7 +103,7 @@ namespace Robust.UnitTesting.Client.GameObjects.Components
             var node2Trans = entMan.GetComponent<TransformComponent>(node2);
             var node3Trans = entMan.GetComponent<TransformComponent>(node3);
 
-            var compState = new TransformComponentState(new Vector2(6, 6), Angle.FromDegrees(135), entMan.GetNetEntity(gridB.Owner), false, false);
+            var compState = new TransformComponentState(new Vector2(6, 6), Angle.FromDegrees(135), entMan.GetNetEntity(gridIdB), false, false);
             var handleState = new ComponentHandleState(compState, null);
             xformSystem.OnHandleState(node1, node1Trans, ref handleState);
 

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

@@ -1,8 +1,6 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using JetBrains.Annotations;
 using NUnit.Framework;
 using Robust.Server.Containers;
 using Robust.Shared.Containers;
@@ -195,7 +193,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
             var sim = SimulationFactory();
             var containerSys = sim.Resolve<IEntitySystemManager>().GetEntitySystem<ContainerSystem>();
 
-            var grid = sim.Resolve<IMapManager>().CreateGrid(new MapId(1)).Owner;
+            var grid = sim.Resolve<IMapManager>().CreateGridEntity(new MapId(1)).Owner;
             var entity = sim.SpawnEntity(null, new EntityCoordinates(new EntityUid(1), new Vector2(0, 0)));
             var container = containerSys.MakeContainer<Container>(entity, "dummy");
 
@@ -222,9 +220,9 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
             Assert.That(entManager.GetComponent<TransformComponent>(containerEntity).ChildCount, Is.EqualTo(1));
             Assert.That(entManager.GetComponent<TransformComponent>(containerEntity).ChildEntities.First(), Is.EqualTo(insertEntity));
 
-            result = insertEntity.TryGetContainerMan(out var resultContainerMan);
+            result = containerSys.TryGetContainingContainer(insertEntity, out var resultContainerMan);
             Assert.That(result, Is.True);
-            Assert.That(resultContainerMan, Is.EqualTo(container.Manager));
+            Assert.That(resultContainerMan?.Manager, Is.EqualTo(container.Manager));
         }
 
         [Test]