tail fountain

cmss13-devs · Nov 25, 2024 · 876ed9d · 876ed9d
1 parent 9073ea0
commit 876ed9d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 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
@@ -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
@@ -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
@@ -5,13 +5,15 @@
 	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,
 		/datum/action/xeno_action/activable/spray_acid/base_prae_spray_acid,
 		/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,