diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
index 34e970d5cc..2aef66cd5c 100644
--- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
+++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
@@ -81,6 +81,7 @@ namespace Content.IntegrationTests.Tests.Disposal
     damageContainer: Biological
   - type: Physics
     bodyType: KinematicController
+  - type: Fixtures
   - type: DoAfter
 
 - type: entity
@@ -93,6 +94,7 @@ namespace Content.IntegrationTests.Tests.Disposal
       - Anchoring
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
   - type: DoAfter
 
 - type: entity
@@ -106,6 +108,7 @@ namespace Content.IntegrationTests.Tests.Disposal
   - type: ApcPowerReceiver
   - type: Physics
     bodyType: Static
+  - type: Fixtures
 
 - type: entity
   name: DisposalTrunkDummy
diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
index d3a9c185e1..0910b1ccad 100644
--- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
+++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
@@ -20,6 +20,7 @@ namespace Content.IntegrationTests.Tests.Doors
   components:
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -35,6 +36,7 @@ namespace Content.IntegrationTests.Tests.Doors
   - type: Airlock
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
index 120610e126..ee1e5cc6f2 100644
--- a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
+++ b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
@@ -25,6 +25,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
   components:
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
index d41a72fbb0..2fd29238ca 100644
--- a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
+++ b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
@@ -21,6 +21,7 @@ namespace Content.IntegrationTests.Tests.Utility
   name: {BlockerDummyId}
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
index 1bbce9041f..c1ec5db65e 100644
--- a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
+++ b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
@@ -66,6 +66,11 @@ namespace Content.Server.Power.EntitySystems
 
             foreach (var receiver in receivers)
             {
+                // No point resetting what the receiver is doing if it's deleting, plus significant perf savings
+                // in not doing needless lookups
+                if (EntityManager.GetComponent<MetaDataComponent>(receiver.OwnerUid).EntityLifeStage >
+                    EntityLifeStage.MapInitialized) continue;
+
                 TryFindAndSetProvider(receiver);
             }
         }
diff --git a/Content.Server/Shuttles/EntitySystems/DockingSystem.cs b/Content.Server/Shuttles/EntitySystems/DockingSystem.cs
index 6800f764cf..56cea164f9 100644
--- a/Content.Server/Shuttles/EntitySystems/DockingSystem.cs
+++ b/Content.Server/Shuttles/EntitySystems/DockingSystem.cs
@@ -21,9 +21,8 @@ namespace Content.Server.Shuttles.EntitySystems
     public sealed class DockingSystem : EntitySystem
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
-        [Dependency] private readonly SharedBroadphaseSystem _broadphaseSystem = default!;
+        [Dependency] private readonly FixtureSystem _fixtureSystem = default!;
         [Dependency] private readonly SharedJointSystem _jointSystem = default!;
-        [Dependency] private readonly AirtightSystem _airtightSystem = default!;
 
         private const string DockingFixture = "docking";
         private const string DockingJoint = "docking";
@@ -108,7 +107,7 @@ namespace Content.Server.Shuttles.EntitySystems
                 !EntityManager.HasComponent<ShuttleComponent>(grid.GridEntityId)) return null;
 
             var transform = body.GetTransform();
-            var dockingFixture = body.GetFixture(DockingFixture);
+            var dockingFixture = _fixtureSystem.GetFixtureOrNull(body, DockingFixture);
 
             if (dockingFixture == null)
             {
@@ -142,7 +141,7 @@ namespace Content.Server.Shuttles.EntitySystems
                         !EntityManager.TryGetComponent(ent, out PhysicsComponent? otherBody)) continue;
 
                     var otherTransform = otherBody.GetTransform();
-                    var otherDockingFixture = otherBody.GetFixture(DockingFixture);
+                    var otherDockingFixture = _fixtureSystem.GetFixtureOrNull(otherBody, DockingFixture);
 
                     if (otherDockingFixture == null)
                     {
@@ -267,7 +266,7 @@ namespace Content.Server.Shuttles.EntitySystems
                 return;
             }
 
-            _broadphaseSystem.DestroyFixture(physicsComponent, DockingFixture);
+            _fixtureSystem.DestroyFixture(physicsComponent, DockingFixture);
         }
 
         private void EnableDocking(EntityUid uid, DockingComponent component)
@@ -297,7 +296,7 @@ namespace Content.Server.Shuttles.EntitySystems
 
             // TODO: I want this to ideally be 2 fixtures to force them to have some level of alignment buuuttt
             // I also need collisionmanager for that yet again so they get dis.
-            _broadphaseSystem.CreateFixture(physicsComponent, fixture);
+            _fixtureSystem.CreateFixture(physicsComponent, fixture);
         }
 
         /// <summary>
@@ -385,8 +384,8 @@ namespace Content.Server.Shuttles.EntitySystems
                 return;
             }
 
-            var fixtureA = bodyA.GetFixture(DockingFixture);
-            var fixtureB = bodyB.GetFixture(DockingFixture);
+            var fixtureA = _fixtureSystem.GetFixtureOrNull(bodyA, DockingFixture);
+            var fixtureB = _fixtureSystem.GetFixtureOrNull(bodyB, DockingFixture);
 
             if (fixtureA == null || fixtureB == null)
             {
diff --git a/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs b/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
index e1a259fec9..e19dc756d0 100644
--- a/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
@@ -101,6 +101,9 @@ namespace Content.Server.Shuttles.EntitySystems
 
         private void OnShuttleShutdown(EntityUid uid, ShuttleComponent component, ComponentShutdown args)
         {
+            // None of the below is necessary for any cleanup if we're just deleting.
+            if (EntityManager.GetComponent<MetaDataComponent>(uid).EntityLifeStage >= EntityLifeStage.Terminating) return;
+
             if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent))
             {
                 return;
diff --git a/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs b/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs
index e04f7621b1..c579cc6a10 100644
--- a/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/EntitySystems/ThrusterSystem.cs
@@ -28,7 +28,7 @@ namespace Content.Server.Shuttles.EntitySystems
     {
         [Robust.Shared.IoC.Dependency] private readonly IMapManager _mapManager = default!;
         [Robust.Shared.IoC.Dependency] private readonly AmbientSoundSystem _ambient = default!;
-        [Robust.Shared.IoC.Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
+        [Robust.Shared.IoC.Dependency] private readonly FixtureSystem _fixtureSystem = default!;
         [Robust.Shared.IoC.Dependency] private readonly DamageableSystem _damageable = default!;
 
         // Essentially whenever thruster enables we update the shuttle's available impulses which are used for movement.
@@ -259,7 +259,7 @@ namespace Content.Server.Shuttles.EntitySystems
                             CollisionLayer = (int) CollisionGroup.MobImpassable
                         };
 
-                        _broadphase.CreateFixture(physicsComponent, fixture);
+                        _fixtureSystem.CreateFixture(physicsComponent, fixture);
                     }
 
                     break;
@@ -323,7 +323,7 @@ namespace Content.Server.Shuttles.EntitySystems
 
             if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent))
             {
-                _broadphase.DestroyFixture(physicsComponent, BurnFixture);
+                _fixtureSystem.DestroyFixture(physicsComponent, BurnFixture);
             }
 
             _activeThrusters.Remove(component);
diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs
index 2c6926d9c4..cd45675f95 100644
--- a/Content.Server/Storage/Components/EntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -279,18 +279,18 @@ namespace Content.Server.Storage.Components
 
         private void ModifyComponents()
         {
-            if (!_isCollidableWhenOpen && Owner.TryGetComponent<IPhysBody>(out var physics))
+            if (!_isCollidableWhenOpen && Owner.TryGetComponent<FixturesComponent>(out var manager))
             {
                 if (Open)
                 {
-                    foreach (var fixture in physics.Fixtures)
+                    foreach (var (_, fixture) in manager.Fixtures)
                     {
                         fixture.CollisionLayer &= ~OpenMask;
                     }
                 }
                 else
                 {
-                    foreach (var fixture in physics.Fixtures)
+                    foreach (var (_, fixture) in manager.Fixtures)
                     {
                         fixture.CollisionLayer |= OpenMask;
                     }
diff --git a/Content.Shared/Singularity/SharedSingularitySystem.cs b/Content.Shared/Singularity/SharedSingularitySystem.cs
index c374c76e31..dbb4fe4921 100644
--- a/Content.Shared/Singularity/SharedSingularitySystem.cs
+++ b/Content.Shared/Singularity/SharedSingularitySystem.cs
@@ -2,7 +2,9 @@
 using Content.Shared.Radiation;
 using Content.Shared.Singularity.Components;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Dynamics;
 
@@ -10,6 +12,8 @@ namespace Content.Shared.Singularity
 {
     public abstract class SharedSingularitySystem : EntitySystem
     {
+        [Dependency] private readonly FixtureSystem _fixtures = default!;
+
         public const string DeleteFixture = "DeleteCircle";
 
         private float GetFalloff(int level)
@@ -74,8 +78,7 @@ namespace Content.Shared.Singularity
                 appearance.SetData(SingularityVisuals.Level, value);
             }
 
-            if (physics != null &&
-                physics.GetFixture(DeleteFixture) is {Shape: PhysShapeCircle circle})
+            if (physics != null && _fixtures.GetFixtureOrNull(physics, DeleteFixture) is {Shape: PhysShapeCircle circle})
             {
                 circle.Radius = value - 0.5f;
             }
diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index ec8685b1a1..5a73b751a7 100644
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -17,11 +17,11 @@ namespace Content.Shared.Throwing
     /// <summary>
     ///     Handles throwing landing and collisions.
     /// </summary>
-    public class ThrownItemSystem : EntitySystem
+    public sealed class ThrownItemSystem : EntitySystem
     {
-        [Dependency] private readonly SharedBroadphaseSystem _broadphaseSystem = default!;
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
         [Dependency] private readonly SharedAdminLogSystem _adminLogSystem = default!;
+        [Dependency] private readonly FixtureSystem _fixtures = default!;
 
         private const string ThrowingFixture = "throw-fixture";
 
@@ -56,14 +56,14 @@ namespace Content.Shared.Throwing
             if (!component.Owner.TryGetComponent(out PhysicsComponent? physicsComponent) ||
                 physicsComponent.Fixtures.Count != 1) return;
 
-            if (physicsComponent.GetFixture(ThrowingFixture) != null)
+            if (_fixtures.GetFixtureOrNull(physicsComponent, ThrowingFixture) != null)
             {
                 Logger.Error($"Found existing throwing fixture on {component.Owner}");
                 return;
             }
 
             var shape = physicsComponent.Fixtures[0].Shape;
-            _broadphaseSystem.CreateFixture(physicsComponent, new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture});
+            _fixtures.CreateFixture(physicsComponent, new Fixture(physicsComponent, shape) {CollisionLayer = (int) CollisionGroup.ThrownItem, Hard = false, ID = ThrowingFixture});
         }
 
         private void HandleCollision(EntityUid uid, ThrownItemComponent component, StartCollideEvent args)
@@ -99,11 +99,11 @@ namespace Content.Shared.Throwing
         {
             if (EntityManager.TryGetComponent(uid, out PhysicsComponent? physicsComponent))
             {
-                var fixture = physicsComponent.GetFixture(ThrowingFixture);
+                var fixture = _fixtures.GetFixtureOrNull(physicsComponent, ThrowingFixture);
 
                 if (fixture != null)
                 {
-                    _broadphaseSystem.DestroyFixture(physicsComponent, fixture);
+                    _fixtures.DestroyFixture(physicsComponent, fixture);
                 }
             }
 
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 922b009a84..4c8f7dabda 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -622,9 +622,6 @@ entities:
     pos: 39.5,-1.5
     parent: 853
     type: Transform
-  - fixtures: []
-    bodyType: Dynamic
-    type: Physics
   - containers:
       PowerCellCharger-powerCellContainer: !type:ContainerSlot {}
     type: ContainerContainer
@@ -1339,6 +1336,7 @@ entities:
         ents: []
       machine_parts: !type:Container
         ents: []
+      ChemMaster-beaker: !type:ContainerSlot {}
     type: ContainerContainer
   - solutions:
       buffer:
@@ -6139,6 +6137,7 @@ entities:
         ents: []
       machine_parts: !type:Container
         ents: []
+      ReagentDispenser-beaker: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 580
   type: SuspicionHitscanSpawner
@@ -7869,8 +7868,6 @@ entities:
   - containers:
       WeaponCapacitorCharger-powerCellContainer: !type:ContainerSlot {}
     type: ContainerContainer
-  - fixtures: []
-    type: Physics
 - uid: 769
   type: PottedPlantRD
   components:
@@ -8507,6 +8504,7 @@ entities:
     type: Transform
   - containers:
       ReagentDispenser-reagentContainerContainer: !type:ContainerSlot {}
+      ReagentDispenser-beaker: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 826
   type: Catwalk
@@ -13589,20 +13587,12 @@ entities:
     type: GridAtmosphere
   - angularDamping: 0.3
     fixedRotation: False
-    fixtures:
-    - shape: !type:PolygonShape
-        vertices:
-        - 16,0
-        - 16,16
-        - 0,16
-        - 0,0
-      id: grid_chunk-0-0
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 1024
-      restitution: 0.1
+    bodyType: Dynamic
+    type: Physics
+  - gravityShakeSound: !type:SoundPathSpecifier
+      path: /Audio/Effects/alert.ogg
+    type: Gravity
+  - fixtures:
     - shape: !type:PolygonShape
         vertices:
         - 0,-16
@@ -13642,6 +13632,19 @@ entities:
       - MapGrid
       mass: 1024
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 16,0
+        - 16,16
+        - 0,16
+        - 0,0
+      id: grid_chunk-0-0
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 1024
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 32,0
@@ -13668,6 +13671,45 @@ entities:
       - MapGrid
       mass: 8
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,15
+        - 32,16
+        - 29,16
+        - 29,15
+      id: grid_chunk-29-15
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 12
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 16,16
+        - 16,23
+        - 0,23
+        - 0,16
+      id: grid_chunk-0-16
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 448
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 15,23
+        - 15,26
+        - 0,26
+        - 0,23
+      id: grid_chunk-0-23
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 180
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 14,26
@@ -13733,6 +13775,149 @@ entities:
       - MapGrid
       mass: 576
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 16,-32
+        - 16,-29
+        - 1,-29
+        - 1,-32
+      id: grid_chunk-1--32
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 180
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 16,-29
+        - 16,-16
+        - 0,-16
+        - 0,-29
+      id: grid_chunk-0--29
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 832
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,-32
+        - 32,-31
+        - 16,-31
+        - 16,-32
+      id: grid_chunk-16--32
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 64
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 22,-31
+        - 22,-30
+        - 19,-30
+        - 19,-31
+      id: grid_chunk-19--31
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 12
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 26,-31
+        - 26,-30
+        - 23,-30
+        - 23,-31
+      id: grid_chunk-23--31
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 12
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 30,-31
+        - 30,-30
+        - 27,-30
+        - 27,-31
+      id: grid_chunk-27--31
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 12
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 30,-30
+        - 30,-28
+        - 19,-28
+        - 19,-30
+      id: grid_chunk-19--30
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 88
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 18,-31
+        - 18,-27
+        - 16,-27
+        - 16,-31
+      id: grid_chunk-16--31
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 32
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 27,-28
+        - 27,-27
+        - 22,-27
+        - 22,-28
+      id: grid_chunk-22--28
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 20
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,-27
+        - 32,-26
+        - 16,-26
+        - 16,-27
+      id: grid_chunk-16--27
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 64
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 29,-26
+        - 29,-16
+        - 16,-16
+        - 16,-26
+      id: grid_chunk-16--26
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 520
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 0,16
@@ -13772,6 +13957,188 @@ entities:
       - MapGrid
       mass: 96
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,16
+        - -16,19
+        - -32,19
+        - -32,16
+      id: grid_chunk--32-16
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 192
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -29,19
+        - -29,20
+        - -32,20
+        - -32,19
+      id: grid_chunk--32-19
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 12
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -30,20
+        - -30,21
+        - -32,21
+        - -32,20
+      id: grid_chunk--32-20
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 8
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,19
+        - -16,21
+        - -28,21
+        - -28,19
+      id: grid_chunk--28-19
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 96
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,21
+        - -16,22
+        - -32,22
+        - -32,21
+      id: grid_chunk--32-21
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 64
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -29,22
+        - -29,24
+        - -32,24
+        - -32,22
+      id: grid_chunk--32-22
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 24
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,22
+        - -16,24
+        - -27,24
+        - -27,22
+      id: grid_chunk--27-22
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 88
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,24
+        - -16,25
+        - -32,25
+        - -32,24
+      id: grid_chunk--32-24
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 64
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,25
+        - -16,26
+        - -27,26
+        - -27,25
+      id: grid_chunk--27-25
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 44
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -29,25
+        - -29,27
+        - -32,27
+        - -32,25
+      id: grid_chunk--32-25
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 24
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -16,26
+        - -16,27
+        - -26,27
+        - -26,26
+      id: grid_chunk--26-26
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 40
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -24,27
+        - -24,28
+        - -32,28
+        - -32,27
+      id: grid_chunk--32-27
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 32
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -30,28
+        - -30,29
+        - -31,29
+        - -31,28
+      id: grid_chunk--31-28
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 4
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - -30,29
+        - -30,30
+        - -32,30
+        - -32,29
+      id: grid_chunk--32-29
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 8
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 0,32
@@ -13798,6 +14165,84 @@ entities:
       - MapGrid
       mass: 8
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,16
+        - 32,19
+        - 29,19
+        - 29,16
+      id: grid_chunk-29-16
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 36
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,19
+        - 32,20
+        - 26,20
+        - 26,19
+      id: grid_chunk-26-19
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 24
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,20
+        - 32,21
+        - 27,21
+        - 27,20
+      id: grid_chunk-27-20
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 20
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,21
+        - 32,22
+        - 29,22
+        - 29,21
+      id: grid_chunk-29-21
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 12
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 18,16
+        - 18,23
+        - 16,23
+        - 16,16
+      id: grid_chunk-16-16
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 56
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,22
+        - 32,26
+        - 31,26
+        - 31,22
+      id: grid_chunk-31-22
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 16
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 10,32
@@ -13824,6 +14269,19 @@ entities:
       - MapGrid
       mass: 36
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 48,0
+        - 48,16
+        - 32,16
+        - 32,0
+      id: grid_chunk-32-0
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 1024
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 52,0
@@ -13837,6 +14295,19 @@ entities:
       - MapGrid
       mass: 240
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 51,15
+        - 51,16
+        - 48,16
+        - 48,15
+      id: grid_chunk-48-15
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 12
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 44,-16
@@ -13863,6 +14334,19 @@ entities:
       - MapGrid
       mass: 4
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 48,-15
+        - 48,-7
+        - 42,-7
+        - 42,-15
+      id: grid_chunk-42--15
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 192
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 40,-9
@@ -13876,6 +14360,19 @@ entities:
       - MapGrid
       mass: 96
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 48,-7
+        - 48,-1
+        - 46,-1
+        - 46,-7
+      id: grid_chunk-46--7
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 48
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 45,-6
@@ -14175,6 +14672,32 @@ entities:
       - MapGrid
       mass: 4
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 57,-15
+        - 57,-7
+        - 48,-7
+        - 48,-15
+      id: grid_chunk-48--15
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 288
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 53,-7
+        - 53,-1
+        - 48,-1
+        - 48,-7
+      id: grid_chunk-48--7
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 120
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 52,-1
@@ -14188,6 +14711,19 @@ entities:
       - MapGrid
       mass: 16
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 33,-32
+        - 33,-31
+        - 32,-31
+        - 32,-32
+      id: grid_chunk-32--32
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 4
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 48,-32
@@ -14240,6 +14776,19 @@ entities:
       - MapGrid
       mass: 8
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 35,-32
+        - 35,-28
+        - 34,-28
+        - 34,-32
+      id: grid_chunk-34--32
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 16
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 48,-29
@@ -14253,6 +14802,32 @@ entities:
       - MapGrid
       mass: 32
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 35,-28
+        - 35,-27
+        - 33,-27
+        - 33,-28
+      id: grid_chunk-33--28
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 8
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 34,-27
+        - 34,-26
+        - 32,-26
+        - 32,-27
+      id: grid_chunk-32--27
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 8
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 41,-28
@@ -14799,6 +15374,32 @@ entities:
       - MapGrid
       mass: 4
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 34,-37
+        - 34,-36
+        - 32,-36
+        - 32,-37
+      id: grid_chunk-32--37
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 8
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 35,-36
+        - 35,-35
+        - 33,-35
+        - 33,-36
+      id: grid_chunk-33--36
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 8
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 48,-34
@@ -14812,6 +15413,19 @@ entities:
       - MapGrid
       mass: 32
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 35,-35
+        - 35,-32
+        - 34,-32
+        - 34,-35
+      id: grid_chunk-34--35
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 12
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 41,-33
@@ -14838,97 +15452,6 @@ entities:
       - MapGrid
       mass: 4
       restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 15,23
-        - 15,26
-        - 0,26
-        - 0,23
-      id: grid_chunk-0-23
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 180
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 16,16
-        - 16,23
-        - 0,23
-        - 0,16
-      id: grid_chunk-0-16
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 448
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 18,16
-        - 18,23
-        - 16,23
-        - 16,16
-      id: grid_chunk-16-16
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 56
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -16,24
-        - -16,25
-        - -32,25
-        - -32,24
-      id: grid_chunk--32-24
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 64
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -16,26
-        - -16,27
-        - -26,27
-        - -26,26
-      id: grid_chunk--26-26
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 40
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -16,25
-        - -16,26
-        - -27,26
-        - -27,25
-      id: grid_chunk--27-25
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 44
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -16,22
-        - -16,24
-        - -27,24
-        - -27,22
-      id: grid_chunk--27-22
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 88
-      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - -32,16
@@ -14944,81 +15467,42 @@ entities:
       restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
-        - -16,16
-        - -16,19
         - -32,19
-        - -32,16
-      id: grid_chunk--32-16
+        - -32,20
+        - -38,20
+        - -38,19
+      id: grid_chunk--38-19
       mask:
       - MapGrid
       layer:
       - MapGrid
-      mass: 192
+      mass: 24
       restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
-        - 16,-29
-        - 16,-16
-        - 0,-16
-        - 0,-29
-      id: grid_chunk-0--29
+        - -39,21
+        - -39,24
+        - -40,24
+        - -40,21
+      id: grid_chunk--40-21
       mask:
       - MapGrid
       layer:
       - MapGrid
-      mass: 832
+      mass: 12
       restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
-        - 16,-32
-        - 16,-29
-        - 1,-29
-        - 1,-32
-      id: grid_chunk-1--32
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 180
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -24,27
-        - -24,28
-        - -32,28
-        - -32,27
-      id: grid_chunk--32-27
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 32
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -16,21
-        - -16,22
-        - -32,22
         - -32,21
-      id: grid_chunk--32-21
+        - -32,24
+        - -38,24
+        - -38,21
+      id: grid_chunk--38-21
       mask:
       - MapGrid
       layer:
       - MapGrid
-      mass: 64
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -16,19
-        - -16,21
-        - -28,21
-        - -28,19
-      id: grid_chunk--28-19
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 96
+      mass: 72
       restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
@@ -15046,97 +15530,6 @@ entities:
       - MapGrid
       mass: 12
       restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -39,21
-        - -39,24
-        - -40,24
-        - -40,21
-      id: grid_chunk--40-21
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 16,-33
-        - 16,-32
-        - 13,-32
-        - 13,-33
-      id: grid_chunk-13--33
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 18,-33
-        - 18,-32
-        - 16,-32
-        - 16,-33
-      id: grid_chunk-16--33
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 48,0
-        - 48,16
-        - 32,16
-        - 32,0
-      id: grid_chunk-32-0
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 1024
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 32,15
-        - 32,16
-        - 29,16
-        - 29,15
-      id: grid_chunk-29-15
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 32,16
-        - 32,19
-        - 29,19
-        - 29,16
-      id: grid_chunk-29-16
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 36
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 32,19
-        - 32,20
-        - 26,20
-        - 26,19
-      id: grid_chunk-26-19
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 24
-      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - -32,25
@@ -15150,71 +15543,6 @@ entities:
       - MapGrid
       mass: 72
       restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -32,21
-        - -32,24
-        - -38,24
-        - -38,21
-      id: grid_chunk--38-21
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 72
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -29,22
-        - -29,24
-        - -32,24
-        - -32,22
-      id: grid_chunk--32-22
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 24
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -29,25
-        - -29,27
-        - -32,27
-        - -32,25
-      id: grid_chunk--32-25
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 24
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -30,29
-        - -30,30
-        - -32,30
-        - -32,29
-      id: grid_chunk--32-29
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -30,28
-        - -30,29
-        - -31,29
-        - -31,28
-      id: grid_chunk--31-28
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 4
-      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - -32,29
@@ -15230,167 +15558,11 @@ entities:
       restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
-        - -32,19
-        - -32,20
-        - -38,20
-        - -38,19
-      id: grid_chunk--38-19
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 24
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -30,20
-        - -30,21
-        - -32,21
-        - -32,20
-      id: grid_chunk--32-20
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - -29,19
-        - -29,20
-        - -32,20
-        - -32,19
-      id: grid_chunk--32-19
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 18,-31
-        - 18,-27
-        - 16,-27
-        - 16,-31
-      id: grid_chunk-16--31
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 32
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 32,-32
-        - 32,-31
-        - 16,-31
+        - 16,-33
         - 16,-32
-      id: grid_chunk-16--32
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 64
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 33,-32
-        - 33,-31
-        - 32,-31
-        - 32,-32
-      id: grid_chunk-32--32
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 4
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 29,-26
-        - 29,-16
-        - 16,-16
-        - 16,-26
-      id: grid_chunk-16--26
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 520
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 32,-27
-        - 32,-26
-        - 16,-26
-        - 16,-27
-      id: grid_chunk-16--27
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 64
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 34,-27
-        - 34,-26
-        - 32,-26
-        - 32,-27
-      id: grid_chunk-32--27
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 35,-28
-        - 35,-27
-        - 33,-27
-        - 33,-28
-      id: grid_chunk-33--28
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 19,-37
-        - 19,-36
-        - 17,-36
-        - 17,-37
-      id: grid_chunk-17--37
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 18,-36
-        - 18,-33
-        - 17,-33
-        - 17,-36
-      id: grid_chunk-17--36
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 21,-38
-        - 21,-37
-        - 18,-37
-        - 18,-38
-      id: grid_chunk-18--38
+        - 13,-32
+        - 13,-33
+      id: grid_chunk-13--33
       mask:
       - MapGrid
       layer:
@@ -15410,6 +15582,45 @@ entities:
       - MapGrid
       mass: 44
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 21,-38
+        - 21,-37
+        - 18,-37
+        - 18,-38
+      id: grid_chunk-18--38
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 12
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 31,-38
+        - 31,-37
+        - 30,-37
+        - 30,-38
+      id: grid_chunk-30--38
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 4
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 19,-37
+        - 19,-36
+        - 17,-36
+        - 17,-37
+      id: grid_chunk-17--37
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 8
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 23,-38
@@ -15423,32 +15634,6 @@ entities:
       - MapGrid
       mass: 8
       restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 26,-34
-        - 26,-32
-        - 23,-32
-        - 23,-34
-      id: grid_chunk-23--34
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 24
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 22,-34
-        - 22,-32
-        - 19,-32
-        - 19,-34
-      id: grid_chunk-19--34
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 24
-      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 27,-38
@@ -15462,6 +15647,19 @@ entities:
       - MapGrid
       mass: 8
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 32,-37
+        - 32,-36
+        - 30,-36
+        - 30,-37
+      id: grid_chunk-30--37
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 8
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 27,-36
@@ -15488,6 +15686,58 @@ entities:
       - MapGrid
       mass: 44
       restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 18,-36
+        - 18,-33
+        - 17,-33
+        - 17,-36
+      id: grid_chunk-17--36
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 12
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 18,-33
+        - 18,-32
+        - 16,-32
+        - 16,-33
+      id: grid_chunk-16--33
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 8
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 22,-34
+        - 22,-32
+        - 19,-32
+        - 19,-34
+      id: grid_chunk-19--34
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 24
+      restitution: 0.1
+    - shape: !type:PolygonShape
+        vertices:
+        - 26,-34
+        - 26,-32
+        - 23,-32
+        - 23,-34
+      id: grid_chunk-23--34
+      mask:
+      - MapGrid
+      layer:
+      - MapGrid
+      mass: 24
+      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 30,-34
@@ -15501,175 +15751,6 @@ entities:
       - MapGrid
       mass: 24
       restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 26,-31
-        - 26,-30
-        - 23,-30
-        - 23,-31
-      id: grid_chunk-23--31
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 30,-31
-        - 30,-30
-        - 27,-30
-        - 27,-31
-      id: grid_chunk-27--31
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 27,-28
-        - 27,-27
-        - 22,-27
-        - 22,-28
-      id: grid_chunk-22--28
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 20
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 30,-30
-        - 30,-28
-        - 19,-28
-        - 19,-30
-      id: grid_chunk-19--30
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 88
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 22,-31
-        - 22,-30
-        - 19,-30
-        - 19,-31
-      id: grid_chunk-19--31
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 35,-32
-        - 35,-28
-        - 34,-28
-        - 34,-32
-      id: grid_chunk-34--32
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 16
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 35,-36
-        - 35,-35
-        - 33,-35
-        - 33,-36
-      id: grid_chunk-33--36
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 35,-35
-        - 35,-32
-        - 34,-32
-        - 34,-35
-      id: grid_chunk-34--35
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 34,-37
-        - 34,-36
-        - 32,-36
-        - 32,-37
-      id: grid_chunk-32--37
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 32,-37
-        - 32,-36
-        - 30,-36
-        - 30,-37
-      id: grid_chunk-30--37
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 8
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 31,-38
-        - 31,-37
-        - 30,-37
-        - 30,-38
-      id: grid_chunk-30--38
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 4
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 37,26
-        - 37,29
-        - 36,29
-        - 36,26
-      id: grid_chunk-36-26
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 32,22
-        - 32,26
-        - 31,26
-        - 31,22
-      id: grid_chunk-31-22
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 16
-      restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
         - 48,16
@@ -15685,24 +15766,11 @@ entities:
       restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
-        - 49,22
-        - 49,26
-        - 48,26
-        - 48,22
-      id: grid_chunk-48-22
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 16
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 51,21
-        - 51,22
-        - 48,22
-        - 48,21
-      id: grid_chunk-48-21
+        - 37,26
+        - 37,29
+        - 36,29
+        - 36,26
+      id: grid_chunk-36-26
       mask:
       - MapGrid
       layer:
@@ -15724,11 +15792,11 @@ entities:
       restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
-        - 51,15
-        - 51,16
-        - 48,16
-        - 48,15
-      id: grid_chunk-48-15
+        - 51,21
+        - 51,22
+        - 48,22
+        - 48,21
+      id: grid_chunk-48-21
       mask:
       - MapGrid
       layer:
@@ -15737,87 +15805,18 @@ entities:
       restitution: 0.1
     - shape: !type:PolygonShape
         vertices:
-        - 32,20
-        - 32,21
-        - 27,21
-        - 27,20
-      id: grid_chunk-27-20
+        - 49,22
+        - 49,26
+        - 48,26
+        - 48,22
+      id: grid_chunk-48-22
       mask:
       - MapGrid
       layer:
       - MapGrid
-      mass: 20
+      mass: 16
       restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 32,21
-        - 32,22
-        - 29,22
-        - 29,21
-      id: grid_chunk-29-21
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 12
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 48,-7
-        - 48,-1
-        - 46,-1
-        - 46,-7
-      id: grid_chunk-46--7
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 48
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 48,-15
-        - 48,-7
-        - 42,-7
-        - 42,-15
-      id: grid_chunk-42--15
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 192
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 53,-7
-        - 53,-1
-        - 48,-1
-        - 48,-7
-      id: grid_chunk-48--7
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 120
-      restitution: 0.1
-    - shape: !type:PolygonShape
-        vertices:
-        - 57,-15
-        - 57,-7
-        - 48,-7
-        - 48,-15
-      id: grid_chunk-48--15
-      mask:
-      - MapGrid
-      layer:
-      - MapGrid
-      mass: 288
-      restitution: 0.1
-    bodyType: Dynamic
-    type: Physics
-  - gravityShakeSound: !type:SoundPathSpecifier
-      path: /Audio/Effects/alert.ogg
-    type: Gravity
+    type: Fixtures
 - uid: 854
   type: Catwalk
   components:
@@ -16704,8 +16703,6 @@ entities:
   - pos: -9.117588,-25.708118
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 975
   type: FoodDonutChocolate
   components:
@@ -28082,6 +28079,7 @@ entities:
     type: Transform
   - containers:
       ReagentDispenser-reagentContainerContainer: !type:ContainerSlot {}
+      ReagentDispenser-beaker: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 2474
   type: PoweredSmallLight
@@ -28128,8 +28126,6 @@ entities:
   - pos: -14.661121,21.735569
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2479
   type: WallSolid
   components:
@@ -28471,8 +28467,6 @@ entities:
   - pos: -14.582996,21.735449
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2522
   type: SalternApc
   components:
@@ -33544,8 +33538,6 @@ entities:
   - pos: -14.489246,21.735449
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3004
   type: CableApcExtension
   components:
@@ -38764,7 +38756,6 @@ entities:
     type: Transform
   - canCollide: False
     type: Physics
-
 - uid: 3540
   type: CableHV
   components:
@@ -39149,8 +39140,6 @@ entities:
   - pos: -14.457996,21.735449
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3580
   type: CableHV
   components:
@@ -43229,8 +43218,6 @@ entities:
   - pos: -14.735261,21.532217
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3974
   type: CableApcExtension
   components:
@@ -43971,8 +43958,6 @@ entities:
   - pos: -14.73512,21.063467
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4060
   type: WallSolid
   components:
@@ -45353,8 +45338,6 @@ entities:
   - containers:
       WeaponCapacitorCharger-powerCellContainer: !type:ContainerSlot {}
     type: ContainerContainer
-  - fixtures: []
-    type: Physics
 - uid: 4224
   type: Table
   components:
@@ -45474,8 +45457,6 @@ entities:
   - containers:
       WeaponCapacitorCharger-powerCellContainer: !type:ContainerSlot {}
     type: ContainerContainer
-  - fixtures: []
-    type: Physics
 - uid: 4240
   type: FlashlightLantern
   components:
@@ -49520,8 +49501,6 @@ entities:
   - pos: -14.7353,20.40566
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
   - containers:
       RangedMagazine-magazine: !type:Container
         ents: []
@@ -49586,8 +49565,6 @@ entities:
   - pos: -13.462238,16.735422
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
   - containers:
       BatteryBarrel-powercell-container: !type:ContainerSlot
         ent: 4733
@@ -52453,8 +52430,6 @@ entities:
     pos: 27.736885,-22.289246
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 5068
   type: Wirecutter
   components:
@@ -68300,6 +68275,8 @@ entities:
   - pos: 38.5,24.5
     parent: 853
     type: Transform
+  - fixtures: []
+    type: Fixtures
 - uid: 6491
   type: GasVentPump
   components:
@@ -68353,6 +68330,8 @@ entities:
   - pos: 42.5,24.5
     parent: 853
     type: Transform
+  - fixtures: []
+    type: Fixtures
 - uid: 6498
   type: GasPipeStraight
   components:
diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index 570bc1ed48..a264e2e103 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -43,6 +43,7 @@
   - type: Transform
     anchored: true
   - type: Physics
+  - type: Fixtures
     fixtures:
     - hard: false
       shape:
@@ -70,6 +71,7 @@
     - state: mfoam
       map: ["enum.FoamVisualLayers.Base"]
   - type: Physics
+  - type: Fixtures
     fixtures:
     - hard: true
       shape:
@@ -97,6 +99,7 @@
       - state: mfoam
         map: ["enum.FoamVisualLayers.Base"]
   - type: Physics
+  - type: Fixtures
     fixtures:
     - hard: true
       shape:
@@ -130,6 +133,7 @@
     netsync: false
     drawdepth: Walls
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index 2c34619b30..3d65bcaa62 100644
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -15,6 +15,7 @@
   - type: Clickable
   - type: Slippery
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 0d75335951..5bc0432185 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -17,6 +17,7 @@
       state: bat
       sprite: Mobs/Animals/bat.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -53,6 +54,7 @@
       state: 0
       sprite: Mobs/Animals/bee.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -115,6 +117,7 @@
       state: butterfly
       sprite: Mobs/Animals/butterfly.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -162,6 +165,7 @@
       state: cow
       sprite: Mobs/Animals/cow.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -206,6 +210,7 @@
       state: crab
       sprite: Mobs/Animals/crab.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -278,6 +283,7 @@
       state: crawling
       sprite: Mobs/Animals/gorilla.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -349,6 +355,7 @@
     Slots:
     - Helmet
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -443,6 +450,7 @@
       state: parrot
       sprite: Mobs/Animals/parrot.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -475,6 +483,7 @@
       state: penguin
       sprite: Mobs/Animals/penguin.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -507,6 +516,7 @@
       state: snake
       sprite: Mobs/Animals/snake.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -544,6 +554,7 @@
       state: tarantula
       sprite: Mobs/Animals/spider.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 318653bf36..ebf630a92d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -18,6 +18,7 @@
       state: alive
       sprite: Mobs/Aliens/Carps/space.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -68,6 +69,7 @@
       state: alive
       sprite: Mobs/Aliens/Carps/holo.rsi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
index 1b9e894e53..53f1ab5ba6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -23,6 +23,7 @@
     state: normal
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index a9e847c6bf..43d6d94ba2 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -14,6 +14,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: corgi
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -65,6 +66,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: cat
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -138,6 +140,7 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: sloth
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 30a5470194..4fa20fbc76 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -36,6 +36,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: KinematicController # Same for all inheritors
+  - type: Fixtures
     fixtures:
     - shape:
         # Circles, cuz rotation of rectangles looks very bad
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 9b0dcd5226..166aae1ccc 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -21,6 +21,7 @@
       sprite: Mobs/Aliens/Xenos/xeno.rsi
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index b1c3c0a0d6..57698749df 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -19,7 +19,9 @@
   - type: PlayerInputMover
   - type: Physics
     bodyType: Kinematic
+    status: InAir
     # TODO: Even need these? Don't think so but CBF checking right now.
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -27,7 +29,6 @@
       mass: 5
       mask:
         - GhostImpassable
-    status: InAir
   - type: Body
     template: AGhostTemplate
     preset: HumanPreset
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index 69fd30e1de..7a7023154b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -11,6 +11,8 @@
   - type: Physics
     bodyType: KinematicController
     fixedRotation: true
+    status: InAir
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -18,7 +20,6 @@
       mass: 5
       mask:
       - GhostImpassable
-    status: InAir
   - type: PlayerInputMover
   - type: Eye
     drawFov: false
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index 3814c27caa..6cee014309 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -152,6 +152,7 @@
     - map: [ "enum.Slots.POCKET2" ]
   - type: Physics
     bodyType: KinematicController
+  - type: Fixtures
     fixtures: # TODO: This needs a second fixture just for mob collisions.
     - shape:
         !type:PhysShapeCircle
@@ -389,6 +390,7 @@
       - map: ["hand-right"]
     - type: Physics
       bodyType: Dynamic
+    - type: Fixtures
       fixtures:
       - shape:
           !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 976a1fe689..538049024d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -144,6 +144,7 @@
     enabled: false
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
index 991d6673a6..8ed9ca6a4a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
@@ -12,6 +12,7 @@
       state: nuclearbomb_base
     - type: Physics
       bodyType: Dynamic
+    - type: Fixtures
       fixtures:
       - shape:
           !type:PhysShapeCircle
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 7b22106c62..218d9d81a2 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -117,6 +117,7 @@
     enabled: false
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 76149520c6..6ba18b3989 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -38,7 +38,7 @@
   - type: FireExtinguisher
     hasSafety: true
   - type: MeleeWeapon
-    damage: 
+    damage:
       types:
         Blunt: 10
     hitSound:
@@ -62,6 +62,7 @@
         map: [ "enum.VaporVisualLayers.Base" ]
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index 449418dcfe..44bdabc183 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -92,6 +92,7 @@
         shader: unshaded
         visible: false
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
@@ -159,6 +160,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
diff --git a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
index 799e48d90e..74707d277b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
@@ -10,6 +10,7 @@
     state: inflatable_wall
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 95a5d507ea..f3ed5b3ef6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -19,6 +19,7 @@
     - type: Transform
       anchored: true
     - type: Physics
+    - type: Fixtures
       fixtures:
       - hard: false
         mass: 7
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index b094a5b4b8..6bf0b4d91e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -41,6 +41,7 @@
           Quantity: 500
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 59c2f302e8..0e893587b5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -19,6 +19,7 @@
     enabled: false
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index 98e02456f0..f157d99fcc 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -81,9 +81,10 @@
       map: ["enum.VaporVisualLayers.Base"]
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
-              !type:PhysShapeAabb
+        !type:PhysShapeAabb
         bounds: "-0.25,-0.25,0.25,0.25"
       hard: false
       mask:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index eed9ac0607..f9d3b4f2b3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -5,7 +5,7 @@
   components:
   - type: Sprite
     netsync: false
-    drawdepth: SmallObjects # I guess body bags need appear above a coroner's table? 
+    drawdepth: SmallObjects # I guess body bags need appear above a coroner's table?
     sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
     layers:
     - state: bag
@@ -21,6 +21,7 @@
   - type: MovedByPressure
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
index 6b80b1a19b..4b642776aa 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
@@ -10,6 +10,7 @@
     state: idle
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index 890c5bdc2d..3b9cafa5c5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -31,6 +31,7 @@
     enabled: false
   - type: Physics
     bodyType: KinematicController
+  - type: Fixtures
     fixtures: # TODO: Make a second fixture.
     - shape:
         !type:PhysShapeAabb
@@ -71,6 +72,7 @@
     enabled: false
   - type: Physics
     bodyType: KinematicController
+  - type: Fixtures
     fixtures: # TODO: Make a second fixture.
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
index 331266ec6b..ef91ab5a89 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -32,6 +32,7 @@
       type: TransferAmountBoundUserInterface
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
index 7ea18fabcc..1e2dff0db4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
@@ -25,6 +25,7 @@
   - type: Physics
     bodyType: Dynamic
     fixedRotation: false
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index c9f2e29fc7..17bd498582 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -13,6 +13,9 @@
     state: bullet
   - type: Physics
     bodyType: Dynamic
+    linearDamping: 0
+    angularDamping: 0
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -22,8 +25,6 @@
       - Impassable
       layer:
       - MobImpassable
-    linearDamping: 0
-    angularDamping: 0
   - type: Projectile
     damage:
       types:
@@ -104,6 +105,7 @@
     - state: spark
       shader: unshaded
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -138,6 +140,7 @@
     sprite: Structures/Power/Generation/Singularity/emitter.rsi
     state: 'projectile'
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/base.yml b/Resources/Prototypes/Entities/Objects/base.yml
index 530507f3a5..60128bee9a 100644
--- a/Resources/Prototypes/Entities/Objects/base.yml
+++ b/Resources/Prototypes/Entities/Objects/base.yml
@@ -20,6 +20,7 @@
   - type: Physics
     bodyType: Dynamic
     fixedRotation: false
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
index 8a0c56f853..eee628d814 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
@@ -10,6 +10,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
index 22303658f3..d122905e2f 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -10,6 +10,7 @@
     sprite: Structures/Doors/Airlocks/Standard/basic.rsi
     state: "assembly"
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
index 931801a274..fe8791ec73 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
@@ -22,6 +22,7 @@
     - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index ce7b8b94dc..0a2aa6c5d8 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -24,6 +24,7 @@
     #- state: panel_open
     #  map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index 7e47c40ce3..bc96f2309c 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -34,6 +34,7 @@
           map: ["enum.WiresVisualLayers.MaintenancePanel"]
     - type: Physics
       canCollide: false
+    - type: Fixtures
       fixtures:
       - shape:
           !type:PhysShapeAabb
@@ -120,6 +121,7 @@
       airBlockedDirection:
         - South
     - type: Physics
+    - type: Fixtures
       fixtures:
       - shape:
           !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
index 116191168a..741d3871fe 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
@@ -24,6 +24,7 @@
         acts: ["Destruction"]
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
index b64aa6e7bf..3d44b433b9 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -12,6 +12,7 @@
     - state: closed
       map: ["enum.DoorVisualLayers.Base"]
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
index e402c6a1bf..57ca7feb8f 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -11,6 +11,7 @@
     layers:
     - state: assembly
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
index 72cd014647..353beaa850 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
@@ -7,6 +7,7 @@
   components:
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
index 5b95d8b898..af96ea4b12 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -10,6 +10,7 @@
     placeCentered: true
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
index 47a7cbde8c..3f1ce205a7 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
@@ -15,6 +15,7 @@
     tags: [ Carpet ]
   - type: Physics
     canCollide: false
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index a3a146db99..f5aa2f58a6 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -10,6 +10,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -51,6 +52,7 @@
   - type: Sprite
     state: chair
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -74,6 +76,7 @@
     state: stool
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -100,6 +103,7 @@
     state: bar
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -122,6 +126,7 @@
   - type: Sprite
     state: office-white
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -158,6 +163,7 @@
     state: comfy
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -179,6 +185,7 @@
     state: wooden
   - type: Rotatable
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -227,6 +234,7 @@
     netsync: false
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
index c01d4b12dd..464de03983 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -8,6 +8,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -72,6 +73,7 @@
     state: plant-25
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index 67e877d5d8..11a620b6f5 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -18,6 +18,7 @@
       toilet:
         maxVol: 250
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
index 64460b9d00..b0e80cff7e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -6,6 +6,7 @@
   components:
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/base.yml b/Resources/Prototypes/Entities/Structures/Machines/base.yml
index a7413268d9..2ef9417bdc 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base.yml
@@ -7,6 +7,7 @@
   - type: Anchorable
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index 8b3bc7a67b..3baec8f082 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -23,6 +23,7 @@
         - FitsInDispenser
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
index e586ea094d..3a9a1b4613 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -12,6 +12,7 @@
       - state: pod_0
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
index 219dfdb447..4ac69da524 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -10,6 +10,7 @@
       anchored: true
     - type: Physics
       bodyType: Static
+    - type: Fixtures
       fixtures:
       - shape:
           !type:PhysShapeAabb
@@ -60,6 +61,7 @@
       anchored: true
     - type: Physics
       bodyType: Static
+    - type: Fixtures
       fixtures:
       - shape:
           !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
index ff0fb9838f..ff215570f9 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
@@ -26,6 +26,7 @@
   - type: ExtensionCableReceiver
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index dab7b7192a..c68b112379 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -18,6 +18,7 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -96,6 +97,7 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
index ad8e4d966c..177fa0d7f4 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -16,6 +16,7 @@
       map: ["enum.MedicalScannerVisualLayers.Terminal"]
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 89b2724e0d..c3348b20d5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -19,6 +19,7 @@
     - key: enum.MicrowaveUiKey.Key
       type: MicrowaveBoundUserInterface
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index 4bc8139697..3b825719c6 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -16,6 +16,7 @@
     visuals:
     - type: ReagentGrinderVisualizer
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
index 9b233d2be0..ee466f03f7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -5,6 +5,7 @@
   description: A large crushing machine used to recycle small items inefficiently. There are lights on the side.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
index 7ad2f475bc..ffd0141ebc 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
@@ -13,6 +13,7 @@
     netsync: false
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/traitordm.yml b/Resources/Prototypes/Entities/Structures/Machines/traitordm.yml
index 4127d3f695..2a94d0d91e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/traitordm.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/traitordm.yml
@@ -13,6 +13,7 @@
         shader: unshaded
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 99a1c75ef1..c968816cbb 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -16,6 +16,7 @@
     netsync: false
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index 6a9c17d91e..3e6c3e098a 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -23,6 +23,7 @@
   - type: Physics
     bodyType: Dynamic
     fixedRotation: false
+  - type: Fixtures
     fixtures:
       - shape:
           !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
index 474ff68894..f4d6ba5f2b 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
@@ -9,6 +9,7 @@
       anchored: true
     - type: Physics
       bodyType: Static
+    - type: Fixtures
       fixtures:
         - shape:
             !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
index b9b8f418b4..2a3366d172 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -13,6 +13,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
   - type: Transform
     anchored: true
   - type: Anchorable
@@ -57,6 +58,7 @@
       state_anchored: pipe-s
       state_broken: pipe-b
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -85,6 +87,7 @@
     - key: enum.DisposalTaggerUiKey.Key
       type: DisposalTaggerBoundUserInterface
   - type: Physics
+  - type: Fixtures
     fixtures:
       - shape:
           !type:PhysShapeAabb
@@ -109,6 +112,7 @@
       state_anchored: pipe-t
       state_broken: pipe-b
   - type: Physics
+  - type: Fixtures
     fixtures:
       - shape:
           !type:PhysShapeAabb
@@ -143,6 +147,7 @@
     - key: enum.DisposalRouterUiKey.Key
       type: DisposalRouterBoundUserInterface
   - type: Physics
+  - type: Fixtures
     fixtures:
       - shape:
           !type:PhysShapeAabb
@@ -172,6 +177,7 @@
   - type: Flippable
     mirrorEntity: DisposalRouter
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -202,6 +208,7 @@
   - type: Flippable
     mirrorEntity: DisposalJunctionFlipped
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -231,6 +238,7 @@
   - type: Flippable
     mirrorEntity: DisposalJunction
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -259,6 +267,7 @@
       state_anchored: pipe-y
       state_broken: pipe-b
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -283,6 +292,7 @@
       state_anchored: pipe-c
       state_broken: pipe-b
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 9a651237a3..311a018096 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -20,6 +20,7 @@
       map: ["enum.DisposalUnitVisualLayers.Light"]
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml
index d26b126a99..38420ec16a 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml
@@ -9,6 +9,7 @@
     - type: Rotatable
     - type: Physics
       bodyType: Static
+    - type: Fixtures
       fixtures:
       - shape:
           !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
index d38655749f..3a95aa3df2 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
@@ -17,6 +17,7 @@
         types:
           Radiation: 10
     - type: Physics
+    - type: Fixtures
       fixtures:
       - shape:
           !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
index 4e00649126..3d23d55286 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
@@ -9,6 +9,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
index 47afecc048..f167b1c467 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
@@ -9,6 +9,7 @@
   - type: Clickable
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         # Using a circle here makes it a lot easier to pull it all the way from Cargo
@@ -56,6 +57,7 @@
   - type: Clickable
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index 168de1ffa9..4fd9485365 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -9,6 +9,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
index 4069d3c901..0fc986d226 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
@@ -13,6 +13,7 @@
   - type: Clickable
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         # Using a circle here makes it a lot easier to pull it all the way from Cargo
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
index e40bbbc18c..a3913c9a90 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
@@ -11,6 +11,7 @@
       path: /Audio/Effects/singularity.ogg
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - id: DeleteCircle
       shape:
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
index ccea996fd6..4b73ef33c4 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -11,6 +11,7 @@
     sprite: Structures/Power/Generation/ame.rsi
     state: control
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -74,6 +75,7 @@
   components:
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -102,6 +104,7 @@
     sprite: Structures/Power/Generation/ame.rsi
     state: shield_0
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml
index 89e796f89e..8f50a91d9b 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml
@@ -14,6 +14,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
index a676deeb7e..1f0b0d6485 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -11,6 +11,7 @@
     anchored: true
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -109,6 +110,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeCircle
@@ -150,6 +152,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 0472f6b509..35dbb33df6 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -22,6 +22,7 @@
     access: [["Engineering"]]
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
       - shape:
           !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
index ccaec3f878..4747ae5ddb 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -11,6 +11,7 @@
       drawdepth: BelowFloor
     - type: Clickable
     - type: Physics
+    - type: Fixtures
       fixtures:
         - shape:
             !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml
index a25b4b85d5..b04421f07d 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -6,6 +6,7 @@
   components:
   - type: Clickable
   - type: Physics
+  - type: Fixtures
     fixtures:
       - shape:
           !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
index 226e95d992..5c304701d9 100644
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -20,6 +20,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -63,6 +64,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -94,6 +96,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -153,6 +156,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index f9760b1005..17e8d351e4 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -46,6 +46,7 @@
       damageModifierSet: Metallic
     - type: Physics
       bodyType: Dynamic
+    - type: Fixtures
       fixtures:
         - shape:
             !type:PhysShapeAabb
@@ -372,6 +373,7 @@
       state: grey-1
     - type: Physics
       bodyType: Dynamic
+    - type: Fixtures
       fixtures:
         - shape:
             !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
index a5d0b9c86c..4df4cb70cb 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
@@ -26,6 +26,7 @@
       path: /Audio/Effects/bang.ogg
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
index ae547fad37..a32d344473 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
@@ -20,6 +20,7 @@
       map: ["enum.StorageVisualLayers.Welded"]
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 3fab43d9d4..1bcd889158 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -553,6 +553,7 @@
         acts: [ "Destruction" ]
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
index ae9381273b..5a861537a0 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
@@ -7,6 +7,7 @@
   components:
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
index 6644c1b695..6c6579f964 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -17,6 +17,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -59,6 +60,7 @@
   components:
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
       - shape:
           !type:PhysShapeAabb
@@ -97,6 +99,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
index 9a2cf4cd59..3bb96a4501 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -15,6 +15,7 @@
     state: rack
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
index f75198e1ed..d7ed55e77d 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
@@ -4,6 +4,7 @@
   name: atmos plaque
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index 158b0d897e..7be976678d 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -4,6 +4,7 @@
   name: bar sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
index 938d37f01d..87af129eab 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
@@ -8,6 +8,7 @@
   - type: Physics
     bodyType: Static
     canCollide: false
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
index 3b94a02934..1e8b9ba8a8 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -10,6 +10,7 @@
   description: Return to monky.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -31,6 +32,7 @@
   components:
   - type: Rotatable
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -50,6 +52,7 @@
   components:
   - type: Rotatable
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -70,6 +73,7 @@
   components:
   - type: Rotatable
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -90,6 +94,7 @@
   components:
   - type: Rotatable
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -110,6 +115,7 @@
   components:
   - type: Rotatable
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -129,6 +135,7 @@
   components:
   - type: Rotatable
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -148,6 +155,7 @@
   components:
   - type: Rotatable
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -168,6 +176,7 @@
   name: armory sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -186,6 +195,7 @@
   name: tool storage sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -204,6 +214,7 @@
   name: anomaly lab sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -222,6 +233,7 @@
   name: atmos sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -240,6 +252,7 @@
   name: bar sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -258,6 +271,7 @@
   name: library sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -276,6 +290,7 @@
   name: chapel sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -294,6 +309,7 @@
   name: head sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -312,6 +328,7 @@
   name: conference room sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -330,6 +347,7 @@
   name: drones sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -347,6 +365,7 @@
   name: engine sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -364,6 +383,7 @@
   name: cloning sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -381,6 +401,7 @@
   name: interrogation sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -398,6 +419,7 @@
   name: surgery sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -415,6 +437,7 @@
   name: telecomms sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -432,6 +455,7 @@
   name: cargo sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -449,6 +473,7 @@
   name: cargo dock sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -466,6 +491,7 @@
   name: chemistry sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -483,6 +509,7 @@
   name: docking sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -500,6 +527,7 @@
   name: engineering sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -517,6 +545,7 @@
   name: EVA sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -534,6 +563,7 @@
   name: gravity sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -551,6 +581,7 @@
   name: medbay sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -568,6 +599,7 @@
   name: morgue sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -585,6 +617,7 @@
   name: prison sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -602,6 +635,7 @@
   name: research and development sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -619,6 +653,7 @@
   name: science sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -636,6 +671,7 @@
   name: toxins sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -653,6 +689,7 @@
   name: bridge sign
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -673,6 +710,7 @@
   description: WARNING! Air flow tube. Ensure the flow is disengaged before working.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -691,6 +729,7 @@
   description: WARNING! CO2 flow tube. Ensure the flow is disengaged before working.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -709,6 +748,7 @@
   description: WARNING! N2 flow tube. Ensure the flow is disengaged before working.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -727,6 +767,7 @@
   description: WARNING! N2O flow tube. Ensure the flow is disengaged before working.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -745,6 +786,7 @@
   description: WARNING! O2 flow tube. Ensure the flow is disengaged before working.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -763,6 +805,7 @@
   description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -781,6 +824,7 @@
   description: WARNING! Waste flow tube. Ensure the flow is disengaged before working.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -799,6 +843,7 @@
   description: A warning sign which reads 'NO SMOKING'
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -817,6 +862,7 @@
   description: Technical information of some sort, shame its too worn-out to read.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -835,6 +881,7 @@
   description: Looks like a planet crashing by some station above it. Its kinda scary.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
index dd84827c06..d9afd39091 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
@@ -11,6 +11,7 @@
     node: tubeLight
   - type: Physics
     canCollide: false
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -154,6 +155,7 @@
     enabled: false
     offset: "0, -0.5"
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Walls/barricades.yml b/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
index bff0d0d9c0..6ae63a0b3d 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
@@ -11,6 +11,7 @@
     sprite: Structures/Walls/barricades.rsi
     state: barricadewooden
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
diff --git a/Resources/Prototypes/Entities/Structures/Walls/base.yml b/Resources/Prototypes/Entities/Structures/Walls/base.yml
index ab79b00167..120dd63128 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/base.yml
@@ -22,6 +22,7 @@
     damageModifierSet: Metallic
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Walls/girder.yml b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
index e4a38be23a..149162c4bf 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
@@ -8,6 +8,7 @@
     anchored: true
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
index 08829dfa99..02e8ec7b9d 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -43,6 +43,7 @@
           nodeGroupID: Apc
     - type: Physics
       bodyType: Static
+    - type: Fixtures
       fixtures:
         - shape:
             !type:PhysShapeAabb
@@ -85,6 +86,7 @@
       node: grilleBroken
       deconstructionTarget: start
     - type: Physics
+    - type: Fixtures
       fixtures:
         - shape:
             !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index d76c470068..50a4550fa6 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -21,6 +21,7 @@
     state: full
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
@@ -88,6 +89,7 @@
     sprite: Structures/Windows/directional.rsi
     state: window
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/base.yml b/Resources/Prototypes/Entities/Structures/base.yml
index 57abbe000a..2d90cfc849 100644
--- a/Resources/Prototypes/Entities/Structures/base.yml
+++ b/Resources/Prototypes/Entities/Structures/base.yml
@@ -9,6 +9,7 @@
   - type: Clickable
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
@@ -39,6 +40,7 @@
   - type: Clickable
   - type: Physics
     bodyType: Dynamic
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
index 887a39b7ad..ace3862d19 100644
--- a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
+++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
@@ -7,6 +7,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml
index 3f9c086b1d..99046aaf08 100644
--- a/Resources/Prototypes/Entities/Structures/catwalk.yml
+++ b/Resources/Prototypes/Entities/Structures/catwalk.yml
@@ -8,6 +8,7 @@
   - type: Clickable
   - type: Physics
     canCollide: false
+  - type: Fixtures
     fixtures:
       - shape:
           !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml
index 946e8ceeba..626cca545b 100644
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -8,6 +8,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index 7039d8bb75..fa628f3e93 100644
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -5,6 +5,7 @@
   description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds.
   components:
   - type: Physics
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb {}
diff --git a/Resources/Prototypes/Entities/Structures/soil.yml b/Resources/Prototypes/Entities/Structures/soil.yml
index 33c4ffd9ea..4c5a9e9ada 100644
--- a/Resources/Prototypes/Entities/Structures/soil.yml
+++ b/Resources/Prototypes/Entities/Structures/soil.yml
@@ -8,6 +8,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+  - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb