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

makes synthetics unable to grab large xenomorphs #8129

Merged
merged 3 commits into from
Jan 18, 2025
+15 −1
Merged

makes synthetics unable to grab large xenomorphs #8129

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c4fd8d
makes synthetics unable to grab large xenomorphs
Detective-Google Jan 17, 2025
8e530cc
Apply suggestions from code review
Detective-Google Jan 17, 2025
fa52da7
early death check
Detective-Google Jan 17, 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
12 changes: 12 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
View file
Open in desktop
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,18 @@
playsound(puller.loc, 'sound/weapons/pierce.ogg', 25, 1)
puller.visible_message(SPAN_WARNING("[puller] tried to pull [src] but instead gets a tail swipe to the head!"))
return FALSE
if(stat != DEAD && (issynth(puller)) && ((mob_size >= 4) || (istype(src, /mob/living/carbon/xenomorph/warrior))))
Detective-Google marked this conversation as resolved.
Show resolved Hide resolved
var/mob/living/carbon/human/synthetic/puller_synth = puller
var/facing = get_dir(src, puller)
if(puller_synth.ally_of_hivenumber(hivenumber))
return TRUE
puller.apply_effect(1, DAZE)
shake_camera(puller, 2, 1)
playsound(puller.loc, 'sound/weapons/alien_claw_block.ogg', 25, 1)
src.throw_carbon(puller, facing, 1, SPEED_SLOW, shake_camera = FALSE, immobilize = FALSE)
Detective-Google marked this conversation as resolved.
Show resolved Hide resolved
puller.apply_effect(get_xeno_stun_duration(puller, 1), WEAKEN)
puller.visible_message(SPAN_WARNING("[puller] tried to pull [src] but instead gets whacked in the chest!"))
return FALSE
return TRUE

/mob/living/carbon/xenomorph/resist_grab(moving_resist)
Expand Down
Loading