cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes some martial art runtimes (#22041)

Browse Source
This commit is contained in:
GDN
2023-08-25 10:28:14 -05:00
committed by GitHub
parent d6335a547f
commit a59cb9741e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/martial.dm
+6 -3
View File
@@ -70,15 +70,17 @@
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)
if(istype(owner) && !QDELETED(owner))
owner.hud_used.combo_display.update_icon(ALL, streak)
return check_combos(step, user, target)
return FALSE
/datum/martial_art/proc/reset_combos()
current_combos.Cut()
streak = ""
var/mob/living/carbon/human/owner = locateUID(owner_UID)
owner?.hud_used.combo_display.update_icon(ALL, streak)
if(istype(owner) && !QDELETED(owner))
owner.hud_used.combo_display.update_icon(ALL, streak)
for(var/combo_type in combos)
current_combos.Add(new combo_type())
@@ -162,6 +164,7 @@
var/datum/martial_art/MA = src
if(!H.mind)
return
deltimer(combo_timer)
H.mind.known_martial_arts.Remove(MA)
H.mind.martial_art = get_highest_weight(H)
H.verbs -= /mob/living/carbon/human/proc/martial_arts_help