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

Fix foldable-pickup interactions. (#6057)

Browse Source
This commit is contained in:
Leon Friedrich
2022-01-07 19:09:42 +13:00
committed by GitHub
parent 106f176d13
commit c29489ff4d
10 changed files with 145 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Item/ItemSystem.cs
View File

@@ -53,11 +53,11 @@ namespace Content.Shared.Item
args.Using != null ||
!args.CanAccess ||
!args.CanInteract ||
!component.CanPickup(args.User, popup: false))
!args.Hands.CanPickupEntityToActiveHand(args.Target))
return;
Verb verb = new();
verb.Act = () => args.Hands.PutInHand(args.Target);
verb.Act = () => args.Hands.TryPickupEntityToActiveHand(args.Target);
verb.IconTexture = "/Textures/Interface/VerbIcons/pickup.svg.192dpi.png";
// if the item already in a container (that is not the same as the user's), then change the text.