From 0560d9fb504f4781f08edd2ce28aca585f3884d8 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 16 Oct 2022 07:20:05 +1100
Subject: [PATCH] Fix gloves melee (#11841)

---
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs          | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 3dd034aa5b..b3c6004f56 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -1,8 +1,10 @@
 using Content.Shared.ActionBlocker;
+using Content.Shared.Clothing.Components;
 using Content.Shared.CombatMode;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Popups;
 using Content.Shared.Weapons.Melee.Events;
@@ -21,6 +23,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
     [Dependency] protected readonly ActionBlockerSystem Blocker = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] protected readonly SharedCombatModeSystem CombatMode = default!;
+    [Dependency] protected readonly InventorySystem Inventory = default!;
     [Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
 
     protected ISawmill Sawmill = default!;
@@ -195,6 +198,14 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
             return null;
         }
 
+        // Use hands clothing if applicable.
+        if (Inventory.TryGetSlotEntity(entity, "gloves", out var gloves) &&
+            TryComp<MeleeWeaponComponent>(gloves, out var glovesMelee))
+        {
+            return glovesMelee;
+        }
+
+        // Use our own melee
         if (TryComp(entity, out melee))
         {
             return melee;