aaaaaa

cmss13-devs · Aug 4, 2024 · dc49f95 · dc49f95
1 parent df197b2
commit dc49f95
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm
@@ -146,7 +146,14 @@
 /datum/action/xeno_action/activable
 
 /datum/action/xeno_action/activable/can_use_action()
-	. = ..()
+	if(!owner)
+		return FALSE
+	var/mob/living/carbon/xenomorph/xeno = owner
+	if(xeno.stat == DEAD) // to prevent dead xenos from doing wacky interactions
+		return FALSE
+	if(xeno.m_intent == MOVE_INTENT_STALK && xeno.tier < 2)
+		return FALSE
+	return TRUE
 
 // Called when the action is clicked on.
 // For non-activable Xeno actions, this is used to

diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm
@@ -61,10 +61,6 @@
 
 /datum/action/xeno_action/activable/apply_salve/use_ability(atom/target_atom)
 	var/mob/living/carbon/xenomorph/xeno = owner
-
-	if(xeno.m_intent == MOVE_INTENT_STALK)
-		return FALSE
-
 	xeno.xeno_apply_salve(target_atom, health_transfer_amount, max_range, damage_taken_mod)
 	return ..()