Rework CollisionGroups (#7656)

* Replace Mob, Vault, and Small impassable with Mid, High, Low

* Remove CollisionGroup.Underplating

* Remove CollisionGroup.Passable

* Fix constructed APCs not being interactable

* Change firelocks to occlude

* Make pipe inherit from BaseItem

* Clean up pipes

* Remove duplicate physics and fixtures from bucket

* Rework CollisionGroups on all entities

* Add SlipLayer

* Remove fixture from delta

* Fix maps

* Address reviews

* Add SubfloorMask

* Fix glass collisions for flying mobs

* Fix maps

* Update new items

* Fix bagel again

* Fix slug

* Fix maps

* Touchups

* Fix tables blocking high pressure movement

* Update StandingState to allow going under flaps

* Cleanup

* More formatting

Resources/Prototypes/Entities/Effects/chemistry_effects.yml

@@ -48,9 +48,11 @@
     - hard: false
       shape:
         !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.4"
+        bounds: "-0.4,-0.4,0.4,0.4"
+      mask:
+      - ItemMask
       layer:
-      - MobImpassable
+      - SlipLayer
   - type: FoamSolutionAreaEffect
   - type: SolutionContainerManager
     solutions:
@@ -70,15 +72,6 @@
     layers:
     - state: mfoam
       map: ["enum.FoamVisualLayers.Base"]
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-    - hard: true
-      shape:
-        !type:PhysShapeAabb
-        bounds: "-0.4,-0.4,0.4,0.4"
-      layer:
-      - MobImpassable
   - type: Appearance
     visuals:
     - type: FoamVisualizer
@@ -98,15 +91,6 @@
     layers:
       - state: mfoam
         map: ["enum.FoamVisualLayers.Base"]
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-    - hard: true
-      shape:
-        !type:PhysShapeAabb
-        bounds: "-0.4,-0.4,0.4,0.4"
-      layer:
-      - MobImpassable
   - type: Appearance
     visuals:
       - type: FoamVisualizer
@@ -138,11 +122,9 @@
     - shape:
         !type:PhysShapeAabb {}
       layer:
-        - Opaque
-        - Impassable
-        - MobImpassable
-        - VaultImpassable
-        - SmallImpassable
+      - WallLayer
+      mask:
+      - WallLayer
   - type: Occluder
     sizeX: 32
     sizeY: 32

Resources/Prototypes/Entities/Effects/puddle.yml

@@ -19,11 +19,11 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.4"
-      layer:
-      - SmallImpassable
+        bounds: "-0.4,-0.4,0.4,0.4"
       mask:
-      - SmallImpassable
+      - ItemMask
+      layer:
+      - SlipLayer
       hard: false
   - type: Appearance
     visuals:

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -26,11 +26,9 @@
         radius: 0.25
       mass: 5
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - FlyingMobMask
       layer:
-      - Opaque
+      - FlyingMobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -90,11 +88,9 @@
         radius: 0.1
       mass: 5
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - FlyingMobMask
       layer:
-      - Opaque
+      - FlyingMobLayer
   - type: MobState
     thresholds:
       0: !type:NormalMobState {}
@@ -291,11 +287,9 @@
         radius: 0.2
       mass: 5
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - FlyingMobMask
       layer:
-      - Opaque
+      - FlyingMobLayer
   - type: MobState
     thresholds:
       0: !type:NormalMobState {}
@@ -341,11 +335,9 @@
         radius: 0.40
       mass: 45
       mask:
-      - Impassable
-      - MobImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -400,11 +392,9 @@
         radius: 0.35
       mass: 5
       mask:
-      - Impassable
-      - MobImpassable #Bullets!?
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -518,11 +508,9 @@
         radius: 0.48
       mass: 20
       mask:
-      - Impassable
-      - MobImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -554,16 +542,14 @@
   - type: Physics
   - type: Fixtures
     fixtures:
-      - shape:
-          !type:PhysShapeCircle
-          radius: 0.25
-        mass: 60
-        mask:
-          - Impassable
-          - MobImpassable #Bullets?!
-          - SmallImpassable
-        layer:
-          - Opaque
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.25
+      mass: 60
+      mask:
+      - MobMask
+      layer:
+      - MobLayer
   - type: Appearance
     visuals:
       - type: DamageStateVisualizer
@@ -686,10 +672,9 @@
         radius: 0.2
       mass: 10
       mask:
-      - SmallImpassable
-      - MobImpassable
+      - SmallMobMask
       layer:
-      - Opaque
+      - SmallMobLayer
   - type: MobState
     thresholds:
       0: !type:NormalMobState {}
@@ -829,11 +814,9 @@
         radius: 0.2
       mass: 5
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -879,11 +862,9 @@
         radius: 0.2
       mass: 5
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -924,11 +905,9 @@
         radius: 0.2
       mass: 2
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - SmallMobMask
       layer:
-      - Opaque
+      - SmallMobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -972,11 +951,9 @@
         radius: 0.25
       mass: 5
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - FlyingMobMask
       layer:
-      - Opaque
+      - FlyingMobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -1017,11 +994,9 @@
         radius: 0.25
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -1068,11 +1043,9 @@
         radius: 0.25
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -1125,11 +1098,9 @@
         radius: 0.25
       mass: 8
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - SmallMobMask
       layer:
-      - Opaque
+      - SmallMobLayer
   - type: Appearance
     visuals:
     - type: RotationVisualizer
@@ -1175,11 +1146,9 @@
         radius: 0.35
       mass: 25
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -1240,12 +1209,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -1299,12 +1265,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -1358,12 +1321,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer

Resources/Prototypes/Entities/Mobs/NPCs/bear.yml

@@ -24,11 +24,9 @@
         radius: 0.5
       mass: 100
       mask:
-      - Impassable
-      - MobImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: MovementIgnoreGravity
   - type: MobState
     thresholds:

Resources/Prototypes/Entities/Mobs/NPCs/carp.yml

@@ -25,11 +25,9 @@
         radius: 0.40
       mass: 20
       mask:
-      - Impassable
-      - MobImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: MobState
     thresholds:
       0: !type:NormalMobState {}
@@ -107,10 +105,8 @@
         radius: 0.40
       mass: 5
       mask:
-        - Impassable
-        - MobImpassable
-        - SmallImpassable
+      - MobMask
       layer:
-        - Opaque
+      - Opaque
   - type: GhostTakeoverAvailable
     name: holocarp

Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml

@@ -27,16 +27,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.35,-0.35,0.35,0.35"
+        bounds: "-0.35,-0.35,0.35,0.35"
       mass: 100
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
-      - MobImpassable
+      - MachineLayer
   - type: CharacterInfo
   - type: HumanoidAppearance
   - type: AnimationPlayer

Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

@@ -21,11 +21,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -224,11 +222,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -376,11 +372,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -421,12 +415,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -478,12 +469,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -524,12 +512,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable
-      - SmallImpassable
-      - VaultImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer
@@ -604,12 +589,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - Impassable
-      - MobImpassable
-      - SmallImpassable
-      - VaultImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer

Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

@@ -52,12 +52,9 @@
         radius: 0.35
       mass: 20
       mask:
-      - Impassable
-      - MobImpassable #Bullets?!
-      - VaultImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: SolutionContainerManager
   - type: Bloodstream
     bloodlossDamage:

Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml

@@ -29,11 +29,9 @@
         radius: 0.20
       mass: 2.5
       mask:
-      - Impassable
-      - MobImpassable
-      - SmallImpassable
+      - SmallMobMask
       layer:
-      - Opaque
+      - SmallMobLayer
   - type: MobState
     thresholds:
       0: !type:NormalMobState {}

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -34,12 +34,9 @@
         radius: 0.35
       mass: 120
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: MobState
     thresholds:
       0: !type:NormalMobState {}

Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

@@ -29,7 +29,7 @@
         bounds: "-0.35,-0.35,0.35,0.35"
       mass: 5
       mask:
-        - GhostImpassable
+      - GhostImpassable
   - type: Body
     template: AGhostTemplate
     preset: HumanPreset

Resources/Prototypes/Entities/Mobs/Player/guardian.yml

@@ -43,9 +43,9 @@
         radius: 0.35
       mass: 10
       mask:
-      - VaultImpassable
+      - FlyingMobMask
       layer:
-      - Opaque
+      - FlyingMobLayer
   - type: Damageable
     damageContainer: Biological
   - type: MobState

Resources/Prototypes/Entities/Mobs/Player/observer.yml

@@ -16,7 +16,7 @@
     fixtures:
     - shape:
         !type:PhysShapeCircle
-          radius: 0.35
+        radius: 0.35
       mass: 5
       mask:
       - GhostImpassable

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -36,12 +36,9 @@
         radius: 0.35
       mass: 20
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: MovementSpeedModifier
     baseWalkSpeed : 4
     baseSprintSpeed : 3
@@ -135,10 +132,9 @@
         radius: 0.35
       mass: 20
       mask:
-      - SmallImpassable
-      - MobImpassable
+      - SmallMobMask
       layer:
-      - Opaque
+      - SmallMobLayer
   - type: Appearance
     visuals:
       - type: GenericEnumVisualizer
@@ -215,12 +211,9 @@
         radius: 1
       mass: 500
       mask:
-      - SmallImpassable
-      - MobImpassable
-      - VaultImpassable
-      - Impassable
+      - LargeMobMask
       layer:
-      - Opaque
+      - LargeMobLayer
   - type: Appearance
     visuals:
     - type: DamageStateVisualizer

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -191,12 +191,9 @@
       mass: 70
       restitution: 0.0
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: AtmosExposed
   - type: Flammable
     fireSpread: true
@@ -421,16 +418,13 @@
       fixtures:
       - shape:
           !type:PhysShapeAabb
-            bounds: "-0.35,-0.35,0.35,0.35"
+          bounds: "-0.35,-0.35,0.35,0.35"
         mass: 70
         restitution: 0.0
         mask:
-        - Impassable
-        - MobImpassable
-        - VaultImpassable
-        - SmallImpassable
+        - MobMask
         layer:
-        - Opaque
+        - MobLayer
     - type: HumanoidAppearance
     - type: Body
       template: HumanoidTemplate

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -191,13 +191,13 @@
       id: "slips"
       hard: false
       layer:
-        - SmallImpassable
+      - SlipLayer
     - shape:
         !type:PhysShapeAabb
         bounds: "-0.2,-0.2,0.2,0.2"
       mass: 5
       mask:
-        - SmallImpassable
+      - ItemMask
   - type: Tag
     tags:
     - Recyclable

Resources/Prototypes/Entities/Objects/Decoration/flora.yml

@@ -16,8 +16,8 @@
         radius: 0.4
       mass: 500
       layer:
+      - HalfWallLayer
       - Opaque
-      - VaultImpassable
   - type: Climbable
 
 - type: entity
@@ -36,11 +36,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.35,-1.3,0.35,-0.5"
+        bounds: "-0.35,-1.3,0.35,-0.5"
       mass: 500
       layer:
-      - Opaque
-      - Impassable
+      - WallLayer
 
 - type: entity
   parent: BaseTree
@@ -53,11 +52,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.1,-1.0,0.1,-0.4"
+        bounds: "-0.1,-1.0,0.1,-0.4"
       mass: 500
       layer:
-      - Opaque
-      - Impassable
+      - WallLayer
 
 - type: entity
   parent: BaseTree
@@ -70,11 +68,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.18,-1.9,0.18,-1.2"
+        bounds: "-0.18,-1.9,0.18,-1.2"
       mass: 500
       layer:
-      - Opaque
-      - Impassable
+      - WallLayer
 
 - type: entity
   parent: BaseTree
@@ -87,11 +84,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.1,-1.5,0.1,-0.8"
+        bounds: "-0.1,-1.5,0.1,-0.8"
       mass: 500
       layer:
-      - Opaque
-      - Impassable
+      - WallLayer
 
 - type: entity
   parent: BaseRock
@@ -312,11 +308,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.8,-1.5,0.8,-0.8"
+        bounds: "-0.8,-1.5,0.8,-0.8"
       mass: 500
       layer:
-      - Opaque
-      - Impassable
+      - WallLayer
 
 - type: entity
   parent: BaseTreeConifer

Resources/Prototypes/Entities/Objects/Devices/nuke.yml

@@ -4,47 +4,47 @@
   name: nuclear fission explosive
   description: You probably shouldn't stick around to see if this is armed.
   components:
-    - type: Transform
-      anchored: true
-    - type: Sprite
-      sprite: Objects/Devices/nuke.rsi
-      netsync: false
-      state: nuclearbomb_base
-    - type: Physics
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures:
-      - shape:
-          !type:PhysShapeCircle
-            radius: 0.45
-        mass: 150
-        layer:
-        - SmallImpassable
-        mask:
-        - VaultImpassable
-    - type: Nuke
-      # ~50 tile radius in open space
-      # close to defaulkt max cap.
-      explosionType: Default
-      maxIntensity: 100
-      intensitySlope: 5
-      totalIntensity: 500000
-      diskSlot:
-        name: Disk
-        insertSound:
-          path: /Audio/Machines/terminal_insert_disc.ogg
-        ejectSound:
-          path: /Audio/Machines/terminal_insert_disc.ogg
-        whitelist:
-          components:
-          - NukeDisk
-    - type: InteractionOutline
-    - type: ActivatableUI
-      key: enum.NukeUiKey.Key
-    - type: UserInterface
-      interfaces:
-        - key: enum.NukeUiKey.Key
-          type: NukeBoundUserInterface
+  - type: Transform
+    anchored: true
+  - type: Sprite
+    sprite: Objects/Devices/nuke.rsi
+    netsync: false
+    state: nuclearbomb_base
+  - type: Physics
+    bodyType: Dynamic
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.45
+      mass: 150
+      mask:
+      - MachineMask
+      layer:
+      - HalfWallLayer
+  - type: Nuke
+    # ~50 tile radius in open space
+    # close to defaulkt max cap.
+    explosionType: Default
+    maxIntensity: 100
+    intensitySlope: 5
+    totalIntensity: 500000
+    diskSlot:
+      name: Disk
+      insertSound:
+        path: /Audio/Machines/terminal_insert_disc.ogg
+      ejectSound:
+        path: /Audio/Machines/terminal_insert_disc.ogg
+      whitelist:
+        components:
+        - NukeDisk
+  - type: InteractionOutline
+  - type: ActivatableUI
+    key: enum.NukeUiKey.Key
+  - type: UserInterface
+    interfaces:
+    - key: enum.NukeUiKey.Key
+      type: NukeBoundUserInterface
 
 - type: entity
   parent: StorageTank
@@ -53,27 +53,27 @@
   suffix: keg
   description: You probably shouldn't stick around to see if this is armed. It has a tap on the side.
   components:
-    - type: Sprite
-      sprite: Objects/Devices/nuke.rsi
-      netsync: false
-      state: nuclearbomb_base
-    - type: Physics
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures:
-      - shape:
-          !type:PhysShapeCircle
-            radius: 0.45
-        mass: 150
-        layer:
-        - SmallImpassable
-        mask:
-        - VaultImpassable
-    - type: SolutionContainerManager
-      solutions:
-        tank:
-          reagents:
-          - ReagentId: NuclearCola
-            Quantity: 3000
-    - type: ReagentTank
-      transferAmount: 100
+  - type: Sprite
+    sprite: Objects/Devices/nuke.rsi
+    netsync: false
+    state: nuclearbomb_base
+  - type: Physics
+    bodyType: Dynamic
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.45
+      mass: 150
+      mask:
+      - TabletopMachineMask
+      layer:
+      - TabletopMachineLayer
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: NuclearCola
+          Quantity: 3000
+  - type: ReagentTank
+    transferAmount: 100

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -205,13 +205,13 @@
       id: "slips"
       hard: false
       layer:
-      - SmallImpassable
+      - SlipLayer
     - shape:
         !type:PhysShapeAabb
         bounds: "-0.4,-0.3,0.4,0.3"
       mass: 2.5
       mask:
-      - SmallImpassable
+      - ItemMask
 
 - type: entity
   parent: BasePDA

Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml

@@ -84,17 +84,17 @@
         visible: false
         map: [ "light" ]
   - type: Physics
+    canCollide: true
   - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.2, -0.5, 0.2, 0.5"
+        bounds: "-0.2, -0.5, 0.2, 0.5"
       mass: 20
       mask:
-      - Impassable
+      - MachineMask
       layer:
-      - Opaque
-      - Impassable
+      - MachineLayer
   - type: PointLight
     enabled: false
     radius: 8
@@ -153,10 +153,10 @@
   - type: Fixtures
     fixtures:
     - shape:
-        !type:PhysShapeAabb {}
+        !type:PhysShapeAabb
+        bounds: "-0.2, -0.5, 0.2, 0.5"
+      mass: 20
+      mask:
+      - MachineMask
       layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MachineLayer

Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml

@@ -15,13 +15,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
+        bounds: "-0.5,-0.5,0.5,0.5"
       mass: 15
       layer:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - WallLayer
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Inflatable
@@ -59,13 +56,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
+        bounds: "-0.5,-0.5,0.5,0.5"
       mass: 15
       layer:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - WallLayer
   - type: Door
     openSound:
       path: /Audio/Misc/zip.ogg

Resources/Prototypes/Entities/Objects/Misc/kudzu.yml

@@ -27,7 +27,7 @@
           !type:PhysShapeAabb
           bounds: "-0.5,-0.5,0.5,0.5"
         layer:
-          - MobImpassable
+        - MidImpassable
     - type: Damageable
       damageModifierSet: Wood
     - type: Destructible

Resources/Prototypes/Entities/Objects/Misc/space_cash.yml

@@ -22,10 +22,9 @@
     - mass: 5
       shape:
         !type:PhysShapeAabb
-          bounds: "-0.35,-0.2,0.25,0.1"
+        bounds: "-0.35,-0.2,0.25,0.1"
       mask:
-      - Impassable
-      - VaultImpassable
+      - ItemMask
   - type: Appearance
     visuals:
     - type: StackVisualizer

Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

@@ -59,12 +59,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.40,0.25,0.25"
+        bounds: "-0.25,-0.40,0.25,0.25"
       mass: 20
       mask:
-      - Impassable
+      - MobMask
       layer:
-      - Opaque
+      - MobLayer
   - type: Pullable
 
 - type: entity
@@ -121,14 +121,14 @@
               - TrashBag
     - type: Fixtures
       fixtures:
-        - shape:
-            !type:PhysShapeCircle
-            radius: 0.3
-          layer:
-            - SmallImpassable
-          mask:
-            - VaultImpassable
-          mass: 100
+      - shape:
+          !type:PhysShapeCircle
+          radius: 0.3
+        mass: 100
+        layer:
+        - MobLayer
+        mask:
+        - MobMask
     - type: Spillable
     - type: SolutionContainerManager
       solutions:

Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml

@@ -28,13 +28,13 @@
       id: "slips"
       hard: false
       layer:
-      - SmallImpassable
+      - SlipLayer
     - shape:
         !type:PhysShapeAabb
         bounds: "-0.4,-0.3,0.4,0.3"
       mass: 5
       mask:
-      - SmallImpassable
+      - ItemMask
 
 - type: entity
   name: soap

Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml

@@ -92,10 +92,7 @@
         bounds: "-0.25,-0.25,0.25,0.25"
       hard: false
       mask:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - SmallImpassable
+      - FullTileMask
   - type: Appearance
     visuals:
     - type: VaporVisualizer

Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml

@@ -34,7 +34,7 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.4,0.25,0.1"
+        bounds: "-0.25,-0.4,0.25,0.1"
       mass: 5
       mask:
       - Impassable

Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml

@@ -4,6 +4,8 @@
   description: A deployable barrier. Swipe your ID card to lock/unlock it.
   parent: BaseStructure
   components:
+  - type: Transform
+    noRot: true
   - type: Sprite
     sprite: Objects/Specific/Security/barrier.rsi
     netsync: false
@@ -14,15 +16,12 @@
     fixtures:
     - shape:
         !type:PhysShapeCircle
-          radius: 0.45
-      layer:
-      - Opaque
-      - Impassable
-      - VaultImpassable
-      - SmallImpassable
-      mask:
-      - Impassable
+        radius: 0.45
       mass: 150
+      mask:
+      - MachineMask
+      layer:
+      - WallLayer
   - type: AccessReader
     access: [["Security"]]
   - type: Lock

Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml

@@ -32,11 +32,9 @@
             radius: 0.45
           mass: 150
           mask:
-            - Impassable
+          - MachineMask
           layer:
-            - Opaque
-            - MobImpassable
-            - SmallImpassable
+          - MachineLayer
     - type: Icon
       sprite: Structures/Storage/Crates/artifact.rsi
       state: artifact_container_icon

Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifacts.yml

@@ -16,14 +16,14 @@
       noRot: true
     - type: Fixtures
       fixtures:
-        - shape:
-            !type:PhysShapeCircle
-            radius: 0.45
-          mass: 150
-          layer:
-            - SmallImpassable
-          mask:
-            - VaultImpassable
+      - shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        mass: 150
+        layer:
+        - WallLayer
+        mask:
+        - MachineMask
     - type: InteractionOutline
     - type: Artifact
     - type: RandomArtifactSprite

Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml

@@ -29,20 +29,21 @@
     target: MobMonkey
   - type: CollisionWake
     enabled: false
-  - type: Physics
-    bodyType: KinematicController
   - type: Fixtures
-    fixtures: # TODO: Make a second fixture.
+    fixtures:
     - shape:
         !type:PhysShapeAabb
         bounds: "-0.4,-0.3,0.4,0.3"
       mass: 2.5
+      mask:
+      - ItemMask
+    - shape:
+        !type:PhysShapeAabb
+        bounds: "-0.4,-0.3,0.4,0.3"
+      id: "rehydrate"
       hard: false
       layer:
-      - SmallImpassable
-      mask:
-      - Impassable
-      - MobImpassable
+      - LowImpassable
 
 - type: entity
   parent: PlushieCarp
@@ -78,9 +79,12 @@
         !type:PhysShapeAabb
         bounds: "-0.4,-0.4,0.4,0.4"
       mass: 2.5
+      mask:
+      - ItemMask
+    - shape:
+        !type:PhysShapeAabb
+        bounds: "-0.4,-0.4,0.4,0.4"
+      id: "rehydrate"
       hard: false
       layer:
-      - SmallImpassable
-      mask:
-      - Impassable
-      - MobImpassable
+      - LowImpassable

Resources/Prototypes/Entities/Objects/Tools/bucket.yml

@@ -29,16 +29,6 @@
     interfaces:
     - key: enum.TransferAmountUiKey.Key
       type: TransferAmountBoundUserInterface
-  - type: Physics
-    bodyType: Dynamic
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-      mass: 5
-      mask:
-      - Impassable
   - type: Spillable
     solution: bucket
   - type: DrawableSolution

Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml

@@ -31,10 +31,9 @@
       mass: 180
       restitution: 0.0
       mask:
-      - Impassable
-      - VaultImpassable
+      - MobMask
       layer:
-      - VaultImpassable
+      - MobLayer
   - type: VehicleVisuals
   - type: Appearance
   - type: Repairable

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml

@@ -29,13 +29,12 @@
     fixtures:
     - shape:
         !type:PhysShapeCircle
-          radius: 0.8
+        radius: 0.8
       mass: 200
       hard: true
       # Didn't use MapGrid for now as the bounds are stuffed.
       layer:
-        - Impassable
-        - SmallImpassable
-        - VaultImpassable
+      - LargeMobLayer
       mask:
-        - Impassable
+      - Impassable
+      - BulletImpassable

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -19,12 +19,11 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
+        bounds: "-0.1,-0.1,0.1,0.1"
       hard: false
       mask:
       - Impassable
-      layer:
-      - MobImpassable
+      - BulletImpassable
   - type: Projectile
     damage:
       types:
@@ -46,12 +45,11 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.15,-0.45,0.15,0.15"
+        bounds: "-0.15,-0.45,0.15,0.15"
       hard: false
       mask:
       - Impassable
-      layer:
-      - MobImpassable
+      - BulletImpassable
 
 - type: entity
   id: BulletBaseFlash
@@ -125,12 +123,11 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
+        bounds: "-0.2,-0.2,0.2,0.2"
       hard: false
       mask:
       - Impassable
-      layer:
-      - MobImpassable
+      - BulletImpassable
   - type: Ammo
     isProjectile: true
     ammoVelocity: 20
@@ -160,10 +157,11 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
+        bounds: "-0.2,-0.2,0.2,0.2"
       hard: false
       mask:
-        - Opaque
+      - Impassable
+      - Opaque
   - type: Projectile
     damage:
       types:

Resources/Prototypes/Entities/Objects/Weapons/security.yml

@@ -81,13 +81,11 @@
       fixtures:
       - shape:
           !type:PhysShapeAabb
-            bounds: "-0.15,-0.3,0.15,0.3"
+          bounds: "-0.15,-0.3,0.15,0.3"
         mask:
-        - Impassable
-        - VaultImpassable
-        - SmallImpassable
+        - MachineMask
         layer:
-        - MobImpassable
+        - MachineLayer
         mass: 70
     - type: Appearance
     - type: AnimationPlayer

Resources/Prototypes/Entities/Objects/base_item.yml

@@ -24,11 +24,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
+        bounds: "-0.25,-0.25,0.25,0.25"
       mass: 5
       mask:
-      - Impassable
-      - SmallImpassable
+      - ItemMask
       restitution: 0.3  # fite me
       friction: 0.2
   - type: Sprite

Resources/Prototypes/Entities/Structures/Decoration/banners.yml

@@ -18,13 +18,12 @@
         radius: 0.2
       mass: 25
       mask:
-        - SmallImpassable
-        - VaultImpassable
+      - MachineMask
       layer:
-        - Opaque
-        - MobImpassable
-        - SmallImpassable
-        - VaultImpassable
+      - Opaque
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
   - type: InteractionOutline
 
 - type: entity

Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml

@@ -16,16 +16,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.4,-0.3,0.4,0.3"
+        bounds: "-0.4,-0.3,0.4,0.3"
       mass: 25
       mask:
-        - Impassable
-        - VaultImpassable
-        - SmallImpassable
+      - TabletopMachineMask
       layer:
-        - Opaque
-        - MobImpassable
-        - SmallImpassable
+      - TabletopMachineLayer
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
   - type: ActivatableUI

Resources/Prototypes/Entities/Structures/Dispensers/booze.yml

@@ -9,20 +9,7 @@
     sprite: Structures/dispensers.rsi
     drawdepth: SmallObjects
     state: booze
-    netsync: false 
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.4,-0.3,0.4,0.3"
-      mass: 25
-      mask:
-        - Impassable
-        - VaultImpassable
-      layer:
-        - Opaque
-        - MobImpassable
-        - SmallImpassable
+    netsync: false
   - type: ReagentDispenser
     pack: BoozeDispenserInventory
     emagPack: BoozeDispenserEmagInventory

Resources/Prototypes/Entities/Structures/Dispensers/soda.yml

@@ -10,19 +10,6 @@
     drawdepth: SmallObjects
     state: soda
     netsync: false
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.4,-0.3,0.4,0.3"
-      mass: 25
-      mask:
-        - Impassable
-        - VaultImpassable
-      layer:
-        - Opaque
-        - MobImpassable
-        - SmallImpassable
   - type: ReagentDispenser
     pack: SodaDispenserInventory
     emagPack: SodaDispenserEmagInventory

Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml

@@ -87,9 +87,6 @@
   components:
   - type: Door
     occludes: false
-    crushDamage:
-      types:
-        Blunt: 15
   - type: Occluder
     enabled: false
   - type: Sprite
@@ -98,13 +95,12 @@
     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
+        bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
       mass: 100
       mask:
-      - Impassable
+      - FullTileMask
       layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
-      - Impassable
-      - VaultImpassable
+      - GlassAirlockLayer
   - type: Construction
     graph: Airlock
     node: glassAirlock

Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml

@@ -15,13 +15,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
+        bounds: "-0.45,-0.45,0.45,0.45"
       mass: 100
       mask:
-      - MobMask
+      - FullTileMask
       layer:
-      - MobImpassable
-      - VaultImpassable
+      - HumanoidBlockLayer
   - type: Anchorable
     delay: 2
   - type: Pullable

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml

@@ -29,14 +29,12 @@
     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
+        bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
       mass: 100
       mask:
-      - Impassable
+      - FullTileMask
       layer:
-      - Opaque
-      - Impassable
-      - VaultImpassable
+      - AirlockLayer
   - type: Door
     board: DoorElectronics
     crushDamage:

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -48,13 +48,10 @@
           !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
+        - Impassable
+        - HighImpassable
         layer:
-          - Opaque
-          - Impassable
-          - MobImpassable
-          - VaultImpassable
-          - SmallImpassable
+        - AirlockLayer
     - type: Door
       openDrawDepth: WallTops
       closeTimeOne: 0.1
@@ -92,6 +89,7 @@
           type: WiresBoundUserInterface
     - type: Airtight
       fixVacuum: true
+    - type: Occluder
     - type: Construction
       graph: Firelock
       node: Firelock
@@ -103,6 +101,20 @@
   components:
     - type: Sprite
       sprite: Structures/Doors/Airlocks/Glass/firelock.rsi
+    - type: Occluder
+      enabled: false
+    - type: Fixtures
+      fixtures:
+      - shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"  # don't want this colliding with walls or they won't close
+        mask:
+        - Impassable
+        - HighImpassable
+        layer:
+        - GlassAirlockLayer
+    - type: Door
+      occludes: false
 
 - type: entity
   id: FirelockEdge
@@ -122,10 +134,11 @@
           !type:PhysShapeAabb
           bounds: "-0.49,-0.49,0.49,-0.2" # don't want this colliding with walls or they won't close
         mask:
-          - MobImpassable
+        - Impassable
+        - HighImpassable
         layer:
-          - Opaque
-          - Impassable
-          - MobImpassable
-          - VaultImpassable
-          - SmallImpassable
+        - GlassAirlockLayer
+    - type: Occluder
+      enabled: false
+    - type: Door
+      occludes: false

Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml

@@ -28,11 +28,13 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
+        bounds: "-0.45,-0.45,0.45,0.45"
       mass: 50
-      layer:
-      - SmallImpassable
       mask:
-      - VaultImpassable
+      - Impassable
+      - HighImpassable
+      layer:
+      - HighImpassable
+      - MidImpassable
   - type: Transform
     noRot: true

Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml

@@ -20,13 +20,9 @@
         bounds: "-0.49,-0.49,0.49,0.49"
       mass: 100
       mask:
-      - MobImpassable
+      - FullTileMask
       layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - AirlockLayer
   - type: Door
     bumpOpen: false
     clickOpen: true

Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml

@@ -19,13 +19,9 @@
         bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
       mass: 100
       mask:
-      - MobImpassable
+      - FullTileMask
       layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - AirlockLayer
   - type: Door
     board: DoorElectronics
     bumpOpen: false
@@ -180,11 +176,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
+        bounds: "-0.45,-0.45,0.45,0.45"
       mass: 50
-      layer:
-      - Opaque
       mask:
-      - VaultImpassable
+      - Impassable
+      - HighImpassable
+      layer:
+      - HighImpassable
   - type: Transform
     noRot: true

Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml

@@ -19,7 +19,7 @@
       mass: 30
       mask:
       - Impassable
-      - VaultImpassable
+      - HighImpassable
   - type: Anchorable
   - type: Pullable
   - type: Rotatable

Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml

@@ -13,13 +13,10 @@
         !type:PhysShapeAabb
         bounds: "-0.49,-0.49,0.49,-0.3"
       mass: 50
-      layer:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
       mask:
-      - VaultImpassable
+      - TabletopMachineMask
+      layer:
+      - GlassAirlockLayer
   - type: Sprite
     netsync: false
     sprite: Structures/Doors/Windoors/windoor.rsi

Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml

@@ -15,12 +15,10 @@
         !type:PhysShapeAabb
         bounds: "-0.45,-0.45,0.45,0.45"
       mass: 50
+      mask: # tables should collide with other tables
+      - TableMask
       layer:
-      - VaultImpassable
-      mask:
-      - Impassable
-      - VaultImpassable # tables should collide with other tables
-      - SmallImpassable
+      - TableLayer
   - type: Sprite
     netsync: false
   - type: Icon

Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml

@@ -16,8 +16,9 @@
         bounds: "-0.40,-0.30,0.40,0.45"
       mass: 50
       mask:
-      - Impassable
-      - SmallImpassable
+      - TableMask
+      layer:
+      - TableLayer
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -61,8 +62,9 @@
         bounds: "-0.45,-0.45,0.45,0.45"
       mass: 50
       mask:
-      - Impassable
-      - SmallImpassable
+      - MachineMask
+      layer:
+      - HalfWallLayer
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood
@@ -106,8 +108,9 @@
         bounds: "-0.45,-0.45,0.45,0.45"
       mass: 50
       mask:
-      - Impassable
-      - SmallImpassable
+      - MachineMask
+      layer:
+      - HalfWallLayer
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic

Resources/Prototypes/Entities/Structures/Furniture/beds.yml

@@ -17,10 +17,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.05"
+        bounds: "-0.45,-0.45,0.45,0.05"
       mass: 25
       mask:
-      - SmallImpassable
+      - TableMask
   - type: Sprite
     sprite: Structures/Furniture/furniture.rsi
     state: bed

Resources/Prototypes/Entities/Structures/Furniture/carpets.yml

@@ -18,11 +18,6 @@
   - type: Physics
     canCollide: false
   - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      layer:
-      - Passable
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -136,14 +131,6 @@
     state: chapel
   - type: Tag
     tags: [ Carpet ]
-  - type: Physics
-    canCollide: false
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb {}
-      layer:
-      - Passable
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible

Resources/Prototypes/Entities/Structures/Furniture/chairs.yml

@@ -14,11 +14,10 @@
     fixtures:
     - shape:
         !type:PhysShapeCircle
-          radius: 0.2
-      mask:
-      - Impassable
-      - VaultImpassable
+        radius: 0.2
       mass: 10
+      mask:
+      - TableMask
   - type: Sprite
     sprite: Structures/Furniture/chairs.rsi
     noRot: true

Resources/Prototypes/Entities/Structures/Furniture/instruments.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: baseinstrument
   id: BasePlaceableInstrument
   parent: BaseStructureDynamic
@@ -31,14 +31,19 @@
       type: InstrumentBoundUserInterface
   - type: Fixtures
     fixtures:
-      - shape:
-          !type:PhysShapeCircle
-          radius: 0.45
-        mass: 50
-        layer:
-          - SmallImpassable
-        mask:
-          - VaultImpassable
+    - shape:
+        !type:PhysShapeCircle
+        radius: 0.45
+      mass: 50
+      mask:
+      - Impassable
+      - HighImpassable
+      - MidImpassable
+      layer:
+      - Opaque
+      - HighImpassable
+      - MidImpassable
+      - BulletImpassable
   - type: Transform
     anchored: true
 

Resources/Prototypes/Entities/Structures/Furniture/memorial.yml

@@ -13,10 +13,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.20"
+        bounds: "-0.45,-0.45,0.45,0.20"
       mass: 50
-      layer:
-      - SmallImpassable
       mask:
-      - Impassable
+      - FullTileMask
+      layer:
+      - WallLayer
   - type: InteractionOutline

Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml

@@ -15,9 +15,10 @@
         radius: 0.2
       mass: 25
       mask:
-        - Impassable 
+      - Impassable
       layer:
-        - Opaque
+      - Opaque
+      - BulletImpassable
   - type: Sprite
     drawdepth: Overdoors
     offset: "0.0,0.3"
@@ -69,19 +70,6 @@
   components:
   - type: Sprite
     state: plant-25
-  - type: Physics
-    bodyType: Dynamic
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeCircle
-        radius: 0.2
-        position: "0.0,-0.3"
-      mass: 25
-      layer:
-      - SmallImpassable
-      mask:
-      - Impassable
 
 - type: entity
   id: PottedPlantBioluminscent

Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml

@@ -22,15 +22,12 @@
     - type: Physics
     - type: Fixtures
       fixtures:
-        - shape:
-            !type:PhysShapeCircle
-            radius: 0.35
-          mass: 30
-          mask:
-            - Impassable
-            - SmallImpassable
-          layer:
-            - Opaque
+      - shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        mass: 30
+        mask:
+        - MobMask
     - type: Damageable
     - type: Destructible
       thresholds:

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -420,9 +420,9 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
+        bounds: "-0.25,-0.25,0.25,0.25"
       mass: 50
-      layer:
-      - SmallImpassable
       mask:
-      - Impassable
+      - TabletopMachineMask
+      layer:
+      - TabletopMachineLayer

Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml

@@ -11,15 +11,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.5,0.25,0.5"
+        bounds: "-0.25,-0.5,0.25,0.5"
       mass: 25
       mask:
-        - MobMask
+      - MachineMask
       layer:
-        - Opaque
-        - MobImpassable
-        - SmallImpassable
-        - VaultImpassable
+      - MachineLayer
   - type: InteractionOutline
   - type: Rotatable
   - type: Anchorable

Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml

@@ -14,13 +14,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
+        bounds: "-0.45,-0.45,0.45,0.45"
       mass: 25
-      layer:
-      - MobMask
-      - Opaque
       mask:
-      - MobMask
+      - MachineMask
+      layer:
+      - MachineLayer
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic

Resources/Prototypes/Entities/Structures/Machines/chem_master.yml

@@ -28,13 +28,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.4,0.25,0.4"
+        bounds: "-0.25,-0.4,0.25,0.4"
       mass: 25
       mask:
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - MobImpassable
+      - MachineLayer
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml

@@ -16,13 +16,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.5,0.25,0.5"
+        bounds: "-0.25,-0.5,0.25,0.5"
       mass: 25
-      layer:
-      - SmallImpassable
-      - Opaque
       mask:
-      - MobMask
+      - MachineMask
+      layer:
+      - MachineLayer
   - type: Construction
     graph: Machine
     node: machine

Resources/Prototypes/Entities/Structures/Machines/frame.yml

@@ -16,17 +16,12 @@
       fixtures:
       - shape:
           !type:PhysShapeAabb
-            bounds: "-0.25,-0.5,0.25,0.5"
+          bounds: "-0.25,-0.5,0.25,0.5"
         mass: 25
-        layer:
-          - Impassable
-          - MobImpassable
-          - VaultImpassable
-          - Opaque
         mask:
-          - Impassable
-          - MobImpassable
-          - VaultImpassable
+        - MachineMask
+        layer:
+        - MachineLayer
     - type: Clickable
     - type: InteractionOutline
     - type: Anchorable
@@ -69,17 +64,12 @@
       fixtures:
       - shape:
           !type:PhysShapeAabb
-            bounds: "-0.25,-0.5,0.25,0.5"
+          bounds: "-0.25,-0.5,0.25,0.5"
         mass: 25
-        layer:
-          - Impassable
-          - MobImpassable
-          - VaultImpassable
-          - Opaque
         mask:
-          - Impassable
-          - MobImpassable
-          - VaultImpassable
+        - MachineMask
+        layer:
+        - MachineLayer
     - type: Clickable
     - type: InteractionOutline
     - type: Anchorable
@@ -145,4 +135,4 @@
     - type: Sprite
       netsync: false
       sprite: Structures/Machines/parts.rsi
-      state: destroyed
+      state: destroyed

Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml

@@ -31,15 +31,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-1.5,-1.5,1.5,1.5"
+        bounds: "-1.5,-1.5,1.5,1.5"
       mass: 500
       mask:
-      - Impassable
+      - LargeMobMask
       layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
+      - WallLayer
   - type: Repairable
     fuelCost: 10
     doAfterDelay: 5

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -27,15 +27,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.4"
+        bounds: "-0.4,-0.4,0.4,0.4"
       mass: 25
       mask:
-      - Impassable
-      - VaultImpassable
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - MobImpassable
+      - MachineLayer
   - type: Construction
     graph: Machine
     node: machine
@@ -116,15 +113,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.4"
+        bounds: "-0.4,-0.4,0.4,0.4"
       mass: 25
       mask:
-      - Impassable
-      - VaultImpassable
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - MobImpassable
+      - MachineLayer
   - type: ResearchClient
   - type: Construction
     graph: Machine

Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml

@@ -19,13 +19,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.5,0.25,0.5"
+        bounds: "-0.25,-0.5,0.25,0.5"
       mass: 25
-      layer:
-      - SmallImpassable
-      - Opaque
       mask:
-      - MobMask
+      - MachineMask
+      layer:
+      - MachineLayer
   - type: Construction
     graph: Machine
     node: machine

Resources/Prototypes/Entities/Structures/Machines/microwave.yml

@@ -25,12 +25,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.3,-0.16,0.3,0.16"
+        bounds: "-0.3,-0.16,0.3,0.16"
       mass: 25
-      layer:
-      - SmallImpassable
       mask:
-      - VaultImpassable
+      - TabletopMachineMask
+      layer:
+      - TabletopMachineLayer
   - type: Sprite
     netsync: false
     sprite: Structures/Machines/microwave.rsi

Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml

@@ -30,15 +30,15 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.08,-0.35,0.15,0.25"
-      layer:
-      - SmallImpassable
+        bounds: "-0.08,-0.35,0.15,0.25"
       mask:
-      - VaultImpassable
+      - TabletopMachineMask
+      layer:
+      - TabletopMachineLayer
   - type: Sprite
     netsync: false
     sprite: Structures/Machines/juicer.rsi
     state: juicer0
     drawdepth: SmallObjects
   - type: ApcPowerReceiver
-    powerLoad: 300
+    powerLoad: 300

Resources/Prototypes/Entities/Structures/Machines/recycler.yml

@@ -16,23 +16,21 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
+        bounds: "-0.2,-0.2,0.2,0.2"
       id: brrt
       hard: false
       layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
+      - FullTileMask
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49"
+        bounds: "-0.49,-0.49,0.49,0.49"
       id: collision
       hard: true
       mask:
       - Impassable
       layer:
-        - Opaque
+      - Opaque
+      - BulletImpassable
   - type: Transform
     anchored: true
     noRot: false    

Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml

@@ -17,11 +17,10 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.4,0.25,0.4"
+        bounds: "-0.25,-0.4,0.25,0.4"
       mass: 25
-      layer:
-      - MobMask
-      - Opaque
       mask:
-      - MobMask
+      - MachineMask
+      layer:
+      - MachineLayer
   - type: SeedExtractor

Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml

@@ -44,8 +44,8 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.05"
+        bounds: "-0.45,-0.45,0.45,0.05"
       mass: 25
       mask:
-      - SmallImpassable
+      - LowImpassable
 

Resources/Prototypes/Entities/Structures/Machines/traitordm.yml

@@ -17,13 +17,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
+        bounds: "-0.25,-0.25,0.25,0.25"
       mass: 25
       mask:
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - MobImpassable
+      - MachineLayer
   - type: TraitorDeathMatchRedemption
   placement:
     mode: AlignTileAny

Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml

@@ -22,14 +22,11 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.45,0.25,0.45"
+        bounds: "-0.25,-0.45,0.25,0.45"
       mask:
-      - Impassable
-      - VaultImpassable
-      - SmallImpassable
+      - FullTileMask
       layer:
-      - Opaque
-      - MobImpassable
+      - WallLayer
       mass: 100
   - type: Destructible
     thresholds:

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml

@@ -1,6 +1,7 @@
 - type: entity
   abstract: true
   id: GasPipeBase
+  parent: BaseItem
   name: pipe
   description: Holds gas.
   placement:
@@ -8,32 +9,6 @@
   components:
   - type: Item
     size: 10
-  - type: Clickable
-  - type: InteractionOutline
-  - type: MovedByPressure
-  - type: DamageOnHighSpeedImpact
-    damage:
-      types:
-        Blunt: 5
-    soundHit:
-      path: /Audio/Effects/hit_kick.ogg
-  - type: CollisionWake
-  - type: TileFrictionModifier
-    modifier: 0.5
-  - type: Physics
-    bodyType: Dynamic
-    fixedRotation: false
-  - type: Fixtures
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-        mass: 5
-        mask:
-          - Impassable
-          - VaultImpassable
-        restitution: 0.3  # fite me
-        friction: 0.2
   - type: Transform
     anchored: true
   - type: Damageable
@@ -43,7 +18,6 @@
   - type: PipeAppearance
   - type: Anchorable
   - type: Rotatable
-  - type: Pullable
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml

@@ -13,19 +13,14 @@
       fixedRotation: false
     - type: Fixtures
       fixtures:
-        - shape:
-            !type:PhysShapeAabb
-            bounds: "-0.25,-0.4,0.25,0.4"
-          mass: 25
-          layer:
-            - Impassable
-            - MobImpassable
-            - VaultImpassable
-            - Opaque
-          mask:
-            - Impassable
-            - MobImpassable
-            - VaultImpassable
+      - shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.4,0.25,0.4"
+        mass: 25
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
     - type: Clickable
     - type: InteractionOutline
     - type: Anchorable

Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml

@@ -16,6 +16,12 @@
   - type: Physics
     bodyType: Static
   - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+        bounds: "-0.25,-0.5,0.25,0.5"
+      mask:
+      - SubfloorMask
   - type: Transform
     anchored: true
   - type: Anchorable
@@ -60,13 +66,6 @@
     drawdepth: ThickPipe
     sprite: Structures/Piping/disposal.rsi
     state: pipe-b
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.25,-0.5,0.25,0.5"
-      layer: [ Underplating ]
   - type: Construction
     graph: DisposalPipe
     node: broken
@@ -87,13 +86,6 @@
     - type: DisposalVisualizer
       state_free: conpipe-s
       state_anchored: pipe-s
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.25,-0.5,0.25,0.5"
-      layer: [ Underplating ]
   - type: Construction
     graph: DisposalPipe
     node: pipe
@@ -120,13 +112,6 @@
     interfaces:
     - key: enum.DisposalTaggerUiKey.Key
       type: DisposalTaggerBoundUserInterface
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.25,-0.5,0.25,0.5"
-        layer: [ Underplating ]
   - type: Construction
     graph: DisposalPipe
     node: tagger
@@ -147,13 +132,13 @@
     - type: DisposalVisualizer
       state_free: conpipe-t
       state_anchored: pipe-t
-  - type: Physics
   - type: Fixtures
     fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.25,-0.5,0.25,0.4"
-        layer: [ Underplating ]
+    - shape:
+        !type:PhysShapeAabb
+        bounds: "-0.25,-0.5,0.25,0.4"
+      mask:
+      - SubfloorMask
   - type: Construction
     graph: DisposalPipe
     node: trunk
@@ -186,13 +171,13 @@
     interfaces:
     - key: enum.DisposalRouterUiKey.Key
       type: DisposalRouterBoundUserInterface
-  - type: Physics
   - type: Fixtures
     fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.5,-0.5,0.25,0.5"
-        layer: [ Underplating ]
+    - shape:
+        !type:PhysShapeAabb
+        bounds: "-0.5,-0.5,0.25,0.5"
+      mask:
+      - SubfloorMask
   - type: Construction
     graph: DisposalPipe
     node: router
@@ -218,13 +203,13 @@
       state_anchored: pipe-j2s
   - type: Flippable
     mirrorEntity: DisposalRouter
-  - type: Physics
   - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.5,0.5,0.5"
-      layer: [ Underplating ]
+        bounds: "-0.25,-0.5,0.5,0.5"
+      mask:
+      - SubfloorMask
 
 - type: entity
   id: DisposalJunction
@@ -248,13 +233,13 @@
       state_anchored: pipe-j1
   - type: Flippable
     mirrorEntity: DisposalJunctionFlipped
-  - type: Physics
   - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.25,0.5"
-      layer: [ Underplating ]
+        bounds: "-0.5,-0.5,0.25,0.5"
+      mask:
+      - SubfloorMask
   - type: Construction
     graph: DisposalPipe
     node: junction
@@ -280,13 +265,13 @@
       state_anchored: pipe-j2
   - type: Flippable
     mirrorEntity: DisposalJunction
-  - type: Physics
   - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.5,0.5,0.5"
-      layer: [ Underplating ]
+        bounds: "-0.25,-0.5,0.5,0.5"
+      mask:
+      - SubfloorMask
 
 - type: entity
   id: DisposalYJunction
@@ -308,13 +293,13 @@
     - type: DisposalVisualizer
       state_free: conpipe-y
       state_anchored: pipe-y
-  - type: Physics
   - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.25"
-      layer: [ Underplating ]
+        bounds: "-0.5,-0.5,0.5,0.25"
+      mask:
+      - SubfloorMask
   - type: Construction
     graph: DisposalPipe
     node: yJunction
@@ -335,13 +320,13 @@
     - type: DisposalVisualizer
       state_free: conpipe-c
       state_anchored: pipe-c
-  - type: Physics
   - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.25,0.25"
-      layer: [ Underplating ]
+        bounds: "-0.5,-0.5,0.25,0.25"
+      mask:
+      - SubfloorMask
   - type: Construction
     graph: DisposalPipe
     node: bend

Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml

@@ -24,15 +24,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.4,0.25,0.4"
+        bounds: "-0.25,-0.4,0.25,0.4"
       mass: 30
       mask:
-      - Impassable
+      - MachineMask
       layer:
-      - Opaque
-      - SmallImpassable
-      - VaultImpassable
-      - MobImpassable
+      - MachineLayer
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml

@@ -14,13 +14,12 @@
       fixtures:
       - shape:
           !type:PhysShapeAabb
-            bounds: "-0.45,-0.45,0.45,0.45"
+          bounds: "-0.45,-0.45,0.45,0.45"
         mass: 25
         mask:
-        - Opaque
-        - Impassable
-        - MobImpassable
-        - VaultImpassable
+        - MachineMask
+        layer:
+        - MachineLayer
     - type: Transform
       anchored: true
       noRot: false

Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml

@@ -21,13 +21,13 @@
       fixtures:
       - shape:
           !type:PhysShapeAabb
-            bounds: "-0.48,-0.48,0.48,0.48"
+          bounds: "-0.48,-0.48,0.48,0.48"
         hard: false
         layer: [None]
         mask:
-          # Has to hit mobs, singularity, and singularity generator
-          - MobMask
-          - Opaque
+        # Has to hit mobs, singularity, and singularity generator
+        - Opaque
+        - FullTileMask
     - type: ParticleProjectile
     - type: SinguloFood
       # Energy is setup by the PA particle fire function.

Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml

@@ -14,17 +14,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
+        bounds: "-0.45,-0.45,0.45,0.45"
       mass: 25
-      layer:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - Opaque
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
+      - MachineMask
+      layer:
+      - MachineLayer
   - type: Transform
     anchored: true
     noRot: true

Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml

@@ -1,35 +1,21 @@
 - type: entity
+  parent: BaseStructure
   id: ContainmentFieldGenerator
   name: containment field generator
   description: A machine that generates a containment field when powered by an emitter. Keeps the Singularity docile.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: InteractionOutline
-  - 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
-        # However keep in mind that this will affect singulo collision as well,
-        #  when people inevitably physicsify that,
-        #  so it can't just be 0.1 or something
-        !type:PhysShapeCircle
-          radius: 0.45
+        !type:PhysShapeAabb
+        bounds: "-0.45,-0.45,0.45,0.45"
       mass: 25
-      layer:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - Opaque
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-  - type: Transform
-    anchored: true
+      - FullTileMask
+      layer:
+      - FullTileMask
+  - type: InteractionOutline
+  - type: Anchorable
   - type: Sprite
     sprite: Structures/Power/Generation/Singularity/containment.rsi
     state: icon
@@ -38,8 +24,6 @@
     sprite: Structures/Power/Generation/Singularity/containment.rsi
     state: icon
   - type: ContainmentFieldGenerator
-  - type: Anchorable
-  - type: Pullable
   - type: PointLight
     enabled: false
     color: "#4080FF"
@@ -62,16 +46,11 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
-      layer:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - Opaque
+        bounds: "-0.5,-0.5,0.5,0.5"
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
+      - FullTileMask
+      layer:
+      - FullTileMask
   - type: Transform
     anchored: true
   - type: Sprite

Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml

@@ -14,17 +14,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
+        bounds: "-0.25,-0.25,0.25,0.25"
       mass: 100
-      layer:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - Opaque
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
+      - MachineMask
+      layer:
+      - MachineLayer
   - type: Transform
     anchored: true
   - type: Sprite

Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml

@@ -23,10 +23,10 @@
           radius: 0.45
       mass: 25
       # Keep an eye on ParticlesProjectile when adjusting these
+      mask:
+      - MachineMask
       layer:
       - Opaque
-      mask:
-      - MobMask
   - type: Transform
     anchored: true
     noRot: true

Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml

@@ -16,16 +16,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
+        bounds: "-0.45,-0.45,0.45,0.45"
       mass: 25
       mask:
-      - Impassable
-      - VaultImpassable
-      - SmallImpassable
+      - FullTileMask
       layer:
-      - Opaque
-      - MobImpassable
-      - SmallImpassable
+      - WallLayer
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -83,20 +79,6 @@
   components:
   - type: Physics
     bodyType: Dynamic
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
-      mass: 25
-      mask:
-      - Impassable
-      - VaultImpassable
-      - SmallImpassable
-      layer:
-      - Opaque
-      - MobImpassable
-      - SmallImpassable
 
 - type: entity
   id: AMEShielding
@@ -115,13 +97,12 @@
   - type: Fixtures
     fixtures:
     - shape:
-        !type:PhysShapeAabb {}
+        !type:PhysShapeAabb
+      mass: 25
+      mask:
+      - FullTileMask
       layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - WallLayer
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic

Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml

@@ -21,18 +21,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.4,-0.5,0.4,0.3"
+        bounds: "-0.4,-0.5,0.4,0.3"
       mass: 25
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MachineLayer
   - type: Transform
     anchored: true
     noRot: true
@@ -94,11 +88,6 @@
     color: "#3db83b"
     castShadows: false
   - type: Fixtures
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.25,-0.25,0.3,0.25"
-        layer: [ Passable ]
   - type: Transform
     anchored: true
   - type: Sprite
@@ -137,11 +126,6 @@
   - type: InteractionOutline
   - type: Physics
   - type: Fixtures
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.25,-0.25,0.3,0.25"
-        layer: [ Passable ]
   - type: Transform
     anchored: true
   - type: Sprite

Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml

@@ -16,18 +16,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.45,-0.1,0.45,0.1"
+        bounds: "-0.45,-0.1,0.45,0.1"
       mass: 100
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MachineLayer
   - type: Sprite
     sprite: Structures/Power/Generation/solar_panel.rsi
     state: normal
@@ -120,9 +114,9 @@
         radius: 0.25
       mass: 75
       mask:
-      - VaultImpassable
+      - MachineMask
       layer:
-      - VaultImpassable
+      - MachineLayer
   - type: Sprite
     sprite: Structures/Power/Generation/solar_panel.rsi
     state: solar_assembly
@@ -163,15 +157,9 @@
         !type:PhysShapeAabb {}
       mass: 100
       mask:
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - MachineLayer
   - type: Sprite
     sprite: Structures/Power/Generation/solar_panel.rsi
     state: solar_tracker

Resources/Prototypes/Entities/Structures/Power/apc.yml

@@ -22,13 +22,6 @@
   - type: AccessReader
     access: [["Engineering"]]
   - type: InteractionOutline
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.25,-0.25,0.3,0.25"
-        layer: [ Passable ]
   - type: Transform
     anchored: true
   - type: Sprite
@@ -75,3 +68,4 @@
     maxChargeRate: 5000
     supplyRampTolerance: 1000
     supplyRampRate: 500
+  - type: WallMount

Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml

@@ -10,14 +10,6 @@
       netsync: false
       drawdepth: BelowFloor
     - type: Clickable
-    - type: Physics
-    - type: Fixtures
-      fixtures:
-        - shape:
-            !type:PhysShapeAabb
-            bounds: "-0.5,-0.5,0.5,0.5"
-          layer:
-            - Underplating
     - type: InteractionOutline
     - type: Transform
       anchored: true

Resources/Prototypes/Entities/Structures/Power/cables.yml

@@ -5,14 +5,6 @@
     mode: SnapgridCenter
   components:
   - type: Clickable
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.5,-0.5,0.5,0.5"
-        layer:
-        - Underplating
   - type: InteractionOutline
   - type: Transform
     anchored: true

Resources/Prototypes/Entities/Structures/Power/debug_power.yml

@@ -24,7 +24,7 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
+        bounds: "-0.5,-0.5,0.5,0.5"
       layer: [MobMask, Opaque]
   - type: Transform
     anchored: true
@@ -68,7 +68,7 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
+        bounds: "-0.5,-0.5,0.5,0.5"
       layer: [MobMask, Opaque]
   - type: Transform
     anchored: true
@@ -100,7 +100,7 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
+        bounds: "-0.5,-0.5,0.5,0.5"
       layer: [MobMask, Opaque]
   - type: Transform
     anchored: true
@@ -160,7 +160,7 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
+        bounds: "-0.5,-0.5,0.5,0.5"
       layer: [MobMask, Opaque]
   - type: Transform
     anchored: true

Resources/Prototypes/Entities/Structures/Power/saltern_power.yml

@@ -25,7 +25,6 @@
   parent: BaseAPC
   id: SalternAPC
   components:
-  - type: WallMount
   - type: Battery
     maxCharge: 12000
     startingCharge: 2000

Resources/Prototypes/Entities/Structures/Power/substation.yml

@@ -102,11 +102,6 @@
   - type: Physics
     bodyType: Static
   - type: Fixtures
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.25,-0.25,0.3,0.25"
-        layer: [ Passable ]
   - type: Transform
     anchored: true
   - type: Sprite # TODO: add sprite for maintenance panel open
@@ -188,11 +183,6 @@
   - type: Physics
     bodyType: Static
   - type: Fixtures
-    fixtures:
-      - shape:
-          !type:PhysShapeAabb
-            bounds: "-0.25,-0.25,0.3,0.25"
-        layer: [ Passable ]
   - type: Transform
     anchored: true
   - type: Sprite

Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml

@@ -50,17 +50,14 @@
       bodyType: Dynamic
     - type: Fixtures
       fixtures:
-        - shape:
-            !type:PhysShapeAabb
-            bounds: "-0.25,-0.25,0.25,0.25"
-          mass: 25
-          mask:
-          - MobMask
-          layer:
-            - Opaque
-            - MobImpassable
-            - SmallImpassable
-            - VaultImpassable
+      - shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        mass: 25
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
     - type: AtmosDevice
       requireAnchored: false
       joinSystem: true
@@ -376,17 +373,14 @@
       bodyType: Dynamic
     - type: Fixtures
       fixtures:
-        - shape:
-            !type:PhysShapeAabb
-              bounds: "-0.4,-0.3,0.4,0.3"
-          mass: 25
-          mask:
-          - MobMask
-          layer:
-            - Opaque
-            - MobImpassable
-            - SmallImpassable
-            - VaultImpassable
+      - shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.3,0.4,0.3"
+        mass: 25
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
 
 - type: entity
   parent: GasCanisterBrokenBase

Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml

@@ -31,15 +31,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.25,-0.48,0.25,0.48"
+        bounds: "-0.25,-0.48,0.25,0.48"
       mass: 70
       mask:
-      - Impassable
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - MobImpassable
-      - SmallImpassable
+      - MachineLayer
   - type: EntityStorage
   - type: Weldable
   - type: PlaceableSurface

Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml

@@ -23,15 +23,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.29"
+        bounds: "-0.4,-0.4,0.4,0.29"
       mass: 25
       mask:
-      - Impassable
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - MobImpassable
-      - SmallImpassable
+      - MachineLayer
   - type: EntityStorage
     Capacity: 500
   - type: Weldable
@@ -86,15 +83,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.29"
+        bounds: "-0.4,-0.4,0.4,0.29"
       mass: 25
       mask:
-      - Impassable
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - MobImpassable
-      - SmallImpassable
+      - MachineLayer
   - type: EntityStorage
     Capacity: 500
   - type: Weldable

Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml

@@ -619,15 +619,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.29"
+        bounds: "-0.4,-0.4,0.4,0.29"
       mass: 75
       mask:
-      - Impassable
-      - SmallImpassable
+      - LargeMobMask
       layer:
-      - Opaque
-      - MobImpassable
-      - SmallImpassable
+      - LargeMobLayer
   - type: Construction
     graph: CrateLivestock
     node: cratelivestock

Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml

@@ -13,17 +13,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.4"
+        bounds: "-0.4,-0.4,0.4,0.4"
       mass: 100
       mask:
-      - Impassable
-      - SmallImpassable
+      - MachineMask
       layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+      - WallLayer
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -55,4 +50,4 @@
     solution: tank
   - type: ReagentTank
   - type: Transform
-    noRot: true
+    noRot: true

Resources/Prototypes/Entities/Structures/Storage/morgue.yml

@@ -21,18 +21,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
+        bounds: "-0.5,-0.5,0.5,0.5"
       mass: 25
       mask:
-       - Impassable
-       - MobImpassable
-       - VaultImpassable
-       - SmallImpassable
+      - MachineMask
       layer:
-       - Opaque
-       - MobImpassable
-       - VaultImpassable
-       - SmallImpassable
+      - WallLayer
   - type: MorgueEntityStorage
     IsCollidableWhenOpen: true
     Capacity: 1
@@ -61,15 +55,12 @@
     bodyType: Static
   - type: Fixtures
     fixtures:
-      - shape:
-          !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
-        mass: 25
-        mask:
-          - Impassable
-          - MobImpassable
-          - VaultImpassable
-          - SmallImpassable
+    - shape:
+        !type:PhysShapeAabb
+        bounds: "-0.5,-0.5,0.5,0.5"
+      mass: 25
+      mask:
+      - Impassable
   - type: Sprite
     netsync: false
     sprite: Structures/Storage/morgue.rsi
@@ -102,18 +93,12 @@
     fixtures:
     - shape:
         !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
+        bounds: "-0.5,-0.5,0.5,0.5"
       mass: 25
       mask:
-       - Impassable
-       - MobImpassable
-       - VaultImpassable
-       - SmallImpassable
+      - MachineMask
       layer:
-       - Opaque
-       - MobImpassable
-       - VaultImpassable
-       - SmallImpassable
+      - MachineLayer
   - type: CrematoriumEntityStorage
     IsCollidableWhenOpen: true
     Capacity: 1