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.

Sign up for GitHub

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

Jump to bottom

HealingSystem: check blood restoration, staunching #33526

Merged
merged 3 commits into from
Feb 5, 2025
Merged

HealingSystem: check blood restoration, staunching #33526

merged 3 commits into from
Feb 5, 2025

Conversation

whatston3
Copy link
Contributor

About the PR

Healing objects now check for possible blood restoration or bleeding reduction when checking whether or not to allow or repeat healing.

Why / Balance

Fixes #28831.

Porting new-frontiers-14/frontier-station-14#2457.

Technical details

The conditions of HasDamage now check bleeding reduction and target bleeding, and blood restoration and target blood loss.

Media

A video reproducing the steps for #28831 in the test map. The moth is struck with a 200 dmg bang stick, and gauze is applied, stopping the moth's bleeding despite the moth having no pierce or slash damage. The bloodpack is then applied, and repeats successfully, despite the moth having no bloodloss damage.

2024-11-24.14-29-56.mp4

Requirements

Breaking changes

Changelog

🆑

  • tweak: Healing items that reduce bleeding can now be applied to undamaged mobs.

@whatston3 whatston3 requested a review from Jezithyr as a code owner November 24, 2024 19:40
@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/S Denotes a PR that changes 10-99 lines. labels Nov 24, 2024
@whatston3 whatston3 mentioned this pull request Nov 24, 2024
Merged
2 tasks
@beck-thompson beck-thompson added P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. T: New Feature Type: New feature or content, or extending existing content D3: Low Difficulty: Some codebase knowledge required. A: General Interactions Area: General in-game interactions that don't relate to another area. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Nov 24, 2024
@Plykiya
Copy link
Contributor

Plykiya commented Nov 25, 2024

does this stop repeated healing with gauze for pierce damage if they happened to be bleeding?

@whatston3
Copy link
Contributor Author

whatston3 commented Nov 25, 2024 •
edited
Loading

does this stop repeated healing with gauze for pierce damage if they happened to be bleeding?

No. I think you'll need extra state for that - bleeding reduction, blood restoration, and damage healing are all treated as equally important in all cases (edit: on the current state of the branch).

@whatston3
Copy link
Contributor Author

does this stop repeated healing with gauze for pierce damage if they happened to be bleeding?

Here's a changeset that would do that: https://github.com/space-wizards/space-station-14/compare/master...whatston3:2024-11-24-healingsystem-bleeding-damage-types?expand=1

@KashRas2
Copy link

Frontier is licensed for AGPL3. Does it means that this pr will change licence?

@whatston3
Copy link
Contributor Author

I wrote this, I am making this contribution to this repo under the MIT license.

MilonPL
MilonPL reviewed Jan 20, 2025
View reviewed changes
@whatston3
Copy link
Contributor Author

Thanks for the review, I'll make the changes in a bit.

@whatston3
Copy link
Contributor Author

Suggestions made where appropriate.

beck-thompson
beck-thompson requested changes Jan 21, 2025
View reviewed changes
Copy link
Contributor

@beck-thompson beck-thompson left a comment

Choose a reason for hiding this comment

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

Minor style changes rest looks good 👍

The double popup thing is annoying but I think that's kind of out of scope for this PR

beck-thompson
beck-thompson approved these changes Jan 21, 2025
View reviewed changes
Copy link
Contributor

@beck-thompson beck-thompson left a comment

Choose a reason for hiding this comment

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

Looks great! 👍

@beck-thompson beck-thompson added the S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. label Jan 21, 2025
@MilonPL MilonPL merged commit 5092681 into space-wizards:master Feb 5, 2025
13 checks passed
@insoPL insoPL mentioned this pull request Feb 5, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MilonPL MilonPL MilonPL approved these changes

@beck-thompson beck-thompson beck-thompson approved these changes

@Jezithyr Jezithyr Awaiting requested review from Jezithyr

Assignees
No one assigned
Labels
A: General Interactions Area: General in-game interactions that don't relate to another area. D3: Low Difficulty: Some codebase knowledge required. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. S: Needs Review Status: Requires additional reviews before being fully accepted size/S Denotes a PR that changes 10-99 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Excessive brute damage causes bleeding, yet there is no way to stop bleeding caused by brute
5 participants
@whatston3 @Plykiya @KashRas2 @MilonPL @beck-thompson