diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index b962052491..39c8c2df07 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -67,6 +67,7 @@
H.dna.species.punchdamagehigh -= enhancement
H.dna.species.punchdamagelow -= enhancement
H.dna.species.punchwoundbonus -= wound_enhancement
+ H.dna?.species?.attack_sound_override = null
if(!silent)
to_chat(user, "With [src] off of your arms, you feel less ready to punch things.")
@@ -237,16 +238,31 @@
siemens_coefficient = 0
permeability_coefficient = 0.05
strip_delay = 80
- enhancement = 11 // slightly worse than changeling gauntlets but is also insulated
- wound_enhancement = 11
+ enhancement = 12 // same as the changeling gauntlets but without changeling utility
+ wound_enhancement = 12
silent = TRUE
inherited_trait = TRAIT_CHUNKYFINGERS // your fingers are fat because the gloves are
secondary_trait = TRAIT_MAULER // commit table slam
/obj/item/clothing/gloves/fingerless/pugilist/mauler/equipped(mob/user, slot)
. = ..()
- if(current_equipped_slot == SLOT_GLOVES)
- to_chat(user, "You feel prickles around your wrists as strength courses through your veins! You're ready to kick some ass!")
+ if(slot == SLOT_GLOVES)
+ use_mauls(user, TRUE)
+ wornonce = TRUE
+
+/obj/item/clothing/gloves/fingerless/pugilist/mauler/dropped(mob/user)
+ . = ..()
+ if(wornonce)
+ use_mauls(user, FALSE)
+ wornonce = FALSE
+
+/obj/item/clothing/gloves/fingerless/pugilist/mauler/proc/use_mauls(mob/user, maul)
+ if(maul)
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ H.dna?.species?.attack_sound_override = 'sound/weapons/mauler_punch.ogg'
+ if(silent)
+ to_chat(H, "You feel prickles around your wrists as [src] cling to them - strength courses through your veins!")
/obj/item/clothing/gloves/botanic_leather
name = "botanist's leather gloves"
@@ -278,7 +294,6 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
strip_mod = 1.5
-
/obj/item/clothing/gloves/bracer
name = "bone bracers"
desc = "For when you're expecting to get slapped on the wrist. Offers modest protection to your arms."
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 1aa3749589..e621eb89d1 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -149,6 +149,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
///
var/sound/attack_sound = 'sound/weapons/punch1.ogg'
var/sound/miss_sound = 'sound/weapons/punchmiss.ogg'
+ var/attack_sound_override = null
var/list/mob/living/ignored_by = list() // list of mobs that will ignore this species
//Breathing!
@@ -1615,7 +1616,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/armor_block = target.run_armor_check(affecting, "melee")
- playsound(target.loc, user.dna.species.attack_sound, 25, 1, -1)
+ playsound(target.loc, user.dna.species.attack_sound_override || attack_sound, 25, 1, -1)
target.visible_message("[user] [atk_verb]ed [target]!", \
"[user] [atk_verb]ed you!", null, COMBAT_MESSAGE_RANGE, null, \
user, "You [atk_verb]ed [target]!")
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index ec5be1f0d9..5155f06134 100644
Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 102896fb20..25cde38df9 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/sound/weapons/mauler_punch.ogg b/sound/weapons/mauler_punch.ogg
new file mode 100644
index 0000000000..3e610ea238
Binary files /dev/null and b/sound/weapons/mauler_punch.ogg differ