Upstream Merge 8/11/23 #37
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
Co-authored-by: metalgearsloth <[email protected]>
…#21094) * generalize SolutionSpikeOverflowEvent * let reactions overflow * spacelube: 3 -> 5 * restore TryMixAndOverflow threshold cap
* add * fix * temporary change, needs fixing * mayb fix * actually fix FR * yes
* fix: Incendiary bullets no longer deal cold, acid, or shock damage that ignores all armor. * Atomic bomb
… console. (#21320)
changes the chief engineer's belt to remove the lv wires (they take up a lot of space and are easy to get anyways) in exchange for a holofan, a t-ray, and a gas analyzer (first time coding ever this might have to be edited)
* New foam sprites (icon smoothing) * changed to edge sprites for foam * fix * edges for metal foams * fix
* Add Space Asshole Coat * Add sledgehammer * Adjust sledgehammer damage values * Add copyright string to sledgehammer
…21519) * Unfatten the machines * This actually works better
* Speed Boots * validate * monkey
* Added a crack overlay for directional windows. Added directional window crack components to windows, reinforced windows, plasma windows and reinforced plasma windows. * Changed the copyright information with the files I actually used. * Updated the copyright further.
This reverts commit 4729024.
This reverts commit 49f0b20.
This reverts commit a96563c.
This reverts commit 188cbba.
This reverts commit 74f1098.
…c-drift into upstreammerge81123
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.
this is my paying for my sins