Skip to content

Commit

Permalink
overlay fix
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed Feb 15, 2024
1 parent 719c1eb commit b54290d
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions code/modules/cm_preds/yaut_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
///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 @@ -189,6 +190,9 @@
var/mob/living/carbon/xenomorph/xenomorph = target
xenomorph.interference = xeno_interfere_amount

if(!has_ability)
return

if(target == user || target.stat == DEAD || isanimal(target))
to_chat(user, SPAN_DANGER("You think you're smart?")) //very funny
return
Expand Down Expand Up @@ -269,6 +273,7 @@
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 @@ -337,6 +342,7 @@
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 Expand Up @@ -540,7 +546,6 @@
desc = "A viciously sharp dagger inscribed with ancient Yautja markings. Smells thickly of blood. Carried by some hunters."
icon_state = "predknife"
item_state = "knife"
flags_atom = FPRINT|CONDUCT
flags_item = ITEM_PREDATOR|CAN_DIG_SHRAPNEL
flags_equip_slot = SLOT_STORE
sharp = IS_SHARP_ITEM_ACCURATE
Expand All @@ -552,7 +557,6 @@
hitsound = 'sound/weapons/slash.ogg'
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
actions_types = list(/datum/action/item_action)
unacidable = TRUE

/obj/item/weapon/yautja/knife/attack(mob/living/target, mob/living/carbon/human/user)
if(target.stat != DEAD)
Expand Down

0 comments on commit b54290d

Please sign in to comment.