-
Notifications
You must be signed in to change notification settings - Fork 69
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
[MIRROR] Fixes hallucination destroy runtime (#70512) #814
Merged
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
Fixes hallucination destroy runtime (#70512) Co-authored-by: ShizCalev <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Nov 25, 2023
Iajret
pushed a commit
that referenced
this pull request
May 6, 2024
* Ports effigy-se #814 * Implements all non-signal related suggestions in preparation for the shuffling * Moves around everything but the attack logic * oops * compile fix, removes the attack signal * Replaces currently_leashed with a weakref to the component; maintains attack(), implements the rest of the signal suggestions * mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm * Fixes - New Bugs; Accidentally Comitting Something I shouldn't have; but fixes all but leash creation for realsies. And the balloon alert for unleashing * remove_leash is the final runtime issue(tm) and the final problem in general assuming everything else looks good * All but a runtime (remove shog debug before unmarking draft) * This is apparently redundant behavior. * Kill the debug prefs bypass * will this keep the good runtimes down? * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm Co-authored-by: Bloop <[email protected]> * h! * Fixes weakref implementation (oorah) * Functional! * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm Co-authored-by: Bloop <[email protected]> * mmmmmmmmmmmm * Fix dropped message; Add Resist/OOC Escape Functionality * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm CI already fails so I'm pulling this unpatched (needs to call owner's breakouttime; not it's own) so I can bulk fix 'em all at once Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm Co-authored-by: Bloop <[email protected]> * Fixes, To Test * By god; but is that (cascade) ugly! Get in here before- * mmm can you tell i'm getting tired * i did it AGAIN lmaooo. let's be glad i'm not coding something important like that jobs refactor from 2021 * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm --------- Co-authored-by: Bloop <[email protected]>
Iajret
pushed a commit
that referenced
this pull request
May 6, 2024
* Ports effigy-se #814 * Implements all non-signal related suggestions in preparation for the shuffling * Moves around everything but the attack logic * oops * compile fix, removes the attack signal * Replaces currently_leashed with a weakref to the component; maintains attack(), implements the rest of the signal suggestions * mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm * Fixes - New Bugs; Accidentally Comitting Something I shouldn't have; but fixes all but leash creation for realsies. And the balloon alert for unleashing * remove_leash is the final runtime issue(tm) and the final problem in general assuming everything else looks good * All but a runtime (remove shog debug before unmarking draft) * This is apparently redundant behavior. * Kill the debug prefs bypass * will this keep the good runtimes down? * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm * h! * Fixes weakref implementation (oorah) * Functional! * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm * mmmmmmmmmmmm * Fix dropped message; Add Resist/OOC Escape Functionality * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm CI already fails so I'm pulling this unpatched (needs to call owner's breakouttime; not it's own) so I can bulk fix 'em all at once * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm * Fixes, To Test * By god; but is that (cascade) ugly! Get in here before- * mmm can you tell i'm getting tired * i did it AGAIN lmaooo. let's be glad i'm not coding something important like that jobs refactor from 2021 * Update modular_nova/modules/modular_items/lewd_items/code/lewd_items/leash.dm --------- Co-authored-by: BluBerry016 <[email protected]> Co-authored-by: Bloop <[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#25239
ORIGINAL PR: tgstation/tgstation#70512
Went to fix this upstream, only to find it has already been fixed. Thanks a lot, mirror bot.
Changelog
🆑 ShizCalev
fix: Fixed a minor runtime when hallucinations are ending.
/:cl: