From f164a729d34fcb6696addd4b1c1fc5fba0d185e3 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Thu, 15 Feb 2024 19:16:50 +0000 Subject: [PATCH] better fix --- code/modules/cm_preds/yaut_weapons.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm index 318e596d50ec..425691507e15 100644 --- a/code/modules/cm_preds/yaut_weapons.dm +++ b/code/modules/cm_preds/yaut_weapons.dm @@ -168,7 +168,6 @@ ///The amount this weapon interrupts hivemind link on Xenomorphs. var/xeno_interfere_amount = 30 - var/has_ability = FALSE ///The amount of charges towards use of special abilities. var/ability_charge = 0 var/ability_charge_max = ABILITY_MAX_DEFAULT @@ -190,7 +189,7 @@ var/mob/living/carbon/xenomorph/xenomorph = target xenomorph.interference = xeno_interfere_amount - if(!has_ability) + if(!ability_cost) return if(target == user || target.stat == DEAD || isanimal(target)) @@ -240,6 +239,7 @@ attack_verb = list("whipped", "slashed","sliced","diced","shredded") attack_speed = 0.8 SECONDS hitsound = 'sound/weapons/chain_whip.ogg' + ability_cost = ABILITY_COST_CHAIN /obj/item/weapon/yautja/chain/attack(mob/target, mob/living/user) @@ -256,6 +256,7 @@ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_speed = 1 SECONDS hitsound = "clan_sword_hit" + ability_cost = ABILITY_COST_SWORD /obj/item/weapon/yautja/scythe name = "dual war scythe" @@ -273,7 +274,6 @@ ability_cost = ABILITY_COST_SCYTHE ability_charge_max = ABILITY_COST_SCYTHE ability_charge_rate = ABILITY_CHARGE_NORMAL - has_ability = TRUE /obj/item/weapon/yautja/scythe/attack_self(mob/user) ..() @@ -342,7 +342,6 @@ ability_cost = ABILITY_COST_DEFAULT ability_charge_max = ABILITY_MAX_DEFAULT ability_charge_rate = ABILITY_CHARGE_SMALL - has_ability = TRUE var/on = TRUE