[Repo] Upstream sync #183
Merged
[Repo] Upstream sync #183
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
(cherry picked from commit 0d086df2e501816b64fd0fae3040f2850c723ef0)
* Make stack count affect item size * and the test, too * readd this check * vwoom * huh * if you ever read this commit message ping me on discord in #contributors * changerinos (cherry picked from commit 5c60a27c7c835ad34a064b4d48f2cdab0260996b)
(cherry picked from commit c82d1b437e715aa4b7ccdec06962842e873cc683)
* Procgen asteroids for salvage magnet * big roids, remove min offset radius * i fuck with configs a bit more * some shit i guess * actually this makes more sense (cherry picked from commit 7cdfaa09d5f690f1e56d00a831becf27c485457f)
(cherry picked from commit cb24d88be44d85bd9f09c36d2137551dd664e51a)
(cherry picked from commit 6f19075be9df36af9e82555411ee319d9bea41f4)
(cherry picked from commit 6f76ae4720226efc9e2ed85683b95062e03cc079)
(cherry picked from commit 6a3dc3cc1d919d1fee1254286fca4bb7b9e0ab45)
Co-authored-by: Jeff <[email protected]> (cherry picked from commit ee5eeb97733ade8b988cb86236ede3aace5405c1)
(cherry picked from commit 06fc0122fea3571ea4061e8547247c2b494ec837)
(cherry picked from commit 5b76549b093435a51be5da29cd42a1ed86d2fe80)
(cherry picked from commit 4c8965ac32fadf15806c0c0b4f80e4c2142b17b5)
(cherry picked from commit 25d459ac7d89e09821ddf16130faeb5dbbb5f785)
(cherry picked from commit 7ab522689236c97c418539f2b253850667698f02)
(cherry picked from commit 1056e7b24d34148d2bcfdafee20086543ffe9e5b)
(cherry picked from commit 0b8b107175d77e10c884f8c1d7c7d6ecc5cdca8b) Fix ghost transparency (#17686) (cherry picked from commit 55f57cfbe4ee142fab9018270a42ee0b589708b5)
* Rebase Cargo Gifts * Remove Chaos values from gifts (for now) * Translate CargoGifts, rename fields * Fix gift errors, detect missing products * Fix order Id, some crate IDs * Fix get Station. Gifts for Sec, Med, Fire, spacing * Minimum players for various gifts (cherry picked from commit db81e5901325f0fcec8d202b3e9ce6313ad59559)
Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit b9f24b26818c5ef5831b426864c5fe76a1e37d8c)
Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 41fae6e9cd9b09abee9d100e21b05416059b0328)
Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit a3c37edd69a3347982cceb85b7ffa66fa4c45927)
(cherry picked from commit cca1a783844029fbcd22f13ff3b551302ebe313e)
(cherry picked from commit 0c260e8be471accb72ea55d2c6156c6558131f7c)
(cherry picked from commit 46a0f178e521e26fc5cdb458eb91ecb4dac27be7)
(cherry picked from commit 1485666a23b00902334d32bad1b21066c836ea5c)
(cherry picked from commit 3e00b444d0106f2e03c0f44ce78e7581f8477aa0)
(cherry picked from commit 4d1ab16ed87ddab36ed6725e717e157f90090823)
(cherry picked from commit 90110183bec0acadba48cfb69dd1664cdfaf4f81)
(cherry picked from commit 6fb78790412db6d8f0f0c2b7260a5ec41aebd639)
(cherry picked from commit 044d5f68530ba210ee70358b8ab0364946f53d83)
Co-authored-by: keronshb <[email protected]> (cherry picked from commit 631316436854d83798eccb72d24426f791d4e297)
* clown mimimi sleeping sound * make its own component * different sound (with attribution) * oopsie * back to mimimi (with attribution) (cherry picked from commit 2eb66898347d2928b6ded3a64379cd495439ce92)
* Make clumsy entities able to shoot funny weapons * remove unneeded line (cherry picked from commit 580d4817100170f7f43eba76c4cd98d20cc1a038)
Co-authored-by: Chief-Engineer <[email protected]> (cherry picked from commit 579913b617c9b7deb3e58ed00bc229906d8dd826)
(cherry picked from commit b4b0fe41db51660b3b1e23c1ec9fe06a4b940e65)
Cherrypick 2023-07-21
# Conflicts: # Resources/Maps/parkstation.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml # Resources/Prototypes/Maps/parkstation.yml
…nto upstream-sync-2
DEATHB4DEFEAT
added
Priority: 2-High
github-actions
bot
added
Changes: C#
Closed
DEATHB4DEFEAT
added
Priority: 1-Urgent
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.