Upstream sync #469
Merged
Upstream sync #469
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
Added a period to an object description. Adds a period to silk's description. This is my first and last pull request.
I'm so dumb. Co-authored-by: Plykiya <[email protected]>
* Lowered reoccurencedelay to 45 * Lowered Further down to 20
Added a recipe for crafting menu
* Tipped .35 ammo * used layers instead of new sprites * remove the useless old sprites * changed the green slightly
Add minitile and brick decals overlay
* add * Update Resources/Textures/Parallaxes/attributions.yml * sprite change * address review --------- Co-authored-by: metalgearsloth <[email protected]>
Trolley
…141) Added display for amount of hits left in stun batons/stunprods. Co-authored-by: Plykiya <[email protected]>
* gastankening * fix price
Initial commit
* make door status use SendSignal * LastSignals and logic, add ClearSignal api too * make everything outputting a logic signal default to false * refactor ops **
Resolves issue #23059, for which the submitter wrote: Emergency toolboxes contain a crowbar, two flashlights (sometimes one), two breath masks, and two chocolate. With the addition of water bottles to survival boxes and emergency nitrogen tanks, I think emergency toolboxes should be updated to include said water bottles and emergency tanks. Would make these just a little bit more useful. It feels weird they don't have oxygen tanks when they have two breath masks, and since water bottles are now commonplace it would be a good idea to put them in a place where emergency food is stored as well.
…5162) This makes the life of forks slightly easier by letting you pass an environment variable instead of having to maintain this file yourself.
* Balancing my beloved Significantly nerfs deathnettles so botanists can't just take down jug's like it's no issue, we have guns, we should be using them * Additional Balancing Changes. * Losing my mind
…#24780) * Implement closing; add open/close verbs * Add breakable seals * Allow custom verb names; make condiment bottles closeable * Remove pointless VV annotations and false defaults * Split Sealable off into a new component * Should have a Closed event too * Oh hey, there are icons I could use * Ternary operator * Add support for seal visualizers * Moved Sealable to Shared, added networking * Replaced bottle_close1.ogg
* content * add cat * ambient * I FORGOT HEARTS! * fix ambient * some fixes * canCollide: false * connect to damageable * pi * remove fx * some fixes * *sad bruh* * hazed * Update base_shadow.yml
* Facelift Microwave UI Includes new background light in UI, Uses predictive input, UI now properly disables buttons when microwave is active * Microwave now shows Elapsed time * Fixed bad formatting * Added new term for "BottomMargin" * Change yellow color * Update StyleNano.cs just spacing fixed * Cook time countdown now detached from server Instead of the server constantly sending out messages for the cook countdown, it is now predicted client side using TimeSpan * Update MicrowaveMenu.xaml forgot to re-add item space
* brute * add
* content * nerf * fix rsi
Co-authored-by: deltanedas <@deltanedas:kde.org>
Benign client-side command.
* added * checks tweaking * fixed what sloth wanted * fixed? * dialog diposing fix * checks tweaking * more changes * dispose streamreader * Update Content.Client/Fax/UI/FaxBoundUi.cs Co-authored-by: metalgearsloth <[email protected]> * Update Content.Server/Fax/FaxSystem.cs Co-authored-by: metalgearsloth <[email protected]> * fix minor typo --------- Co-authored-by: metalgearsloth <[email protected]>
* voxnames * New generator parameters, names are more readable * bunch of missing vox stuff * more names * sad
* Balanced ChemVend Stock ChemVend needs more balanced stock for what actually gets used * +1 Sugar
* Changed holo signs to be ranged and used on click rather than Z. * Updated comments * Failed attempt at ignoring walls * Getting rid of unused libraries --------- Co-authored-by: Plykiya <[email protected]>
Stuff that probably shoulda been wrapped ig but our test runner stinky.
Seaborgium is element number 106 and is presumably what lets these glasses "see" "borgs".
Co-authored-by: Jeff <[email protected]>
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.