From 29804cf578aa091e66a0241ca1355330fb5e1a98 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sun, 21 Apr 2024 18:31:28 +0300 Subject: [PATCH 1/3] Update general_abilities.dm --- .../living/carbon/xenomorph/abilities/general_abilities.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index f62bb9e17421..65ad4bd7e99f 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -284,7 +284,7 @@ /datum/action/xeno_action/onclick/toggle_long_range/can_use_action() var/mob/living/carbon/xenomorph/xeno = owner - if(xeno && !xeno.is_mob_incapacitated() && !xeno.buckled) + if(xeno && !xeno.is_mob_incapacitated() && !xeno.buckled && xeno.check_state()) return TRUE /datum/action/xeno_action/onclick/toggle_long_range/give_to(mob/living/living_mob) @@ -296,6 +296,9 @@ /datum/action/xeno_action/onclick/toggle_long_range/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner + if (!xeno.check_state()) + return + if(xeno.observed_xeno) return From 258b538a5da971aeeccde3278c708d45446eb983 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sun, 21 Apr 2024 21:16:48 +0300 Subject: [PATCH 2/3] Update code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm Co-authored-by: fira --- .../mob/living/carbon/xenomorph/abilities/general_abilities.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index 65ad4bd7e99f..0d341f0d0191 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -284,7 +284,7 @@ /datum/action/xeno_action/onclick/toggle_long_range/can_use_action() var/mob/living/carbon/xenomorph/xeno = owner - if(xeno && !xeno.is_mob_incapacitated() && !xeno.buckled && xeno.check_state()) + if(xeno?.check_state()) return TRUE /datum/action/xeno_action/onclick/toggle_long_range/give_to(mob/living/living_mob) From 1d84eeda0a6fdc7c6f17c72d448c5ed6abc26a49 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Mon, 22 Apr 2024 07:47:14 +0300 Subject: [PATCH 3/3] Update general_abilities.dm --- .../mob/living/carbon/xenomorph/abilities/general_abilities.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index 0d341f0d0191..f36e23394eef 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -284,7 +284,7 @@ /datum/action/xeno_action/onclick/toggle_long_range/can_use_action() var/mob/living/carbon/xenomorph/xeno = owner - if(xeno?.check_state()) + if(xeno && !xeno.is_mob_incapacitated() && !xeno.buckled) return TRUE /datum/action/xeno_action/onclick/toggle_long_range/give_to(mob/living/living_mob)