tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow attack while pulling (#29703)

Browse Source 
* Make VirtualItem not block attacking

* Remove unneeded usings
This commit is contained in:
ShadowCommander
2024-07-10 21:48:00 -07:00
committed by GitHub
parent 24a2866747
commit 4d4f67132c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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