Upstream update #16
Merged
Upstream update #16
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
I'm so dumb. Co-authored-by: Plykiya <plykiya@protonmail.com>
* 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 <31366439+metalgearsloth@users.noreply.github.com>
Trolley
…141) Added display for amount of hits left in stun batons/stunprods. Co-authored-by: Plykiya <plykiya@protonmail.com>
* 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
Hops will love me
…s (#25129) Added wink and tearfully smiles emote + more cries variations
Replaced medical's HM console with a CM console, added janitor equipment closet
Because of course I would forget one line
Add purely atmospheric heat exchange to the gas thermomachine component (in preparation for space heaters).
* Holosigns can be stored again * TryComp to HasComp --------- Co-authored-by: Plykiya <plykiya@protonmail.com>
* Indicate whether pickpocketing is stealthy in logs, change :user to :actor, and clean up messages. * Remove ugly whitespace * Do the thing I should have done but didn't because I didn't want to think * Fix spacing
…rted (#25233) Fix disposals bins not automatically flushing after an object is inserted. Because of Spaghetti Code:tm:, AfterInsert() in DisposalUnitSystem still handles insertion itself. Except in all cases except drag/drop insert, the object is already inserted so this check fails and the remaining logic doesn't happen anymore. Fixed now.
* "resprites" sec & greysec jumpskirts * adjustments
reduce eshield hp
…240) * Artifact blood trigger now accepts all sentient blood types * Update artifact-hints.ftl
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
No idea what im doing fr fr |
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.
A simple
git cherry-pick ab175d6^..2a5eb86