From 967515becdce56de9b7ae638d05470cc858fd94d Mon Sep 17 00:00:00 2001 From: X0-11 Date: Fri, 2 Feb 2024 01:13:52 +0000 Subject: [PATCH] a different approach --- code/modules/halo/misc/melee_strikes.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/halo/misc/melee_strikes.dm b/code/modules/halo/misc/melee_strikes.dm index 982a78e210aca..d460629a6e614 100644 --- a/code/modules/halo/misc/melee_strikes.dm +++ b/code/modules/halo/misc/melee_strikes.dm @@ -31,24 +31,24 @@ /obj/item/New() if(melee_strikes) - melee_strikes += null //Purposefully added, so the stance-switch system can allow you to switch to no-stance for lunges and such. for(var/type in melee_strikes) if(isnull(type)) continue var/strike = new type melee_strikes -= type melee_strikes += strike + melee_strikes += null //Purposefully added, so the stance-switch system can allow you to switch to no-stance for lunges and such. . = ..() /obj/item/proc/has_melee_strike(var/mob/user) - if(isnull(melee_strikes) || melee_strikes.len == 0) + if(isnull(melee_strikes)) return null if(isnull(melee_strike)) melee_strike = melee_strikes[1] if(!isnull(melee_strike)) melee_strike.strike_active(user) - return 1 + return melee_strike /obj/item/proc/verb_swap_stances() set name = "Swap Stances"