Create and Destroy! #2141
Merged
Create and Destroy! #2141
Conversation
This file contains hidden or 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
github-actions
bot
added
the
MERGE CONFLICT
…derlin into create_destroy
github-actions
bot
removed
the
MERGE CONFLICT
github-actions
bot
added
the
Mapping
github-actions
bot
removed
the
DO NOT MERGE
CheffieGithub
added
DO NOT MERGE
github-actions
bot
removed
Code Maintenance
grungussuss
reviewed
Jun 6, 2025
|
|
||
| /obj/effect/statclick/proc/cleanup() | ||
| SIGNAL_HANDLER | ||
| qdel(src) |
There was a problem hiding this comment.
can't just qdel this on the parent's destroy?
There was a problem hiding this comment.
Maybe, this is just a blind port from lemon gc fixes
| @@ -468,6 +468,10 @@ GLOBAL_REAL(Master, /datum/controller/master) | |||
| continue | |||
| if ((SS_flags & (SS_TICKER|SS_KEEP_TIMING)) == SS_KEEP_TIMING && SS.last_fire + (SS.wait * 0.75) > world.time) | |||
| continue | |||
| if (SS.postponed_fires >= 1) | |||
There was a problem hiding this comment.
Allows the mc to postpone correctly tgstation/tgstation#59813
code/controllers/subsystem.dm
Outdated
| @@ -96,7 +134,7 @@ | |||
| return FALSE | |||
|
|
|||
| if (queue_node_flags & SS_TICKER) | |||
| if (!(SS_flags & SS_TICKER)) | |||
| if (!(SS_flags & (SS_TICKER|SS_BACKGROUND)) == SS_TICKER) | |||
There was a problem hiding this comment.
It was part of a fix batch for ticker and background subsystems conflicting, but I missed a fix for this change so I'm glad you commented
| @@ -1,26 +1,25 @@ | |||
| /atom | |||
| /atom/movable | |||
There was a problem hiding this comment.
why, what if I want a particle emitter on a turf?
There was a problem hiding this comment.
All the emitter procs and stuff are on movable they can be moved to atom later if someone wants to do that
Co-authored-by: grungussuss <[email protected]>
github-actions
bot
added
the
MERGE CONFLICT
github-actions
bot
removed
the
MERGE CONFLICT
|
There may be some false positives sometimes but we can figure them out later |
|
we yolo ball |
PotatoTomahto
added a commit
to PotatoTomahto/Potato-Vanderlin
that referenced
this pull request
Jun 13, 2025
This reverts commit 0872f08.
StiffRobot
pushed a commit
to StiffRobot/Vanderlin
that referenced
this pull request
Jun 13, 2025
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- Note: PRs including balance changes authored by anyone other than maintainers and official devs will not be considered. --> ## About The Pull Request Fixes create and destroy: Fixes the hard deletes and qdel/init hints that stopped create and destroy from running. Fixes runtimes that occured during create and destory runs. Adds reference tracking and SSgarbage improvements. Port MC fixes. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review or prevent the PR from being merged! --> ## Why It's Good For The Game <!-- 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. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [x] This code did not runtime during testing. - [x] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> --------- Co-authored-by: grungussuss <[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.
About The Pull Request
Fixes create and destroy:
Fixes the hard deletes and qdel/init hints that stopped create and destroy from running.
Fixes runtimes that occured during create and destory runs.
Adds reference tracking and SSgarbage improvements.
Port MC fixes.
Why It's Good For The Game
Pre-Merge Checklist