-
-
Notifications
You must be signed in to change notification settings - Fork 549
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ports timed_action_flags & centralizes do_afters (#2865)
Ports: - tgstation/tgstation#54409 - tgstation/tgstation#55172 - BeeStation/BeeStation-Hornet#8635 - BeeStation/BeeStation-Hornet#8678 Fix to #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. --> ## 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 <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## 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. <!-- 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. --> ## Changelog :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]>
- Loading branch information
1 parent
861735d
commit 41aedd0
Showing
83 changed files
with
230 additions
and
348 deletions.
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
#define DOAFTER_SOURCE_SURGERY "doafter_surgery" | ||
#define DOAFTER_SOURCE_MECHADRILL "doafter_mechadrill" | ||
#define DOAFTER_SOURCE_SURVIVALPEN "doafter_survivalpen" | ||
#define DOAFTER_SOURCE_GETTING_UP "doafter_gettingup" |
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// timed_action_flags parameter for 'proc/do_after' | ||
|
||
// The user can move freely without canceling the do_after | ||
#define IGNORE_USER_LOC_CHANGE (1<<0) | ||
// The target can move freely without canceling the do_after | ||
#define IGNORE_TARGET_LOC_CHANGE (1<<1) | ||
/// Can do the action even if the item is no longer being held | ||
#define IGNORE_HELD_ITEM (1<<2) | ||
/// Can do the action even if the mob is incapacitated | ||
#define IGNORE_INCAPACITATED (1<<3) |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.