Upstreams #712

CrimeMoot · 2024-12-17T05:42:16Z

No description provided.

* Organize Sandbox Panel * Map Editing -> Editing * Unset ToggleMode on Suicide button. Can hardly un-suicide, no? * Remove 'Link machines' button that has done nothing for 3 years * Remember Sandbox window's position instead of forcing to center * Shows Spawns -> Show Spawns * Remove SandboxSystem.MachineLinking

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

* Give silicons proper lobby/character editor previews No more naked dummies, properly show a borg/AI sprite now. This means taking the JobEntity into account when spawning the dummy. For AIs I had to add a "JobPreviewEntity" field because they'd look like a posibrain otherwise. AI therefore uses a custom dummy entity I defined. Also I had to add some margins to the UI, because otherwise the 32x32 sprite of the AI would look bad. * Update Content.Shared/Roles/JobPrototype.cs * Update Content.Client/Lobby/LobbyUIController.cs * Update Resources/Prototypes/Entities/Mobs/Player/silicon.yml --------- Co-authored-by: slarticodefast <[email protected]>

* Fixed various issued identified during playtests. * Fixed a firelock stuck closed * Added more cameras and moved others * Fixed an issue with disposals

This reverts commit f27fa1e.

…r) (#33785)

These were coded to only listen to InteractHand, which doesn't follow our interaction model properly.

…oor, force detective to have a selected outerclothing like all other sec roles (#33765) fix detective vox spawning with their outer clothing on the floor

* fix gas pipe unanchoring * remove unneeded update * revert popup change

* max duration * comment

* Popup when being pulled * Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs Co-authored-by: MilenVolf <[email protected]> * Update Resources/Locale/en-US/movement/pulling.ftl Co-authored-by: MilenVolf <[email protected]> --------- Co-authored-by: MilenVolf <[email protected]>

* Fix disposals. * Rename properly --------- Co-authored-by: sleepyyapril <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>

* Major Marathon atmospherics rework * More atmos changes --------- Co-authored-by: dylanstrategie <[email protected]~>

…3348) * Adds an introductory message to the user-facing ahelp chat window * Update Resources/Locale/en-US/administration/bwoink.ftl * Update Resources/Locale/en-US/administration/bwoink.ftl --------- Co-authored-by: chromiumboy <[email protected]>

add audio label to labeler

whoops

Pettable AI core

* does everything * beer flavor revert and linter fix * Update Resources/Locale/en-US/flavors/flavor-profiles.ftl Co-authored-by: Thomas <[email protected]> * fix misspelling * fix yet another misspelling Co-authored-by: Thomas <[email protected]> * english has weird spellings huh * im starting to feel ashamed of myself * this is shameful --------- Co-authored-by: Thomas <[email protected]>

* Fix Meta TEG power issues, give singulo more scaffold, give AI two cams in singulo containment like other stations * remove serialized invalids because it happens to the best of us * properly setup cameras, label substation and atmos APC while I'm here

Co-authored-by: kvant8 <[email protected]> Co-authored-by: Ko4ergaPunk <[email protected]>

[Tweak] Upstream sync

Maiden by Remuchi

coderabbitai · 2024-12-17T05:42:26Z

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.

67 files out of 162 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-17T05:42:29Z

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

github-actions · 2024-12-17T05:43:10Z

RSI Diff Bot; head commit 03e3ee3 merging into 298b7a9
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Structures/Furniture/rollerbeds.rsi

State	Old	New	Status
cheap_rollerbed			Modified
cheap_rollerbed_buckled			Modified
cheap_rollerbed_folded			Modified
emergency_rollerbed			Modified
emergency_rollerbed_buckled			Modified
emergency_rollerbed_folded			Modified

Resources/Textures/Structures/Wallmounts/posters.rsi

State	Old	New	Status
poster52_legit			Modified

Resources/Textures/Clothing/Head/Hats/beret_warden.rsi

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

Resources/Textures/Clothing/Head/Hats/safarihat.rsi

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

Edit: diff updated after 03e3ee3

github-actions · 2024-12-17T05:45:43Z

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

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

SpaceManiac and others added 30 commits December 7, 2024 19:13

let bagel be played at max pop (#33769)

c85642d

Codeowners cleanup (#33297)

337952d

Update Credits (#33772)

3d53e74

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

Automatic changelog update

4661e9e

Amber Station - Playtest Fixes (#33773)

73d5129

* Fixed various issued identified during playtests. * Fixed a firelock stuck closed * Added more cameras and moved others * Fixed an issue with disposals

Revert "Simplify separated screen top menu (#33047)"

8472603

This reverts commit f27fa1e.

Revert "Simplify separated screen top menu (#33047)" (Stable -> Maste…

0c4dd9d

…r) (#33785)

Singularity equipment can now be activated with E interact (#33762)

f9da258

These were coded to only listen to InteractHand, which doesn't follow our interaction model properly.

Automatic changelog update

98ad7a8

Fix detective Vox spawning with their chosen outer clothing on the fl…

34bfc59

…oor, force detective to have a selected outerclothing like all other sec roles (#33765) fix detective vox spawning with their outer clothing on the floor

Automatic changelog update

c4556fc

Fix gas pipe leaking when unanchoring or breaking them (#33774)

ede8a1d

* fix gas pipe unanchoring * remove unneeded update * revert popup change

Automatic changelog update

670f1a8

Signal timer duration limit (#33781)

d57e731

* max duration * comment

Automatic changelog update

a7e1adf

Automatic changelog update

1510e89

Fix Disposals Ejections (#33468)

7fd8980

* Fix disposals. * Rename properly --------- Co-authored-by: sleepyyapril <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>

Major Marathon atmospherics rework (#33688)

38c35d8

* Major Marathon atmospherics rework * More atmos changes --------- Co-authored-by: dylanstrategie <[email protected]~>

Automatic changelog update

a7957dd

add "Changes: Audio" label to labeler (#33790)

8bb4c82

add audio label to labeler

Derelict icon hotfix (#33768)

3844352

whoops

You can now pet the AI core. (#33788)

60bf48c

Pettable AI core

Automatic changelog update

35b1c04

Automatic changelog update

dd96f77

Ko4ergaPunk and others added 13 commits December 14, 2024 23:17

[Maps] Tushkan new year update (#2851)

d27e5d9

[Maps] Pilgrim new year update (#2850)

b33fc55

[Maps] Maus new year update (#2849)

b75a24a

[Maps] Awesome new year update (#2848)

1be6a6b

[Maps] Outpost return (#2847)

2f27031

Co-authored-by: kvant8 <[email protected]> Co-authored-by: Ko4ergaPunk <[email protected]>

[Maps] Astra new year update (#2844)

74f47dc

Update corvax_delta.yml (#2856)

7fa704a

Merge remote-tracking branch 'wizard/master' into upstream-sync

e78a01c

Merge remote-tracking branch 'corvax/master' into upstream-sync

3d1fba9

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

b96e693

[Tweak] Upstream sync

Automatic changelog update

780b51c

Yooooo! (Rxup#983)

df17876

Maiden by Remuchi

Automatic changelog update

03cf326

github-actions bot added the size/L label Dec 17, 2024

github-actions bot added S: Merge Conflict S: Untriaged Changes: Localization Changes: UI Changes: Sprites Changes: Map and removed size/L S: Untriaged S: Merge Conflict labels Dec 17, 2024

Merge branch 'master' into upstreams

03e3ee3

github-actions bot added the size/L label Dec 17, 2024

CrimeMoot merged commit ec2ac1f into master Dec 17, 2024
11 of 12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstreams #712

Upstreams #712

CrimeMoot commented Dec 17, 2024

coderabbitai bot commented Dec 17, 2024

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 17, 2024

github-actions bot commented Dec 17, 2024 •

edited

Loading

github-actions bot commented Dec 17, 2024

Upstreams #712

Upstreams #712

Conversation

CrimeMoot commented Dec 17, 2024

coderabbitai bot commented Dec 17, 2024

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 17, 2024

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

github-actions bot commented Dec 17, 2024

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

CodeRabbit Configuration File (`.coderabbit.yaml`)

github-actions bot commented Dec 17, 2024 •

edited

Loading