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

Fix slippery items not being slippery (#1948)

Browse Source 
* Fix slippery items not being slippery

* Fix slippery not being slippery part 2 redux electric boogaloo

* You got a license for that hard collidable?
This commit is contained in:
DrSmugleaf
2020-08-29 13:13:22 +02:00
committed by GitHub
parent c37c39fe3c
commit 4d23bbf4df
6 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs
View File

@@ -44,9 +44,16 @@ namespace Content.Shared.GameObjects.Components.Movement
[ViewVariables(VVAccess.ReadWrite)]
private float RequiredSlipSpeed { get; set; } = 0f;
/// <summary>
/// Whether or not this component will try to slip entities.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public bool Slippery { get; set; }
private bool TrySlip(IEntity entity)
{
if (ContainerHelpers.IsInContainer(Owner)
if (!Slippery
|| ContainerHelpers.IsInContainer(Owner)
|| _slipped.Contains(entity.Uid)
|| !entity.TryGetComponent(out SharedStunnableComponent stun)
|| !entity.TryGetComponent(out ICollidableComponent otherBody)
@@ -137,6 +144,7 @@ namespace Content.Shared.GameObjects.Components.Movement
serializer.DataField(this, x => ParalyzeTime, "paralyzeTime", 3f);
serializer.DataField(this, x => IntersectPercentage, "intersectPercentage", 0.3f);
serializer.DataField(this, x => RequiredSlipSpeed, "requiredSlipSpeed", 0f);
serializer.DataField(this, x => x.Slippery, "slippery", true);
}
}
}