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

Fix emoting past the grave #6387

Merged
merged 2 commits into from
Jun 7, 2024

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Jun 6, 2024

About the pull request

This PR fixes the lack of stat, muted, and cooldown checks for larva and facehugger emotes.

Explain why it's good for the game

Something that is dead shouldn't be emoting.

Testing Photographs and Procedure

Screenshots & Videos

image

Changelog

🆑 Drathek
fix: Fixed larva and hugger emotes performing no stat or muted or cooldown checks
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Jun 6, 2024
@deathrobotpunch
Copy link
Contributor

only add the stat and muted checks. keep no cooldown

Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the lack of delay was parity with pre-emote datumisation, but i'm fine with adding it

@harryob harryob added this pull request to the merge queue Jun 7, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 7, 2024
@harryob harryob added this pull request to the merge queue Jun 7, 2024
Merged via the queue into cmss13-devs:master with commit 28409ec Jun 7, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Jun 7, 2024
@Drulikar Drulikar deleted the Fix_Larva_Hugger_Emotes branch June 7, 2024 11:14
Git-Nivrak pushed a commit to Git-Nivrak/cmss13 that referenced this pull request Jun 9, 2024
# About the pull request

This PR fixes the lack of stat, muted, and cooldown checks for larva and
facehugger emotes.

# Explain why it's good for the game

Something that is dead shouldn't be emoting.

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


![image](https://github.com/cmss13-devs/cmss13/assets/76988376/4dbc6375-93db-4f76-8765-c54cfca33294)

</details>


# Changelog
:cl: Drathek
fix: Fixed larva and hugger emotes performing no stat or muted or
cooldown checks
/:cl:
Git-Nivrak pushed a commit to Git-Nivrak/cmss13 that referenced this pull request Jun 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants