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-12-07-2024-upstream

Browse Source 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
This commit is contained in:
Ed
2024-07-12 12:53:42 +03:00
parent e87994ae40 b5e49c9c07
commit 0931c9e7d1
327 changed files with 13173 additions and 13957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
View File

@@ -12,7 +12,7 @@ using Content.Shared.Hands;
using Content.Shared.Hands.Components;
using Content.Shared.Interaction;
using Content.Shared.Inventory;
using Content.Shared.Item;
using Content.Shared.Inventory.VirtualItem;
using Content.Shared.Item.ItemToggle.Components;
using Content.Shared.Physics;
using Content.Shared.Popups;
@@ -27,7 +27,6 @@ using Robust.Shared.Physics.Systems;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.Shared.Toolshed.Syntax;
using ItemToggleMeleeWeaponComponent = Content.Shared.Item.ItemToggle.Components.ItemToggleMeleeWeaponComponent;
namespace Content.Shared.Weapons.Melee;
@@ -276,7 +275,8 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
return true;
}
return false;
if (!HasComp<VirtualItemComponent>(held))
return false;
}
// Use hands clothing if applicable.