cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 18:13:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix (#22019)

Browse Source
This commit is contained in:
Charlie
2023-08-18 00:00:10 +01:00
committed by GitHub
parent aad8529c24
commit f0afff8b62
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/martial.dm
+4 -7
View File
@@ -64,16 +64,13 @@
return MARTIAL_ARTS_CANNOT_USE
if(combo_timer)
deltimer(combo_timer)
/*
if(last_hit + COMBO_ALIVE_TIME < world.time)
reset_combos()
*/
combo_timer = addtimer(CALLBACK(src, PROC_REF(reset_combos)), COMBO_ALIVE_TIME, TIMER_UNIQUE | TIMER_STOPPABLE)
streak += intent_to_streak(step)
var/mob/living/carbon/human/owner = locateUID(owner_UID)
owner?.hud_used.combo_display.update_icon(ALL, streak)
if(HAS_COMBOS)
streak += intent_to_streak(step)
var/mob/living/carbon/human/owner = locateUID(owner_UID)
owner?.hud_used.combo_display.update_icon(ALL, streak)
return check_combos(step, user, target)
return FALSE