tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slip Nerfs (#7733)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Absolute-Potato
2022-05-06 00:36:03 -04:00
committed by GitHub
parent 43a446f39b
commit 856df8921a
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Climbing/Components/GlassTableComponent.cs
View File

@@ -34,5 +34,5 @@ public sealed class GlassTableComponent : Component
/// <summary> /// <summary>
/// How long should someone who climbs on this table be stunned for? /// How long should someone who climbs on this table be stunned for?
/// </summary> /// </summary>
public float StunTime = 5.0f; public float StunTime = 2.0f;
} }

2
Content.Server/Fluids/Components/PuddleComponent.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.Fluids.Components
public sealed class PuddleComponent : Component public sealed class PuddleComponent : Component
{ {
public const string DefaultSolutionName = "puddle"; 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); public static readonly FixedPoint2 DefaultOverflowVolume = FixedPoint2.New(20);
// Current design: Something calls the SpillHelper.Spill, that will either // Current design: Something calls the SpillHelper.Spill, that will either

2
Content.Shared/Slippery/SlipperyComponent.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Shared.Slippery
[NetworkedComponent()] [NetworkedComponent()]
public sealed class SlipperyComponent : Component public sealed class SlipperyComponent : Component
{ {
private float _paralyzeTime = 5f; private float _paralyzeTime = 3f;
private float _intersectPercentage = 0.3f; private float _intersectPercentage = 0.3f;
private float _requiredSlipSpeed = 3.5f; private float _requiredSlipSpeed = 3.5f;
private float _launchForwardsMultiplier = 1f; private float _launchForwardsMultiplier = 1f;

3
Resources/Prototypes/Entities/Effects/puddle.yml
View File

@@ -13,9 +13,9 @@
path: /Audio/Effects/Fluids/splat.ogg path: /Audio/Effects/Fluids/splat.ogg
recolor: true recolor: true
- type: Clickable - type: Clickable
- type: Evaporation
- type: Slippery - type: Slippery
launchForwardsMultiplier: 2.0 launchForwardsMultiplier: 2.0
- type: Evaporation
- type: Physics - type: Physics
- type: Fixtures - type: Fixtures
fixtures: fixtures:
@@ -100,7 +100,6 @@
state: splatter-0 state: splatter-0
netsync: false netsync: false
- type: Puddle - type: Puddle
slipThreshold: 20
overflowVolume: 50 overflowVolume: 50
opacityModifier: 8 opacityModifier: 8
- type: Evaporation - type: Evaporation

2
Resources/Prototypes/Reagents/cleaning.yml
View File

@@ -40,5 +40,5 @@
tileReactions: tileReactions:
- !type:SpillTileReaction - !type:SpillTileReaction
paralyzeTime: 3 paralyzeTime: 3
launchForwardsMultiplier: 2 launchForwardsMultiplier: 4
requiredSlipSpeed: 1 requiredSlipSpeed: 1