From f4bf71edfed77835eb5f31974514705d73c06fa8 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Thu, 13 Aug 2020 04:58:28 -0700
Subject: [PATCH] Fix collision masks and layers (#1654)

* Fix bullets getting stopped by tables

* Fix collision masks
---
 Resources/Prototypes/Entities/Constructible/Ground/table.yml  | 2 +-
 .../Entities/Constructible/Storage/Closets/closet.yml         | 1 -
 .../Prototypes/Entities/Constructible/Storage/crate_base.yml  | 2 --
 .../Prototypes/Entities/Constructible/Walls/low_wall.yml      | 4 +++-
 Resources/Prototypes/Entities/Mobs/Species/human.yml          | 1 -
 .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 --
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Resources/Prototypes/Entities/Constructible/Ground/table.yml b/Resources/Prototypes/Entities/Constructible/Ground/table.yml
index ed324df1d3..8c28f0aef9 100644
--- a/Resources/Prototypes/Entities/Constructible/Ground/table.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/table.yml
@@ -16,7 +16,7 @@
     shapes:
     - !type:PhysShapeAabb
       layer:
-      - SmallImpassable
+      - VaultImpassable
   - type: SnapGrid
     offset: Center
   - type: IconSmooth
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
index 19d0a25958..2833854a0d 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
@@ -32,7 +32,6 @@
       - SmallImpassable
       layer:
       - Opaque
-      - Impassable
       - MobImpassable
       - VaultImpassable
       - SmallImpassable
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
index 10b4afb31a..711f2f4ac9 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
@@ -26,9 +26,7 @@
       - SmallImpassable
       layer:
       - Opaque
-      - Impassable
       - MobImpassable
-      - VaultImpassable
       - SmallImpassable
     IsScrapingFloor: true
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
index 230c66d1d3..36d945b8de 100644
--- a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
@@ -20,7 +20,9 @@
   - type: Collidable
     shapes:
     - !type:PhysShapeAabb
-      layer: [SmallImpassable, MobImpassable]
+      layer:
+      - VaultImpassable
+      - SmallImpassable
   - type: Damageable
   - type: Destructible
     thresholdvalue: 100
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index 5118d9606e..b5a18678fd 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -113,7 +113,6 @@
       - Impassable
       - MobImpassable
       - VaultImpassable
-      - SmallImpassable
       layer:
       - Opaque
       - MobImpassable
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 4e810bdb1b..0aac56f67c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -23,8 +23,6 @@
       mask:
       - Impassable
       - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
   - type: Physics
     edgeslide: false
   - type: Projectile