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.

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

Watcher nerf #6237

Merged
merged 5 commits into from
May 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@
freeze_time = 5
freeze_play_sound = FALSE
can_be_shield_blocked = TRUE

/datum/action/xeno_action/onclick/toggle_long_range/facehugger
handles_movement = FALSE
should_delay = FALSE
ability_primacy = XENO_PRIMARY_ACTION_3
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,13 @@
to_chat(owner, SPAN_WARNING("We cannot do that while squeezing and scuttling!"))
return FALSE
return ..()

/datum/action/xeno_action/onclick/toggle_long_range/facehugger/use_ability()
. = ..()

var/mob/living/carbon/xenomorph/facehugger/facehugger = owner

if (facehugger.is_zoomed)
ADD_TRAIT(facehugger, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Long-Range Sight"))
else
REMOVE_TRAIT(facehugger, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Long-Range Sight"))
Git-Nivrak marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/datum/action/xeno_action/onclick/xenohide,
)
actions_to_add = list(
/datum/action/xeno_action/onclick/toggle_long_range/runner,
/datum/action/xeno_action/onclick/toggle_long_range/facehugger,
)

behavior_delegate_type = /datum/behavior_delegate/facehugger_watcher
Expand All @@ -21,5 +21,5 @@
name = "Watcher Facehugger Behavior Delegate"

/datum/behavior_delegate/facehugger_watcher/on_life()
if(bound_xeno.body_position == STANDING_UP && !(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno)))
if(bound_xeno.body_position == STANDING_UP && !(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno)) && !bound_xeno.is_zoomed)
bound_xeno.adjustBruteLoss(1)
Git-Nivrak marked this conversation as resolved.
Show resolved Hide resolved
Loading