From 8f252be853a7c39a156dd0ea4e454493a1ed45ef Mon Sep 17 00:00:00 2001 From: Drulikar Date: Sat, 29 Jul 2023 07:28:53 -0700 Subject: [PATCH 1/2] Standardized hugger pounce windup and attack windup to the same duration of 1 second --- .../xenomorph/abilities/facehugger/facehugger_abilities.dm | 5 ++++- .../modules/mob/living/carbon/xenomorph/castes/Facehugger.dm | 2 +- 2 files changed, 5 insertions(+), 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 index 9f5de1c631cd..8b44d09b4294 100644 --- 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 index 79a5f986ea10..ac03389994c9 100644 --- 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.")) From 0ad85b39a38b0ad13c0f80876a9dccb53c338290 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Sat, 29 Jul 2023 16:11:50 -0700 Subject: [PATCH 2/2] xeno __defines --- code/__DEFINES/xeno.dm | 3 +++ .../xenomorph/abilities/facehugger/facehugger_abilities.dm | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm index 82237cd793b2..222222a09d54 100644 --- a/code/__DEFINES/xeno.dm +++ b/code/__DEFINES/xeno.dm @@ -8,6 +8,9 @@ #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 + // Defines for action types and click delays used by xenomorph/unarmedattack() and attack_alien(). /// Full attack delay. 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 index 8b44d09b4294..91bda707ec45 100644 --- 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,6 +1,3 @@ -/// 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"