From 7e2c6dca6a1dfd767363ff3997e905204705e048 Mon Sep 17 00:00:00 2001
From: Comxy <tijntensen@gmail.com>
Date: Mon, 27 Jun 2022 23:14:43 +0200
Subject: [PATCH] martial arts bug fix (#68028)

---
 code/datums/martial/cqc.dm           | 10 +++++-----
 code/datums/martial/plasma_fist.dm   |  6 +++---
 code/datums/martial/sleeping_carp.dm |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm
index 273b0b0dc90..4c3b4c689b7 100644
--- a/code/datums/martial/cqc.dm
+++ b/code/datums/martial/cqc.dm
@@ -22,19 +22,19 @@
 	if(!can_use(A))
 		return FALSE
 	if(findtext(streak,SLAM_COMBO))
-		streak = ""
+		reset_streak(A)
 		return Slam(A,D)
 	if(findtext(streak,KICK_COMBO))
-		streak = ""
+		reset_streak(A)
 		return Kick(A,D)
 	if(findtext(streak,RESTRAIN_COMBO))
-		streak = ""
+		reset_streak(A)
 		return Restrain(A,D)
 	if(findtext(streak,PRESSURE_COMBO))
-		streak = ""
+		reset_streak(A)
 		return Pressure(A,D)
 	if(findtext(streak,CONSECUTIVE_COMBO))
-		streak = ""
+		reset_streak(A)
 		return Consecutive(A,D)
 	return FALSE
 
diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm
index 6f5c2acad39..0f959d48ebe 100644
--- a/code/datums/martial/plasma_fist.dm
+++ b/code/datums/martial/plasma_fist.dm
@@ -16,17 +16,17 @@
 	if(findtext(streak,TORNADO_COMBO))
 		if(A == D)//helps using apotheosis
 			return FALSE
-		streak = ""
+		reset_streak(A)
 		Tornado(A,D)
 		return TRUE
 	if(findtext(streak,THROWBACK_COMBO))
 		if(A == D)//helps using apotheosis
 			return FALSE
-		streak = ""
+		reset_streak(A)
 		Throwback(A,D)
 		return TRUE
 	if(findtext(streak,PLASMA_COMBO))
-		streak = ""
+		reset_streak(A)
 		if(A == D && !nobomb)
 			Apotheosis(A,D)
 		else
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 767cf869ecc..3838305caf1 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -11,15 +11,15 @@
 
 /datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/A, mob/living/D)
 	if(findtext(streak,STRONG_PUNCH_COMBO))
-		streak = ""
+		reset_streak(A)
 		strongPunch(A,D)
 		return TRUE
 	if(findtext(streak,LAUNCH_KICK_COMBO))
-		streak = ""
+		reset_streak(A)
 		launchKick(A,D)
 		return TRUE
 	if(findtext(streak,DROP_KICK_COMBO))
-		streak = ""
+		reset_streak(A)
 		dropKick(A,D)
 		return TRUE
 	return FALSE