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] immortal heart attack fix #2953

Merged
merged 1 commit into from
Apr 19, 2024
Merged

[MIRROR] immortal heart attack fix #2953

merged 1 commit into from
Apr 19, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#2069
Original PR: tgstation/tgstation#82738

About The Pull Request

cybernetic hearts no longer permanently break when you die, as they would try to restart after you get revived but then the proc to stop the heart attack would get early returned because the heart is immune to heart attacks

Why It's Good For The Game

having to explode to revive because of surplus heart seems like a bug

Changelog

🆑 TheRyeGuyWhoWillNowDie
fix: being revived with a cyber-heart now properly restarts the cyber heart
/:cl:

* immortal heart attack fix (#82738)

## About The Pull Request

cybernetic hearts no longer permanently break when you die, as they
would try to restart after you get revived but then the proc to stop the
heart attack would get early returned because the heart is immune to
heart attacks

## Why It's Good For The Game

having to explode to revive because of surplus heart seems like a bug

## Changelog
:cl:
fix: being revived with a cyber-heart now properly restarts the cyber
heart
/:cl:

---------

Co-authored-by: MrMelbert <[email protected]>

* immortal heart attack fix

---------

Co-authored-by: TheRyeGuyWhoWillNowDie <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
@ReezeBL ReezeBL merged commit d222bcb into master Apr 19, 2024
27 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-2069 branch April 19, 2024 07:18
AnywayFarus added a commit that referenced this pull request Apr 19, 2024
Iajret pushed a commit that referenced this pull request Jun 11, 2024
* FREE MAINTDRONE STORAGE

Give maint drones their dufflebag instead of a meme'd in backpack that
can't store shit

* FIX TYPES

I'm dumb

* Add extra items to the drone duffelbag

Forgot the t-ray scanner, gas analyzer and pipe dispenser from the
starting bag. Also nixxes a leftover initialize proc for the bag.

---------

Co-authored-by: Gear <[email protected]>
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