Revert "Physics (#3452)"

This reverts commit 3e64fd56a1.
2021-02-28 18:49:48 +01:00
parent eddec5fcce
commit 1eb0fbd8d0
211 changed files with 2560 additions and 2600 deletions
--- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
@@ -24,10 +24,9 @@
    - state: panel_open
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: Physics
-    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
+    shapes:
+    - !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,10 +35,9 @@

    - type: Physics
      on: false
-      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
+      shapes:
+        - !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:
@@ -111,9 +110,8 @@
      airBlockedDirection:
        - East
    - type: Physics
-      fixtures:
-        - shape:
-            !type:PhysShapeRect {}
+      shapes:
+        - !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,10 +22,9 @@
        - !type:DoActsBehavior
          acts: ["Destruction"]
    - type: Physics
-      fixtures:
-        - shape:
-            !type:PhysShapeAabb
-              bounds: "-0.49,-0.49,0.49,0.49"
+      shapes:
+        - !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,10 +8,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.45, -0.45, 0.05, 0.45"
+    shapes:
+    - !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,9 +11,8 @@
  - type: Sprite
    sprite: Constructible/Misc/bookshelf.rsi
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
+    shapes:
+    - !type:PhysShapeAabb
      layer:
      - Opaque
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/carpets.yml
@@ -16,10 +16,9 @@
    key: full
    base: carpet_
  - type: Physics
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.5, -0.5, 0.5, 0.5"
+    shapes:
+      - !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,9 +11,8 @@
  - type: InteractionOutline
  - type: Anchorable
  - type: Physics
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb {}
+    shapes:
+      - !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,10 +7,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.2, 0.5, 0.2"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.2, 0.5, 0.2"
      mask:
      - Impassable
      - MobImpassable
@@ -59,10 +58,9 @@
  - type: Sprite
    state: plant-25
  - type: Physics
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.47,-0.25,0.05,0.25"
+    shapes:
+      - !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,10 +10,9 @@
  - type: InteractionOutline
  - type: Physics
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5,-0.25,0.5,0.25"
      mask:
      - Impassable
      - VaultImpassable
@@ -45,10 +44,9 @@
    state: chair
    color: "#8e9799"
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.45, -0.45, 0.05, 0.45"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.45, -0.45, 0.05, 0.45"
      mask:
      - Impassable
      - VaultImpassable
@@ -64,10 +62,9 @@
    state: stool_base
    color: "#8e9799"
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.25, 0.05, 0.25"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.25, 0.05, 0.25"
      mask:
      - Impassable
      - VaultImpassable
@@ -82,10 +79,9 @@
    state: bar_stool
    color: "white"
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.2, 0.2, 0.25"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.2, 0.2, 0.25"
      mask:
      - Impassable
      - VaultImpassable
@@ -101,10 +97,9 @@
  - type: Sprite
    state: officechair_white
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.49, -0.25, 0.37, 0.25"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.49, -0.25, 0.37, 0.25"
      mask:
      - Impassable
      - VaultImpassable
@@ -127,10 +122,9 @@
  - type: Sprite
    state: comfychair_preview
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.45, -0.3, 0.35, 0.3"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.45, -0.3, 0.35, 0.3"
      mask:
      - Impassable
      - VaultImpassable
@@ -145,10 +139,9 @@
    state: wooden_chair
    color: "white"
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.37, -0.25, 0.49, 0.24"
+    shapes:
+    - !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,10 +13,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.4"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.4,-0.4,0.4,0.4"
      layer:
      - Opaque
      - Impassable
@@ -62,10 +61,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.4"
+    shapes:
+    - !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,9 +17,8 @@
    key: state
    base: state_
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
+    shapes:
+    - !type:PhysShapeAabb
      layer:
      - VaultImpassable
  - type: SnapGrid
--- a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml
@@ -8,10 +8,9 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.5,-0.5,0.5,0.5"
+    shapes:
+      - !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,9 +8,8 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
+    shapes:
+    - !type:PhysShapeAabb
      mask:
      - Impassable
      layer:
--- a/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml
@@ -50,10 +50,9 @@
  - type: Physics
    mass: 25
    anchored: false
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.5,-0.25,0.5,0.25"
+    shapes:
+      - !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,10 +8,9 @@
    - type: Physics
      mass: 25
      anchored: true
-      fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.5,-0.25,0.5,0.25"
+      shapes:
+      - !type:PhysShapeAabb
+        bounds: "-0.5,-0.25,0.5,0.25"
        layer:
        - Impassable
        - MobImpassable
@@ -41,10 +40,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5,-0.25,0.5,0.25"
      layer:
      - Impassable
      - MobImpassable
