diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs index 61369be545b7d5..19438ac32feae9 100644 --- a/Content.Shared/Wieldable/WieldableSystem.cs +++ b/Content.Shared/Wieldable/WieldableSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.Interaction.Events; using Content.Shared.Inventory.VirtualItem; using Content.Shared.Item; +using Content.Shared.Movement.Pulling.Components; using Content.Shared.Movement.Pulling.Systems; using Content.Shared.Popups; using Content.Shared.Timing; @@ -197,7 +198,7 @@ public bool CanWield(EntityUid uid, WieldableComponent component, EntityUid user return false; } //ss220 weild fix begin - if (_pull.IsPulling(user)) + if (TryComp(user, out var puller) && _pull.IsPulling(user, puller) && puller.NeedsHands) return false; //ss220 weild fix end