Standardized hugger pounce windup and attack windup to the same durat…

…ion of 1 second
cmss13-devs · Jul 29, 2023 · 8f252be · 8f252be
1 parent 4e8cdad
commit 8f252be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
@@ -1,3 +1,6 @@
+/// The duration it takes a player controlled facehugger to leap or hug adjacently
+#define FACEHUGGER_WINDUP_DURATION 1 SECONDS
+
 /datum/action/xeno_action/activable/pounce/facehugger
 	name = "Leap"
 	action_icon_state = "pounce"
@@ -12,7 +15,7 @@
 	knockdown = TRUE
 	knockdown_duration = 0.5
 	windup = TRUE
-	windup_duration = 10
+	windup_duration = FACEHUGGER_WINDUP_DURATION
 	freeze_self = TRUE
 	freeze_time = 5
 	freeze_play_sound = FALSE

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm
@@ -133,7 +133,7 @@
 			to_chat(src, SPAN_WARNING("You can't infect \the [human]..."))
 			return
 		visible_message(SPAN_WARNING("\The [src] starts climbing onto \the [human]'s face..."), SPAN_XENONOTICE("You start climbing onto \the [human]'s face..."))
-		if(!do_after(src, 6 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, human, INTERRUPT_MOVED, BUSY_ICON_HOSTILE))
+		if(!do_after(src, FACEHUGGER_WINDUP_DURATION, INTERRUPT_ALL, BUSY_ICON_HOSTILE, human, INTERRUPT_MOVED, BUSY_ICON_HOSTILE))
 			return
 		if(!human.lying)
 			to_chat(src, SPAN_WARNING("You can't reach \the [human], they need to be lying down."))