Upstream merge #234
Closed
Upstream merge #234
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 ai upload console itemslot whitelist * aw man
vox laugh not underwater
* fix shotgun sprite * fix take 2
pest events reorganized and snails spawn
* break pull at sleep * TryStopPull without user --------- Co-authored-by: YourUsername <you@example.com>
…tegories: [ HideSpawnMenu ] + self recharge removed + 1 more shot + normal recharge speed (space-wizards#31235) * narrow nerf * last instance of nospawn gone * removes self recharge * 8 shots, less recharge time
* Add justice helm * backslash moment * spinny light * remove power cell from recipe
Deleting binary key Silicon supremacy!
…30662) * split temperature protection into heating and cooling * fugg * weh
* Remake bottles and syringes names to use labels * vial * fix and add stuff
* bagel update * remove invalid
Remove Antimov and Overlord
* disaster evacpod tinyfan * real
* fix paper label whitelist * forgor * oh lmao
Update box disposals
Update fland disposals
* 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
…zards#31847) * 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 <161409025+slarticodefast@users.noreply.github.com> * paste --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
…pace-wizards#31975) resistances to directional windows
…ards#31989) * AlmostCertainlyDoesntWork * Please work * maybe work * emptycommit * test * testest * Empty-Commit * Uplink grammar/typos fix
…zards#31962) * Add SetEntity(Owner) so can view APC sprite in UI * bump apc version flavor text --------- Co-authored-by: TIMMY <timmytriggers@cock.li>
added stuff
Update moffra.png
Cull Sala Max Pop
Fixed a leftover head tag from merge
|
Closing this because I've opened my own to fix the merge issues/add some new stuff |
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.
No description provided.