Fix use-in-hand interactions (#7085)

Content.Shared/Inventory/InventorySystem.Equip.cs

@@ -29,16 +29,11 @@ public abstract partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, EntInsertedIntoContainerMessage>(OnEntInserted);
         SubscribeLocalEvent<InventoryComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
 
-        SubscribeLocalEvent<SharedItemComponent, UseInHandEvent>(OnUseInHand);
-
         SubscribeAllEvent<UseSlotNetworkMessage>(OnUseSlot);
     }
 
-    private void OnUseInHand(EntityUid uid, SharedItemComponent component, UseInHandEvent args)
+    protected void QuickEquip(EntityUid uid, SharedItemComponent component, UseInHandEvent args)
     {
-        if (args.Handled || !component.QuickEquip)
-            return;
-
         if (!TryComp(args.User, out InventoryComponent? inv)
             || !TryComp(args.User, out SharedHandsComponent? hands)
             || !_prototypeManager.TryIndex<InventoryTemplatePrototype>(inv.TemplateId, out var prototype))

Content.Shared/Item/SharedItemComponent.cs

@@ -15,9 +15,6 @@ namespace Content.Shared.Item
     {
         [Dependency] private readonly IEntityManager _entMan = default!;
 
-        [DataField("quickEquip")]
-        public bool QuickEquip = true;
-
         /// <summary>
         ///     How much big this item is.
         /// </summary>