Skip to content

Commit

Permalink
better fix
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed Feb 15, 2024
1 parent b54290d commit f164a72
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions code/modules/cm_preds/yaut_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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))
Expand Down Expand Up @@ -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)
Expand All @@ -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"
Expand All @@ -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)
..()
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit f164a72

Please sign in to comment.