diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
index d1fb56ad6d..dde7bb615c 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -17,7 +17,7 @@
           bounds: "-0.49,-0.49,0.49,0.49"
       mass: 100
       mask:
-      - MobImpassable
+      - MobMask
       layer:
       - MobImpassable
       - VaultImpassable
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
index b20f4eeb08..cba52df920 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
@@ -19,6 +19,7 @@
       - VaultImpassable
       mask:
       - Impassable
+      - VaultImpassable # tables should collide with other tables
       - SmallImpassable
   - type: Sprite
     netsync: false
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
index c6dea87f84..3ba5803a43 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -15,7 +15,8 @@
         radius: 0.2
       mass: 25
       mask:
-        - MobImpassable
+        - SmallImpassable
+        - VaultImpassable
       layer:
         - Opaque
         - MobImpassable
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
index 73b709730c..9ebd03255c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -13,7 +13,7 @@
           bounds: "-0.25,-0.5,0.25,0.5"
       mass: 25
       mask:
-        - MobImpassable
+        - MobMask
       layer:
         - Opaque
         - MobImpassable
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
index fbc971fcbd..61da77d6bb 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
@@ -25,7 +25,7 @@
       layer:
       - Opaque
       mask:
-      - MobImpassable
+      - MobMask
   - type: Transform
     anchored: true
   - type: Anchorable
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index 17e8d351e4..46921a5fa5 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -53,7 +53,7 @@
             bounds: "-0.25,-0.25,0.25,0.25"
           mass: 25
           mask:
-            - MobImpassable
+          - MobMask
           layer:
             - Opaque
             - MobImpassable
@@ -380,7 +380,7 @@
               bounds: "-0.4,-0.3,0.4,0.3"
           mass: 25
           mask:
-            - MobImpassable
+          - MobMask
           layer:
             - Opaque
             - MobImpassable