cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14121 from AnturK/martialfix

Browse Source 
Makes martial arts reset combos on target change.
This commit is contained in:
tkdrg
2015-12-29 20:09:32 -03:00
parent 14da386e28 cfe47257b2
commit ab7a3837d9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial.dm
+6 -6
View File
@@ -258,21 +258,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)
@@ -378,7 +378,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
..()
@@ -387,7 +387,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")
@@ -402,7 +402,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 ..()