diff --git a/Content.Shared/Slippery/SharedSlipperySystem.cs b/Content.Shared/Slippery/SharedSlipperySystem.cs index a443eea497..a311e4d90f 100644 --- a/Content.Shared/Slippery/SharedSlipperySystem.cs +++ b/Content.Shared/Slippery/SharedSlipperySystem.cs @@ -91,6 +91,11 @@ namespace Content.Shared.Slippery return false; } + if (EntityManager.HasComponent(otherBody.Owner)) + { + return false; + } + var ev = new SlipAttemptEvent(); RaiseLocalEvent(otherBody.Owner, ev, false); if (ev.Cancelled) diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index e602486b39..b336093c67 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -15,6 +15,7 @@ - type: Clickable - type: Evaporation - type: Slippery + launchForwardsMultiplier: 2.0 - type: Physics - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 38a6297bc2..aa081b9032 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -178,6 +178,7 @@ HeldPrefix: peel - type: Slippery intersectPercentage: 0.2 + launchForwardsMultiplier: 6.0 - type: CollisionWake enabled: false - type: Physics diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 82e0a384f8..8ab2fbb369 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -132,6 +132,7 @@ state: pda-clown - type: Slippery paralyzeTime: 4 + launchForwardsMultiplier: 9.0 - type: CollisionWake enabled: false - type: Physics @@ -520,4 +521,3 @@ state: pda-atmos - type: Icon state: pda-atmos - diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml index 0e893587b5..c5a9b3794c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -15,6 +15,7 @@ - type: Slippery paralyzeTime: 2 intersectPercentage: 0.2 + launchForwardsMultiplier: 6.0 - type: CollisionWake enabled: false - type: Physics @@ -67,6 +68,7 @@ state: syndie - type: Slippery paralyzeTime: 5 + launchForwardsMultiplier: 9.0 - type: Item HeldPrefix: syndie @@ -93,5 +95,6 @@ state: omega - type: Slippery paralyzeTime: 7 + launchForwardsMultiplier: 9.0 - type: Item HeldPrefix: omega