Fix martial art combos not clearing themselves when martial art is removed (#29592)

* reset martial art combo before removing

* move reset to mind transfer

* clear old body combos

* reset combos when martial art removed
This commit is contained in:
Toastical
2025-06-19 21:22:03 +03:00
committed by GitHub
parent 28383b3161
commit bd7d43dcb5
2 changed files with 9 additions and 2 deletions
+8 -2
View File
@@ -76,10 +76,14 @@
return check_combos(step, user, target, could_start_new_combo)
return FALSE
/datum/martial_art/proc/reset_combos()
/datum/martial_art/proc/reset_combos(mob/living/carbon/human/H)
current_combos.Cut()
streak = ""
var/mob/living/carbon/human/owner = locateUID(owner_UID)
var/mob/living/carbon/human/owner
if(H)
owner = H
else
owner = locateUID(owner_UID)
if(istype(owner) && !QDELETED(owner))
owner.hud_used.combo_display.update_icon(ALL, streak)
for(var/combo_type in combos)
@@ -168,6 +172,8 @@
var/datum/martial_art/MA = src
if(!H.mind)
return
if(H.hud_used)
reset_combos()
deltimer(combo_timer)
H.mind.known_martial_arts.Remove(MA)
H.mind.martial_art = get_highest_weight(H)