From b8cc4e2d76b456c80871202ad1108a6e69544643 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Mon, 26 Mar 2018 04:28:53 -0500
Subject: [PATCH] [MIRROR] Fixes Mush Punch (#6102)

* Fixes Mush Punch (#36631)

* sometimes you just gotta own up to your mistakes :(

* I'm gonna be the best friend you have to ask for yourself to be the most things I can tell

Real shit

* Fixes Mush Punch
---
 code/datums/martial/mushpunch.dm | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/code/datums/martial/mushpunch.dm b/code/datums/martial/mushpunch.dm
index 6a6d4c3fb2..d771f2f948 100644
--- a/code/datums/martial/mushpunch.dm
+++ b/code/datums/martial/mushpunch.dm
@@ -1,23 +1,24 @@
 /datum/martial_art/mushpunch
 	name = "Mushroom Punch"
 
-/datum/martial_art/mushpunch/basic_hit(mob/living/carbon/human/A, mob/living/carbon/human/D)
+/datum/martial_art/mushpunch/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	var/atk_verb
 	to_chat(A, "<span class='spider'>You begin to wind up an attack...</span>")
-	if(do_after(A, 25, target = D))
-		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
-		atk_verb = pick("punches", "smashes", "ruptures", "cracks")
-		D.visible_message("<span class='danger'>[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!</span>", \
-						  "<span class='userdanger'>[A] [atk_verb] you with inhuman strength, sending you flying backwards!</span>")
-		D.apply_damage(rand(15,30), BRUTE)
-		playsound(get_turf(D), 'sound/effects/meteorimpact.ogg', 25, 1, -1)
-		var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
-		D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
-		D.Knockdown(20)
-		if(atk_verb)
-			add_logs(A, D, "[atk_verb] (Mushroom Punch)")
-		return TRUE
-	return FALSE
+	if(!do_after(A, 25, target = D))
+		to_chat(A, "<span class='spider'><b>Your attack was interrupted!</b></span>")
+		return TRUE //martial art code was a mistake
+	A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+	atk_verb = pick("punches", "smashes", "ruptures", "cracks")
+	D.visible_message("<span class='danger'>[A] [atk_verb] [D] with inhuman strength, sending [D.p_them()] flying backwards!</span>", \
+					  "<span class='userdanger'>[A] [atk_verb] you with inhuman strength, sending you flying backwards!</span>")
+	D.apply_damage(rand(15,30), BRUTE)
+	playsound(D, 'sound/effects/meteorimpact.ogg', 25, 1, -1)
+	var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
+	D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
+	D.Knockdown(20)
+	if(atk_verb)
+		add_logs(A, D, "[atk_verb] (Mushroom Punch)")
+	return TRUE
 
 /obj/item/mushpunch
 	name = "mysterious mushroom"