TGS Test Merge (#8181)

cmss13-devs · Mar 5, 2025 · e11dda0 · e11dda0
2 parents 0fc2ceb + 9d320b7
commit e11dda0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm
@@ -8,8 +8,10 @@
 #define TUNNEL_ENTER_BIG_XENO_DELAY 120
 #define TUNNEL_ENTER_LARVA_DELAY 10
 
-/// The duration it takes a player controlled facehugger to leap or hug adjacently
-#define FACEHUGGER_WINDUP_DURATION 1 SECONDS
+/// The duration it takes a player controlled facehugger to leap
+#define FACEHUGGER_LEAP_DURATION 2 SECONDS
+/// The duration it takes a player controlled facehugger to hug a target lying down by clicking on it
+#define FACEHUGGER_CLIMB_DURATION 1 SECONDS
 
 // Defines for action types and click delays used by xenomorph/unarmedattack() and attack_alien().
 

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
@@ -12,7 +12,7 @@
 	knockdown = TRUE
 	knockdown_duration = 0.5
 	windup = TRUE
-	windup_duration = FACEHUGGER_WINDUP_DURATION
+	windup_duration = FACEHUGGER_LEAP_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
@@ -145,7 +145,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, FACEHUGGER_WINDUP_DURATION, INTERRUPT_ALL, BUSY_ICON_HOSTILE, human, INTERRUPT_MOVED, BUSY_ICON_HOSTILE))
+		if(!do_after(src, FACEHUGGER_CLIMB_DURATION, INTERRUPT_ALL, BUSY_ICON_HOSTILE, human, INTERRUPT_MOVED, BUSY_ICON_HOSTILE))
 			return
 		if(human.body_position != LYING_DOWN)
 			to_chat(src, SPAN_WARNING("You can't reach \the [human], they need to be lying down."))
@@ -264,5 +264,5 @@
 	name = "Base Facehugger Behavior Delegate"
 
 /datum/behavior_delegate/facehugger_base/on_life()
-	if(bound_xeno.body_position == STANDING_UP && !(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno)))
-		bound_xeno.adjustBruteLoss(1)
+	if(!(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno)))
+		bound_xeno.adjustBruteLoss(2)
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/facehugger/watcher.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/facehugger/watcher.dm
@@ -22,10 +22,8 @@
 
 /datum/behavior_delegate/facehugger_watcher/on_life()
 	// Sap health if we're standing, not on weeds, and not zoomed out
-	if(bound_xeno.body_position != STANDING_UP)
-		return
 	if(bound_xeno.is_zoomed)
 		return
 	if(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno))
 		return
-	bound_xeno.adjustBruteLoss(1)
+	bound_xeno.adjustBruteLoss(2)