upstream merge 11/01/2025 #21
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
(cherry picked from commit b2b3b22a041879529e89898689eb5b8d967d6e39)
(cherry picked from commit 41bcdd7c36bc80c849fff29c6045c2ddeb430160)
Co-authored-by: PJBot <[email protected]> (cherry picked from commit 9532b613e0caeaa1475013e15025009a68ba20a2)
* fix rainbow plushie inhands * address requested changes * attribute sprites (cherry picked from commit 0639a493908025ddee13a33ebbaf7c127bbe2ecc)
* refactor wieldable events * fix inconsitency with wielding and use updated events * wieldable cosmetic refactoring * Update Content.Shared/Wieldable/Events.cs Co-authored-by: Centronias <[email protected]> * real Co-authored-by: ScarKy0 <[email protected]> --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Centronias <[email protected]> Co-authored-by: ScarKy0 <[email protected]> (cherry picked from commit 0aebc76feb86095514fbc572879691cf3d892e50)
(cherry picked from commit 6f16291557fae810a9446dfcd348183f9bef2c66)
* lobby name cvar * panel width * skrek * server name localization fix * comment format fix Co-authored-by: Thomas <[email protected]> * remove redundant newline Co-authored-by: Thomas <[email protected]> * string.empty Co-authored-by: Thomas <[email protected]> * use SetWidth * Update Resources/Locale/en-US/lobby/lobby-gui.ftl --------- Co-authored-by: Thomas <[email protected]> Co-authored-by: slarticodefast <[email protected]> (cherry picked from commit a55dc4d3bb006f29ca5535cc2f38878f8a498a50)
(cherry picked from commit c536094c1728ef4af37f7e730336a24381551cab)
Adds collision with bullets to lights (cherry picked from commit 6b674e73d68a299b7f154d75e5b457af74137a78)
(cherry picked from commit eecdd827791e5b08f7c5df7cc6bc73a2b1230c48)
(cherry picked from commit ea9954221c45df72044e8ec7b4b1cd945e3876c6)
(cherry picked from commit 4882ba22748ddc230d3045a44b0c264c194949b0)
* Remove kessler, zombeteors gameodes * Probably should keep the protos in case an admin wants to torture players secretly * address slart review (cherry picked from commit b6599d384449e8d54e67a103e81113815145c997)
(cherry picked from commit 02d89d9c5ca8a7b203047d69f796c130cff6b0b9)
* Added distinct ad and bye chatter to Dr. Gibb vending * Correcting revert mistake * Changed ad pack names to better match naming convention (cherry picked from commit 43db40c487e8815f782b4925a117f66be2dba53f)
(cherry picked from commit 2d78b6c9307873172e8929807cdeaca05d5aa62e)
* Special reagents now appear in the guidebook * Improved guidebook wording for reagent category (cherry picked from commit b4e2a3693fa1deca5062b46495e690069c1326fd)
(cherry picked from commit aa458a24cadd22225787e1594c5d784c5b6c182c)
Required for space-wizards/RobustToolbox#5590 to not cause compile fails, but can be merged on its own (cherry picked from commit af75c1a92b8cf33b87fdfe071d5f74fe7c1c0c07)
(cherry picked from commit 483ac50f5f1781d1618f5aa086dbfcfb76b33dc7)
Fix chameleon PDA (cherry picked from commit 3238c2e144c36c1386fac7697a1495051dbf245e)
* Update vessel_warning.ogg Remove DC offset and apply short fade out. * Update attributions.yml * Update attributions.yml (cherry picked from commit 90b46699f6a88eef5c0db093fb44078984145c59)
(cherry picked from commit 23f0b304f284d2600cb2c6b4c9d36fdca7f99ec4)
(cherry picked from commit 4d26ea619ea8f000e03acdc212ad4695e3dc9222)
happy new year (cherry picked from commit 010924611da101c20e31d65a30f1e3122930ea8c)
Don't print newline if admin is hidden. (cherry picked from commit 904d75c8a909e3f7806e662d404a89b880a4da88)
(cherry picked from commit 60e1c6f5159380ccafabbebbb138b2210cc82d43)
(cherry picked from commit fdbb3c8f396003bddde85442169402ddd38e1984)
Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 04984984fe9362be9e2553b4274358a3f83cc160)
(cherry picked from commit 66810ef257821cad3d39a57a7c92c32abf8039b1)
(cherry picked from commit 0b1ed3ec7e79e78e27ad193526db95351bfa263c)
(cherry picked from commit edbc861c78d65b8f5e6c627e59522abb43016f1f)
(cherry picked from commit ac2eb887dc38e0dd177772a493ee4cec3246127c)
(cherry picked from commit 7ae7821213b7b3a528649da1772bc9af80c8584e)
* added BaseRestrictedContraband to forensic gloves * moved from id to parent (cherry picked from commit 87e18b9d3abfdd20b86e9236fc789549ae0aa137)
(cherry picked from commit fa720a05ce31467a62233d09240346120de2d335)
* added the church organ to the cargo console (will add more in this PR, assuming i did this right (HOW DO YOU BUY CARGO ORDERS IN DEV ENVIROMENT???? *sobs)) * added other structure instruments to cargo Catalog * fixed an epic copy/paste fail * changed prices * fixed epic copy/paste fail #2 --------- Co-authored-by: TeenSarlacc <[email protected]> (cherry picked from commit d1f6531722d6cf51f2f12ee713ed61fe82dea136)
(cherry picked from commit 0cd2d827adf2f66f84abcf7d944b91aa31537b70)
(cherry picked from commit fbe6168291e808594564f758b4edc230790a53d4)
(cherry picked from commit 45d47da584897cdd2aedb5ea68fbad5b2cf77252)
* border * Update meta.json * Update Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json --------- Co-authored-by: slarticodefast <[email protected]> (cherry picked from commit f06ea5d0f31759b883f0f7da9aa21cfaacc6acd7)
* Trim trailing newlines from examine messages * TrimTrailingNewlines -> TrimEnd (cherry picked from commit bbb551a01b7cb4debc4679b40219fd672d2d383b)
(cherry picked from commit fdc0853053837aaf715f8dd1b9c1401bc778f978)
fix ghost component locale grammar (cherry picked from commit 5deab7d41ff4e67e2a27649ed402089af50ae36e)
* Add SpookySpeaker component/system * Shuffle Boo action targets before trying to activate them * Add SpookySpeaker to vending machines * Fix chatcode eating messages starting with "..." * Add SpookySpeaker to recycler * Oops * Decrease speak probability for vending machines * Add spooky speaker to arcade machines (cherry picked from commit c6e4d198833ca5c69821a1d4b8108c2a2d94f1d0)
(cherry picked from commit 10b778fc8fd32ad37d29094f42fb27eaaa709c78)
github-actions
bot
added
S: Needs Review
size/M
|
RSI Diff Bot; head commit 57e38bc merging into 556343f Resources/Textures/Structures/Wallmounts/posters.rsi
Resources/Textures/Objects/Fun/toys.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.
About the PR
merges upstream/master up to 11/01/2025