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

Trashbag stuff (#18096)

Browse Source
This commit is contained in:
metalgearsloth
2023-07-18 21:44:00 +10:00
committed by GitHub
parent e0291500af
commit fcf01cc6ef
13 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/Hands/Systems/HandsSystem.cs
View File

@@ -110,16 +110,16 @@ namespace Content.Client.Hands.Systems
#region PickupAnimation
private void HandlePickupAnimation(PickupAnimationEvent msg)
{
PickupAnimation(msg.ItemUid, msg.InitialPosition, msg.FinalPosition);
PickupAnimation(msg.ItemUid, msg.InitialPosition, msg.FinalPosition, msg.InitialAngle);
}
public override void PickupAnimation(EntityUid item, EntityCoordinates initialPosition, Vector2 finalPosition,
public override void PickupAnimation(EntityUid item, EntityCoordinates initialPosition, Vector2 finalPosition, Angle initialAngle,
EntityUid? exclude)
{
PickupAnimation(item, initialPosition, finalPosition);
PickupAnimation(item, initialPosition, finalPosition, initialAngle);
}
public void PickupAnimation(EntityUid item, EntityCoordinates initialPosition, Vector2 finalPosition)
public void PickupAnimation(EntityUid item, EntityCoordinates initialPosition, Vector2 finalPosition, Angle initialAngle)
{
if (!_gameTiming.IsFirstTimePredicted)
return;
@@ -127,7 +127,7 @@ namespace Content.Client.Hands.Systems
if (finalPosition.EqualsApprox(initialPosition.Position, tolerance: 0.1f))
return;
ReusableAnimations.AnimateEntityPickup(item, initialPosition, finalPosition);
ReusableAnimations.AnimateEntityPickup(item, initialPosition, finalPosition, initialAngle);
}
#endregion