Merge pull request #13233 from Hatterhat/za-hando

[READY] za hando - a pr about ling claws and punching shit

code/modules/clothing/gloves/miscellaneous.dm

@@ -20,8 +20,14 @@
 	body_parts_covered = ARMS
 	cold_protection = ARMS
 	strip_delay = 300 //you can't just yank them off
+	/// did you ever get around to wearing these or no
+	var/wornonce = FALSE
 	///Extra damage through the punch.
 	var/enhancement = 0 //it's a +0 to your punches because it isn't magical
+	///extra wound bonus through the punch (MAYBE DON'T BE GENEROUS WITH THIS)
+	var/wound_enhancement = 0
+	/// do we give the flavortext for wearing them
+	var/silent = FALSE
 	///Main trait added by the gloves to the user on wear.
 	var/inherited_trait = TRAIT_NOGUNS //what are you, dishonoroable?
 	///Secondary trait added by the gloves to the user on wear.
@@ -29,7 +35,18 @@
 
 /obj/item/clothing/gloves/fingerless/pugilist/equipped(mob/user, slot)
 	. = ..()
-	if(slot == SLOT_GLOVES)
+	if(current_equipped_slot == SLOT_GLOVES)
+		use_buffs(user, TRUE)
+		wornonce = TRUE
+
+/obj/item/clothing/gloves/fingerless/pugilist/dropped(mob/user)
+	. = ..()
+	if(wornonce)
+		use_buffs(user, FALSE)
+		wornonce = FALSE
+
+/obj/item/clothing/gloves/fingerless/pugilist/proc/use_buffs(mob/user, buff)
+	if(buff) // tarukaja
 		if(ishuman(user))
 			var/mob/living/carbon/human/H = user
 			ADD_TRAIT(H, TRAIT_PUGILIST, GLOVE_TRAIT)
@@ -37,17 +54,20 @@
 			ADD_TRAIT(H, secondary_trait, GLOVE_TRAIT)
 			H.dna.species.punchdamagehigh += enhancement
 			H.dna.species.punchdamagelow += enhancement
-
-/obj/item/clothing/gloves/fingerless/pugilist/dropped(mob/user)
-
-	REMOVE_TRAIT(user, TRAIT_PUGILIST, GLOVE_TRAIT)
-	REMOVE_TRAIT(user, inherited_trait, GLOVE_TRAIT)
-	REMOVE_TRAIT(user, secondary_trait, GLOVE_TRAIT)
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		H.dna.species.punchdamagehigh -= enhancement
-		H.dna.species.punchdamagelow -= enhancement
-	return ..()
+			H.dna.species.punchwoundbonus += wound_enhancement
+			if(!silent)
+				to_chat(H, "<span class='notice'>With [src] on your arms, you feel ready to punch things.</span>")
+	else // dekaja
+		REMOVE_TRAIT(user, TRAIT_PUGILIST, GLOVE_TRAIT)
+		REMOVE_TRAIT(user, inherited_trait, GLOVE_TRAIT)
+		REMOVE_TRAIT(user, secondary_trait, GLOVE_TRAIT)
+		if(ishuman(user))
+			var/mob/living/carbon/human/H = user
+			H.dna.species.punchdamagehigh -= enhancement
+			H.dna.species.punchdamagelow -= enhancement
+			H.dna.species.punchwoundbonus -= wound_enhancement
+		if(!silent)
+			to_chat(user, "<span class='warning'>With [src] off of your arms, you feel less ready to punch things.</span>")
 
 /obj/item/clothing/gloves/fingerless/pugilist/chaplain
 	name = "armwraps of unyielding resolve"
@@ -93,6 +113,7 @@
 	icon_state = "rapid"
 	item_state = "rapid"
 	enhancement = 10 //omae wa mou shindeiru
+	wound_enhancement = 10
 	var/warcry = "AT"
 	secondary_trait = TRAIT_NOSOFTCRIT //basically extra health
 

code/modules/clothing/gloves/tacklers.dm

@@ -65,12 +65,14 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
 	resistance_flags = NONE
+	strip_mod = 1.2 // because apparently black gloves had this
 
 /obj/item/clothing/gloves/tackler/combat/insulated
 	name = "guerrilla gloves"
 	desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
+	strip_mod = 1.5 // and combat gloves had this??
 
 /obj/item/clothing/gloves/tackler/combat/insulated/infiltrator
 	name = "insidious guerrilla gloves"