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

Improve stack merging and crafting (#7105)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-28 17:03:14 +13:00
committed by GitHub
parent 50ea06ba72
commit 51b1535255
6 changed files with 149 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,7 +104,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
}
/// <summary>
/// Puts an item any hand, preferring the active hand, or puts it on the floor.
/// Puts an item into any hand, preferring the active hand, or puts it on the floor.
/// </summary>
public void PickupOrDrop(EntityUid? uid, EntityUid entity, bool checkActionBlocker = true, bool animateUser = false, SharedHandsComponent? handsComp = null, SharedItemComponent? item = null)
{

2
Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
View File

@@ -118,7 +118,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
}
/// <summary>
/// Enumerate over hands, with the active hand being first.
/// Enumerate over held items, starting with the item in the currently active hand (if there is one).
/// </summary>
public IEnumerable<EntityUid> EnumerateHeld(EntityUid uid, SharedHandsComponent? handsComp = null)
{