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

Staging fixes. #4693

Merged
merged 29 commits into from
Jan 8, 2025
Merged

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented Jan 4, 2025

@MistakeNot4892 MistakeNot4892 added the work in progress This PR is under development and shouldn't be merged. label Jan 4, 2025
@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. and removed work in progress This PR is under development and shouldn't be merged. labels Jan 4, 2025
Copy link
Member

@out-of-phaze out-of-phaze left a comment

Choose a reason for hiding this comment

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

there seem to be a lot of confusing and poorly atomized changes in this PR, but it's a fix pr so i don't mind too much. i do have a few nitpicks though

code/controllers/subsystems/overlays.dm Show resolved Hide resolved
code/game/objects/items/_item_reagents.dm Outdated Show resolved Hide resolved
code/modules/crafting/slapcrafting/_crafting_stage.dm Outdated Show resolved Hide resolved
code/modules/events/dust.dm Show resolved Hide resolved
code/game/objects/structures/well.dm Show resolved Hide resolved
@MistakeNot4892
Copy link
Contributor Author

Sorry about the non-atomic changes, this was a bit of a stream of consciousness PR. Thought I had them mostly broken up, alas.

@MistakeNot4892 MistakeNot4892 force-pushed the fixes/staging branch 2 times, most recently from 2061ff4 to 26153a2 Compare January 5, 2025 13:03
Copy link
Member

@out-of-phaze out-of-phaze left a comment

Choose a reason for hiding this comment

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

this is really poorly atomized. welp! good enough for me.

also someone needs to fix the nanoui map generation to only take into account the level data bounds or whatever. i'll probably do it later

@out-of-phaze out-of-phaze merged commit 051354e into NebulaSS13:staging Jan 8, 2025
13 checks passed
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.

2 participants