From 876ed9dd35e55fe5e5d4b9ae26aecdcef921ae93 Mon Sep 17 00:00:00 2001 From: InsaneRed Date: Mon, 25 Nov 2024 21:33:05 +0300 Subject: [PATCH] tail fountain --- .../praetorian/praetorian_abilities.dm | 13 ++++++++++-- .../abilities/praetorian/praetorian_powers.dm | 20 +++++++++++++++++++ .../strains/castes/praetorian/valkyrie.dm | 2 ++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm index 99194190f7bb..d4dd0dcef436 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm @@ -253,7 +253,16 @@ activation_delay = TRUE activation_delay_length = 5 -///////////////////////// VALKYR PRAE +///////////////////////// VALKYRIE PRAE + +/datum/action/xeno_action/activable/tail_stab/tail_fountain //no verbmacrohotkey, its just tail stab. + name = "Tail Fountain" + action_icon_state = "tail_seize" + action_type = XENO_ACTION_CLICK + charge_time = 0.5 SECONDS + xeno_cooldown = 20 SECONDS + ability_primacy = XENO_TAIL_STAB + /datum/action/xeno_action/activable/valkyrie_rage name = "Tantrum" action_icon_state = "warden_heal" @@ -297,5 +306,5 @@ // ranges and windup duration, this part of the ability is heavily experimental and will be touched after if it makes to testing var/low_rage_range = 3 - var/high_rage_range = 7 + var/high_rage_range = 5 var/rejuvenate_cost = 75 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm index 863930ebc19f..2f079cc3ce0e 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm @@ -935,3 +935,23 @@ apply_cooldown() return ..() + +/datum/action/xeno_action/activable/tail_stab/tail_fountain/use_ability(atom/atom) + var/mob/living/carbon/xenomorph/extuingisher_tail = owner + var/mob/living/carbon/xenomorph/target = atom + + + if (!action_cooldown_check()) + return + + if (!extuingisher_tail.check_state()) + return + + if (!check_and_use_plasma_owner()) + return FALSE + + playsound(extuingisher_tail, 'sound/effects/splat.ogg', 40, FALSE) + target.ExtinguishMob() // This can both help your allies, or help caps that are on fire. + apply_cooldown() + xeno_attack_delay(extuingisher_tail) + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/valkyrie.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/valkyrie.dm index 3d76285abd05..1fdb79c30594 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/valkyrie.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/valkyrie.dm @@ -5,6 +5,7 @@ icon_state_prefix = "Warden" actions_to_remove = list( + /datum/action/xeno_action/activable/tail_stab, /datum/action/xeno_action/activable/xeno_spit, /datum/action/xeno_action/activable/pounce/base_prae_dash, /datum/action/xeno_action/activable/prae_acid_ball, @@ -12,6 +13,7 @@ /datum/action/xeno_action/onclick/tacmap, ) actions_to_add = list( + /datum/action/xeno_action/activable/tail_stab/tail_fountain, /datum/action/xeno_action/onclick/emit_pheromones, /datum/action/xeno_action/activable/valkyrie_rage, /datum/action/xeno_action/activable/high_gallop,