Fixtures (again) (#5636)

2021-12-01 18:32:37 +11:00
parent 134f71c0ee
commit 1c089a4079
109 changed files with 1024 additions and 829 deletions
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -43,6 +43,7 @@
  - type: Transform
    anchored: true
  - type: Physics
+  - type: Fixtures
    fixtures:
    - hard: false
      shape:
@@ -70,6 +71,7 @@
    - state: mfoam
      map: ["enum.FoamVisualLayers.Base"]
  - type: Physics
+  - type: Fixtures
    fixtures:
    - hard: true
      shape:
@@ -97,6 +99,7 @@
      - state: mfoam
        map: ["enum.FoamVisualLayers.Base"]
  - type: Physics
+  - type: Fixtures
    fixtures:
    - hard: true
      shape:
@@ -130,6 +133,7 @@
    netsync: false
    drawdepth: Walls
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -15,6 +15,7 @@
  - type: Clickable
  - type: Slippery
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -17,6 +17,7 @@
      state: bat
      sprite: Mobs/Animals/bat.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -53,6 +54,7 @@
      state: 0
      sprite: Mobs/Animals/bee.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -115,6 +117,7 @@
      state: butterfly
      sprite: Mobs/Animals/butterfly.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -162,6 +165,7 @@
      state: cow
      sprite: Mobs/Animals/cow.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -206,6 +210,7 @@
      state: crab
      sprite: Mobs/Animals/crab.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -278,6 +283,7 @@
      state: crawling
      sprite: Mobs/Animals/gorilla.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -349,6 +355,7 @@
    Slots:
    - Helmet
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -443,6 +450,7 @@
      state: parrot
      sprite: Mobs/Animals/parrot.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -475,6 +483,7 @@
      state: penguin
      sprite: Mobs/Animals/penguin.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -507,6 +516,7 @@
      state: snake
      sprite: Mobs/Animals/snake.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -544,6 +554,7 @@
      state: tarantula
      sprite: Mobs/Animals/spider.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -18,6 +18,7 @@
      state: alive
      sprite: Mobs/Aliens/Carps/space.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -68,6 +69,7 @@
      state: alive
      sprite: Mobs/Aliens/Carps/holo.rsi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -23,6 +23,7 @@
    state: normal
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -14,6 +14,7 @@
    - map: ["enum.DamageStateVisualLayers.Base"]
      state: corgi
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -65,6 +66,7 @@
    - map: ["enum.DamageStateVisualLayers.Base"]
      state: cat
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -138,6 +140,7 @@
    - map: ["enum.DamageStateVisualLayers.Base"]
      state: sloth
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -36,6 +36,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: KinematicController # Same for all inheritors
+  - type: Fixtures
    fixtures:
    - shape:
        # Circles, cuz rotation of rectangles looks very bad
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -21,6 +21,7 @@
      sprite: Mobs/Aliens/Xenos/xeno.rsi
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -19,7 +19,9 @@
  - type: PlayerInputMover
  - type: Physics
    bodyType: Kinematic
+    status: InAir
    # TODO: Even need these? Don't think so but CBF checking right now.
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -27,7 +29,6 @@
      mass: 5
      mask:
        - GhostImpassable
-    status: InAir
  - type: Body
    template: AGhostTemplate
    preset: HumanPreset
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -11,6 +11,8 @@
  - type: Physics
    bodyType: KinematicController
    fixedRotation: true
+    status: InAir
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -18,7 +20,6 @@
      mass: 5
      mask:
      - GhostImpassable
-    status: InAir
  - type: PlayerInputMover
  - type: Eye
    drawFov: false
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -152,6 +152,7 @@
    - map: [ "enum.Slots.POCKET2" ]
  - type: Physics
    bodyType: KinematicController
+  - type: Fixtures
    fixtures: # TODO: This needs a second fixture just for mob collisions.
    - shape:
        !type:PhysShapeCircle
@@ -389,6 +390,7 @@
      - map: ["hand-right"]
    - type: Physics
      bodyType: Dynamic
+    - type: Fixtures
      fixtures:
      - shape:
          !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -144,6 +144,7 @@
    enabled: false
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
@@ -12,6 +12,7 @@
      state: nuclearbomb_base
    - type: Physics
      bodyType: Dynamic
+    - type: Fixtures
      fixtures:
      - shape:
          !type:PhysShapeCircle
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -117,6 +117,7 @@
    enabled: false
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -38,7 +38,7 @@
  - type: FireExtinguisher
    hasSafety: true
  - type: MeleeWeapon
-    damage: 
+    damage:
      types:
        Blunt: 10
    hitSound:
@@ -62,6 +62,7 @@
        map: [ "enum.VaporVisualLayers.Base" ]
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -92,6 +92,7 @@
        shader: unshaded
        visible: false
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
@@ -159,6 +160,7 @@
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
--- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
@@ -10,6 +10,7 @@
    state: inflatable_wall
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -19,6 +19,7 @@
    - type: Transform
      anchored: true
    - type: Physics
+    - type: Fixtures
      fixtures:
      - hard: false
        mass: 7
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -41,6 +41,7 @@
          Quantity: 500
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -19,6 +19,7 @@
    enabled: false
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -81,9 +81,10 @@
      map: ["enum.VaporVisualLayers.Base"]
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
-              !type:PhysShapeAabb
+        !type:PhysShapeAabb
        bounds: "-0.25,-0.25,0.25,0.25"
      hard: false
      mask:
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -5,7 +5,7 @@
  components:
  - type: Sprite
    netsync: false
-    drawdepth: SmallObjects # I guess body bags need appear above a coroner's table? 
+    drawdepth: SmallObjects # I guess body bags need appear above a coroner's table?
    sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
    layers:
    - state: bag
@@ -21,6 +21,7 @@
  - type: MovedByPressure
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
@@ -10,6 +10,7 @@
    state: idle
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -31,6 +31,7 @@
    enabled: false
  - type: Physics
    bodyType: KinematicController
+  - type: Fixtures
    fixtures: # TODO: Make a second fixture.
    - shape:
        !type:PhysShapeAabb
@@ -71,6 +72,7 @@
    enabled: false
  - type: Physics
    bodyType: KinematicController
+  - type: Fixtures
    fixtures: # TODO: Make a second fixture.
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -32,6 +32,7 @@
      type: TransferAmountBoundUserInterface
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
@@ -25,6 +25,7 @@
  - type: Physics
    bodyType: Dynamic
    fixedRotation: false
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -13,6 +13,9 @@
    state: bullet
  - type: Physics
    bodyType: Dynamic
+    linearDamping: 0
+    angularDamping: 0
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -22,8 +25,6 @@
      - Impassable
      layer:
      - MobImpassable
-    linearDamping: 0
-    angularDamping: 0
  - type: Projectile
    damage:
      types:
@@ -104,6 +105,7 @@
    - state: spark
      shader: unshaded
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -138,6 +140,7 @@
    sprite: Structures/Power/Generation/Singularity/emitter.rsi
    state: 'projectile'
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Objects/base.yml
+++ b/Resources/Prototypes/Entities/Objects/base.yml
@@ -20,6 +20,7 @@
  - type: Physics
    bodyType: Dynamic
    fixedRotation: false
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base.yml
@@ -10,6 +10,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -10,6 +10,7 @@
    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
    state: "assembly"
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
@@ -22,6 +22,7 @@
    - state: panel_open
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -24,6 +24,7 @@
    #- state: panel_open
    #  map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -34,6 +34,7 @@
          map: ["enum.WiresVisualLayers.MaintenancePanel"]
    - type: Physics
      canCollide: false
+    - type: Fixtures
      fixtures:
      - shape:
          !type:PhysShapeAabb
@@ -120,6 +121,7 @@
      airBlockedDirection:
        - South
    - type: Physics
+    - type: Fixtures
      fixtures:
      - shape:
          !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
@@ -24,6 +24,7 @@
        acts: ["Destruction"]
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -12,6 +12,7 @@
    - state: closed
      map: ["enum.DoorVisualLayers.Base"]
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -11,6 +11,7 @@
    layers:
    - state: assembly
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
@@ -7,6 +7,7 @@
  components:
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -10,6 +10,7 @@
    placeCentered: true
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
@@ -15,6 +15,7 @@
    tags: [ Carpet ]
  - type: Physics
    canCollide: false
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -10,6 +10,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -51,6 +52,7 @@
  - type: Sprite
    state: chair
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -74,6 +76,7 @@
    state: stool
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -100,6 +103,7 @@
    state: bar
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -122,6 +126,7 @@
  - type: Sprite
    state: office-white
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -158,6 +163,7 @@
    state: comfy
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -179,6 +185,7 @@
    state: wooden
  - type: Rotatable
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -227,6 +234,7 @@
    netsync: false
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -8,6 +8,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -72,6 +73,7 @@
    state: plant-25
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -18,6 +18,7 @@
      toilet:
        maxVol: 250
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -6,6 +6,7 @@
  components:
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base.yml
@@ -7,6 +7,7 @@
  - type: Anchorable
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -23,6 +23,7 @@
        - FitsInDispenser
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -12,6 +12,7 @@
      - state: pod_0
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -10,6 +10,7 @@
      anchored: true
    - type: Physics
      bodyType: Static
+    - type: Fixtures
      fixtures:
      - shape:
          !type:PhysShapeAabb
@@ -60,6 +61,7 @@
      anchored: true
    - type: Physics
      bodyType: Static
+    - type: Fixtures
      fixtures:
      - shape:
          !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
@@ -26,6 +26,7 @@
  - type: ExtensionCableReceiver
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -18,6 +18,7 @@
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -96,6 +97,7 @@
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -16,6 +16,7 @@
      map: ["enum.MedicalScannerVisualLayers.Terminal"]
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -19,6 +19,7 @@
    - key: enum.MicrowaveUiKey.Key
      type: MicrowaveBoundUserInterface
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -16,6 +16,7 @@
    visuals:
    - type: ReagentGrinderVisualizer
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -5,6 +5,7 @@
  description: A large crushing machine used to recycle small items inefficiently. There are lights on the side.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
@@ -13,6 +13,7 @@
    netsync: false
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/traitordm.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/traitordm.yml
@@ -13,6 +13,7 @@
        shader: unshaded
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -16,6 +16,7 @@
    netsync: false
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -23,6 +23,7 @@
  - type: Physics
    bodyType: Dynamic
    fixedRotation: false
+  - type: Fixtures
    fixtures:
      - shape:
          !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
@@ -9,6 +9,7 @@
      anchored: true
    - type: Physics
      bodyType: Static
+    - type: Fixtures
      fixtures:
        - shape:
            !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -13,6 +13,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
  - type: Transform
    anchored: true
  - type: Anchorable
@@ -57,6 +58,7 @@
      state_anchored: pipe-s
      state_broken: pipe-b
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -85,6 +87,7 @@
    - key: enum.DisposalTaggerUiKey.Key
      type: DisposalTaggerBoundUserInterface
  - type: Physics
+  - type: Fixtures
    fixtures:
      - shape:
          !type:PhysShapeAabb
@@ -109,6 +112,7 @@
      state_anchored: pipe-t
      state_broken: pipe-b
  - type: Physics
+  - type: Fixtures
    fixtures:
      - shape:
          !type:PhysShapeAabb
@@ -143,6 +147,7 @@
    - key: enum.DisposalRouterUiKey.Key
      type: DisposalRouterBoundUserInterface
  - type: Physics
+  - type: Fixtures
    fixtures:
      - shape:
          !type:PhysShapeAabb
@@ -172,6 +177,7 @@
  - type: Flippable
    mirrorEntity: DisposalRouter
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -202,6 +208,7 @@
  - type: Flippable
    mirrorEntity: DisposalJunctionFlipped
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -231,6 +238,7 @@
  - type: Flippable
    mirrorEntity: DisposalJunction
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -259,6 +267,7 @@
      state_anchored: pipe-y
      state_broken: pipe-b
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -283,6 +292,7 @@
      state_anchored: pipe-c
      state_broken: pipe-b
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -20,6 +20,7 @@
      map: ["enum.DisposalUnitVisualLayers.Light"]
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml
@@ -9,6 +9,7 @@
    - type: Rotatable
    - type: Physics
      bodyType: Static
+    - type: Fixtures
      fixtures:
      - shape:
          !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
@@ -17,6 +17,7 @@
        types:
          Radiation: 10
    - type: Physics
+    - type: Fixtures
      fixtures:
      - shape:
          !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
@@ -9,6 +9,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
@@ -9,6 +9,7 @@
  - type: Clickable
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        # Using a circle here makes it a lot easier to pull it all the way from Cargo
@@ -56,6 +57,7 @@
  - type: Clickable
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -9,6 +9,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
@@ -13,6 +13,7 @@
  - type: Clickable
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        # Using a circle here makes it a lot easier to pull it all the way from Cargo
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
@@ -11,6 +11,7 @@
      path: /Audio/Effects/singularity.ogg
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - id: DeleteCircle
      shape:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -11,6 +11,7 @@
    sprite: Structures/Power/Generation/ame.rsi
    state: control
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -74,6 +75,7 @@
  components:
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -102,6 +104,7 @@
    sprite: Structures/Power/Generation/ame.rsi
    state: shield_0
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generator.yml
@@ -14,6 +14,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -11,6 +11,7 @@
    anchored: true
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -109,6 +110,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeCircle
@@ -150,6 +152,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -22,6 +22,7 @@
    access: [["Engineering"]]
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
      - shape:
          !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -11,6 +11,7 @@
      drawdepth: BelowFloor
    - type: Clickable
    - type: Physics
+    - type: Fixtures
      fixtures:
        - shape:
            !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -6,6 +6,7 @@
  components:
  - type: Clickable
  - type: Physics
+  - type: Fixtures
    fixtures:
      - shape:
          !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -20,6 +20,7 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -63,6 +64,7 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -94,6 +96,7 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -153,6 +156,7 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -46,6 +46,7 @@
      damageModifierSet: Metallic
    - type: Physics
      bodyType: Dynamic
+    - type: Fixtures
      fixtures:
        - shape:
            !type:PhysShapeAabb
@@ -372,6 +373,7 @@
      state: grey-1
    - type: Physics
      bodyType: Dynamic
+    - type: Fixtures
      fixtures:
        - shape:
            !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
@@ -26,6 +26,7 @@
      path: /Audio/Effects/bang.ogg
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
@@ -20,6 +20,7 @@
      map: ["enum.StorageVisualLayers.Welded"]
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -553,6 +553,7 @@
        acts: [ "Destruction" ]
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
@@ -7,6 +7,7 @@
  components:
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -17,6 +17,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -59,6 +60,7 @@
  components:
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
      - shape:
          !type:PhysShapeAabb
@@ -97,6 +99,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -15,6 +15,7 @@
    state: rack
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml
@@ -4,6 +4,7 @@
  name: atmos plaque
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -4,6 +4,7 @@
  name: bar sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
@@ -8,6 +8,7 @@
  - type: Physics
    bodyType: Static
    canCollide: false
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -10,6 +10,7 @@
  description: Return to monky.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -31,6 +32,7 @@
  components:
  - type: Rotatable
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -50,6 +52,7 @@
  components:
  - type: Rotatable
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -70,6 +73,7 @@
  components:
  - type: Rotatable
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -90,6 +94,7 @@
  components:
  - type: Rotatable
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -110,6 +115,7 @@
  components:
  - type: Rotatable
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -129,6 +135,7 @@
  components:
  - type: Rotatable
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -148,6 +155,7 @@
  components:
  - type: Rotatable
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -168,6 +176,7 @@
  name: armory sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -186,6 +195,7 @@
  name: tool storage sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -204,6 +214,7 @@
  name: anomaly lab sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -222,6 +233,7 @@
  name: atmos sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -240,6 +252,7 @@
  name: bar sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -258,6 +271,7 @@
  name: library sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -276,6 +290,7 @@
  name: chapel sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -294,6 +309,7 @@
  name: head sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -312,6 +328,7 @@
  name: conference room sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -330,6 +347,7 @@
  name: drones sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -347,6 +365,7 @@
  name: engine sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -364,6 +383,7 @@
  name: cloning sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -381,6 +401,7 @@
  name: interrogation sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -398,6 +419,7 @@
  name: surgery sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -415,6 +437,7 @@
  name: telecomms sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -432,6 +455,7 @@
  name: cargo sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -449,6 +473,7 @@
  name: cargo dock sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -466,6 +491,7 @@
  name: chemistry sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -483,6 +509,7 @@
  name: docking sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -500,6 +527,7 @@
  name: engineering sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -517,6 +545,7 @@
  name: EVA sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -534,6 +563,7 @@
  name: gravity sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -551,6 +581,7 @@
  name: medbay sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -568,6 +599,7 @@
  name: morgue sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -585,6 +617,7 @@
  name: prison sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -602,6 +635,7 @@
  name: research and development sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -619,6 +653,7 @@
  name: science sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -636,6 +671,7 @@
  name: toxins sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -653,6 +689,7 @@
  name: bridge sign
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -673,6 +710,7 @@
  description: WARNING! Air flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -691,6 +729,7 @@
  description: WARNING! CO2 flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -709,6 +748,7 @@
  description: WARNING! N2 flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -727,6 +767,7 @@
  description: WARNING! N2O flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -745,6 +786,7 @@
  description: WARNING! O2 flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -763,6 +805,7 @@
  description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -781,6 +824,7 @@
  description: WARNING! Waste flow tube. Ensure the flow is disengaged before working.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -799,6 +843,7 @@
  description: A warning sign which reads 'NO SMOKING'
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -817,6 +862,7 @@
  description: Technical information of some sort, shame its too worn-out to read.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -835,6 +881,7 @@
  description: Looks like a planet crashing by some station above it. Its kinda scary.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
@@ -11,6 +11,7 @@
    node: tubeLight
  - type: Physics
    canCollide: false
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -154,6 +155,7 @@
    enabled: false
    offset: "0, -0.5"
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
@@ -11,6 +11,7 @@
    sprite: Structures/Walls/barricades.rsi
    state: barricadewooden
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
--- a/Resources/Prototypes/Entities/Structures/Walls/base.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/base.yml
@@ -22,6 +22,7 @@
    damageModifierSet: Metallic
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
@@ -8,6 +8,7 @@
    anchored: true
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -43,6 +43,7 @@
          nodeGroupID: Apc
    - type: Physics
      bodyType: Static
+    - type: Fixtures
      fixtures:
        - shape:
            !type:PhysShapeAabb
@@ -85,6 +86,7 @@
      node: grilleBroken
      deconstructionTarget: start
    - type: Physics
+    - type: Fixtures
      fixtures:
        - shape:
            !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -21,6 +21,7 @@
    state: full
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
@@ -88,6 +89,7 @@
    sprite: Structures/Windows/directional.rsi
    state: window
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/base.yml
+++ b/Resources/Prototypes/Entities/Structures/base.yml
@@ -9,6 +9,7 @@
  - type: Clickable
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
@@ -39,6 +40,7 @@
  - type: Clickable
  - type: Physics
    bodyType: Dynamic
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
+++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
@@ -7,6 +7,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/catwalk.yml
+++ b/Resources/Prototypes/Entities/Structures/catwalk.yml
@@ -8,6 +8,7 @@
  - type: Clickable
  - type: Physics
    canCollide: false
+  - type: Fixtures
    fixtures:
      - shape:
          !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -8,6 +8,7 @@
  - type: Clickable
  - type: InteractionOutline
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -5,6 +5,7 @@
  description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds.
  components:
  - type: Physics
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb {}
--- a/Resources/Prototypes/Entities/Structures/soil.yml
+++ b/Resources/Prototypes/Entities/Structures/soil.yml
@@ -8,6 +8,7 @@
  - type: InteractionOutline
  - type: Physics
    bodyType: Static
+  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb