f

cmss13-devs · Jan 17, 2025 · 78dfa03 · 78dfa03
1 parent 727aa44
commit 78dfa03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm
@@ -440,6 +440,7 @@
 	pre_pounce_effects()
 
 	X.pounce_distance = get_dist(X, A)
+	var/list/pounce_end_callbacks = list(CALLBACK(src, PROC_REF(on_end_pounce)))
 	X.throw_atom(A, distance, throw_speed, X, launch_type = LOW_LAUNCH, pass_flags = pounce_pass_flags, end_throw_callbacks = pounce_end_callbacks, collision_callbacks = pounce_callbacks)
 	X.update_icons()
 
@@ -448,6 +449,9 @@
 
 	return TRUE
 
+/datum/action/xeno_action/activable/pounce/proc/on_end_pounce()
+	return
+
 // Massive, customizable spray_acid
 /datum/action/xeno_action/activable/spray_acid/use_ability(atom/A)
 	var/mob/living/carbon/xenomorph/X = owner

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm
@@ -144,10 +144,6 @@
 
 // VAMPIRE LURKER
 
-/datum/action/xeno_action/activable/pounce/rush/New()
-	. = ..()
-	pounce_end_callbacks = list(CALLBACK(src, PROC_REF(on_end_rush)))
-
 /datum/action/xeno_action/activable/pounce/rush/use_ability(atom/target)
 	var/mob/living/carbon/xenomorph/xeno = owner
 	if(!action_cooldown_check())
@@ -182,7 +178,7 @@
 	. = ..(carbon_target)
 
 	if(!.)
-		qdel(vamp.rush_target_ref)
+		vamp.rush_target_ref = null
 		return
 
 	if(xeno.can_not_harm(carbon_target))
@@ -192,7 +188,7 @@
 	var/mob/living/carbon/target = living_target
 	var/mob/living/carbon/xenomorph/xeno = owner
 	var/datum/behavior_delegate/lurker_vampire/vamp = xeno.behavior_delegate
-	qdel(vamp.rush_target_ref)
+	vamp.rush_target_ref = null
 	target.sway_jitter(times = 2)
 	xeno.animation_attack_on(target)
 	xeno.flick_attack_overlay(target, "slash")   //fake slash to prevent disarm abuse
@@ -201,14 +197,14 @@
 	playsound(get_turf(target), 'sound/weapons/alien_claw_flesh3.ogg', 30, TRUE)
 	shake_camera(target, 2, 1)
 
-/datum/action/xeno_action/activable/pounce/rush/proc/on_end_rush()
+/datum/action/xeno_action/activable/pounce/rush/on_end_pounce()
 	var/mob/living/carbon/xenomorph/xeno = owner
 	var/datum/behavior_delegate/lurker_vampire/vamp = xeno.behavior_delegate
-	if(!vamp.rush_target_ref || QDELETED(vamp.rush_target_ref))
+	if(!vamp.rush_target_ref)
 		return
 
 	var/mob/living/target = vamp.rush_target_ref.resolve()
-	qdel(vamp.rush_target_ref)
+	vamp.rush_target_ref = null
 	if(!target)
 		return
 	if(!xeno.check_state())