Fixed wielding weapons while pulling object without hands (#1539)

SerbiaStrong-220 · Aug 7, 2024 · 3c9d606 · 3c9d606
1 parent 74acd1a
commit 3c9d606
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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<PullerComponent>(user, out var puller) && _pull.IsPulling(user, puller) && puller.NeedsHands)
             return false;
         //ss220 weild fix end