July '24 Upstream Merge

new-frontiers-14 / frontier-station-14

A multiplayer game about paranoia and chaos on a space station. Remake of the cult-classic Space Station 13.

https://spacestation14.io

GNU Affero General Public License v3.0

79 stars 463 forks source link

July '24 Upstream Merge #1679

Closed whatston3 closed 1 month ago

whatston3 commented 1 month ago

About the PR

Upstream merge.

Why / Balance

Keeping up with the Joneses.

How to test

Very carefully.

Media

[X] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

No changelog for now, captured in upstream ones.

dvir001 commented 1 month ago

Going to have a fun time scanning this for new issues this coming weekend.

github-actions[bot] commented 1 month ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 1 month ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Cheackraze commented 1 month ago

looks good to me from my testing, im going to approve it with a reminder to do a Merge commit, not a squash commit.

This involves a database migration so Im going to plan for this Monday to have this merged and I can do some brief server maintenance along with this.

github-actions[bot] commented 1 month ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 1 month ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.