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

Revert "Upstream (#148)"

Browse Source 
This reverts commit 9f00d4b9aa.
This commit is contained in:
Jabak
2024-10-22 22:47:57 +03:00
parent 9f00d4b9aa
commit dbc492f3f3
96 changed files with 1080 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Inventory/InventorySystem.Equip.cs
View File

@@ -210,7 +210,11 @@ public abstract partial class InventorySystem
return false;
// Can the actor reach the item?
if (_interactionSystem.InRangeAndAccessible(actor, itemUid))
if (_interactionSystem.InRangeUnobstructed(actor, itemUid) && _containerSystem.IsInSameOrParentContainer(actor, itemUid))
return true;
// Is the item in an open storage UI, i.e., is the user quick-equipping from an open backpack?
if (_interactionSystem.CanAccessViaStorage(actor, itemUid))
return true;
// Is the actor currently stripping the target? Here we could check if the actor has the stripping UI open, but