Skip to content

Commit

Permalink
Xeno grabs now block crawling (#7326)
Browse files Browse the repository at this point in the history
# About the pull request
see title, code is copied from  #7039 
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

players (mostly synths and predators) were able to easily escape xeno
bodyblocks by just crawling away, and there was nothing that xeno
players could do to counter it. Now preds/synths can still try to crawl
to escape a bodyblock (over attempting to crit a xeno blocking them), at
the cost of it failing if a xeno grabs them.
# Testing Photographs and Procedure
Tested it, works.

# Changelog
:cl: MistChristmas, Private-Tristan
balance: You can no longer crawl while being grabbed by a xenomorph.
/:cl:
  • Loading branch information
private-tristan authored Oct 28, 2024
1 parent 6b0cb3f commit 2274dbc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/modules/mob/living/living_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
to_chat(src, SPAN_WARNING("You can't resist in your current state."))
return

if(pulledby && isxeno(pulledby))
to_chat(src, SPAN_WARNING("You can't resist while a xeno is grabbing you."))
return

resisting = TRUE

next_move = world.time + 20
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/mob_movement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@
return
if(living_mob.body_position == LYING_DOWN && !living_mob.can_crawl)
return
if(living_mob.body_position == LYING_DOWN && isxeno(mob.pulledby))
next_movement = world.time + 20 //Good Idea
to_chat(src, SPAN_NOTICE("You cannot crawl while a xeno is grabbing you."))
return

//Check if you are being grabbed and if so attemps to break it
if(mob.pulledby)
Expand Down

0 comments on commit 2274dbc

Please sign in to comment.