Move collision groups over to the new flags system.

Content.Shared/Physics/CollisionGroup.cs

@@ -23,8 +23,8 @@ namespace Content.Shared.Physics
 
         MapGrid         = MapGridHelpers.CollisionGroup, // Map grids, like shuttles. This is the actual grid itself, not the walls or other entities connected to the grid.
 
-        // 32 possible groups
         MobMask = Impassable | MobImpassable | VaultImpassable | SmallImpassable,
+        // 32 possible groups
         AllMask = -1,
     }
 }

Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/storage_tank.yml

@@ -10,8 +10,17 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5,-0.5,0.5,0.5"
-      mask: 30
+      mask:
-      layer: 31
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
     IsScrapingFloor: true
   - type: Physics
     mass: 15

Resources/Prototypes/Entities/Buildings/Storage/closet.yml

@@ -22,8 +22,17 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5,-0.25,0.5,0.25"
-      mask: 30
+      mask:
-      layer: 31
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
     IsScrapingFloor: true
   - type: Physics
     mass: 25

Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml

@@ -19,8 +19,17 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.4, -0.4, 0.4, 0.4"
-      layer: 31
+      mask:
-      mask: 30
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
     IsScrapingFloor: true
   - type: Physics
     mass: 25

Resources/Prototypes/Entities/Buildings/airlock_base.yml

@@ -24,8 +24,14 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
-      mask: 4
+      mask:
-      layer: 31
+      - MobImpassable
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: Airlock
   - type: Appearance
     visuals:

Resources/Prototypes/Entities/Buildings/asteroid.yml

@@ -14,7 +14,7 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 31
+      layer: [MobMask]
   - type: Damageable
   - type: Destructible
     thresholdvalue: 100

Resources/Prototypes/Entities/Buildings/computers.yml

@@ -13,7 +13,11 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5,-0.25,0.5,0.25"
-      layer: 15
+      layer:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - Opaque
   - type: Icon
     sprite: Buildings/computer.rsi
     state: computer
@@ -165,7 +169,7 @@
     - type: ComputerVisualizer2D
       key: id_key
       screen: id
-      
+
 - type: entity
   id: computerBodyScanner
   parent: ComputerBase
@@ -181,7 +185,7 @@
     - type: ComputerVisualizer2D
       key: generic_key
       screen: generic
-      
+
 - type: entity
   id: ComputerComms
   parent: ComputerBase

Resources/Prototypes/Entities/Buildings/girder.yml

@@ -12,7 +12,7 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 31
+      layer: [MobMask, Opaque]
   - type: Damageable
   - type: Destructible
     thresholdvalue: 50

Resources/Prototypes/Entities/Buildings/gravity_generator.yml

@@ -21,7 +21,11 @@
       shapes:
         - !type:PhysShapeAabb
           bounds: "-1.5,-1.5,1.5,1.5"
-          layer: 15
+          layer:
+          - Opaque
+          - Impassable
+          - MobImpassable
+          - VaultImpassable
     - type: Clickable
     - type: InteractionOutline
     - type: Damageable

Resources/Prototypes/Entities/Buildings/instruments.yml

@@ -12,7 +12,7 @@
    - type: Collidable
      shapes:
      - !type:PhysShapeAabb
-       layer: 31
+       layer: [MobMask, Impassable]
 
    - type: SnapGrid
      offset: Center

Resources/Prototypes/Entities/Buildings/lathe.yml

@@ -35,7 +35,11 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 15
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
   - type: SnapGrid
     offset: Center
   - type: Lathe
@@ -80,7 +84,11 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 15
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
   - type: SnapGrid
     offset: Center
   - type: ResearchClient

Resources/Prototypes/Entities/Buildings/low_wall.yml

@@ -22,7 +22,7 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 20
+      layer: [SmallImpassable, MobImpassable]
   - type: Damageable
   - type: Destructible
     thresholdvalue: 100

Resources/Prototypes/Entities/Buildings/medical_scanner.yml

@@ -22,7 +22,11 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5,0,0.5,1"
-      layer: 15
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
     IsScrapingFloor: true
   - type: Physics
     mass: 25

Resources/Prototypes/Entities/Buildings/mirror.yml

@@ -11,7 +11,7 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 32
+      layer: [Clickable]
   - type: Clickable
   - type: InteractionOutline
   - type: Physics

Resources/Prototypes/Entities/Buildings/power.yml

@@ -53,7 +53,7 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5, -0.5, 0.3, 0.5"
-      layer: 31
+      layer: [MobMask, Opaque]
   - type: Sprite
     texture: Objects/Power/generator.png
   - type: Icon
@@ -74,7 +74,7 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 31
+      layer: [MobMask, Opaque]
   - type: Sprite
     sprite: Buildings/solar_panel.rsi
     state: normal
@@ -103,7 +103,7 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 32
+      layer: Clickable
   - type: Sprite
     drawdepth: WallMountedItems
     texture: Objects/Power/provider.png
@@ -165,7 +165,7 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5, -0.5, 0.5, 0.5"
-      layer: 31
+      layer: [MobMask, Opaque]
   - type: Sprite
     netsync: false
     sprite: Buildings/smes.rsi
@@ -209,7 +209,7 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5, -0.25, 0.5, 0.25"
-      layer: 31
+      layer: [MobMask, Opaque]
   - type: Sprite
     texture: Objects/Power/wiredmachine.png
   - type: Icon
