From cfe47257b25e260d6df5bc55207439efd20538cf Mon Sep 17 00:00:00 2001 From: AnturK Date: Mon, 28 Dec 2015 21:33:40 +0100 Subject: [PATCH] Makes martial arts reset combos on target change. --- code/datums/martial.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 71dca89f54f..6de5ea19ae3 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -235,21 +235,21 @@ return /datum/martial_art/plasma_fist/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) - add_to_streak("H") + add_to_streak("H",D) if(check_streak(A,D)) return 1 basic_hit(A,D) return 1 /datum/martial_art/plasma_fist/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) - add_to_streak("D") + add_to_streak("D",D) if(check_streak(A,D)) return 1 basic_hit(A,D) return 1 /datum/martial_art/plasma_fist/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) - add_to_streak("G") + add_to_streak("G",D) if(check_streak(A,D)) return 1 basic_hit(A,D) @@ -345,7 +345,7 @@ return basic_hit(A,D) /datum/martial_art/the_sleeping_carp/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) - add_to_streak("G") + add_to_streak("G",D) if(check_streak(A,D)) return 1 ..() @@ -354,7 +354,7 @@ G.state = GRAB_AGGRESSIVE //Instant aggressive grab /datum/martial_art/the_sleeping_carp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) - add_to_streak("H") + add_to_streak("H",D) if(check_streak(A,D)) return 1 var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams") @@ -369,7 +369,7 @@ /datum/martial_art/the_sleeping_carp/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) - add_to_streak("D") + add_to_streak("D",D) if(check_streak(A,D)) return 1 return ..()