juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream

Browse Source 
# Conflicts:
#	Content.Shared/Inventory/InventorySystem.Equip.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
This commit is contained in:
Ed
2024-08-12 14:40:15 +03:00
parent ff8d294af5 691e37c0db
commit d9336781f1
830 changed files with 27583 additions and 19536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,12 +169,8 @@ public abstract partial class InventorySystem
target,
itemUid)
{
BlockDuplicate = true,
BreakOnHandChange = true,
BreakOnMove = clothing.BreakOnMove, //CrystallPunk weapon unequipping on move
CancelDuplicate = true,
RequireCanInteract = true,
NeedHand = true
NeedHand = true,
};
_doAfter.TryStartDoAfter(args);
@@ -420,12 +416,8 @@ public abstract partial class InventorySystem
target,
removedItem.Value)
{
BlockDuplicate = true,
BreakOnHandChange = true,
BreakOnMove = clothing.BreakOnMove, //CrystallPunk weapon unequipping on move
CancelDuplicate = true,
RequireCanInteract = true,
NeedHand = true
NeedHand = true,
};
_doAfter.TryStartDoAfter(args);