Skip to content

Commit

Permalink
Fixes Rock Paper Scissors emotes (#8307)
Browse files Browse the repository at this point in the history
# About the pull request

Fixes: #8300 

<!-- 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
Bug bad.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
  • Loading branch information
ihatethisengine authored Feb 2, 2025
1 parent 1a3d3dc commit f9a7707
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,11 @@
#define PANDEMIC 2

//emote flags
#define EMOTING_HIGH_FIVE 1
#define EMOTING_FIST_BUMP 2
#define EMOTING_HEADBUTT 3
#define EMOTING_TAIL_SWIPE 4
#define EMOTING_ROCK_PAPER_SCISSORS 5
#define EMOTING_HIGH_FIVE (1<<0)
#define EMOTING_FIST_BUMP (1<<1)
#define EMOTING_HEADBUTT (1<<2)
#define EMOTING_TAIL_SWIPE (1<<3)
#define EMOTING_ROCK_PAPER_SCISSORS (1<<4)

//forcesay types
#define SUDDEN 0
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
return XENO_NONCOMBAT_ACTION
else if(flags_emote & EMOTING_TAIL_SWIPE)
xeno.attempt_tailswipe(src)
return
return XENO_NONCOMBAT_ACTION
else if(xeno.zone_selected == "head")
xeno.attempt_headbutt(src)
return XENO_NONCOMBAT_ACTION
Expand Down

0 comments on commit f9a7707

Please sign in to comment.