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

Overhauls pain message/status displaying, fixes oxyloss. #9173

Merged
merged 3 commits into from
Jun 27, 2020

Conversation

NonQueueingMatt
Copy link
Contributor

Pain message/status displaying has been unified into custom_pain. This might cause some weirdness with when people go unconscious or get paralysis from excessive pain.

Oxyloss has been fixed and so has the oxygen damage overlay, which is now back. I'm not sure of the actual impact this has on damage.

Also added a fullscreen BIG RED overlay when you have BIG PAIN.

@NonQueueingMatt NonQueueingMatt added the Test Merge Candidate The PR is eligible for test merging. label Jun 19, 2020
@BotBOREALIS BotBOREALIS added the Sprites Adds new or changes existing sprites. label Jun 19, 2020
@NonQueueingMatt
Copy link
Contributor Author

!review

@skull132 skull132 merged commit b132f45 into Aurorastation:master Jun 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting Merge Sprites Adds new or changes existing sprites. Test Merge Candidate The PR is eligible for test merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants