Byrd-Station/Byrd
Byrd-Station/Byrd
Watch
4
5
Fork
You've already forked Byrd
 22
Code Issues 33 Pull requests 35 Projects 1 Wiki Activity Actions 37

Fixed some more missed softcrit cases #1008

Merged
EchoOfNothing merged 9 commits from QuillTheCreature/Byrd:entities/crewmon/softcritfix into master 2026-10-11 11:23:25 +00:00
Conversation 2 Commits 9 Files changed 9 +19 -10
QuillTheCreature commented 2026-10-08 18:35:02 +00:00
Member

Short description

This PR fixes a couple softcrit related issues where things haven't been upgraded form checking MobState.Critical to MobState.SoftCritical:

  • Crew (and command) monitors showing bad values.
    The monitor hasn't been updated to work with soft crits, so the damage threshold was calculated incorrectly and was set way too high, resulting in the monitor showing "Poor" instead of "Crit".
    This PR adjusts the damage threshold calculation to first check for soft crit and if that doesn't check then it falls back to normal crit values.
    (Yes I'm also aware that when a creature just fell into critical the monitor still shows "Bad" until they get a couple more damage points. This is the same in upstream.)

  • BSOs trackers didn't notify the BSO if someone goes from alive to soft critical.

  • Auto Injectors did not trigger when going from alive to soft critical.

  • Berserker implant now prevents the user from going into soft critical while it is active.

  • Changeling statis now uses soft critical as critical time value.

  • Jumpstart heart now uses soft critical and critical checks.

  • Sprinting system stops sprinting when going into soft crits.

Why we need to add this

Bugfix

Media (Video/Screenshots)

image
image
image

image

Checklist

Ingame Changelog

🆑 Quill

  • fix: Crew and Command monitor now show crews health states properly.
  • fix: BSO tracker now properly notifies about command members who are in soft critical state.
  • fix: Clothing Autoinjectors now properly trigger when the wearer goes into soft critical state.
  • fix: Berserker Implant now properly prevents the user from going into soft critical while it is active.
  • fix: Changling statis now counts it's stasis time based on soft critical.
  • fix: Jumpstart heart now checks for soft critical as well.
  • fix: Sprinting stops when going into soft critical.
<!-- Link definitions, do not edit --> [guidelines]: https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html [ruleset]: https://rules.byrdstation.space/#h.vigrxrnffwji ## Short description This PR fixes a couple softcrit related issues where things haven't been upgraded form checking `MobState.Critical` to `MobState.SoftCritical`: * Crew (and command) monitors showing bad values. The monitor hasn't been updated to work with soft crits, so the damage threshold was calculated incorrectly and was set way too high, resulting in the monitor showing "Poor" instead of "Crit". This PR adjusts the damage threshold calculation to first check for soft crit and if that doesn't check then it falls back to normal crit values. (Yes I'm also aware that when a creature just fell into critical the monitor still shows "Bad" until they get a couple more damage points. This is the same in upstream.) * BSOs trackers didn't notify the BSO if someone goes from alive to soft critical. * Auto Injectors did not trigger when going from alive to soft critical. * Berserker implant now prevents the user from going into soft critical while it is active. * Changeling statis now uses soft critical as critical time value. * Jumpstart heart now uses soft critical and critical checks. * Sprinting system stops sprinting when going into soft crits. ## Why we need to add this Bugfix ## Media (Video/Screenshots) ![image](/attachments/1e1b834e-154f-4e91-9805-214beb26958d) ![image](/attachments/37567315-c090-4f72-b471-7f9d44f8bdd2) ![image](/attachments/c5e98d7f-a295-430d-81fb-69ae73edfc48) ![image](/attachments/d59eadad-dd4a-48ed-b0cc-41cf00cbc218) ## Checklist <!-- Check boxes for faster reviewing of your PR --> - [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]. ### Ingame Changelog :cl: Quill - fix: Crew and Command monitor now show crews health states properly. - fix: BSO tracker now properly notifies about command members who are in soft critical state. - fix: Clothing Autoinjectors now properly trigger when the wearer goes into soft critical state. - fix: Berserker Implant now properly prevents the user from going into soft critical while it is active. - fix: Changling statis now counts it's stasis time based on soft critical. - fix: Jumpstart heart now checks for soft critical as well. - fix: Sprinting stops when going into soft critical.
image.png
22 KiB
image.png
48 KiB
image.png
47 KiB
image.png
39 KiB
Fixed crew monitors not calculating critical state properly for creatures with soft crit
Some checks failed
Close PRs on master / run (pull_request_target) Has been skipped
Details
Labels: PR / labeler (pull_request_target) Successful in 5s
Details
Labels: Size / size-label (pull_request_target) Failing after 4s
Details
CRLF Check / CRLF Check (pull_request) Successful in 36s
Details
Test Packaging / Test Packaging (pull_request) Successful in 13m24s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Successful in 46s
Details
RSI Validator / Validate RSIs (pull_request) Successful in 45s
Details
Map file schema validator / YAML map schema validator (pull_request) Successful in 5m27s
Details
YAML Linter / YAML Linter (pull_request) Successful in 5m24s
Details
0c8310670d
Fixed bso relayed death rattle system not checking for soft crits
Some checks failed
Labels: PR / labeler (pull_request_target) Failing after 10s
Details
Labels: Size / size-label (pull_request_target) Successful in 52s
Details
CRLF Check / CRLF Check (pull_request) Successful in 37s
Details
Test Packaging / Test Packaging (pull_request) Successful in 13m57s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Successful in 49s
Details
RSI Validator / Validate RSIs (pull_request) Successful in 45s
Details
Map file schema validator / YAML map schema validator (pull_request) Successful in 5m32s
Details
YAML Linter / YAML Linter (pull_request) Successful in 5m22s
Details
6af1fd2336
QuillTheCreature changed title from Fixed crew monitors not calculating critical state properly for creatures with soft crit to Fixed some more missed softcrit cases 2026-10-10 15:26:25 +00:00
Clothing auto injectors now properly handle soft critical
Some checks failed
Labels: PR / labeler (pull_request_target) Has been cancelled
Details
Labels: Size / size-label (pull_request_target) Has been cancelled
Details
CRLF Check / CRLF Check (pull_request) Has been cancelled
Details
Test Packaging / Test Packaging (pull_request) Has been cancelled
Details
RGA schema validator / YAML RGA schema validator (pull_request) Has been cancelled
Details
RSI Validator / Validate RSIs (pull_request) Has been cancelled
Details
Map file schema validator / YAML map schema validator (pull_request) Has been cancelled
Details
YAML Linter / YAML Linter (pull_request) Has been cancelled
Details
967d4e1bd3
QuillTheCreature force-pushed entities/crewmon/softcritfix from 967d4e1bd3
Some checks failed
Labels: PR / labeler (pull_request_target) Has been cancelled
Details
Labels: Size / size-label (pull_request_target) Has been cancelled
Details
CRLF Check / CRLF Check (pull_request) Has been cancelled
Details
Test Packaging / Test Packaging (pull_request) Has been cancelled
Details
RGA schema validator / YAML RGA schema validator (pull_request) Has been cancelled
Details
RSI Validator / Validate RSIs (pull_request) Has been cancelled
Details
Map file schema validator / YAML map schema validator (pull_request) Has been cancelled
Details
YAML Linter / YAML Linter (pull_request) Has been cancelled
Details
to 3b609a41c2
Some checks failed
Labels: PR / labeler (pull_request_target) Has been cancelled
Details
Labels: Size / size-label (pull_request_target) Has been cancelled
Details
CRLF Check / CRLF Check (pull_request) Has been cancelled
Details
Test Packaging / Test Packaging (pull_request) Has been cancelled
Details
RGA schema validator / YAML RGA schema validator (pull_request) Has been cancelled
Details
RSI Validator / Validate RSIs (pull_request) Has been cancelled
Details
Map file schema validator / YAML map schema validator (pull_request) Has been cancelled
Details
YAML Linter / YAML Linter (pull_request) Has been cancelled
Details
2026-10-10 15:29:09 +00:00 Compare
Berserker implant handles soft critical now
Some checks failed
Labels: PR / labeler (pull_request_target) Successful in 7s
Details
Labels: Size / size-label (pull_request_target) Successful in 3s
Details
CRLF Check / CRLF Check (pull_request) Successful in 35s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Has been cancelled
Details
RSI Validator / Validate RSIs (pull_request) Has been cancelled
Details
Map file schema validator / YAML map schema validator (pull_request) Has been cancelled
Details
YAML Linter / YAML Linter (pull_request) Has been cancelled
Details
Test Packaging / Test Packaging (pull_request) Has been cancelled
Details
01a289674b
Fixed changling stasis time now using soft critical
Some checks failed
Labels: PR / labeler (pull_request_target) Successful in 6s
Details
Labels: Size / size-label (pull_request_target) Successful in 4s
Details
Test Packaging / Test Packaging (pull_request) Has been cancelled
Details
RGA schema validator / YAML RGA schema validator (pull_request) Has been cancelled
Details
RSI Validator / Validate RSIs (pull_request) Has been cancelled
Details
Map file schema validator / YAML map schema validator (pull_request) Has been cancelled
Details
YAML Linter / YAML Linter (pull_request) Has been cancelled
Details
CRLF Check / CRLF Check (pull_request) Has been cancelled
Details
96c72fa250
QuillTheCreature force-pushed entities/crewmon/softcritfix from 96c72fa250
Some checks failed
Labels: PR / labeler (pull_request_target) Successful in 6s
Details
Labels: Size / size-label (pull_request_target) Successful in 4s
Details
Test Packaging / Test Packaging (pull_request) Has been cancelled
Details
RGA schema validator / YAML RGA schema validator (pull_request) Has been cancelled
Details
RSI Validator / Validate RSIs (pull_request) Has been cancelled
Details
Map file schema validator / YAML map schema validator (pull_request) Has been cancelled
Details
YAML Linter / YAML Linter (pull_request) Has been cancelled
Details
CRLF Check / CRLF Check (pull_request) Has been cancelled
Details
to feb932c82e
Some checks failed
Labels: PR / labeler (pull_request_target) Successful in 4s
Details
Labels: Size / size-label (pull_request_target) Successful in 3s
Details
CRLF Check / CRLF Check (pull_request) Successful in 34s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Has been cancelled
Details
RSI Validator / Validate RSIs (pull_request) Has been cancelled
Details
Map file schema validator / YAML map schema validator (pull_request) Has been cancelled
Details
YAML Linter / YAML Linter (pull_request) Has been cancelled
Details
Test Packaging / Test Packaging (pull_request) Has been cancelled
Details
2026-10-10 16:25:20 +00:00 Compare
Fixed jumpstart heart not triggering because of soft critical check in inject on mob state
Some checks failed
Labels: PR / labeler (pull_request_target) Successful in 7s
Details
Labels: Size / size-label (pull_request_target) Successful in 3s
Details
CRLF Check / CRLF Check (pull_request) Successful in 35s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Has been cancelled
Details
RSI Validator / Validate RSIs (pull_request) Has been cancelled
Details
Map file schema validator / YAML map schema validator (pull_request) Has been cancelled
Details
YAML Linter / YAML Linter (pull_request) Has been cancelled
Details
Test Packaging / Test Packaging (pull_request) Has been cancelled
Details
c0f5eb835a
Stop sprinting when going into soft crits
All checks were successful
Labels: PR / labeler (pull_request_target) Successful in 4s
Details
Labels: Size / size-label (pull_request_target) Successful in 3s
Details
CRLF Check / CRLF Check (pull_request) Successful in 39s
Details
Test Packaging / Test Packaging (pull_request) Successful in 14m2s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Successful in 41s
Details
RSI Validator / Validate RSIs (pull_request) Successful in 45s
Details
Map file schema validator / YAML map schema validator (pull_request) Successful in 5m42s
Details
YAML Linter / YAML Linter (pull_request) Successful in 5m3s
Details
91d48a596c
Fixed heretic nightwatcher ash ability to work with soft and hard critical targets
Some checks failed
Labels: PR / labeler (pull_request_target) Successful in 5s
Details
Labels: Size / size-label (pull_request_target) Successful in 3s
Details
Test Packaging / Test Packaging (pull_request) Has been cancelled
Details
RGA schema validator / YAML RGA schema validator (pull_request) Has been cancelled
Details
RSI Validator / Validate RSIs (pull_request) Has been cancelled
Details
Map file schema validator / YAML map schema validator (pull_request) Has been cancelled
Details
YAML Linter / YAML Linter (pull_request) Has been cancelled
Details
CRLF Check / CRLF Check (pull_request) Has been cancelled
Details
268833fb3c
QuillTheCreature force-pushed entities/crewmon/softcritfix from 268833fb3c
Some checks failed
Labels: PR / labeler (pull_request_target) Successful in 5s
Details
Labels: Size / size-label (pull_request_target) Successful in 3s
Details
Test Packaging / Test Packaging (pull_request) Has been cancelled
Details
RGA schema validator / YAML RGA schema validator (pull_request) Has been cancelled
Details
RSI Validator / Validate RSIs (pull_request) Has been cancelled
Details
Map file schema validator / YAML map schema validator (pull_request) Has been cancelled
Details
YAML Linter / YAML Linter (pull_request) Has been cancelled
Details
CRLF Check / CRLF Check (pull_request) Has been cancelled
Details
to 91d48a596c
All checks were successful
Labels: PR / labeler (pull_request_target) Successful in 4s
Details
Labels: Size / size-label (pull_request_target) Successful in 3s
Details
CRLF Check / CRLF Check (pull_request) Successful in 39s
Details
Test Packaging / Test Packaging (pull_request) Successful in 14m2s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Successful in 41s
Details
RSI Validator / Validate RSIs (pull_request) Successful in 45s
Details
Map file schema validator / YAML map schema validator (pull_request) Successful in 5m42s
Details
YAML Linter / YAML Linter (pull_request) Successful in 5m3s
Details
2026-10-10 17:12:12 +00:00 Compare
EchoOfNothing reviewed 2026-10-11 10:49:54 +00:00
Content.Goobstation.Server/Clothing/ClothingAutoInjector/ClothingAutoinjectorSystem.cs Outdated
@ -71,3 +71,3 @@
private void OnInject(EntityUid uid, ClothingAutoInjectComponent comp, InventoryRelayedEvent<ClothingAutoInjectRelayedEvent> args)
{
if (args.Args.NewState != MobState.Critical
if (args.Args.NewState != MobState.Critical && args.Args.NewState != MobState.SoftCritical // Byrd - Soft critical
EchoOfNothing commented 2026-10-11 10:18:20 +00:00
Owner

This (and other places) doesn't inject on change to HardCritical on purpose or?

This (and other places) doesn't inject on change to `HardCritical` on purpose or?
QuillTheCreature commented 2026-10-11 11:01:21 +00:00
Author
Member

Oh I was under the impression that a mob always goes through all states doesn't matter how much damage they receive.

So it'd always go from alive -> soft -> hard -> dead.

But I just tested it and got from alive -> dead via the gib stick so I'll update all of those to also take hard crit into account.

Oh I was under the impression that a mob always goes through all states doesn't matter how much damage they receive. So it'd always go from alive -> soft -> hard -> dead. But I just tested it and got from alive -> dead via the gib stick so I'll update all of those to also take hard crit into account.
QuillTheCreature marked this conversation as resolved
Include checks for hard crit in all of those too
All checks were successful
Labels: PR / labeler (pull_request_target) Successful in 45s
Details
Labels: Size / size-label (pull_request_target) Successful in 3s
Details
CRLF Check / CRLF Check (pull_request) Successful in 33s
Details
Test Packaging / Test Packaging (pull_request) Successful in 13m53s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Successful in 45s
Details
RSI Validator / Validate RSIs (pull_request) Successful in 42s
Details
PR Changelogs / changelog (pull_request_target) Successful in 1m9s
Details
Map file schema validator / YAML map schema validator (pull_request) Successful in 5m21s
Details
YAML Linter / YAML Linter (pull_request) Successful in 4m50s
Details
7658d895cc
EchoOfNothing approved these changes 2026-10-11 11:20:48 +00:00
EchoOfNothing left a comment

LGTM. Thank you for your contribution!

LGTM. Thank you for your contribution!
byrdbot referenced this pull request from a commit 2026-10-11 11:24:36 +00:00
Automatic changelog update (#1008)
Sign in to join this conversation.
Reviewers
No reviewers
EchoOfNothing
Labels
Clear labels   
Area/Accessibility
Area: Accessibility settings and features.

  
Area/Admin Tooling
Area: Admin tooling and moderation

  
Area/Art
Area: Art with no implications for other areas.

  
Area/Atmospherics
Area: Atmospherics

  
Area/Cargo
Area: Cargo department and related mechanics

  
Area/Character / Species
Area: Player characters and species features and content.

  
Area/Chat
Area: Chat-related features and changes, most likely technical.

  
Area/Combat
Area: Combat features, changes, balancing.

  
Area/Command
Area: Command department, where it isn't applicable to other departments.

  
Area/Database
Area: Changes to Database code.

  
Area/Engineering
Area: Engineering department, doesn't include Atmospherics.

  
Area/Graphics
Area: Changes to shaders or overlays.

  
Area/Guidebook
Area: Ingame guidebook, content or technical implementation.

  
Area/Mapping
Area: Maps, or tools used for mapping

  
Area/Medical
Area: Medical department, including Chemistr

  
Area/Preferences / Options
Area: Player preferences and options.

  
Area/Roleplay / Lore
Area: Roleplay aspects or content that primarily target the game's lore, rather than mechanics

  
Area/Roundflow / Antag
Area: Roundflow - "What happens in the game", including antagonist roles and their capabilities.

  
Area/Rules
Area: Changes to Server rules, SoP, or Space Law.

  
Area/Salvage
Area: Salvage changes

  
Area/Science
Area: Science department, not including Silicons.

  
Area/Security
Area: Security department, including Detectives, HoS

  
Area/Service
Area: Service department, including cooking, botany, etc

  
Area/Silicons
Area: Relates to Silicon roles, including AI.

  
bug
This is in regards to a bug.

  
Changes: Audio

   
Changes: Map

   
Changes: No C#

   
Changes: Sprites

   
Changes: UI

   
documentation
Improvements or additions to documentation

  
DON'T MERGE
This is under review, fixes, or needs significant changes.

  
duplicate
This issue or pull request already exists

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
holding to vote
This is currently being voted for by the Byrds.

  
Note/Port
A port from another repository.

  
Note/Upstream
A PR from upstream.

  
Priority
Critical
 Critical priority task!!

  
Priority
High
 High priority task

  
Priority
Low
 Low priority task

  
Priority
Normal
 Normal priority task

  
size/L

   
size/M

   
size/S

   
size/XL

   
size/XS

   
State/Approved
This PR has been approved.

  
State/invalid
This doesn't seem right

  
State/Merge Conflict

   
State/Needs Changes
Changes/Concerns have been brought up and should be made before review.

  
State/Needs Discussion
Discussion needed for changes, talk about it.

  
State/Untriaged

   
Type/Balance Change
Changes something in the game related to balancing.

  
Type/Bugfix
Fixes a known issue/bug.

  
Type/Documentation
Makes changes to documentation in the repository. This includes attributions changes.

  
Type/Enhancement
New feature or request, change to game.

  
Type/Feature
Adds completely new stuff to the game.

  
Type/Question
Further information is requested.

  
wontfix
This will not be worked on

No labels
Area/Accessibility
Area/Admin Tooling
Area/Art
Area/Atmospherics
Area/Cargo
Area/Character / Species
Area/Chat
Area/Combat
Area/Command
Area/Database
Area/Engineering
Area/Graphics
Area/Guidebook
Area/Mapping
Area/Medical
Area/Preferences / Options
Area/Roleplay / Lore
Area/Roundflow / Antag
Area/Rules
Area/Salvage
Area/Science
Area/Security
Area/Service
Area/Silicons
bug
Changes: Audio
Changes: Map
Changes: No C#
Changes: Sprites
Changes: UI
documentation
DON'T MERGE
duplicate
good first issue
help wanted
holding to vote
Note/Port
Note/Upstream
Priority
Critical
Priority
High
Priority
Low
Priority
Normal
size/L
size/M
size/S
size/XL
size/XS
State/Approved
State/invalid
State/Merge Conflict
State/Needs Changes
State/Needs Discussion
State/Untriaged
Type/Balance Change
Type/Bugfix
Type/Documentation
Type/Enhancement
Type/Feature
Type/Question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
Byrd-Station/Byrd!1008
No description provided.