From d4a4aebeea02ea3a6bede38f2297a8539492141e Mon Sep 17 00:00:00 2001 From: Drulikar Date: Wed, 23 Aug 2023 21:58:30 -0700 Subject: [PATCH] Move xeno grab cooldown change to just ctrl+click logic --- code/_onclick/click.dm | 2 +- code/modules/mob/living/carbon/xenomorph/Xenomorph.dm | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index df7dd48a1dd1..86390718b6ca 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -210,7 +210,7 @@ return TRUE if (mods["ctrl"]) - if (Adjacent(user)) + if (Adjacent(user) && user.next_move < world.time) user.start_pulling(src) return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index cc0c12bd1cc8..dd53868caf36 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -755,9 +755,6 @@ /mob/living/carbon/xenomorph/start_pulling(atom/movable/AM, lunge, no_msg) - if(next_move >= world.time) - return FALSE - if(SEND_SIGNAL(AM, COMSIG_MOVABLE_XENO_START_PULLING, src) & COMPONENT_ALLOW_PULL) return do_pull(AM, lunge, no_msg)