@@ -80,10 +78,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
+    shapes:
+    - !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,10 +12,9 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
      layer: [MobMask, Opaque]
  - type: SnapGrid
    offset: Center
@@ -49,10 +48,9 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
      layer: [MobMask, Opaque]
  - type: SnapGrid
    offset: Center
@@ -77,10 +75,9 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
      layer: [MobMask, Opaque]
  - type: SnapGrid
    offset: Center
@@ -120,10 +117,9 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+    shapes:
+    - !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,10 +10,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.4"
+    shapes:
+    - !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,10 +9,9 @@
    - type: Physics
      mass: 25
      anchored: true
-      fixtures:
-        - shape:
-            !type:PhysShapeAabb
-              bounds: "-0.5,-0.25,0.5,0.25"
+      shapes:
+        - !type:PhysShapeAabb
+          bounds: "-0.5,-0.25,0.5,0.25"
          layer:
            - Impassable
            - MobImpassable
@@ -56,10 +55,9 @@
    - type: Physics
      mass: 25
      anchored: true
-      fixtures:
-        - shape:
-            !type:PhysShapeAabb
-              bounds: "-0.5,-0.25,0.5,0.25"
+      shapes:
+        - !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,10 +9,9 @@
    - type: Physics
      mass: 25
      anchored: true
-      fixtures:
-        - shape:
-            !type:PhysShapeAabb
-              bounds: "-0.49,-0.49,0.49,0.49"
+      shapes:
+        - !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
          layer:
            - Opaque
            - Impassable
@@ -40,11 +39,10 @@
      damages:
        Radiation: 10
    - type: Physics
-      fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.48,-0.48,0.48,0.48"
-        hard: false
+      hard: false
+      shapes:
+      - !type:PhysShapeAabb
+        bounds: "-0.48,-0.48,0.48,0.48"
        layer: [None]
        mask:
        - MobMask
--- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
@@ -11,10 +11,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.4, 0.3, 0.4"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.4, 0.3, 0.4"
      mask:
      - Impassable
      - MobImpassable
@@ -56,9 +55,8 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
+    shapes:
+    - !type:PhysShapeAabb
      mask:
      - Impassable
      - MobImpassable
@@ -115,9 +113,8 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
+    shapes:
+    - !type:PhysShapeAabb
      mask:
      - Impassable
      - MobImpassable
@@ -175,10 +172,9 @@
    access: [["Engineering"]]
  - type: InteractionOutline
  - type: Physics
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.25, -0.25, 0.25, 0.3"
+    shapes:
+      - !type:PhysShapeAabb
+        bounds: "-0.25, -0.25, 0.25, 0.3"
        layer: [ Passable ]
  - type: SnapGrid
    offset: Center
@@ -232,9 +228,8 @@
  - type: Physics
    mass: 25
    anchored: false
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
+    shapes:
+    - !type:PhysShapeAabb
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml
@@ -13,10 +13,9 @@
    - type: Physics
      mass: 25
      anchored: true
-      fixtures:
-        - shape:
-            !type:PhysShapeAabb
-              bounds: "-0.4,-0.25,0.4,0.25"
+      shapes:
+        - !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,10 +13,9 @@
    netsync: false
  - type: Physics
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
+    shapes:
+    - !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,12 +6,10 @@
  components:
  - type: Clickable
  - type: Physics
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.5, -0.5, 0.5, 0.5"
-        layer:
-        - Underplating
+    shapes:
+      - !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,11 +8,10 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49"
-      hard: false
+    hard: false
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.49,-0.49,0.49,0.49"
      layer: [Passable]
      mask:
      - Impassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Cooking/microwave.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Cooking/microwave.yml
@@ -22,10 +22,9 @@
    - key: enum.MicrowaveUiKey.Key
      type: MicrowaveBoundUserInterface
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.16,-0.3,0.16,0.3"
+    shapes:
+    - !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,10 +21,9 @@
  - type: PowerReceiver
  - type: LoopingSound
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.35,-0.08,0.25,0.15"
+    shapes:
+    - !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,10 +9,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.3,-0.4,0.3,0.4"
+    shapes:
+    - !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,9 +13,8 @@
  - type: Physics
    # Mass of 1? Unmovable. Mass of 25? Fine. What on earth is going on?
    mass: 25
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
+    shapes:
+    - !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,9 +12,8 @@
    sprite: Constructible/Power/ame_shielding.rsi
    state: shield_0
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
+    shapes:
+    - !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,10 +10,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+    shapes:
+    - !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,10 +18,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.5,-0.25,0.5,0.25"
+    shapes:
+      - !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
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      layer:
-      - Impassable
-      - VaultImpassable
+    shapes:
+    - !type:PhysShapeAabb
+      mask:
+        - Impassable
+        - VaultImpassable
+        - SmallImpassable
  - 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,10 +13,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.4, -0.45, 0.45, 0.45"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.4, -0.45, 0.45, 0.45"
      mask:
      - Impassable
      - MobImpassable
