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

Fixes maploader landmark. #3617

Merged
merged 2 commits into from
Jan 26, 2024
Merged

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented Jan 23, 2024

Seems like the actual loading loop got clobbered at some point. Tested on Crux.

@MistakeNot4892 MistakeNot4892 added the ready for review This PR is ready for review and merge. label Jan 23, 2024
@out-of-phaze
Copy link
Member

out-of-phaze/LighthouseRelay@2deefa1

no time to review atm but this is the fix downstream

@MistakeNot4892
Copy link
Contributor Author

More or less identical, I just included a New to INITIALIZE_IMMEDIATE and an extra template category to avoid spawning the sub-templates on their own z-levels for testing,

/obj/abstract/landmark/map_load_mark/New(loc)
..()
INITIALIZE_IMMEDIATE(/obj/abstract/landmark/map_load_mark)
/obj/abstract/landmark/map_load_mark/Initialize()
Copy link
Member

Choose a reason for hiding this comment

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

according to past-me in #3330 this isn't feasible because this should never run during Initialize() in SSatoms? it should only run at compiletime or in SSmapping, i could be wrong about that though, i can always just revert/issue a fix if it breaks downstream

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't really get what past-you means since the only time this would run the actual load logic in Initialize() is if someone spawns it, which is already strongly discouraged. Could mark the type as unspawnable to really formalize that though.

@out-of-phaze out-of-phaze merged commit 44be7ec into NebulaSS13:staging Jan 26, 2024
11 checks passed
@MistakeNot4892 MistakeNot4892 deleted the loaderfix branch February 11, 2024 09:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants