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

Jump to bottom

Fixes Warrior Pulls continuously breaking after lunging a M56D/M2C user from front #5151

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Fixes Warrior Pulls continuously breaking after lunging a M56D/M2C user from front #5151

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6149c4
fix warrior hell pull
fira Dec 6, 2023
7439c57
Update code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm
fira Dec 6, 2023
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
3 changes: 2 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@
if(should_neckgrab && living_mob.mob_size < MOB_SIZE_BIG)
living_mob.drop_held_items()
living_mob.apply_effect(get_xeno_stun_duration(living_mob, 2), WEAKEN)
living_mob.pulledby = src
if(living_mob.pulledby != src)
return // Grab was broken, probably as Stun side effect (eg. target getting knocked away from a manned M56D)
visible_message(SPAN_XENOWARNING("[src] grabs [living_mob] by the throat!"), \
SPAN_XENOWARNING("You grab [living_mob] by the throat!"))
lunging = TRUE
Expand Down