Fix: You can once again help people while having martial arts (Paradi…

…seSS13#22394) * fookin loops * not need this * Update code/modules/martial_arts/martial.dm Co-authored-by: DGamerL <[email protected]> * Update code/modules/martial_arts/martial.dm Co-authored-by: DGamerL <[email protected]> --------- Co-authored-by: DGamerL <[email protected]>
HMBGERDO · Sep 14, 2023 · ce870fa · ce870fa
1 parent d42d2f6
commit ce870fa
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
@@ -59,7 +59,7 @@
 /datum/martial_art/proc/can_use(mob/living/carbon/human/H)
 	return !HAS_TRAIT(H, TRAIT_PACIFISM)
 
-/datum/martial_art/proc/act(step, mob/living/carbon/human/user, mob/living/carbon/human/target)
+/datum/martial_art/proc/act(step, mob/living/carbon/human/user, mob/living/carbon/human/target, could_start_new_combo = TRUE)
 	if(!can_use(user))
 		return MARTIAL_ARTS_CANNOT_USE
 	if(combo_timer)
@@ -72,7 +72,7 @@
 		var/mob/living/carbon/human/owner = locateUID(owner_UID)
 		if(istype(owner) && !QDELETED(owner))
 			owner.hud_used.combo_display.update_icon(ALL, streak)
-			return check_combos(step, user, target)
+			return check_combos(step, user, target, could_start_new_combo)
 	return FALSE
 
 /datum/martial_art/proc/reset_combos()
@@ -84,7 +84,7 @@
 	for(var/combo_type in combos)
 		current_combos.Add(new combo_type())
 
-/datum/martial_art/proc/check_combos(step, mob/living/carbon/human/user, mob/living/carbon/human/target)
+/datum/martial_art/proc/check_combos(step, mob/living/carbon/human/user, mob/living/carbon/human/target, could_start_new_combo = TRUE)
 	. = FALSE
 	for(var/thing in current_combos)
 		var/datum/martial_combo/MC = thing
@@ -110,8 +110,8 @@
 					return TRUE
 	if(!LAZYLEN(current_combos))
 		reset_combos()
-		if(HAS_COMBOS)
-			act(step, user, target)
+		if(HAS_COMBOS && could_start_new_combo)
+			act(step, user, target, could_start_new_combo = FALSE)
 
 /datum/martial_art/proc/basic_hit(mob/living/carbon/human/A, mob/living/carbon/human/D)