Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nerfs playable huggers #8181

Merged
merged 5 commits into from
Mar 8, 2025
Merged

Nerfs playable huggers #8181

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ca6353
a
Git-Nivrak Jan 20, 2025
751af6e
a
Git-Nivrak Jan 21, 2025
0b33ed0
Update Facehugger.dm
Git-Nivrak Jan 21, 2025
1e0dfdf
Update xeno.dm
Git-Nivrak Jan 21, 2025
9d320b7
Grammar
Git-Nivrak Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions code/__DEFINES/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 is takes a player contorlled facehugger to hug adjcaently
Copy link
Contributor

@zzzmike zzzmike Jan 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line 13 comment isn't really correct as most people still use the leap ability to hug even if they're directly adjacent (and you've kept the leaping windup nerf in...)

#define FACEHUGGER_CLIMB_DURATION 1 SECONDS

// Defines for action types and click delays used by xenomorph/unarmedattack() and attack_alien().

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."))
Expand Down Expand Up @@ -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)
4 changes: 1 addition & 3 deletions code/modules/mob/living/carbon/xenomorph/strains/castes/facehugger/watcher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Loading