From 0fbaed99601c7051fa5031668a7326c110850e65 Mon Sep 17 00:00:00 2001 From: spaghetti <48985748+definitelynotspaghetti@users.noreply.github.com> Date: Fri, 6 Dec 2024 09:46:44 +0300 Subject: [PATCH] Panther buff (#754) * panther * panther --- .../castes/panther/abilities_panther.dm | 18 ++++++++++-------- .../carbon/xenomorph/castes/panther/panther.dm | 3 +++ .../carbon/xenomorph/castes/runner/runner.dm | 3 +++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/panther/abilities_panther.dm b/code/modules/mob/living/carbon/xenomorph/castes/panther/abilities_panther.dm index 464ae4e8f0b..15cefd0b167 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/panther/abilities_panther.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/panther/abilities_panther.dm @@ -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) /////////////////////////////////// // *************************************** @@ -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( @@ -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 @@ -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, ) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/panther/panther.dm b/code/modules/mob/living/carbon/xenomorph/castes/panther/panther.dm index 9d2f082ed87..ba7bcf8a676 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/panther/panther.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/panther/panther.dm @@ -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 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/runner/runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/runner/runner.dm index 251db0fb576..378bd2759b5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/runner/runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/runner/runner.dm @@ -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