From 3928d59db86533ee57d60b46db623a97e4822105 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Fri, 2 Feb 2024 02:11:37 +0000 Subject: [PATCH] update --- code/modules/halo/misc/melee_strikes.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/halo/misc/melee_strikes.dm b/code/modules/halo/misc/melee_strikes.dm index b3d8bde574027..5d1330dae53f4 100644 --- a/code/modules/halo/misc/melee_strikes.dm +++ b/code/modules/halo/misc/melee_strikes.dm @@ -41,8 +41,8 @@ melee_strikes += strike . = ..() -/obj/item/proc/has_melee_strike(var/mob/user,var/active_only = 0) - if(isnull(melee_strikes)) +/obj/item/proc/has_melee_strike(var/mob/user,var/skip_firststrike_set) + if(!melee_strikes || melee_strikes.len == 0) return 0 if(ishuman(user)) var/mob/living/carbon/human/h = user @@ -54,8 +54,6 @@ melee_strike = melee_strikes[1] if(!isnull(melee_strike)) melee_strike.strike_active(user) - else if (active_only) //If the caller only wants a true result if we have an *active* melee strike, - return 0 //stop here (because we don't, and can't acquire one in the first step) return 1 @@ -79,8 +77,8 @@ melee_strike = stance_curr if(stance_curr == null) to_chat(user,"You return to your normal weapon stance.") - return - stance_curr.strike_active(user) + else + stance_curr.strike_active(user) //Most elements of melee strikes should do nothing extra if set to null. /datum/melee_strike