July '24 Upstream Merge #1679
Merged
July '24 Upstream Merge #1679
Conversation
This file contains 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
Separate the environment check from CapSpawnAmount into GetValidEnvironment to make the code a little cleaner, and also makes these two checks independent. CapSpawnAmount and GetValidEnvironment now both have zero side-effects Broken renamed Idle to reflect its use. Broken in my mind implies that there's some method for fixing. --------- Co-authored-by: Partmedia <[email protected]>
* Cleanup PuddleTest * Cleanup GravityGridTest * Cleanup PowerTest * Cleanup SaveLoadMapTest * Cleanup Body tests * Cleanup ContainerOcclusionTest * Cleanup AirlockTest * Cleanup DamageableTest * Cleanup EntityTest * Cleanup FluidSpillTest * Cleanup FollowerSystemTest * Cleanup HandCuffTest * Cleanup InteractionSystemTests * Cleanup InRangeUnobstructed * Cleanup SimplePredictReconcileTest * Cleanup PostMapInitTest * Cleanup SalvageTest * Cleanup SaveLoadSaveTest * Cleanup ShuttleTest * Cleanup MaterialArbitrageTest * Cleanup PrototypeSaveTest * Fix ShuttleTest * Bunch of small ones * Move JobTests to Station directory * More small fixes * Cleanup InteractionTest.Helpers Had to change a method signature, so some callers were modified too. * Missed one
Co-authored-by: plykiya <[email protected]>
Allow zoom command to modify an eye's PVS range Co-authored-by: metalgearsloth <[email protected]>
* Dungeon spawn support for grid spawns * Recursive dungeons working * Mask approach working * zack * More work * Fix recursive dungeons * Heap of work * weh * the cud * rar * Job * weh * weh * weh * Master merges * orch * weh * vgroid most of the work * Tweaks * Tweaks * weh * do do do do do do * Basic layout * Ore spawning working * Big breaking changes * Mob gen working * weh * Finalising * emo * More finalising * reverty * Reduce distance
* invisible anomaly * good luck
* Remove southRotation from railing structures * Curly Braces
Lefty latchy, righty removey
add apc stat value
* fix * Clean Some Code * Some Commentaries * Update Content.Client/UserInterface/Controls/RadialContainer.cs * Update Content.Client/UserInterface/Controls/RadialContainer.cs --------- Co-authored-by: metalgearsloth <[email protected]>
* Fixes pull rotation logic * cleaner condition * even less code * I CHANGED MY MIND * first one * second one --------- Co-authored-by: plykiya <[email protected]>
Makes portable flashers destructible Co-authored-by: plykiya <[email protected]>
* tank harness * weh * Suit Storage Whitelist * Revert "Suit Storage Whitelist" This reverts commit b1f503573c2936642a2d7627c4852153ec71ce79. * suit storage filter * vox spawn gear * weh
* Fix (hopefully) * Fixed Spelling Mistake and minor Code Cleanup * Revert "Fixed Spelling Mistake and minor Code Cleanup" due to Pull Request Guidelines This reverts commit cee3e0226b349187bd8fd8b639e161fb877e8bdb.
|
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. |
Cheackraze
approved these changes
Aug 2, 2024
github-actions
bot
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…-station-14 into jul24-upstream-merge-228.0.0
github-actions
bot
removed
the
Merge Conflict
github-actions
bot
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…-station-14 into jul24-upstream-merge-228.0.0
github-actions
bot
removed
the
Merge Conflict
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 PR
Upstream merge.
Why / Balance
Keeping up with the Joneses.
How to test
Very carefully.
Media
Breaking changes
Changelog
No changelog for now, captured in upstream ones.