August '24 Upstream Merge #1888
Merged
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
* Contra pass round two * command too * Stamps * oopsied a bracket
* namespaces * Comment does not need a semicolon --------- Co-authored-by: Vasilis <[email protected]>
Contraband pass number three
* Replace alerts with solar console * Sci doesn't need two protolathes & engi frontdesk windoors shouldn't be atmos locked
* golden toilet * Destructible * sprite * fix * copyright
* treasure entities and spawners * no more smiles
lox update
* fland update * exit button on med
* goodbye sweet maps * Update EvacShuttleTest.cs * Update EvacShuttleTest.cs * fix tests * fix tests * nightmare nightmare nightmare * rider is fucking me * jesus christ
derotate origin
* German accent * Add German motherfucker * German accent improvements * Fix failing tests * Only replace th at start of words * Correct plural for "warnungen" * hello and goodbye in German * Fix German again * Remove motherfucker from German accent * German goodbye refactor * 'fix' indents in speech.yml * German accent improvements * Reduce German umlautness * Add umlaut cooldown so consecutive vowels don't get umlauted * Fix german capitalization of th => zh * Add more banger words to German accent * Improve German tesla replacement * German akzent * German scientist gaming * Men and women, now in German * Also replace warops in German accent Co-Authored-By: slarticodefast <[email protected]> * Make requested changes * Make some of the requested changes * Fix linter errors * Address remaining feedback * RE-add toned-down random umlauts * cabbage -> kraut --------- Co-authored-by: slarticodefast <[email protected]>
* first pass * this shit too * ok fix that shit * buff * actually fix that
No idea how long this was broken; mains wire relies upon this id being accurate which means it needs doing before the calls.
vox laugh not underwater
github-actions
bot
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
removed
the
Merge Conflict
dvir001
approved these changes
Sep 7, 2024
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
Updates Frontier to space-station-14's upstream at 9a68cf0 (space-station-14#29123).
Why / Balance
It is time.
How to test
Very carefully.
Media
TBD, probably nothing.
Breaking changes
Changelog
🆑 whatston3 and dvir001