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

Ports timed_action_flags & centralizes do_afters #2865

Merged
merged 16 commits into from
Jun 2, 2024

Conversation

Tsar-Salat
Copy link
Contributor

@Tsar-Salat Tsar-Salat commented Mar 26, 2024

Ports:

Fix to #2899

About The Pull Request

This PR moves unique do_after behavior under a flag system.

It also deletes do_mob & do_atom, and centralizes them under do_after

Why It's Good For The Game

Makes do_after behavior much more granular and easy to edit. Flag systems are straight forward, and the docs I added tell you exactly what their behavior is.

do_mob and do_atom are essentially just snowflake versions of do_after, its much cleaner just to put em under the same umbrella.

Changelog

🆑 rkz, Benjamin(benbot16), Rohesie, Qustinnus, jlsnow301
refactor: refactored do_afters to use timed_action_flags for unique args
code: centralized do_mob and do_atom into do_after
/:cl:

@github-actions github-actions bot added DME Edit Code change Watch something violently break. labels Mar 26, 2024
@Tsar-Salat
Copy link
Contributor Author

Tsar-Salat commented Mar 26, 2024

Hm, you guys had do_after_mob as a result of Rohesie's 2020 mobility refactor, which bee never finished. I need to make more adjustments

@Tsar-Salat Tsar-Salat marked this pull request as draft March 26, 2024 19:41
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Mar 27, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Apr 16, 2024
@Tsar-Salat Tsar-Salat marked this pull request as ready for review April 17, 2024 18:12
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Apr 19, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Apr 22, 2024
@Tsar-Salat Tsar-Salat mentioned this pull request Apr 22, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label May 13, 2024
Copy link
Contributor

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

Copy link
Member

@Sun-Soaked Sun-Soaked left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, fix conflicts and I'll get it in

@Sun-Soaked Sun-Soaked requested a review from FalloutFalcon as a code owner June 2, 2024 11:21
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 2, 2024
Signed-off-by: Sun-Soaked <[email protected]>
@Sun-Soaked Sun-Soaked added this pull request to the merge queue Jun 2, 2024
Merged via the queue into shiptest-ss13:master with commit 41aedd0 Jun 2, 2024
14 checks passed
SomeguyManperson added a commit that referenced this pull request Jun 5, 2024
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 2024
Ports:
- tgstation/tgstation#54409
- tgstation/tgstation#55172
- BeeStation/BeeStation-Hornet#8635
- BeeStation/BeeStation-Hornet#8678

Fix to shiptest-ss13#2899
- tgstation/tgstation#82413

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

This PR moves unique do_after behavior under a flag system.

It also deletes do_mob & do_atom, and centralizes them under do_after

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Makes do_after behavior much more granular and easy to edit. Flag
systems are straight forward, and the docs I added tell you exactly what
their behavior is.

do_mob and do_atom are essentially just snowflake versions of do_after,
its much cleaner just to put em under the same umbrella.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl: rkz, Benjamin(benbot16), Rohesie, Qustinnus, jlsnow301
refactor: refactored do_afters to use timed_action_flags for unique args
code: centralized do_mob and do_atom into do_after
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Sun-Soaked <[email protected]>
Co-authored-by: Sun-Soaked <[email protected]>
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. DME Edit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants