From f0afff8b620ee0c0d650e5dbab062f955f823328 Mon Sep 17 00:00:00 2001
From: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date: Fri, 18 Aug 2023 00:00:10 +0100
Subject: [PATCH] fix (#22019)

---
 code/modules/martial_arts/martial.dm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 17d92661b1b..de4e0e16d10 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -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