From 856df8921a40205593d48ea2db8d6ef76a3e96b0 Mon Sep 17 00:00:00 2001 From: Absolute-Potato Date: Fri, 6 May 2022 00:36:03 -0400 Subject: [PATCH] Slip Nerfs (#7733) Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- Content.Server/Climbing/Components/GlassTableComponent.cs | 2 +- Content.Server/Fluids/Components/PuddleComponent.cs | 2 +- Content.Shared/Slippery/SlipperyComponent.cs | 2 +- Resources/Prototypes/Entities/Effects/puddle.yml | 5 ++--- Resources/Prototypes/Reagents/cleaning.yml | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Content.Server/Climbing/Components/GlassTableComponent.cs b/Content.Server/Climbing/Components/GlassTableComponent.cs index 10a3445d21..d160d43680 100644 --- a/Content.Server/Climbing/Components/GlassTableComponent.cs +++ b/Content.Server/Climbing/Components/GlassTableComponent.cs @@ -34,5 +34,5 @@ public sealed class GlassTableComponent : Component /// /// How long should someone who climbs on this table be stunned for? /// - public float StunTime = 5.0f; + public float StunTime = 2.0f; } diff --git a/Content.Server/Fluids/Components/PuddleComponent.cs b/Content.Server/Fluids/Components/PuddleComponent.cs index 6255c62af5..2fafcf82fe 100644 --- a/Content.Server/Fluids/Components/PuddleComponent.cs +++ b/Content.Server/Fluids/Components/PuddleComponent.cs @@ -17,7 +17,7 @@ namespace Content.Server.Fluids.Components public sealed class PuddleComponent : Component { public const string DefaultSolutionName = "puddle"; - private static readonly FixedPoint2 DefaultSlipThreshold = FixedPoint2.New(3); + private static readonly FixedPoint2 DefaultSlipThreshold = FixedPoint2.New(-1); public static readonly FixedPoint2 DefaultOverflowVolume = FixedPoint2.New(20); // Current design: Something calls the SpillHelper.Spill, that will either diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs index f62c9a24be..4cc3fe3667 100644 --- a/Content.Shared/Slippery/SlipperyComponent.cs +++ b/Content.Shared/Slippery/SlipperyComponent.cs @@ -16,7 +16,7 @@ namespace Content.Shared.Slippery [NetworkedComponent()] public sealed class SlipperyComponent : Component { - private float _paralyzeTime = 5f; + private float _paralyzeTime = 3f; private float _intersectPercentage = 0.3f; private float _requiredSlipSpeed = 3.5f; private float _launchForwardsMultiplier = 1f; diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index b336093c67..75e3723f85 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -12,10 +12,10 @@ spillSound: path: /Audio/Effects/Fluids/splat.ogg recolor: true - - type: Clickable - - type: Evaporation + - type: Clickable - type: Slippery launchForwardsMultiplier: 2.0 + - type: Evaporation - type: Physics - type: Fixtures fixtures: @@ -100,7 +100,6 @@ state: splatter-0 netsync: false - type: Puddle - slipThreshold: 20 overflowVolume: 50 opacityModifier: 8 - type: Evaporation diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml index a6faebd1c1..17ec5e5a9e 100644 --- a/Resources/Prototypes/Reagents/cleaning.yml +++ b/Resources/Prototypes/Reagents/cleaning.yml @@ -36,9 +36,9 @@ physicalDesc: shiny color: "#77b58e" boilingPoint: 290.0 # Glycerin - meltingPoint: 18.2 + meltingPoint: 18.2 tileReactions: - !type:SpillTileReaction paralyzeTime: 3 - launchForwardsMultiplier: 2 + launchForwardsMultiplier: 4 requiredSlipSpeed: 1