Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove server-sprite references from handcuffs (#13515)

Browse Source
This commit is contained in:
Leon Friedrich
2023-01-17 16:23:53 +13:00
committed by GitHub
parent e8b18d17c2
commit 44631c7723
6 changed files with 52 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
View File

@@ -60,9 +60,14 @@ public abstract partial class SharedHandsSystem : EntitySystem
// animation
var xform = Transform(uid);
var coordinateEntity = xform.ParentUid.IsValid() ? xform.ParentUid : uid;
var initialPosition = EntityCoordinates.FromMap(EntityManager, coordinateEntity, Transform(entity).MapPosition);
PickupAnimation(entity, initialPosition, xform.LocalPosition, animateUser ? null : uid);
var itemPos = Transform(entity).MapPosition;
if (itemPos.MapId == xform.MapID)
{
// TODO max range for animation?
var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, EntityManager);
PickupAnimation(entity, initialPosition, xform.LocalPosition, animateUser ? null : uid);
}
DoPickup(uid, hand, entity, handsComp);
return true;