Move xeno grab cooldown change to just ctrl+click logic

cmss13-devs · Aug 24, 2023 · d4a4aeb · d4a4aeb
1 parent c8cb363
commit d4a4aeb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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)