Physics (#3452)

* Content side new physics structure * BroadPhase outline done * But we need to fix WorldAABB * Fix static pvs AABB * Fix import * Rando fixes * B is for balloon * Change human mob hitbox to circle * Decent movement * Start adding friction to player controller I think it's the best way to go about it to keep other objects somewhat consistent for physics. * This baby can fit so many physics bugs in it. * Slight mob mover optimisations. * Player mover kinda works okay. * Beginnings of testbed * More testbed * Circlestack bed * Namespaces * BB fixes * Pull WorldAABB * Joint pulling * Semi-decent movement I guess. * Pulling better * Bullet controller + old movement * im too dumb for this shit * Use kinematic mob controller again It's probably for the best TBH * Stashed shitcode * Remove SlipController * In which movement code is entirely refactored * Singularity fix * Fix ApplyLinearImpulse * MoveRelay fix * Fix door collisions * Disable subfloor collisions Saves on broadphase a fair bit * Re-implement ClimbController * Zumzum's pressure * Laggy item throwing * Minor atmos change * Some caching * Optimise controllers * Optimise CollideWith to hell and back * Re-do throwing and tile friction * Landing too * Optimise controllers * Move CCVars and other stuff swept is beautiful * Cleanup a bunch of controllers * Fix shooting and high pressure movement controller * Flashing improvements * Stuff and things * Combat collisions * Combat mode collisions * Pulling distance joint again * Cleanup physics interfaces * More like scuffedularity * Shit's fucked * Haha tests go green * Bigmoneycrab Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-03-01 03:11:29 +11:00
parent 9deee05279
commit 3e64fd56a1
211 changed files with 2602 additions and 2562 deletions
--- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
@@ -24,9 +24,10 @@
    - state: panel_open
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
      mask:
      - MobImpassable
      layer:
--- a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
@@ -35,9 +35,10 @@

    - type: Physics
      on: false
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+              bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
          mask:
            - MobImpassable
          layer:
@@ -110,8 +111,9 @@
      airBlockedDirection:
        - East
    - type: Physics
-      shapes:
-        - !type:PhysShapeRect
+      fixtures:
+        - shape:
+            !type:PhysShapeRect {}
          bounds: "0.49,-0.49,-0.49,-0.2" # don't want this colliding with walls or they won't close
          mask:
            - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml
@@ -22,9 +22,10 @@
        - !type:DoActsBehavior
          acts: ["Destruction"]
    - type: Physics
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49"
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+              bounds: "-0.49,-0.49,0.49,0.49"
          mask:
            - Impassable
          layer:
--- a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml
@@ -8,9 +8,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.45, -0.45, 0.05, 0.45"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.45, 0.05, 0.45"
      mask:
      - Impassable
      - VaultImpassable
--- a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml
@@ -11,8 +11,9 @@
  - type: Sprite
    sprite: Constructible/Misc/bookshelf.rsi
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml
@@ -16,9 +16,10 @@
    key: full
    base: carpet_
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.5, -0.5, 0.5, 0.5"
        layer: [ Passable ]
  - type: Damageable
  - type: Destructible
--- a/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml
@@ -11,8 +11,9 @@
  - type: InteractionOutline
  - type: Anchorable
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb {}
        layer: [MobMask]
        mask:
          - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml
@@ -7,9 +7,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.2, 0.5, 0.2"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.2, 0.5, 0.2"
      mask:
      - Impassable
      - MobImpassable
@@ -58,9 +59,10 @@
  - type: Sprite
    state: plant-25
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.47,-0.25,0.05,0.25"
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.47,-0.25,0.05,0.25"
        layer: [ Passable ]

 - type: entity
--- a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml
@@ -10,9 +10,10 @@
  - type: InteractionOutline
  - type: Physics
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5,-0.25,0.5,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.25"
      mask:
      - Impassable
      - VaultImpassable
@@ -44,9 +45,10 @@
    state: chair
    color: "#8e9799"
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.45, -0.45, 0.05, 0.45"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.45, 0.05, 0.45"
      mask:
      - Impassable
      - VaultImpassable
@@ -62,9 +64,10 @@
    state: stool_base
    color: "#8e9799"
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.25, 0.05, 0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.25, 0.05, 0.25"
      mask:
      - Impassable
      - VaultImpassable
@@ -79,9 +82,10 @@
    state: bar_stool
    color: "white"
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.2, 0.2, 0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.2, 0.2, 0.25"
      mask:
      - Impassable
      - VaultImpassable
@@ -97,9 +101,10 @@
  - type: Sprite
    state: officechair_white
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.49, -0.25, 0.37, 0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.49, -0.25, 0.37, 0.25"
      mask:
      - Impassable
      - VaultImpassable
@@ -122,9 +127,10 @@
  - type: Sprite
    state: comfychair_preview
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.45, -0.3, 0.35, 0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.3, 0.35, 0.3"
      mask:
      - Impassable
      - VaultImpassable
@@ -139,9 +145,10 @@
    state: wooden_chair
    color: "white"
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.37, -0.25, 0.49, 0.24"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.37, -0.25, 0.49, 0.24"
      mask:
      - Impassable
      - VaultImpassable
--- a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml
@@ -13,9 +13,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.4,0.4,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
      layer:
      - Opaque
      - Impassable
@@ -61,9 +62,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.4,0.4,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
@@ -17,8 +17,9 @@
    key: state
    base: state_
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer:
      - VaultImpassable
  - type: SnapGrid
--- a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
@@ -8,9 +8,10 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.5,0.5,0.5"
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.5,-0.5,0.5,0.5"
        layer: [ Passable ]
  - type: Sprite
    netsync: false
--- a/Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml
@@ -8,8 +8,9 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      mask:
      - Impassable
      layer:
--- a/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml
@@ -50,9 +50,10 @@
  - type: Physics
    mass: 25
    anchored: false
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.25,0.5,0.25"
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.5,-0.25,0.5,0.25"
        mask:
          - Impassable
          - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/computers.yml
@@ -8,9 +8,10 @@
    - type: Physics
      mass: 25
      anchored: true
-      shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.25,0.5,0.25"
+      fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.5,-0.25,0.5,0.25"
        layer:
        - Impassable
        - MobImpassable
@@ -40,9 +41,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5,-0.25,0.5,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.25"
      layer:
      - Impassable
      - MobImpassable
@@ -78,9 +80,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5,-0.25,0.5,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.25"
      layer:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
@@ -12,9 +12,10 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      layer: [MobMask, Opaque]
  - type: SnapGrid
    offset: Center
@@ -48,9 +49,10 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      layer: [MobMask, Opaque]
  - type: SnapGrid
    offset: Center
@@ -75,9 +77,10 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      layer: [MobMask, Opaque]
  - type: SnapGrid
    offset: Center
@@ -117,9 +120,10 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      layer: [MobMask, Opaque]
  - type: SnapGrid
    offset: Center
--- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml
@@ -10,9 +10,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.4,0.4,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Power/machine_frame.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/machine_frame.yml
@@ -9,9 +9,10 @@
    - type: Physics
      mass: 25
      anchored: true
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+              bounds: "-0.5,-0.25,0.5,0.25"
          layer:
            - Impassable
            - MobImpassable
@@ -55,9 +56,10 @@
    - type: Physics
      mass: 25
      anchored: true
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+              bounds: "-0.5,-0.25,0.5,0.25"
          layer:
            - Impassable
            - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Power/particleAccelerator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/particleAccelerator.yml
@@ -9,9 +9,10 @@
    - type: Physics
      mass: 25
      anchored: true
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49"
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+              bounds: "-0.49,-0.49,0.49,0.49"
          layer:
            - Opaque
            - Impassable
@@ -39,10 +40,11 @@
      damages:
        Radiation: 10
    - type: Physics
-      hard: false
-      shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.48,-0.48,0.48,0.48"
+      fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.48,-0.48,0.48,0.48"
+        hard: false
        layer: [None]
        mask:
        - MobMask
--- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
@@ -11,9 +11,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.4, 0.3, 0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.4, 0.3, 0.4"
      mask:
      - Impassable
      - MobImpassable
@@ -55,8 +56,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      mask:
      - Impassable
      - MobImpassable
@@ -113,8 +115,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      mask:
      - Impassable
      - MobImpassable
@@ -172,9 +175,10 @@
    access: [["Engineering"]]
  - type: InteractionOutline
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.25, -0.25, 0.25, 0.3"
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.25, -0.25, 0.25, 0.3"
        layer: [ Passable ]
  - type: SnapGrid
    offset: Center
@@ -228,8 +232,9 @@
  - type: Physics
    mass: 25
    anchored: false
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml
@@ -13,9 +13,10 @@
    - type: Physics
      mass: 25
      anchored: true
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.4,-0.25,0.4,0.25"
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+              bounds: "-0.4,-0.25,0.4,0.25"
          layer:
            - Opaque
            - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
@@ -13,9 +13,10 @@
    netsync: false
  - type: Physics
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5,-0.25,0.5,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.25"
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Power/wires.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/wires.yml
@@ -6,10 +6,12 @@
  components:
  - type: Clickable
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5, -0.5, 0.5, 0.5"
-        layer: [ Underplating ]
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.5, -0.5, 0.5, 0.5"
+        layer:
+        - Underplating
  - type: InteractionOutline
  - type: SnapGrid
    offset: Center
--- a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml
@@ -8,10 +8,11 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    hard: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.49,-0.49,0.49,0.49"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+      hard: false
      layer: [Passable]
      mask:
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Cooking/microwave.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Cooking/microwave.yml
@@ -22,9 +22,10 @@
    - key: enum.MicrowaveUiKey.Key
      type: MicrowaveBoundUserInterface
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.16,-0.3,0.16,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.16,-0.3,0.16,0.3"
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Cooking/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Cooking/reagent_grinder.yml
@@ -21,9 +21,10 @@
  - type: PowerReceiver
  - type: LoopingSound
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.35,-0.08,0.25,0.15"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.35,-0.08,0.25,0.15"
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml
@@ -9,9 +9,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.3,-0.4,0.3,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.3,-0.4,0.3,0.4"
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/controller.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/controller.yml
@@ -13,8 +13,9 @@
  - type: Physics
    # Mass of 1? Unmovable. Mass of 25? Fine. What on earth is going on?
    mass: 25
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/shielding.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/shielding.yml
@@ -12,8 +12,9 @@
    sprite: Constructible/Power/ame_shielding.rsi
    state: shield_0
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml
@@ -10,9 +10,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      layer:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml
@@ -18,9 +18,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.25,0.5,0.25"
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.5,-0.25,0.5,0.25"
        layer:
          - Opaque
          - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml
@@ -20,12 +20,12 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      mask:
-        - Impassable
-        - VaultImpassable
-        - SmallImpassable
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
+      layer:
+      - Impassable
+      - VaultImpassable
  - type: SnapGrid
    offset: Center
  - type: Anchorable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml
@@ -13,9 +13,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4, -0.45, 0.45, 0.45"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4, -0.45, 0.45, 0.45"
      mask:
      - Impassable
      - MobImpassable
@@ -55,8 +56,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml
@@ -10,9 +10,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.45, -0.45, 0.00, 0.45"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.45, 0.00, 0.45"
      layer: [ Passable ]
  - type: Sprite
    sprite: Constructible/Power/cargo_teleporter.rsi
--- a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml
@@ -22,9 +22,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.25,0.4,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.25,0.4,0.25"
      layer:
      - Opaque
      - Impassable
@@ -73,9 +74,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.25,0.4,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.25,0.4,0.25"
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml
@@ -51,9 +51,10 @@
      state_anchored: pipe-s
      state_broken: pipe-b
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5,-0.25,0.5,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.25"
      layer: [ Underplating ]

 - type: entity
@@ -78,9 +79,10 @@
    - key: enum.DisposalTaggerUiKey.Key
      type: DisposalTaggerBoundUserInterface
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.25,0.5,0.25"
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.5,-0.25,0.5,0.25"
        layer: [ Underplating ]

 - type: entity
@@ -101,9 +103,10 @@
      state_anchored: pipe-t
      state_broken: pipe-b
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.25,0.4,0.25"
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.5,-0.25,0.4,0.25"
        layer: [ Underplating ]

 - type: entity
@@ -132,9 +135,10 @@
  - type: InteractionOutline
  - type: Physics
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.3,-0.35,0.3,0.35"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.3,-0.35,0.3,0.35"
      mask:
      - Impassable
      - MobImpassable
@@ -206,9 +210,10 @@
    - key: enum.DisposalRouterUiKey.Key
      type: DisposalRouterBoundUserInterface
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.5,0.5,0.25"
+    fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.5,-0.5,0.5,0.25"
        layer: [ Underplating ]

 - type: entity
@@ -234,10 +239,11 @@
  - type: Flippable
    entity: DisposalRouter
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.25,0.5,0.5"
-        layer: [ Underplating ]
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.5"
+      layer: [ Underplating ]

 - type: entity
  id: DisposalJunction
@@ -263,10 +269,11 @@
  - type: Flippable
    entity: DisposalJunctionFlipped
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.5,0.5,0.25"
-        layer: [ Underplating ]
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.25"
+      layer: [ Underplating ]

 - type: entity
  id: DisposalJunctionFlipped
@@ -291,10 +298,11 @@
  - type: Flippable
    entity: DisposalJunction
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.25,0.5,0.5"
-        layer: [ Underplating ]
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.5"
+      layer: [ Underplating ]

 - type: entity
  id: DisposalYJunction
@@ -318,10 +326,11 @@
      state_anchored: pipe-y
      state_broken: pipe-b
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.5,0.25,0.5"
-        layer: [ Underplating ]
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.25,0.5"
+      layer: [ Underplating ]

 - type: entity
  id: DisposalBend
@@ -341,10 +350,11 @@
      state_anchored: pipe-c
      state_broken: pipe-b
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.5,-0.5,0.25,0.25"
-        layer: [ Underplating ]
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.25,0.25"
+      layer: [ Underplating ]

 - type: entity
  id: DisposalMailingUnit
@@ -375,9 +385,10 @@
  - type: InteractionOutline
  - type: Physics
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.35,-0.3,0.35,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.35,-0.3,0.35,0.3"
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml
@@ -18,14 +18,15 @@
  - type: PowerReceiver
    powerLoad: 500
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-1.5,-1.5,1.5,1.5"
-        layer:
-        - Opaque
-        - Impassable
-        - MobImpassable
-        - VaultImpassable
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-1.5,-1.5,1.5,1.5"
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
  - type: Clickable
  - type: InteractionOutline
  - type: Damageable
--- a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml
@@ -9,10 +9,11 @@
  - type: Physics
    mass: 25
    anchored: true
-    hard: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.1, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.1, 0.5"
+      hard: false
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml
@@ -8,10 +8,11 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    hard: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.49,-0.49,0.49,0.49"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+      hard: false
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
@@ -21,11 +21,12 @@
    soundHit: /Audio/Effects/bang.ogg
  - type: InteractionOutline
  - type: Physics
-    mass: 25
+    mass: 50
    anchored: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5,-0.25,0.5,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.25"
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml
@@ -19,9 +19,10 @@
  - type: Physics
    mass: 25
    anchored: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4, -0.4, 0.29, 0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4, -0.4, 0.29, 0.4"
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml
@@ -7,11 +7,12 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    mass: 15
+    mass: 100
    anchored: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5,-0.5,0.5,0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
@@ -11,8 +11,9 @@
    state: 0

  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer: [MobMask]
  - type: Damageable
    resistances: metallicResistances
--- a/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/atmos_plaque.yml
@@ -4,9 +4,10 @@
  name: Atmos Plaque
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.3,-0.3,0.3,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.3,-0.3,0.3,0.3"
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
@@ -5,10 +5,11 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.45, -0.95, 0.45, 1"
-        layer: [ Passable ]
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.95, 0.45, 1"
+      layer: [ Passable ]
  - type: Sprite
    drawdepth: WallTops
    sprite: Constructible/Misc/barsign.rsi
--- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
@@ -16,8 +16,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
@@ -9,9 +9,10 @@
    graph: lightFixture
    node: tubeLight
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.45, -0.15, 0.45, 0.35"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45, -0.15, 0.45, 0.35"
      layer: [ Passable ]
  - type: LoopingSound
  - type: Sprite
@@ -122,10 +123,11 @@
    enabled: false
    offset: "0, -0.5"
  - type: Physics
-    shapes:
-      - !type:PhysShapeAabb
-        bounds: "0, 0.1, 0.25, 0.1"
-        layer: [ Passable ]
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "0, 0, 0.25, 0.1"
+      layer: [ Passable ]
  - type: PoweredLight
    bulb: Bulb
  - type: PowerReceiver
--- a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
@@ -20,8 +20,9 @@
    sprite: Constructible/Structures/Walls/low_wall.rsi
    state: metal
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer:
      - VaultImpassable
      - SmallImpassable
--- a/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/mirror.yml
@@ -9,8 +9,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer: [Clickable]
  - type: Clickable
  - type: InteractionOutline
--- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
@@ -6,8 +6,9 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
  - type: Damageable
    resistances: metallicResistances
  - type: Destructible
@@ -34,9 +35,10 @@
  description: Return to monky.
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.1,-0.4,0.1,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.1,-0.4,0.1,0.4"
      layer:
      - Opaque
      - Impassable
@@ -57,9 +59,10 @@
  components:
  - type: Rotatable
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.1,-0.4,0.1,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.1,-0.4,0.1,0.4"
      layer:
      - Opaque
      - Impassable
@@ -78,9 +81,10 @@
  components:
  - type: Rotatable
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.1,-0.4,0.1,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.1,-0.4,0.1,0.4"
      layer:
      - Opaque
      - Impassable
@@ -100,9 +104,10 @@
  components:
  - type: Rotatable
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.1,-0.4,0.1,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.1,-0.4,0.1,0.4"
      layer:
      - Opaque
      - Impassable
@@ -122,9 +127,10 @@
  components:
  - type: Rotatable
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.1,-0.4,0.1,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.1,-0.4,0.1,0.4"
      layer:
      - Opaque
      - Impassable
@@ -144,9 +150,10 @@
  components:
  - type: Rotatable
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.1,-0.4,0.1,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.1,-0.4,0.1,0.4"
      layer:
      - Opaque
      - Impassable
@@ -165,9 +172,10 @@
  components:
  - type: Rotatable
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.1,-0.4,0.1,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.1,-0.4,0.1,0.4"
      layer:
      - Opaque
      - Impassable
@@ -186,9 +194,10 @@
  components:
  - type: Rotatable
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.1,-0.4,0.1,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.1,-0.4,0.1,0.4"
      layer:
      - Opaque
      - Impassable
@@ -208,9 +217,10 @@
  name: armory sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -228,9 +238,10 @@
  name: tool storage sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -248,9 +259,10 @@
  name: anomaly lab sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -268,9 +280,10 @@
  name: atmos sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -288,9 +301,10 @@
  name: bar sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -308,9 +322,10 @@
  name: library sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -328,9 +343,10 @@
  name: chapel sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -348,9 +364,10 @@
  name: head sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -368,9 +385,10 @@
  name: conference room sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -388,9 +406,10 @@
  name: drones sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -408,9 +427,10 @@
  name: engine sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -428,9 +448,10 @@
  name: cloning sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -448,9 +469,10 @@
  name: interrogation sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -468,9 +490,10 @@
  name: surgery sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -488,9 +511,10 @@
  name: telecomms sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -508,9 +532,10 @@
  name: cargo sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -528,9 +553,10 @@
  name: cargo dock sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -548,9 +574,10 @@
  name: chemistry sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -568,9 +595,10 @@
  name: docking sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -588,9 +616,10 @@
  name: engineering sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -608,9 +637,10 @@
  name: EVA sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -628,9 +658,10 @@
  name: gravity sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -648,9 +679,10 @@
  name: medbay sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -668,9 +700,10 @@
  name: morgue sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -688,9 +721,10 @@
  name: prison sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -708,9 +742,10 @@
  name: research and development sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -728,9 +763,10 @@
  name: science sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -748,9 +784,10 @@
  name: toxins sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -768,9 +805,10 @@
  name: bridge sign
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -791,9 +829,10 @@
  description: WARNING! Air flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.2,-0.3,0.2,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.3"
      layer:
      - Opaque
      - Impassable
@@ -812,9 +851,10 @@
  description: WARNING! CO2 flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.2,-0.3,0.2,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.3"
      layer:
      - Opaque
      - Impassable
@@ -833,9 +873,10 @@
  description: WARNING! N2 flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.2,-0.3,0.2,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.3"
      layer:
      - Opaque
      - Impassable
@@ -854,9 +895,10 @@
  description: WARNING! N2O flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.2,-0.3,0.2,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.3"
      layer:
      - Opaque
      - Impassable
@@ -875,9 +917,10 @@
  description: WARNING! O2 flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.2,-0.3,0.2,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.3"
      layer:
      - Opaque
      - Impassable
@@ -896,9 +939,10 @@
  description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.2,-0.3,0.2,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.3"
      layer:
      - Opaque
      - Impassable
@@ -917,9 +961,10 @@
  description: WARNING! Waste flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.2,-0.3,0.2,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.3"
      layer:
      - Opaque
      - Impassable
@@ -938,9 +983,10 @@
  description: A warning sign which reads 'NO SMOKING'
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -959,9 +1005,10 @@
  description: Technical information of some sort, shame its too worn-out to read.
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
@@ -980,9 +1027,10 @@
  description: Looks like a planet crashing by some station above it. Its kinda scary.
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.3,0.4,0.3"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
@@ -20,8 +20,11 @@
  - type: Icon
    state: full
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
@@ -19,8 +19,10 @@
    sprite: Constructible/Structures/Windows/window.rsi
    state: full
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    bodyType: Static
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -16,9 +16,10 @@
  - type: Physics
    anchored: false
    mass: 50
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.30,-0.25,0.40,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.30,-0.25,0.40,0.25"
      mask:
      - Impassable
      - VaultImpassable
@@ -49,9 +50,10 @@
  - type: Physics
    anchored: false
    mass: 90
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.90,-0.50,0.05,0.50"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.90,-0.50,0.05,0.50"
      mask:
      - Impassable
      - VaultImpassable
@@ -79,9 +81,10 @@
  - type: Physics
    anchored: false
    mass: 20
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.45,-0.20,0.10,0.20"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45,-0.20,0.10,0.20"
      mask:
      - Impassable
      - VaultImpassable
@@ -112,9 +115,10 @@
  - type: Physics
    anchored: false
    mass: 5
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.20,-0.20,0.20,0.20"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.20,-0.20,0.20,0.20"
      mask:
      - Impassable
      - VaultImpassable
@@ -155,9 +159,10 @@
  - type: Physics
    anchored: false
    mass: 5
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.20,-0.20,0.20,0.20"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.20,-0.20,0.20,0.20"
      mask:
      - Impassable
      - VaultImpassable
@@ -189,9 +194,10 @@
  - type: Physics
    anchored: false
    mass: 5
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.10,-0.10,0.10,0.10"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.10,-0.10,0.10,0.10"
      mask:
      - Impassable
      - VaultImpassable
@@ -219,9 +225,10 @@
  - type: Physics
    anchored: false
    mass: 20
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.60,-0.50,0.05,0.50"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.60,-0.50,0.05,0.50"
      mask:
      - Impassable
      - VaultImpassable
@@ -250,9 +257,10 @@
  - type: Physics
    anchored: false
    mass: 20
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.45,-0.35,0.45,0.35"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45,-0.35,0.45,0.35"
      mask:
      - Impassable
      - VaultImpassable
@@ -284,9 +292,10 @@
  - type: Physics
    anchored: false
    mass: 20
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.30,-0.35,0.35,0.35"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.30,-0.35,0.35,0.35"
      mask:
      - Impassable
      - VaultImpassable
@@ -314,9 +323,10 @@
  - type: Physics
    anchored: false
    mass: 10
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.30,-0.30,0.25,0.30"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.30,-0.30,0.25,0.30"
      mask:
      - Impassable
      - VaultImpassable
@@ -347,9 +357,10 @@
  - type: Physics
    anchored: false
    mass: 10
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.30,-0.40,0.45,0.40"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.30,-0.40,0.45,0.40"
      mask:
      - Impassable
      - VaultImpassable
@@ -377,9 +388,10 @@
  - type: Physics
    anchored: false
    mass: 10
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.40,-0.35,0.20,0.35"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.40,-0.35,0.20,0.35"
      mask:
      - Impassable
      - VaultImpassable
@@ -407,9 +419,10 @@
  - type: Physics
    anchored: false
    mass: 10
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.50,-0.30,0.35,0.30"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.50,-0.30,0.35,0.30"
      mask:
      - Impassable
      - VaultImpassable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -20,9 +20,10 @@
  - type: Physics
    anchored: false
    mass: 50
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.35,-0.35,0.35,0.35"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.35,-0.35,0.35,0.35"
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -24,9 +24,10 @@
  - type: Physics
    anchored: false
    mass: 85
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.35,-0.35,0.35,0.35"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.35,-0.35,0.35,0.35"
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -15,9 +15,10 @@
      state: corgi
  - type: Physics
    mass: 10
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.50,-0.25,0.30,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.50,-0.25,0.30,0.25"
      mask:
      - Impassable
      - VaultImpassable
@@ -62,9 +63,10 @@
      state: cat
  - type: Physics
    mass: 10
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.45,-0.20,0.30,0.20"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45,-0.20,0.30,0.20"
      mask:
      - Impassable
      - VaultImpassable
@@ -112,9 +114,10 @@
      state: sloth
  - type: Physics
    mass: 10
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.45,-0.35,0.15,0.35"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45,-0.35,0.15,0.35"
      mask:
      - Impassable
      - VaultImpassable
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -32,8 +32,9 @@
  - type: Physics
    anchored: false
    mass: 50
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      mask:
      - Impassable
 #      - MobImpassable Turns these off for now since humans don't have collisions either.
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -22,9 +22,10 @@
  - type: Physics
    anchored: false
    mass: 85
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-1,-0.4,-0.2,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-1,-0.4,-0.2,0.4"
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -4,3 +4,6 @@
  id: AdminObserver
  name: admin observer
  abstract: true
+  components:
+  - type: PlayerInputMover
+    ignorePaused: true
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -10,6 +10,8 @@
    showExamineInfo: true
  - type: Input
    context: "human"
+  - type: PlayerMobMover
+  - type: PlayerInputMover
  - type: Alerts
  - type: Actions
    innateActions:
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -11,9 +11,10 @@
  - type: Physics
    anchored: false
    mass: 5
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.35,-0.35,0.35,0.35"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.35,-0.35,0.35,0.35"
      mask:
      - GhostImpassable
    status: InAir
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -117,11 +117,14 @@
    - map: [ "enum.Slots.MASK" ]
    - map: [ "enum.Slots.HEAD" ]
  - type: Physics
+    bodyType: Kinematic
    anchored: false
-    mass: 85
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.35,-0.35,0.35,0.35"
+    mass: 70
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+          radius: 0.35
+      restitution: 0.0
      mask:
      - Impassable
      - MobImpassable
@@ -129,7 +132,6 @@
      layer:
      - Opaque
      - MobImpassable
-  - type: PlayerInputMover
  - type: AtmosExposed
  - type: Flammable
    fireSpread: true
@@ -301,9 +303,10 @@
    - type: Physics
      anchored: false
      mass: 85
-      shapes:
-      - !type:PhysShapeAabb
-        bounds: "-0.35,-0.35,0.35,0.35"
+      fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.35,-0.35,0.35,0.35"
        mask:
        - Impassable
        - MobImpassable
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash.yml
@@ -183,8 +183,9 @@
  - type: Slippery
    intersectPercentage: 0.2
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.2,-0.2,0.2,0.2"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
      layer:
      - MobImpassable
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -86,9 +86,10 @@
  - type: Slippery
    paralyzeTime: 4
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.25,-0.25,0.25,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
      layer:
      - MobImpassable

--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -48,14 +48,15 @@
        - state: extinguish
          map: [ "enum.VaporVisualLayers.Base" ]
    - type: Physics
-      hard: false
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-          mask:
-            - Impassable
-            - MobImpassable
-            - SmallImpassable
+      fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.25,-0.25,0.25,0.25"
+        hard: false
+        mask:
+          - Impassable
+          - MobImpassable
+          - SmallImpassable
    - type: Appearance
      visuals:
        - type: VaporVisualizer
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -87,8 +87,9 @@
        shader: unshaded
        visible: false
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer:
      - Opaque
      - Impassable
@@ -149,8 +150,9 @@
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml
@@ -49,8 +49,9 @@
  description: "Portal to another location."
  components:
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb {}
      mask: [Impassable, MobImpassable]
  - type: Portal
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -8,9 +8,10 @@
  components:
  - type: Physics
    anchored: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.15,-0.3,0.2,0.3" # TODO: these are placeholder values
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.15,-0.3,0.2,0.3" # TODO: these are placeholder values
      layer:
      - Clickable
  - type: PowerCell
@@ -322,9 +323,10 @@
  - type: InteractionOutline
  - type: Physics
    mass: 5
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.25,-0.25,0.25,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
      mask: [Impassable]
      layer: [Clickable]

@@ -350,9 +352,10 @@
  - type: InteractionOutline
  - type: Physics
    mass: 5
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.25,-0.25,0.25,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
      mask: [Impassable]
      layer: [Clickable]

@@ -377,8 +380,9 @@
  - type: InteractionOutline
  - type: Physics
    mass: 5
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.25,-0.25,0.25,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
      mask: [Impassable]
      layer: [Clickable]
--- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
@@ -41,9 +41,10 @@
  - type: Physics
    mass: 5
    anchored: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.40,-0.25,0.25,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.40,-0.25,0.25,0.25"
      mask:
      - Impassable
      - Opaque
@@ -71,9 +72,10 @@
  - type: Physics
    mass: 5
    anchored: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.25,-0.25,0.25,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
      mask:
      - Impassable
  - type: Spillable
@@ -104,9 +106,10 @@
  - type: Slippery
    paralyzeTime: 2.5
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.3,-0.4,0.3,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.3,-0.4,0.3,0.4"
      layer:
      - MobImpassable

@@ -179,14 +182,15 @@
          map: [ "enum.VaporVisualLayers.Base" ]
    - type: Physics
      anchored: false
-      hard: false
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-          mask:
-            - Impassable
-            - MobImpassable
-            - SmallImpassable
+      fixtures:
+      - shape:
+          !type:PhysShapeAabb
+            bounds: "-0.25,-0.25,0.25,0.25"
+        hard: false
+        mask:
+          - Impassable
+          - MobImpassable
+          - SmallImpassable
    - type: Appearance
      visuals:
        - type: VaporVisualizer
--- a/Resources/Prototypes/Entities/Objects/Specific/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/morgue.yml
@@ -21,9 +21,10 @@
  - type: Physics
    mass: 5
    anchored: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.45,-0.5,0.1,0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.45,-0.5,0.1,0.5"
      layer:
      - Clickable
  - type: BodyBagEntityStorage
@@ -38,7 +39,7 @@
      state_closed: bag
    - type: BodyBagVisualizer
  - type: Pullable
-  
+
 - type: entity
  id: BodyBag_Item
  name: body bag
@@ -53,8 +54,8 @@
 # - type: Placeable
 #   prototype: someId
 #   snap: Center
-  
-  
+
+
 - type: entity
  id: Morgue
  name: morgue
@@ -75,9 +76,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      mask:
       - Impassable
       - MobImpassable
@@ -105,7 +107,7 @@
      light_soul: morgue_soul_light
  - type: SnapGrid
    offset: Center
-    
+
 - type: entity
  id: MorgueTray
  name: morgue tray
@@ -120,9 +122,10 @@
  - type: Physics
    mass: 15
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      layer:
       - Clickable
  - type: MorgueTray
@@ -148,9 +151,10 @@
  - type: Physics
    mass: 25
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      mask:
       - Impassable
       - MobImpassable
@@ -179,7 +183,7 @@
      light_burning: crema_active_light
  - type: SnapGrid
    offset: Center
-      
+
 - type: entity
  id: CrematoriumTray
  name: crematorium tray
@@ -199,4 +203,4 @@
  - type: Sprite
    netsync: false
    sprite: Objects/Consumable/Trash/ash.rsi
-    state: icon
+    state: icon
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -14,10 +14,11 @@
  - type: Physics
    anchored: false
    edgeslide: false
-    hard: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.1,-0.1,0.1,0.1"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.1,-0.1,0.1,0.1"
+      hard: false
      layer: [Clickable]
      mask:
      - Impassable
@@ -99,10 +100,11 @@
  - type: Physics
    anchored: false
    edgeslide: false
-    hard: false
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.2,-0.2,0.2,0.2"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+      hard: false
      layer: 32
      mask: 30

--- a/Resources/Prototypes/Entities/base_item.yml
+++ b/Resources/Prototypes/Entities/base_item.yml
@@ -9,14 +9,23 @@
  - type: InteractionOutline
  - type: MovedByPressure
  - type: DamageOnHighSpeedImpact
+  - type: CollisionWake
+  - type: TileFrictionModifier
+    modifier: 0.5
  - type: Physics
    anchored: false
    mass: 5
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.25,-0.25,0.25,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
      layer:
      - Clickable
+      mask:
+      - Impassable
+      - SmallImpassable
+      restitution: 0.8  # We want them items B O U N C Y
+      friction: 0.2
  - type: Sprite
    drawdepth: Items
  - type: Pullable
--- a/Resources/Prototypes/Entities/puddle.yml
+++ b/Resources/Prototypes/Entities/puddle.yml
@@ -16,12 +16,13 @@
  - type: Clickable
  - type: Slippery
  - type: Physics
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.4,-0.4,0.4,0.4"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+      hard: false
      layer:
      - MobImpassable
-    hard: false

 - type: entity
  name: puddle
--- a/Resources/Prototypes/Entities/singularity.yml
+++ b/Resources/Prototypes/Entities/singularity.yml
@@ -6,10 +6,13 @@
  - type: Clickable
  - type: Physics
    anchored: false
-    shapes:
-    - !type:PhysShapeCircle
-      radius: 0.5
-      layer: [Impassable]
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+          radius: 0.5
+      hard: false
+      layer:
+      - MapGrid
      mask:
      - AllMask
    mass: 5
@@ -36,9 +39,10 @@
  - type: InteractionOutline
  - type: Physics
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      layer: [MobMask, Opaque]
  - type: SnapGrid
    offset: Center
@@ -70,9 +74,10 @@
  - type: Clickable
  - type: Physics
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      layer: [MobMask, Opaque]
  - type: SnapGrid
    offset: Center
@@ -103,9 +108,10 @@
  - type: Clickable
  - type: Physics
    anchored: true
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.5, -0.5, 0.5, 0.5"
      layer: [MobMask, Opaque]
  - type: SnapGrid
    offset: Center
@@ -130,9 +136,10 @@
    - type: Clickable
    - type: Physics
      anchored: true
-      shapes:
-        - !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+      fixtures:
+        - shape:
+            !type:PhysShapeAabb
+              bounds: "-0.5, -0.5, 0.5, 0.5"
          layer: [ MobMask ]
    - type: SnapGrid
      offset: Center
--- a/Resources/Prototypes/Entities/traitordm.yml
+++ b/Resources/Prototypes/Entities/traitordm.yml
@@ -15,9 +15,10 @@
  - type: Physics
    anchored: true
    mass: 1
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.25,-0.25,0.25,0.25"
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
      layer:
      - Clickable
  - type: TraitorDeathMatchRedemption