Fix crates masks (#27137)

Fixes crates masks not allowing them to go under plastic flaps + crates no longer can go trough windoors.

diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index 1c10fefd5dc128ccb2a23069953844e7e6622ac1..775ccb7c446c52485973cd9b25d9b5ad7f58fa71 100644 (file)
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -48,6 +48,9 @@ public enum CollisionGroup
     MachineLayer = Opaque | MidImpassable | LowImpassable | BulletImpassable,
     ConveyorMask = Impassable | MidImpassable | LowImpassable | DoorPassable,
 
+    // Crates
+    CrateMask = Impassable | HighImpassable | LowImpassable,
+
     // Tables that SmallMobs can go under
     TableMask = Impassable | MidImpassable,
     TableLayer = MidImpassable,

diff --git a/Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml b/Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml
index 2e19d0ba196989932446668fb60d926f705b335f..2d65f851d7d2851341d249be47bb1f4d646c908e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml
@@ -30,7 +30,7 @@
           radius: 0.45
         density: 25
         mask:
-        - SmallMobMask
+        - ItemMask
         layer:
         - MachineLayer
   - type: EntityStorage

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
index c38868b39970ee53c4644698a6927868819b5fa7..e1716f084394160720bb2446e82bd937608a6678 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -36,7 +36,7 @@
             radius: 0.45
           density: 50
           mask:
-          - SmallMobMask #this is so they can go under plastic flaps
+          - CrateMask #this is so they can go under plastic flaps
           layer:
           - MachineLayer
     - type: Icon

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 95580292d9fea5591a20f509f7564273c2bbfed5..2d84541231eb3d5f0259f79e9e8f19ae7ab03f0a 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -34,7 +34,7 @@
           bounds: "-0.4,-0.4,0.4,0.29"
         density: 50
         mask:
-        - SmallMobMask #this is so they can go under plastic flaps
+        - CrateMask #this is so they can go under plastic flaps
         layer:
         - MachineLayer
   - type: EntityStorage

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 8d8eec953860b0d09d64519ee83aee1c33f5845b..171b664c83a4df0f13e8b3f7ffc4c05c02aada0f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -356,7 +356,7 @@
           bounds: "-0.4,-0.4,0.4,0.29"
         density: 135
         mask:
-        - SmallMobMask #this is so they can go under plastic flaps
+        - CrateMask #this is so they can go under plastic flaps
         layer:
         - LargeMobLayer
   - type: Construction
@@ -413,7 +413,7 @@
           bounds: "-0.4,-0.4,0.4,0.29"
         density: 80
         mask:
-        - LargeMobMask
+        - CrateMask
         layer:
         - LargeMobLayer
   - type: StaticPrice

diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
index c4ee507395f2df6791071fd82d5045970287ab7a..4439c11d6899ca995836cf0e6459b4d47b937326 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -23,7 +23,7 @@
           bounds: "-0.49,-0.49,0.49,0.49"
         density: 100
         mask:
-        - TabletopMachineMask
+        - Impassable
         layer:
         - MidImpassable
   - type: Damageable
@@ -61,7 +61,7 @@
           bounds: "-0.49,-0.49,0.49,0.49"
         density: 100
         mask:
-        - TabletopMachineMask
+        - Impassable
         layer:
         - Opaque
         - MidImpassable