Upstreams #721

CrimeMoot · 2024-12-23T16:11:06Z

Описание PR

Медиа

Тип PR

Изменения

Amber Station - Playtest Fixes (#33773) * Fixed various issued identified during playtests. * Fixed a firelock stuck closed * Added more cameras and moved others * Fixed an issue with disposals Co-authored-by: Southbridge <[email protected]>

* Rename Dungeon Master Laws to not run into copyright problems * Revert direct map changes * Added renaming of DungeonMasterCircuitBoard to migration.yml * Remove whitespace changes to oasis.yml --------- Co-authored-by: Litrax <[email protected]>

* Zombies can see Initial Infected * Update zombie character info text

Fixed stores with multiple currencies having bad formatting and non-functional withdraw screens

* Cluster grenade refactor * oopsies on the name * Solve client-side errors * reviews addressed * filling scattering grenades is now predicted * reviews addressed

* working mind swap spell * Removing unncessary spacing Co-authored-by: Thomas <[email protected]> * Changing mind swap speech Co-authored-by: keronshb <[email protected]> * All requested changes in review * Stores owned by mind instead of body * Requested changes, traitor uplink fixed * Revert "Requested changes, traitor uplink fixed" This reverts commit 2ceac6733d6a28890f60d2ccef3dafa160a702fd. * Revert "Stores owned by mind instead of body" This reverts commit dfb72ab70ed66db50312617f2dce02d0a4e4dfce. * Separate target and performer stun duration --------- Co-authored-by: Thomas <[email protected]> Co-authored-by: keronshb <[email protected]>

@deltanedas

* add SpawnTableOnUse * make BaseEmitSound more flexible and remove sound from spawntable * add log *

--------- Co-authored-by: deltanedas <@deltanedas:kde.org>

* First commit * Forgot the shading! * tweaked values * sprite update * Radiation

* Add a test to check that all lathes accept the materials for all their recipesy * Add check for storage limit * Track total recipe material volume * Check dynamic and emag recipes too * Move AllLatheRecipesValidTest from ResearchTest to LatheTest * Extremely minor modernization

* Changed comments to be more clear and uniform. EggLayer uses NextGrowth instead of frame accumulation. Egglayer uses much less energy to make eggs, and lay time is randomized for player and AI chicken. * UdderComponent ReagentId can be changed now UdderSystem and WoolySystem use SharedSolutionContainerSystem now * Entities with udders can be examined to see a rough hunger level udders and wooly stop reagent generation/extra nutrient usage once the solution container is full * Moved stuff to Shared AutoPausedField now * Cleanup moving stuff to Shared * Oops. Make UdderSystem sealed instead of abstract. * Switch PopupEntity for PopupClient * Didn't mean to delete Access * new() instead of default! prototype revert egglayer balance change NextGrowth += timespan in egglayer * forgot [Datafield] for NextGrowth * forgot NetworkedComponent again... * Renaming Shared Animal to Shared Animals to match Server Hopefully also resolve merge conflicts. * Fix incorrect filename * Update with requested changes Put UdderSystem dependencies in alphabetical order. Initialise NextGrowth for Udder and Wooly components on MapInitEvent. Clean-up EggLayerSystem a little. Re-write OnExamine function for UdderSystem, improving clarity. Add full stops to end of udder examine locales. And more :) * Add some additional descriptions for cow hunger levels. * Add Udder and Wooly quantity to AutoNetworkedField * Account for less than starving threshold. --------- Co-authored-by: sirionaut <[email protected]> Co-authored-by: Sirionaut <[email protected]> Co-authored-by: Tayrtahn <[email protected]>

* No more teleporting pulling * pulled dash * Update Content.Shared/Ninja/Systems/DashAbilitySystem.cs Co-authored-by: slarticodefast <[email protected]> * Update Content.Server/Implants/SubdermalImplantSystem.cs Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]>

* add hold sprites for lizard plushie * make the lizard plushie sprites slightly chonkier for those who are not wearing winter clothes. * me when i hit the noise button and pretend it's shading. * lizard plushie is not legally-distinct green dinosaur with a long tongue™ (front sprite tongue has been shortened) * update meta.json

[Tweak] Upstream sync

…nto upstreams

coderabbitai · 2024-12-23T16:11:19Z

Important

Review skipped

More than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review.

