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 security maintenance on Kilostation #4005

Merged
merged 3 commits into from
Oct 31, 2024

Conversation

KnigTheThrasher
Copy link
Contributor

@KnigTheThrasher KnigTheThrasher commented Oct 28, 2024

About The Pull Request

Ports my pr:

Why It's Good For The Game

closes #3986

Changelog

🆑
fix: Fixed security maintenance on kilostation
/:cl:

@Absolucy
Copy link
Collaborator

why is the change count +4,507 / -4,514, when the original pr is +50 / -57

@KnigTheThrasher
Copy link
Contributor Author

why is the change count +4,507 / -4,514, when the original pr is +50 / -57

thats how merging map conflicts work

@Absolucy
Copy link
Collaborator

ah fair lol, just double-checking

@Absolucy Absolucy merged commit 90ae9d3 into Monkestation:master Oct 31, 2024
23 checks passed
github-actions bot added a commit that referenced this pull request Oct 31, 2024
@KnigTheThrasher KnigTheThrasher deleted the kilomaint branch October 31, 2024 23:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

KiloStation: "Emergency Storage" next to upper security maints isn't rad-proof
3 participants