Stop puddles and soap from blocking doors (#16258)

diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index b4828d5e79e0df412e78be9e1debb6cc4100f468..396f90da5d4dc1b63fdd2f4177d8934135a4202b 100644 (file)
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -5,11 +5,11 @@ using Content.Shared.DoAfter;
 using Content.Shared.Doors.Components;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
+using Content.Shared.Physics;
 using Content.Shared.Stunnable;
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
@@ -446,6 +446,10 @@ public abstract class SharedDoorSystem : EntitySystem
             if (!otherPhysics.CanCollide)
                 continue;
 
+            //If the colliding entity is a slippable item ignore it by the airlock
+            if (otherPhysics.CollisionLayer == (int) CollisionGroup.SlipLayer && otherPhysics.CollisionMask == (int) CollisionGroup.ItemMask)
+                continue;
+
             if ((physics.CollisionMask & otherPhysics.CollisionLayer) == 0 && (otherPhysics.CollisionMask & physics.CollisionLayer) == 0)
                 continue;
 

diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index a638cc580fce9bdb62ab4983e4207ff1d020e845..cecfb2f941cecc8619cec01a983a60dd8eb1779e 100644 (file)
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -85,7 +85,6 @@
       layers:
         - sprite: Fluids/puddle.rsi
           state: splat0
-      netsync: false
       drawdepth: FloorObjects
       color: "#FFFFFF80"
     - type: Physics

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 280bca3abad9aee708d94c675f15b345ea24d6d4..fae2eb9781ee8d8309bce9c4e057d047f97a8a1f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -27,9 +27,9 @@
         shape:
           !type:PhysShapeAabb
           bounds: "-0.4,-0.3,0.4,0.3"
-        hard: false
         layer:
         - SlipLayer
+        hard: false
       fix1:
         shape:
           !type:PhysShapeAabb