Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Panther buff #754

Merged
merged 2 commits into from
Dec 6, 2024
Merged

Panther buff #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e44105
panther
definitelynotspaghetti Dec 4, 2024
eeef3e2
panther
definitelynotspaghetti Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions code/modules/mob/living/carbon/xenomorph/castes/panther/abilities_panther.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
keybinding_signals = list(
KEYBINDING_NORMAL = COMSIG_XENOABILITY_PANTHER_POUNCE,
)
cooldown_duration = 13 SECONDS
ability_cost = 20
var/pantherplasmaheal = 45
cooldown_duration = 8 SECONDS
ability_cost = 15
var/pantherplasmaheal = 35
var/pantherlifesteal = 25

/datum/action/ability/activable/xeno/pounce/panther/mob_hit(datum/source, mob/living/M)
. = ..()
var/mob/living/carbon/xenomorph/xenomorph_owner = owner
xenomorph_owner.plasma_stored += pantherplasmaheal
HEAL_XENO_DAMAGE(xenomorph_owner, pantherlifesteal, FALSE)

///////////////////////////////////
// ***************************************
Expand All @@ -24,8 +26,8 @@
name = "Tearing tail"
action_icon_state = "tearing_tail"
desc = "Hit all nearby enemies around you, poisoning them with selected toxin and healing you for each target hit."
ability_cost = 50
cooldown_duration = 15 SECONDS
ability_cost = 35
cooldown_duration = 10 SECONDS
var/tearing_tail_reagent
keybind_flags = ABILITY_KEYBIND_USE_ABILITY
keybinding_signals = list(
Expand All @@ -52,7 +54,7 @@
affecting = human_target.get_limb("chest") //Gotta have a torso?!
human_target.apply_damage(damage, BRUTE, affecting, MELEE)
xenomorph_owner.plasma_stored += 25
xenomorph_owner.heal_overall_damage(25, 25, updating_health = TRUE)
xenomorph_owner.heal_overall_damage(35, 35, updating_health = TRUE)
if(human_target.can_sting())
tearing_tail_reagent = xenomorph_owner.selected_reagent
var/reagent_amount = (xenomorph_owner.selected_reagent == /datum/reagent/toxin/xeno_ozelomelyn) ? PANTHER_TEARING_TAIL_REAGENT_AMOUNT * 0.5 : PANTHER_TEARING_TAIL_REAGENT_AMOUNT
Expand Down Expand Up @@ -82,8 +84,8 @@
name = "Adrenaline Jump"
action_icon_state = "adrenaline_jump"
desc = "Jump from some distance to target, knocking them down and pulling them to you, only works if you are at least from 3 to 8 meters away from the target, this ability sends Pounce on cooldown."
ability_cost = 15
cooldown_duration = 12 SECONDS
ability_cost = 10
cooldown_duration = 8 SECONDS
keybinding_signals = list(
KEYBINDING_NORMAL = COMSIG_XENOABILITY_ADRENALINE_JUMP,
)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/castes/panther/panther.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,6 @@
if(prob(44.81))
new /obj/item/reagent_containers/food/drinks/pantherheart(loc)
gib()

/mob/living/carbon/xenomorph/panther/set_frenzy_aura(new_aura)
return
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/castes/runner/runner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,6 @@
holder.pixel_x = 24
holder.pixel_y = 24
hud_list[XENO_EVASION_HUD] = holder

/mob/living/carbon/xenomorph/runner/set_frenzy_aura(new_aura)
return
Loading