upstream merge 14/9 #1825
Merged
upstream merge 14/9 #1825
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
* fix paper label whitelist * forgor * oh lmao
minor misspelling
fix wall closet range
* Returned functionality to industrial reagent grinders without un-nerfing recyclers * Limited industrial reagent grinder to only extractable solutions
* biogenerator * ack * test success! * fix tests * increase price of reagents
* setup some data * cheeseburger recipe * Update FoodSequenceSystem.cs * finalize cheseburger recipe * remove fun * return old taco sprites * full foodsequence data refactor * return tacos * well done * add cutlets to burger * chickenburger recipe * +2 burger recipes * more fun * Update brain.png * some slice produce added * documentation * watermelon * skewer work * flipping * tomato * skewer watermelon * Update skewer.yml * oopsie, ok, im go to sleep * fix checks * Update produce.yml * screwed * cheeeeeeeese * all cooked meat added * produce added * aaaaand suppermatter * key to Tag * More * proto string remove * raw snail * fix * Update FoodMetamorphableByAddingComponent.cs * fixes * fix3 * fififififx
* Add completions to addobjective and localise it * Cleanup * Fix * Make a manager to handle subscribtion completion options This is so we can unsubscribe to prototype reloads properly * Convert the manager into a system * Move the system into the systems folder I forgor * Merge CompletionsSystem into ObjectivesSystem
* some contra fixes * whistles change
Add random sentience to calm events
* Ring * Silly name fix
* Update PULL_REQUEST_TEMPLATE.md * Update PULL_REQUEST_TEMPLATE.md 2 * Update PULL_REQUEST_TEMPLATE.md 3 * Update PULL_REQUEST_TEMPLATE.md 3 * Update PULL_REQUEST_TEMPLATE.md 5 * slart suggestions Co-authored-by: slarticodefast <[email protected]> * paste --------- Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Initial commit
github-actions
bot
added
Status: Needs Review
Changes: YML
added 3 commits
September 14, 2024 15:30
|
Popping out of vacation mode to note that we had a couple concerns with this upstream merge (namely the shuttles, which are going to require some review from @IamVelcroboy in addition to an "Is this just a meme?" test, and the random sentience event, which should be tied to Glimmer). |
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
visitor pda for passenger loadout had to be changed to not give tiders external access on lowpop
i couldnt reproduce it no matter what i did so idk
excluded security trooper uniform/hat since it might not fit with the style @IamVelcroboy
Changelog
🆑