Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tweak] Upstream sync #976

Merged
merged 92 commits into from
Dec 8, 2024
Merged

[Tweak] Upstream sync #976

merged 92 commits into from
Dec 8, 2024

Conversation

Roudenn
Copy link
Collaborator

@Roudenn Roudenn commented Dec 7, 2024

🆑 Rouden

  • tweak: Сервер обновлён до последней версии Upstream 07.12.2024.

Doctorjakes and others added 30 commits November 30, 2024 18:45
* Fix for over-cuffing someone

* comment
Actually inspect entity in hands
* Fix borgs not getting names on roundstart

* Glory to the NT

* Allow riggable to take in multiple reagents

* Revert

---------

Co-authored-by: Winkarst <[email protected]>
* Add MeleeRequiresWield component

* Prevent world activation
Fix makeghostroleraffle command with 4 arguments
* Remove usage of obsolete GetTilesIntersecting round 1

* Oop wrong uids

* Remove usage of obsolete GetLocalTilesIntersecting round 2

* Remove usage of obsolete GetLocalTilesIntersecting final round

* weh

* Fix using `SharedMapSystem` in `StencilOverlay`
* Update Snowasis

* Appease test gods

* Woops had the leftward animation backwards. Fixed.

* add santa suits and envelopes to chapel

* It looks worse unscaled but whatever.

* fix ghost role

* examines
Fix wrong system using
* Add check before marking event as handled

* Update Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs

Co-authored-by: slarticodefast <[email protected]>

* Cleanup

---------

Co-authored-by: slarticodefast <[email protected]>
* Touching up Bagel Security Brig

* Added a few missing door names

* Last door name I promise

* Address feedback

* Forgot to delete old shutter button

---------

Co-authored-by: dylanstrategie <[email protected]~>
* fix ghost role rules for some syndicate familiars

* change from monkey rules to Team Antag rules.

* Resolve reviews + Fix rules for LoneOp and Xenos

* ghostrole rules

---------

Co-authored-by: JIPDawg <[email protected]>
Co-authored-by: Errant <[email protected]>
PJBot and others added 19 commits December 6, 2024 06:23
* Added evac shuttle and fixed various issues brought up during playtests

* Updated Amber with playtest feedback, removed waste loop and firelocks from evac shuttle
* vox guidebook regen update

* damage number

* skreee
Update DungeonJob.PostGenBiome.cs
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: slarticodefast <[email protected]>
* Make unknown shuttle events trigger an announcement

* Call base at the end

---------

Co-authored-by: Winkarst <[email protected]>
* Predicted gas pumps

I wanted to try out atmos and first thing I found.

* a

* Remove details range
* 圣诞歌曲

* Update Resources/Audio/StationEvents/attributions.yml

Co-authored-by: slarticodefast <[email protected]>

---------

Co-authored-by: slarticodefast <[email protected]>
Added more holiday decorations
@Roudenn Roudenn requested a review from Rxup as a code owner December 7, 2024 11:26
Copy link
Contributor

coderabbitai bot commented Dec 7, 2024

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.

138 files out of 231 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 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 github-actions bot added S: Untriaged size/L Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation labels Dec 7, 2024
Copy link
Contributor

github-actions bot commented Dec 7, 2024

RSI Diff Bot; head commit 60b5161 merging into 189d4a1
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Devices/nuke.rsi

State Old New Status
nukefestive Modified

Resources/Textures/Corvax/Mobs/Species/displacement.rsi

State Old New Status
jumpsuit-female Added

Resources/Textures/Mobs/Animals/reindeer_buck.rsi

State Old New Status
reindeer_buck Added
reindeer_buck_dead Added
reindeer_buck_still Added

Resources/Textures/Mobs/Animals/reindeer_doe.rsi

State Old New Status
reindeer_doe Added
reindeer_doe_dead Added
reindeer_doe_still Added

Resources/Textures/Mobs/Silicon/chassis.rsi

State Old New Status
derelict Added
derelict_e Added
derelict_e_r Added
derelict_icon Added
derelict_l Added

Resources/Textures/Objects/Devices/gates.rsi

State Old New Status
logic_a Added
logic_b Added
logic_o Added

Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi

State Old New Status
locker-effect Added
locker-inhand-left Added
locker-inhand-right Added
locker Added

Edit: diff updated after 60b5161

@Rxup Rxup merged commit c48fca4 into Rxup:master Dec 8, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design S: Untriaged size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.