Upstream sync #185
Merged
Upstream sync #185
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
* Remove unused attributions and songs * Remove superfluous lines at end of file * Sort songs by alphabetical order * Correct "skubstep" filename attribution * Remove songs without attribution * Retire song "Space Asshole" * Retire song "Title3" * Retire song "Singuloose" * Retire song "Thunderdome" * Convert to Unix newlines * Add song "Nymphs of the forest" * Add song "Conundrum" * Add song "A.D.R (Lagoona rmx)" * Add song "Autumnal Equinox" * Add song "MEL -Aggravated Assault" * Add song "==(Time Lapse of Clouds)==" * Add song "MEL -Cyberpunk" * Add song "Nights of Orion" * Add song "Leisurely Voice" * Add song "Alone" * Normalize volume and reduce clipping in "skubstep" * Add song "Superposition"
* Move out Nyano localization * Remove pointless items * Add sunglasses to Syndicate uplink
* Reduce zombie infection chances * Reduce zombie strengths * Reduce zombie brute movement speed
* Move out Nyano localization * Prevent golems from using guns again
* Remove all hard-coded MailReceivers * Remove NukeOps no MailReceiver patch * Add StationMailRouter component
…(#18190) (cherry picked from commit 3eff0b7fbd3bee846aeafc90b645f31189deeabb) (cherry picked from commit 9241c981281b61608ece354c04ac6a2e023b11ca)
(cherry picked from commit 32def478620b1531adac5a6c3e0d998abd67b8ac) (cherry picked from commit 217c3e58a72abf10da617f58e13b7524b665444d)
(cherry picked from commit ef3a6b245b20880e236d1edd9da847bcf122e773) (cherry picked from commit 5117a3a9a7cfe0de76bd8a90bc8e2148eddf581d)
(cherry picked from commit 946073f3d28cc44ac5feed37a92f3aa42a4de064) (cherry picked from commit 83244d31294cae4c2428077ea5136bdb8b034974)
(cherry picked from commit 1de396d56650ab2a6d4430ca2dc476eeb8bbb227) (cherry picked from commit 22903deacade22d6a7e4ff0ea2645fe79eb5c817)
(cherry picked from commit cfb827c99b968609864b53150606996357855ca9) (cherry picked from commit ce8638f0fee64d7d3ce9fb349e67d1b4868b6831)
(cherry picked from commit e755509fc7234bf73a790ea1243094594772d529) (cherry picked from commit bffedede7f2fb631716743d8a795c6c94749d100)
(cherry picked from commit 5dd4169c5191fb44bae42e5447d7a70ebdd1ebf3) (cherry picked from commit 17e960fb05416e60e3f309334884624132e98ca1)
(cherry picked from commit 27c08e6429e4a3ef446cc6790dd2ffccb282b54c) (cherry picked from commit 86018c26f136815195dc3bc936e73d4af8bc944f)
(cherry picked from commit 3f12b2816cb61ac0449ad978dfe06e73ed7fe368) (cherry picked from commit 141ee23f33e4c121d629d7d4face8a7f556e9228)
Co-authored-by: Moony <[email protected]> (cherry picked from commit c6d2dd6c7bc1b1f979f3a9d917c411d0adb5ad0d) (cherry picked from commit 5349bf957cbcd1a1fb530d9d25762f04afd10ade)
(cherry picked from commit 7786daa20ee26806b8fa553aed5d90ef9cea947e) (cherry picked from commit 2819e4ac6c411fcbea14b3b4d85b17b451ae3a4b)
* Reduce nitrogen tank output pressure to 21 * Actually reduce nitrogen tank output pressure to 21 (cherry picked from commit b576fda6ed68df32e4ce0c09924c631af5313527) (cherry picked from commit f5be9b5eec08b8a8a5af878aa2bf29ae73ac44a6)
* gas tank size tweaks * gas_tanks cleanup * gas_tanks cleanup * gas_tanks cleanup * gas tank supply time comment * gas tank cleanup * gas tank cleanup comments * gas tank cleanup * gas tank cleanup (cherry picked from commit 5836959388d872791484418156239193a2939c00) (cherry picked from commit 5e14add5f810d4213824438ed10693478c249edb)
Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit dec24461718b19f6a864e50def9833681c05f7b9) (cherry picked from commit 53ec832abe92ea4e0bd9ce271a86d0e32e9715cf)
Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit b0f815cdc6e607e2717910e476e7ff9fcafb8887) (cherry picked from commit 3037018e914aac1c69b32529177c00eedcf31bc7)
(cherry picked from commit a4fc33284682c9471a8dfa16fcb09bf6e2b3b559) (cherry picked from commit 8f24eae2d25d529f84a43746b3c8016e586c87e2)
Adds temperature&bloodLevel locale to Health Analyzer (cherry picked from commit 3f20fb625af8138439bb9e293b451ae2546a0d05)
(cherry picked from commit 28fff33b54b931e3da9bd0d34a3043e603889198)
(cherry picked from commit 978887bf03d4fc950df072a1689bacbb9f6ab944)
Cherrypick 2023-07-25
* Disable starvationDamage * Update changelog
github-actions
bot
added
Changes: C#
DEATHB4DEFEAT
approved these changes
Jul 25, 2023
* Adds the MoNoKrome drobe and additional outfits. * Removes Uniforms from the sprite address. * Fixes the silly mistake. _ -> - * Fixes UnifromTop -> UniformTop. * Adds the .rsi to the rsi. :kemogiggle: * Fixes MNK Tracksuit conflicts. * Update arena.yml * just do a migration lol --------- Co-authored-by: Rane <[email protected]>
* Resprite glass floor tile * Update changelog
Co-authored-by: Jeff <[email protected]>
* Maps the MNK drobe into 9 stations. * Reverts Arena, Hammurabi, and Tortuga to reverse merge conflicts. * Re-adds MNK to Arena, Hammurabi, and Tortuga. * Final revert of Arena and Tortuga. * Final addition of MNK into Arena and Tortuga. * Revert "Final addition of MNK into Arena and Tortuga." This reverts commit 703002f62678e136c1084d1ad15b3e6adf6046d6.
Co-authored-by: Jeff <[email protected]>
…nto upstream-sync-3
|
RSI Diff Bot; head commit d925ba6 merging into 4d330a7 Resources/Textures/Objects/Misc/bureaucracy.rsi
Resources/Textures/Nyanotrasen/Clothing/Misc/black_dress.rsi
Resources/Textures/Nyanotrasen/Clothing/Misc/black_jacket.rsi
Resources/Textures/Nyanotrasen/Clothing/Misc/black_overall.rsi
Resources/Textures/Nyanotrasen/Clothing/Misc/black_top_coat.rsi
Resources/Textures/Nyanotrasen/Clothing/Misc/exposed_shoulder.rsi
Resources/Textures/Nyanotrasen/Clothing/Misc/gym_bra.rsi
Resources/Textures/Nyanotrasen/Clothing/Misc/hoodie_white.rsi
Resources/Textures/Nyanotrasen/Clothing/Misc/office_skirt.rsi
Resources/Textures/Nyanotrasen/Clothing/Misc/under_garments.rsi
Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/mnkdrobe.rsi
|
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.
Looks mostly fine.
There are lots of new lobby audios, but I kept our file. Probably worth looking through for any good ones, or removing any we're not using. Mostly just needs to be given a quick look over and tested, but I don't suspect any major issues from what I saw.
@DEATHB4DEFEAT