From 21f04b36ff3caab3a58bdb050e2cc4e6ef06cd3c Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Wed, 9 Mar 2016 22:53:19 -0500 Subject: [PATCH] Sleeping Carp attacks now have attack animations --- code/datums/martial.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index b60de2f15ff..1d88a3d047c 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -319,6 +319,7 @@ /datum/martial_art/the_sleeping_carp/proc/wristWrench(mob/living/carbon/human/A, mob/living/carbon/human/D) if(!D.stat && !D.stunned && !D.weakened) + A.do_attack_animation(D) D.visible_message("[A] grabs [D]'s wrist and wrenches it sideways!", \ "[A] grabs your wrist and violently wrenches it to the side!") playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) @@ -331,6 +332,7 @@ /datum/martial_art/the_sleeping_carp/proc/backKick(mob/living/carbon/human/A, mob/living/carbon/human/D) if(A.dir == D.dir && !D.stat && !D.weakened) + A.do_attack_animation(D) D.visible_message("[A] kicks [D] in the back!", \ "[A] kicks you in the back, making you stumble and fall!") step_to(D,get_step(D,D.dir),1) @@ -341,6 +343,7 @@ /datum/martial_art/the_sleeping_carp/proc/kneeStomach(mob/living/carbon/human/A, mob/living/carbon/human/D) if(!D.stat && !D.weakened) + A.do_attack_animation(D) D.visible_message("[A] knees [D] in the stomach!", \ "[A] winds you with a knee in the stomach!") D.audible_message("[D] gags!") @@ -352,6 +355,7 @@ /datum/martial_art/the_sleeping_carp/proc/headKick(mob/living/carbon/human/A, mob/living/carbon/human/D) if(!D.stat && !D.weakened) + A.do_attack_animation(D) D.visible_message("[A] kicks [D] in the head!", \ "[A] kicks you in the jaw!") D.apply_damage(20, BRUTE, "head") @@ -363,6 +367,7 @@ /datum/martial_art/the_sleeping_carp/proc/elbowDrop(mob/living/carbon/human/A, mob/living/carbon/human/D) if(D.weakened || D.resting || D.stat) + A.do_attack_animation(D) D.visible_message("[A] elbow drops [D]!", \ "[A] piledrives you with their elbow!") if(D.stat) @@ -385,6 +390,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("[A] [atk_verb] [D]!", \ "[A] [atk_verb] you!")