162 files out of 293 files are above the max files limit of 75. Please upgrade to Pro plan to get higher limits.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

github-actions · 2024-12-23T16:11:22Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-12-23T16:13:59Z

RSI Diff Bot; head commit d83fd0c merging into 26bbf3a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

github-actions · 2024-12-23T16:17:55Z

Измененные карты:

cargo.yml — Изменена карта, редактировал @CrimeMoot
emergency_amber.yml — Изменена карта, редактировал @CrimeMoot
trading_outpost.yml — Изменена карта, редактировал @CrimeMoot

Errant-4 and others added 30 commits December 14, 2024 16:40

[Maps] Pilgrim hotfix #2 (#2860)

366baae

Resprite botany food (#2858)

5e736bd

Separate RGlass recipe for autolathe and ore processor (#33876)

5958801

Fix spacelaw loadout (#2861)

4745cdd

Zombies can see Initial Infected (#33665)

5e8db16

* Zombies can see Initial Infected * Update zombie character info text

Automatic changelog update

e0a1db6

Automatic changelog update

51a45ae

Bug fixes for Store UIs with multiple currencies (#33565)

1266b05

Fixed stores with multiple currencies having bad formatting and non-functional withdraw screens

Cluster grenade refactor and contra markings (#31108)

a4d6f09

* Cluster grenade refactor * oopsies on the name * Solve client-side errors * reviews addressed * filling scattering grenades is now predicted * reviews addressed

Automatic changelog update

612f8be

add SpawnTableOnUse (#32620)

2635888

* add SpawnTableOnUse * make BaseEmitSound more flexible and remove sound from spawntable * add log * --------- Co-authored-by: deltanedas <@deltanedas:kde.org>

LightOnCollide entityquery (#33886)

386e431

Add generator scrap (Plasma / uranium scrap) (#32198)

1967827

* First commit * Forgot the shading! * tweaked values * sprite update * Radiation

Automatic changelog update

d532333

Make Jolene TTS voice female (#2834)

06ed3db

Update configs (#2855)

712e5fa

New Year Music (#2829)

8a798d2

Revert "Удаление лимита времени для доступа к стартовым ролям." (#2652)

ac0bae5

Automatic changelog update

389c461

Automatic changelog update

3448634

Automatic changelog update

852b3e9

[Maps] Glacier new year update (#2864)

4b7be5d

Automatic changelog update

2a6800f

Rxup and others added 2 commits December 23, 2024 18:18

Merge pull request Rxup#985 from Roudenn/upstream-sync

f9aa07e

[Tweak] Upstream sync

Merge branch 'upstreams' of https://github.com/fospas/Space-Cats-14 i…

d83fd0c

…nto upstreams

github-actions bot added S: Untriaged size/XL S: Merge Conflict labels Dec 23, 2024

github-actions bot added Changes: Localization Changes: UI Changes: Sprites Changes: Map Changes: Shaders Changes: Audio and removed S: Untriaged S: Merge Conflict size/XL labels Dec 23, 2024

syns

404e5f6

github-actions bot added the size/XL label Dec 23, 2024

CrimeMoot added 8 commits December 23, 2024 21:21

fix

f2af026

fix source

0fd4192

fix xd

49f7bc5

fix?

f174952

fix dublicate

aa808e0

fix

b810e65

fix?

b4dea2f

fix

198d853

CrimeMoot closed this Dec 23, 2024

CrimeMoot deleted the upstreams branch December 23, 2024 17:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstreams #721

Upstreams #721

CrimeMoot commented Dec 23, 2024

coderabbitai bot commented Dec 23, 2024 •

edited

Loading

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

github-actions bot commented Dec 23, 2024

github-actions bot commented Dec 23, 2024

github-actions bot commented Dec 23, 2024 •

edited

Loading

Upstreams #721

Upstreams #721

Conversation

CrimeMoot commented Dec 23, 2024

Описание PR

Медиа

Тип PR

coderabbitai bot commented Dec 23, 2024 • edited Loading

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

github-actions bot commented Dec 23, 2024

github-actions bot commented Dec 23, 2024

github-actions bot commented Dec 23, 2024 • edited Loading

Измененные карты:

coderabbitai bot commented Dec 23, 2024 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

github-actions bot commented Dec 23, 2024 •

edited

Loading