@@ -56,9 +55,8 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
+    shapes:
+    - !type:PhysShapeAabb
      mask:
      - Impassable
      - MobImpassable
--- a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml
@@ -10,10 +10,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.45, -0.45, 0.00, 0.45"
+    shapes:
+    - !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,10 +22,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.4,-0.25,0.4,0.25"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.4,-0.25,0.4,0.25"
      layer:
      - Opaque
      - Impassable
@@ -74,10 +73,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.4,-0.25,0.4,0.25"
+    shapes:
+    - !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,10 +51,9 @@
      state_anchored: pipe-s
      state_broken: pipe-b
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5,-0.25,0.5,0.25"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5,-0.25,0.5,0.25"
      layer: [ Underplating ]

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

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

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

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

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

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

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

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

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

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

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

@@ -380,9 +377,8 @@
  - type: InteractionOutline
  - type: Physics
    mass: 5
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
+    shapes:
+    - !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,10 +41,9 @@
  - type: Physics
    mass: 5
    anchored: false
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.40,-0.25,0.25,0.25"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.40,-0.25,0.25,0.25"
      mask:
      - Impassable
      - Opaque
@@ -72,10 +71,9 @@
  - type: Physics
    mass: 5
    anchored: false
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.25,-0.25,0.25,0.25"
      mask:
      - Impassable
  - type: Spillable
@@ -106,10 +104,9 @@
  - type: Slippery
    paralyzeTime: 2.5
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.3,-0.4,0.3,0.4"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.3,-0.4,0.3,0.4"
      layer:
      - MobImpassable

@@ -182,15 +179,14 @@
          map: [ "enum.VaporVisualLayers.Base" ]
    - type: Physics
      anchored: false
-      fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.25,-0.25,0.25,0.25"
-        hard: false
-        mask:
-          - Impassable
-          - MobImpassable
-          - SmallImpassable
+      hard: false
+      shapes:
+        - !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+          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,10 +21,9 @@
  - type: Physics
    mass: 5
    anchored: false
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.45,-0.5,0.1,0.5"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.45,-0.5,0.1,0.5"
      layer:
      - Clickable
  - type: BodyBagEntityStorage
@@ -39,7 +38,7 @@
      state_closed: bag
    - type: BodyBagVisualizer
  - type: Pullable
-
+  
 - type: entity
  id: BodyBag_Item
  name: body bag
@@ -54,8 +53,8 @@
 # - type: Placeable
 #   prototype: someId
 #   snap: Center
-
-
+  
+  
 - type: entity
  id: Morgue
  name: morgue
@@ -76,10 +75,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
      mask:
       - Impassable
       - MobImpassable
@@ -107,7 +105,7 @@
      light_soul: morgue_soul_light
  - type: SnapGrid
    offset: Center
-
+    
 - type: entity
  id: MorgueTray
  name: morgue tray
@@ -122,10 +120,9 @@
  - type: Physics
    mass: 15
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
      layer:
       - Clickable
  - type: MorgueTray
@@ -151,10 +148,9 @@
  - type: Physics
    mass: 25
    anchored: true
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.5, -0.5, 0.5, 0.5"
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
      mask:
       - Impassable
       - MobImpassable
@@ -183,7 +179,7 @@
      light_burning: crema_active_light
  - type: SnapGrid
    offset: Center
-
+      
 - type: entity
  id: CrematoriumTray
  name: crematorium tray
@@ -203,4 +199,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,11 +14,10 @@
  - type: Physics
    anchored: false
    edgeslide: false
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
-      hard: false
+    hard: false
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.1,-0.1,0.1,0.1"
      layer: [Clickable]
      mask:
      - Impassable
@@ -100,11 +99,10 @@
  - type: Physics
    anchored: false
    edgeslide: false
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
-      hard: false
+    hard: false
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.2,-0.2,0.2,0.2"
      layer: 32
      mask: 30

--- a/Resources/Prototypes/Entities/base_item.yml
+++ b/Resources/Prototypes/Entities/base_item.yml
@@ -9,23 +9,14 @@
  - type: InteractionOutline
  - type: MovedByPressure
  - type: DamageOnHighSpeedImpact
-  - type: CollisionWake
-  - type: TileFrictionModifier
-    modifier: 0.5
  - type: Physics
    anchored: false
    mass: 5
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
+    shapes:
+    - !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,13 +16,12 @@
  - type: Clickable
  - type: Slippery
  - type: Physics
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.4"
-      hard: false
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.4,-0.4,0.4,0.4"
      layer:
      - MobImpassable
+    hard: false

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