@@ -234,7 +234,7 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5, -0.25, 0.5, 0.25"
-      layer: 31
+      layer: [MobMask, Opaque]
   - type: Sprite
     texture: Objects/Furniture/wirelessmachine.png
   - type: Icon

Resources/Prototypes/Entities/Buildings/reagent_dispenser_base.yml

@@ -8,7 +8,11 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.4,-0.25,0.4,0.25"
-      layer: 15
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
     IsScrapingFloor: true
   - type: Physics
     mass: 25

Resources/Prototypes/Entities/Buildings/table.yml

@@ -16,7 +16,9 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 20
+      layer:
+      - SmallImpassable
+      - MobImpassable
 
   - type: SnapGrid
     offset: Center

Resources/Prototypes/Entities/Buildings/vending_machines.yml

@@ -21,7 +21,12 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5,-0.25,0.5,0.25"
-      layer: 15
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: SnapGrid
     offset: Center
   - type: Damageable

Resources/Prototypes/Entities/Buildings/windows.yml

@@ -21,7 +21,11 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.5, -0.5, 0.3, 0.5"
-      layer: 30
+      layer:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: Damageable
   - type: Destructible
     thresholdvalue: 100

Resources/Prototypes/Entities/Items/item_base.yml

@@ -11,8 +11,9 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.25,-0.25,0.25,0.25"
-      mask: 0
+      layer:
-      layer: 32
+      - Clickable
+
     IsScrapingFloor: true
   - type: Physics
     mass: 5

Resources/Prototypes/Entities/Items/powercells.yml

@@ -7,8 +7,8 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.15,-0.3,0.2,0.3"
-      mask: 0
+      layer:
-      layer: 32
+      - Clickable
   - type: PowerCell
   - type: Appearance
   - type: Sprite
@@ -125,8 +125,8 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.25,-0.25,0.25,0.25"
-      mask: 2
+      mask: [Impassable]
-      layer: 32
+      layer: [Clickable]
     IsScrapingFloor: true
 
 - type: entity
@@ -157,8 +157,8 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.25,-0.25,0.25,0.25"
-      mask: 2
+      mask: [Impassable]
-      layer: 32
+      layer: [Clickable]
     IsScrapingFloor: true
 
 - type: entity
@@ -188,6 +188,6 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.25,-0.25,0.25,0.25"
-      mask: 2
+      mask: [Impassable]
-      layer: 32
+      layer: [Clickable]
     IsScrapingFloor: true

Resources/Prototypes/Entities/Items/teleporters.yml

@@ -53,7 +53,7 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      mask: 10
+      mask: [Impassable, MobImpassable]
   - type: Portal
   - type: Sprite
     netsync: false

Resources/Prototypes/Entities/Mobs/human.yml

@@ -103,8 +103,13 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.35,-0.35,0.35,0.35"
-      mask: 30
+      mask:
-      layer: 4
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
+      layer:
+      - MobImpassable
   - type: Input
     context: "human"
   - type: Species
@@ -113,7 +118,7 @@
   - type: BodyManager
     BaseTemplate: bodyTemplate.Humanoid
     BasePreset: bodyPreset.BasicHuman
-    
+
   - type: StatusEffectsUI
   - type: OverlayEffectsUI
   - type: HeatResistance
@@ -228,8 +233,13 @@
       shapes:
         - !type:PhysShapeAabb
           bounds: "-0.35,-0.35,0.35,0.35"
-          mask: 30
+          mask:
-          layer: 4
+          - Impassable
+          - MobImpassable
+          - VaultImpassable
+          - SmallImpassable
+          layer:
+          - MobImpassable
 
     - type: Species
       Template: Human
@@ -241,4 +251,3 @@
         - type: SpeciesVisualizer2D
 
     - type: HumanoidAppearance
-    

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

@@ -17,8 +17,12 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.2,-0.2,0.2,0.2"
-      layer: 32
+      layer: [Clickable]
-      mask: 30
+      mask:
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: Physics
     edgeslide: false
   - type: Projectile

Resources/Prototypes/Entities/janitor.yml

@@ -44,8 +44,11 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.25,-0.25,0.25,0.25"
-      mask: 3
+      mask:
-      layer: 1
+      - Impassable
+      - Opaque
+      layer:
+      - Opaque
     IsScrapingFloor: true
   - type: Physics
     mass: 5
@@ -72,8 +75,11 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.25,-0.25,0.25,0.25"
-      mask: 3
+      mask:
-      layer: 1
+      - Impassable
+      - Opaque
+      layer:
+      - Opaque
     IsScrapingFloor: true
   - type: Physics
     mass: 5

Resources/Prototypes/Entities/kitchen.yml

@@ -25,7 +25,11 @@
     shapes:
     - !type:PhysShapeAabb
       bounds: "-0.25,-0.4,0.25,0.4"
-      layer: 15
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
     IsScrapingFloor: true
   - type: Sprite
     netsync: false

Resources/Prototypes/Entities/research.yml

@@ -40,7 +40,12 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: 15
+      layer:
+      - Opaque
+      - Impassable
+      - MobImpassable
+      - VaultImpassable
+      - SmallImpassable
   - type: SnapGrid
     offset: Center
   - type: ResearchPointSource