From c5ae1d1419885a20c45806965dfee61cd0b6e211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= <mieszko335@gmail.com>
Date: Sat, 26 Mar 2016 14:59:07 +0100
Subject: [PATCH] welp

---
 code/datums/martial.dm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/datums/martial.dm b/code/datums/martial.dm
index b7e947bd762..d9892d86b00 100644
--- a/code/datums/martial.dm
+++ b/code/datums/martial.dm
@@ -70,13 +70,13 @@
 		if(H.martial_art)
 			base = H.martial_art.base
 	else
-		base = src		
+		base = src
 	H.martial_art = src
 
 /datum/martial_art/proc/remove(var/mob/living/carbon/human/H)
 	if(H.martial_art != src)
 		return
-	H.martial_art = H.martial_art.base
+	H.martial_art = base
 	if(help_verb)
 		H.verbs -= help_verb
 
@@ -378,6 +378,7 @@
 
 /datum/martial_art/the_sleeping_carp/proc/wristWrench(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(!D.stat && !D.stunned && !D.weakened)
+		A.do_attack_animation(D)
 		D.visible_message("<span class='warning'>[A] grabs [D]'s wrist and wrenches it sideways!</span>", \
 						  "<span class='userdanger'>[A] grabs your wrist and violently wrenches it to the side!</span>")
 		playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
@@ -390,6 +391,7 @@
 
 /datum/martial_art/the_sleeping_carp/proc/backKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(A.dir == D.dir && !D.stat && !D.weakened)
+		A.do_attack_animation(D)
 		D.visible_message("<span class='warning'>[A] kicks [D] in the back!</span>", \
 						  "<span class='userdanger'>[A] kicks you in the back, making you stumble and fall!</span>")
 		step_to(D,get_step(D,D.dir),1)
@@ -400,6 +402,7 @@
 
 /datum/martial_art/the_sleeping_carp/proc/kneeStomach(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(!D.stat && !D.weakened)
+		A.do_attack_animation(D)
 		D.visible_message("<span class='warning'>[A] knees [D] in the stomach!</span>", \
 						  "<span class='userdanger'>[A] winds you with a knee in the stomach!</span>")
 		D.audible_message("<b>[D]</b> gags!")
@@ -411,6 +414,7 @@
 
 /datum/martial_art/the_sleeping_carp/proc/headKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(!D.stat && !D.weakened)
+		A.do_attack_animation(D)
 		D.visible_message("<span class='warning'>[A] kicks [D] in the head!</span>", \
 						  "<span class='userdanger'>[A] kicks you in the jaw!</span>")
 		D.apply_damage(20, BRUTE, "head")
@@ -422,6 +426,7 @@
 
 /datum/martial_art/the_sleeping_carp/proc/elbowDrop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	if(D.weakened || D.resting || D.stat)
+		A.do_attack_animation(D)
 		D.visible_message("<span class='warning'>[A] elbow drops [D]!</span>", \
 						  "<span class='userdanger'>[A] piledrives you with their elbow!</span>")
 		if(D.stat)
@@ -444,6 +449,7 @@
 	add_to_streak("H",D)
 	if(check_streak(A,D))
 		return 1
+	A.do_attack_animation(D)
 	var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams")
 	D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>", \
 					  "<span class='userdanger'>[A] [atk_verb] you!</span>")