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

/tg/ Status Effects Prelude D - Mob Freeze Refactor #4878

Merged
merged 5 commits into from
Nov 15, 2023

Conversation

fira
Copy link
Member

@fira fira commented Nov 8, 2023

About the pull request

Another bit split off #4828 - this implements TRAIT_IMMOBILIZED partially by using it to replace freeze functionality. It does not include all the interactions with other traits because they're not yet in this version.

Explain why it's good for the game

Stops issues with freeze getting stuck thanks to Trait magic.
Also a mandatory passage point toward removing update_canmove in Part 1 PR

Testing Photographs and Procedure

Tested Admin Panel Freeze/Unfreeze, that they were updated timely and not on Lifetick, Runner pounce, and interaction of both of them

Changelog

🆑
fix: Rooting effects should now properly update when stacked and unstacked.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Nov 8, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 8, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 9, 2023
@harryob harryob added this pull request to the merge queue Nov 13, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 13, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Nov 13, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 13, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@harryob harryob added this pull request to the merge queue Nov 15, 2023
Merged via the queue into cmss13-devs:master with commit 533e8ed Nov 15, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants