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

Broken bones now hurt less on rollerbeds #3024

Merged
merged 4 commits into from
Jun 4, 2024

Conversation

SomeguyManperson
Copy link
Contributor

@SomeguyManperson SomeguyManperson commented May 25, 2024

About The Pull Request

fixes #2968

splints would work for some stuff but they are both uncommon (only spawn in like brute kits/need to be crafted) and don't work on the head or chest. Also gives rollerbeds a niche

Why It's Good For The Game

Life or random damage ticks for broken cat

it's a bit unintuitive that putting someone on a rollerbed won't make them resistant/immune to bone jostling

Changelog

🆑
balance: Rollerbeds stop broken bone damage ticks from occurring while buckled
/:cl:

Signed-off-by: Theos <[email protected]>
Signed-off-by: Theos <[email protected]>
@github-actions github-actions bot added the Code change Watch something violently break. label May 25, 2024
@Anticept
Copy link
Contributor

Anticept commented May 25, 2024

This will also cause fireman carrying, piggybacking, borgriding, and other technically buckled but not really stabilized ways of preventing bone jostling too.

Cant remember if skate/hoverboarding is buckling too.

@SomeguyManperson SomeguyManperson marked this pull request as draft May 26, 2024 00:17
@SomeguyManperson
Copy link
Contributor Author

This will also cause fireman carrying, piggybacking, borgriding, and other technically buckled but not really stabilized ways of preventing bone jostling too.

Cant remember if skate/hoverboarding is buckling too.

I kind of forgot about vehicles

@Anticept
Copy link
Contributor

You should be able to do a simple check to see what they are buckled TO and whitelist.

@SomeguyManperson SomeguyManperson changed the title Update bodyparts.dm Broken bones now cau May 26, 2024
@SomeguyManperson SomeguyManperson changed the title Broken bones now cau Broken bones now hurt less if moved while buckled May 26, 2024
@SomeguyManperson SomeguyManperson marked this pull request as ready for review May 30, 2024 18:31
@SomeguyManperson SomeguyManperson changed the title Broken bones now hurt less if moved while buckled Broken bones now hurt less on rollerbeds May 31, 2024
@FalloutFalcon FalloutFalcon enabled auto-merge June 2, 2024 22:08
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Jun 4, 2024
Merged via the queue into shiptest-ss13:master with commit f463852 Jun 4, 2024
14 checks passed
@Anticept
Copy link
Contributor

Anticept commented Jun 5, 2024

I wanted to come back to this, and suggest a better way to handle, but I didn't make it in time.

I was thinking more about this, and I think for long term maintainability, the true, best way to handle is to check for a flag on an object. Sure, right now we only have rollerbeds, but that might change.

I guess though if that day comes up, it can be changed then.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Roller beds still cause broken bones to jostle
3 participants