[TG Mirror] Fixes two improper calls to ADD_TRAIT (magic mirror, robo customer) #150
Conversation
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
…stomer) [MDB IGNORE] (#24426) * Fixes two improper calls to ADD_TRAIT (magic mirror, robo customer) (#79072) ## About The Pull Request `ADD_TRAIT` doesn't take a list ## Changelog :cl: Melbert fix: Magic Mirrors properly prevent you from being soft locked fix: Robo customers are as robust as before /:cl: * Fixes two improper calls to ADD_TRAIT (magic mirror, robo customer) --------- Co-authored-by: MrMelbert <[email protected]>
Steals-The-PRs
added a commit
that referenced
this pull request
Oct 19, 2023
Iajret
pushed a commit
that referenced
this pull request
Jan 3, 2024
…150) * Fixes AI behavior with breaking cuffs and resisting aggressive grabs (#80328) ## About The Pull Request Makes it so that ai's recognize they're in a do_after after resisting, preventing them from processing and interrupting the do_after while they're in a condition that necessitates it. If it gets interrupted then they'll process as normal, or if they finish they'll be free. ## Why It's Good For The Game Monkeys can now resist things that they should've been, such as aggressive grabs or cuffs, instead of having their ai completely freeze when they're cuffed. ## Changelog :cl: fix: ai can now tell if it is in a do_after for resisting and will not interrupt it. monkeys also now don't freeze up when aggressively grabbed and will resist out of those and cuffs. /:cl: * Fixes AI behavior with breaking cuffs and resisting aggressive grabs --------- Co-authored-by: Diamond_ <[email protected]> Co-authored-by: NovaBot <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24426
Original PR: tgstation/tgstation#79072
About The Pull Request
ADD_TRAITdoesn't take a listChangelog
🆑 Melbert
fix: Magic Mirrors properly prevent you from being soft locked
fix: Robo customers are as robust as before
/:cl: