Stunnable New Status and Cleanup #38618
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
S: Untriaged
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
S: Merge Conflict
|
Me when I forget to update my master branch x2 |
github-actions
bot
removed
the
S: Merge Conflict
TheShuEd
reviewed
Jun 27, 2025
|
What the fuck is causing this test fail goddamn |
TheShuEd
reviewed
Jun 27, 2025
Content.Shared/Movement/Components/SlowdownStatusEffectComponent.cs
Outdated
Show resolved
Hide resolved
|
|
|
Also need remove all yml references to removed old status effects |
|
you can use #38620 |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
S: Merge Conflict
github-actions
bot
removed
the
S: Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
S: Merge Conflict
# Conflicts: # Content.Server/Stunnable/Systems/StunOnCollideSystem.cs # Content.Shared/Bed/Sleep/SleepingSystem.cs # Content.Shared/Movement/Systems/MovementModStatusSystem.cs # Content.Shared/Slippery/SlipperySystem.cs # Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs # Content.Shared/Stunnable/SharedStunSystem.cs # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml
github-actions
bot
removed
the
S: Merge Conflict
Fildrance
requested changes
Jul 20, 2025
There was a problem hiding this comment.
Kinda okay but i want to talk about that StunnedStatusEffectComponent.Remove flag.
Other then that - i am pretty much ready to approve :3
Testing is a bit hard, i think. The whole thing can be nice with some admin commands? Not in this PR but in following stuff. I had to change timers on falsh and on vomiting to do my testing, and it worked.
PJBot
added
S: Awaiting Changes
…' into stunnable-new-status-and-cleanup
PJBot
added
the
S: Approved
Fildrance
added
S: Needs Review
TheShuEd
approved these changes
Jul 21, 2025
PJBot
removed
the
S: Needs Review
ScarKy0
approved these changes
Jul 21, 2025
ScarKy0
approved these changes
Jul 21, 2025
|
PR so good i approved twice (somehow) |
FairlySadPanda
pushed a commit
to FairlySadPanda/honk-station-15
that referenced
this pull request
Jul 25, 2025
Co-authored-by: Princess Cheeseballs <[email protected]> Co-authored-by: pa.pecherskij <[email protected]>
Princess-Cheeseballs
added a commit
to Princess-Cheeseballs/space-station-14
that referenced
this pull request
Aug 1, 2025
Co-authored-by: Princess Cheeseballs <[email protected]> Co-authored-by: pa.pecherskij <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Helps with: #38575
Requires: #38617
Requires: #38660
Project Zero warnings PR basically.
Cleaned up every warning in Stunnable and moved Stun and Knockdown to New Status
Moved SlowedDown to its own system in Movement and updated it to the new status system.
Got rid of a number of miscellaneous warnings in areas I was touching anyways.
Should be compatible with: #36881 (Although I'll have to eat some fat merge conflicts)
Why / Balance
Warnings bad, new status good.
New status good, warnings bad.
Technical details
Media
Requirements
Breaking changes
TrySlowdown and relevant components have been moved to MovementModStatusSystem in the Movement folder.
TrySlowdown has had its refresh bool moved to the end of the component to match how other status effects work.
TrySlowdown has been renamed to TryModMovement.
Changelog
no cl no fun