Byrd-Station/Byrd

Fork 32

Port Omu CPR Fixes #731

Merged

LilithArson merged 2 commits from duuckie/port-omu-cpr-fixes into master

2026-07-31 21:32:07 +00:00

AGit

Duuckie commented

2026-07-31 09:57:21 +00:00

Contributor

Short description

ports omustation's https://github.com/ProjectOmu/OmuStation/pull/1315 (that i made)

make CPR's fail text show up appropriately instead of leaving you confused as to why you just can't do CPR i guess
fixes minor bug that let you do CPR with a patient that has a mask on
stops people from doing CPR if they're not supposed to continue to do it

Why we need to add this

heavily reduces confusion over why CPR just don't fuckin' work, especially with limiting CPR to only a select few
other aspects are more or less bug fixes

side note, just realized that you CAN trigger the "stop CPR if you're suddenly don't meet the conditions to start CPR" by just pulling up your mask

Media (Video/Screenshots)

Checklist

I do not require assistance to complete the PR.
I have verified that the changes work before posting/requesting review of my PR.
I have added screenshots/videos of the changes, or this PR does not change in-game mechanics.
I have read the Pull Request and Changelog Guidelines and Byrd Station's Contributor Ruleset.

Breaking changes

Ingame Changelog

🆑 Duuckie

fix: CPR shows proper fail text for when you're not able to do it. You can also no longer do CPR through your patient's mask, and you can't continue doing CPR if you suddenly don't meet the conditions to start CPR while mid-CPR.

[guidelines]: https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html [ruleset]: https://rules.byrdstation.space/#h.vigrxrnffwji ## Short description  ports omustation's https://github.com/ProjectOmu/OmuStation/pull/1315 (that i made) make CPR's fail text show up appropriately instead of leaving you confused as to why you just can't do CPR i guess fixes minor bug that let you do CPR with a patient that has a mask on stops people from doing CPR if they're not supposed to continue to do it ## Why we need to add this  heavily reduces confusion over why CPR just don't fuckin' work, especially with limiting CPR to only a select few other aspects are more or less bug fixes side note, just realized that you CAN trigger the "stop CPR if you're suddenly don't meet the conditions to start CPR" by just pulling up your mask ## Media (Video/Screenshots)  <video src="/attachments/e8c63560-f806-4cf4-b2d2-b660235057ee" title="20260731-0953-29.7706617" controls></video> ## Checklist  - [X] I do not require assistance to complete the PR. - [X] I have verified that the changes work before posting/requesting review of my PR. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I have read the [Pull Request and Changelog Guidelines][guidelines] and [Byrd Station's Contributor Ruleset][ruleset]. ## Breaking changes  ### Ingame Changelog  :cl: Duuckie - fix: CPR shows proper fail text for when you're not able to do it. You can also no longer do CPR through your patient's mask, and you can't continue doing CPR if you suddenly don't meet the conditions to start CPR while mid-CPR.

20260731-0953-29.7706617.mp4

90 MiB

Duuckie added 1 commit

2026-07-31 09:57:21 +00:00

Fix CPR Logic & Missing Text (#1315 )

Close PRs on master / run (pull_request_target) Has been skipped

Details

Labels: PR / labeler (pull_request_target) Successful in 6s

Details

Labels: Size / size-label (pull_request_target) Failing after 4s

Details

CRLF Check / CRLF Check (pull_request) Successful in 1m23s

Details

RSI Validator / Validate RSIs (pull_request) Successful in 2m22s

Details

RGA schema validator / YAML RGA schema validator (pull_request) Successful in 5m10s

Details

Map file schema validator / YAML map schema validator (pull_request) Successful in 11m3s

Details

YAML Linter / YAML Linter (pull_request) Successful in 14m45s

Details

Test Packaging / Test Packaging (pull_request) Successful in 36m53s

Details

19adb0d7ba

* fix start CPR logic not checking if target is wearing a mask

* fix the text for failing to start CPR not showing up

it's shitcode and i know it but i don't know a better way to do this

* prevent CPR from continuing if someone blocks your from doing it

did not set attemptfrequency to every tick for performance concerns (as i'm already shitcoding and this might not be so good for the game)

* i meant argument not parameter

arguments are actual, folks

* undo my shitcode for getting the text to show up

* re-implement CPR ingestion text showing up in a non-shitcode way

* Revert "prevent CPR from continuing if someone blocks your from doing it"

This reverts commit abd75c4eac94c459becdfb300b828096405cc5d3.

* re-implement CPR stopping if you don't meet conditions to start CPR

this doesn't have the red interrupt flash though so ehhh whatever at least it's not shitcode

* properly make HasMouthAvailable use nullable out

thought this shit didn't exist but hey it works

no new video because changes are all on backend

* refactored the WHOOOLE fucking thing to properly add in text when interrupted doing CPR

also added lines that make more sense and help reduce ambiguity

* re-add the byte order mark (BOM) to this file to avoid confusing diffs

see also https://en.wikipedia.org/wiki/Byte_order_mark

---------

Co-authored-by: fish <fish@zcx.pw>

Duuckie added 1 commit

2026-07-31 17:29:58 +00:00

kill SPDX on omu's cpr-training-component.ftl

Labels: Size / size-label (pull_request_target) Successful in 5s

Details

Labels: PR / labeler (pull_request_target) Successful in 6s

Details

RSI Validator / Validate RSIs (pull_request) Successful in 2m41s

Details

CRLF Check / CRLF Check (pull_request) Successful in 3m47s

Details

RGA schema validator / YAML RGA schema validator (pull_request) Successful in 3m48s