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

[MIRROR] Heart code cleanup #641

Merged
merged 1 commit into from
Nov 15, 2023
Merged

[MIRROR] Heart code cleanup #641

merged 1 commit into from
Nov 15, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25019
Original PR: tgstation/tgstation#79602

About The Pull Request

General clean up of heart code.

  • Use Stop and Restart in set_heart_attack
  • Use SEND_SOUND() rather than playsound_local for heartbeats
  • Use update_icon_blocker
  • Correctly ensures ethereal hearts get their overlay
    • Adds heartbeat animation to ethereal hearts

Changelog

🆑 Melbert
code: General heart code cleanup.
fix: Heartbeat sound effects are no longer sourced to the exact tile you fell into crit at
fix: Abductors glands are less likely to become invisible or look wrong
fix: Ethereal hearts are less likely to become invisible or look wrong, and now properly spawn with their shine overlay
image: Adds heartbeat animation to beating Ethereal Hearts
/:cl:

* Heart code cleanup  (#79602)

## About The Pull Request

General clean up of heart code.

- Use `Stop` and `Restart` in `set_heart_attack`
- Use `SEND_SOUND()` rather than `playsound_local` for heartbeats
- Use `update_icon_blocker`
- Correctly ensures ethereal hearts get their overlay
   - Adds heartbeat animation to ethereal hearts

## Changelog

:cl: Melbert
code: General heart code cleanup.
fix: Heartbeat sound effects are no longer sourced to the exact tile you
fell into crit at
fix: Abductors glands are less likely to become invisible or look wrong
fix: Ethereal hearts are less likely to become invisible or look wrong,
and now properly spawn with their shine overlay
image: Adds heartbeat animation to beating Ethereal Hearts
/:cl:

* Heart code cleanup

---------

Co-authored-by: MrMelbert <[email protected]>
@Iajret Iajret merged commit 0cf6971 into master Nov 15, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-25019 branch November 15, 2023 09:44
AnywayFarus added a commit that referenced this pull request Nov 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants