Plastic Flaps Collision Fix Again (SerbiaStrong-220#1939)

Kirus59 · Sep 25, 2024 · a726b5a · a726b5a
1 parent b3603df
commit a726b5a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
@@ -48,16 +48,15 @@ public enum CollisionGroup
     LargeMobLayer = Opaque | HighImpassable | MidImpassable | LowImpassable | BulletImpassable,
 
     // Machines, computers
-    MachineMask = Impassable | MidImpassable | LowImpassable,
+    // SS220 Plastic Flaps Collision Fix Again begin
+    //MachineMask = Impassable | MidImpassable | LowImpassable,
+    MachineMask = Impassable | HighImpassable | LowImpassable,
+    // SS220 Plastic Flaps Collision Fix Again end
     MachineLayer = Opaque | MidImpassable | LowImpassable | BulletImpassable,
     ConveyorMask = Impassable | MidImpassable | LowImpassable | DoorPassable,
 
     // Crates
-    // SS220 Plastic Flaps Collision Fix begin
-    //CrateMask = Impassable | HighImpassable | LowImpassable,
-    // Why: not deleted for compatibility with wizards changes 
-    CrateMask = MachineMask,
-    // SS220 Plastic Flaps Collision Fix end
+    CrateMask = Impassable | HighImpassable | LowImpassable,
 
     // Tables that SmallMobs can go under
     TableMask = Impassable | MidImpassable,
@@ -77,11 +76,7 @@ public enum CollisionGroup
 
     // Soap, spills
     SlipLayer = MidImpassable | LowImpassable,
-    // SS220 Plastic Flaps Collision Fix begin
-    //ItemMask = Impassable | HighImpassable,
-    // Why: plastic flaps moved to HighImpassible layer, and items should be able to pass
-    ItemMask = Impassable,
-    // SS220 Plastic Flaps Collision Fix end
+    ItemMask = Impassable | HighImpassable,
     ThrownItem = Impassable | HighImpassable | BulletImpassable,
     WallLayer = Opaque | Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable,
     GlassLayer = Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable,

diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -23,10 +23,7 @@
         mask:
         - Impassable
         layer:
-        # SS220 Plastic Flaps Collision Fix begin
-        #- MidImpassable
-        - HighImpassable
-        # SS220 Plastic Flaps Collision Fix end
+        - MidImpassable
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: Metallic
@@ -73,10 +70,7 @@
         - Impassable
         layer:
         - Opaque
-        # SS220 Plastic Flaps Collision Fix begin
-        #- MidImpassable
-        - HighImpassable
-        # SS220 Plastic Flaps Collision Fix end
+        - MidImpassable
   - type: Occluder
   - type: Construction
     graph: PlasticFlapsGraph