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

Ups #726

Merged
merged 114 commits into from
Jan 1, 2025
Merged

Ups #726

merged 114 commits into from
Jan 1, 2025

Conversation

CrimeMoot
Copy link
Collaborator

No description provided.

LevitatingTree and others added 30 commits December 19, 2024 17:44
* Remove plushie_lizard_mirrored.png

* Remove from meta.json

* Replace mirrored state from yml

---------

Co-authored-by: LevitatingTree <None>
* Initial commit

* AIs get a warning when trying to answer long distance calls

* Better handling of ending telephone calls

* Fixed issue with duplicated holopad window when an AI answers a summons

* Changed how ranges are handled, added the bluespace holopad

* Bug fixes

* More bug fixes

* More bug fixes

* Update Resources/Prototypes/Entities/Structures/Machines/holopad.yml

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

* Update Resources/Prototypes/Entities/Structures/Machines/holopad.yml

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

---------

Co-authored-by: slarticodefast <[email protected]>
* update fland for holopads

* fix duplicate holopad name
…botics (#33960)

removed borg spawnpoint from engineering, added one to robotics

Co-authored-by: august-sun <[email protected]>
Mainly useful for medicalborg so you can get a looping sound and not footsteps playing over and over.

Didn't actually update medborg because footsteps need updating.

Not needed for AI.
Revert "New Nukie Song (#25765)"

This reverts commit 806c0d1.
fix Communication console
* merge licence files

* actual commit

* whoops
* All hostile turret

* Other factions are now hostile against "all hostile" too
* First commit

* Fix silly test

* Swiched stuff up

* Update Content.Shared/Medical/DefibrillatorComponent.cs

* remove unneeded visuals

---------

Co-authored-by: slarticodefast <[email protected]>
…#32515)

* Weh

Weh

* Now hostiles too!

Added Dragon to hostile factions for Hostiles

* Nah

Better not do this, I think
* Add description of tool qualities to entity

* LMAO I FORGOT FUCKING FTL FILE

* minor cleanup

---------

Co-authored-by: slarticodefast <[email protected]>
* Adds chirping to adult diona

* Added vocals for diona nymph

* Nymphs now have a speechsound
* Increase uplink discounts from 3 to 7

* nevermind, 6
ArtisticRoomba and others added 12 commits December 29, 2024 03:02
…ds for moffs (#33508)

* A looooooooot of new cotton foods for the moffs

* address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs)

* alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png

* update requested sprites

* change requested sprites

* address part of sloth's review, awaiting response

* address second half of review, fix magical food nutriment mitosis bug
* Remove filters from joint crafting

* err

* hmmm

* guhhh

* yyyy

* whitespace

---------

Co-authored-by: Velcroboy <[email protected]>
fix
Copy link

coderabbitai bot commented Jan 1, 2025

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.

88 files out of 179 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.

Copy link

github-actions bot commented Jan 1, 2025

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

Copy link

github-actions bot commented Jan 1, 2025

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

Resources/Textures/Objects/Misc/Lights/lamp.rsi

State Old New Status
christmaslamp-on Modified
christmaslamp Modified

Resources/Textures/Objects/Misc/Lights/lampint.rsi

State Old New Status
burnt Modified
flashing Modified
lamp-int-on Modified
lamp-int Modified

Resources/Textures/Objects/Specific/Medical/defib.rsi

State Old New Status
screen Modified
ready Removed

Resources/Textures/Objects/Fun/toys.rsi

State Old New Status
plushie_lizard_mirrored Removed

Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi

State Old New Status
head Added

Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi

State Old New Status
bagel-cottondough Added

Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi

State Old New Status
baguette-cotton-equipped-BELT Added
baguette-cotton-inhand-left Added
baguette-cotton-inhand-right Added
baguette-cotton Added
crostini-cotton Added

Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi

State Old New Status
chevrechaud-cotton Added
croissant-cotton Added

Resources/Textures/Objects/Consumable/Food/ingredients.rsi

State Old New Status
cotton-dough-rope Added
cotton-dough-slice Added
croissant-raw-cotton Added

Resources/Textures/Objects/Misc/Lights/lampgreen.rsi

State Old New Status
christmaslamp-on Added
christmaslamp Added

Resources/Textures/Objects/Misc/candles.rsi

State Old New Status
loadout Added

Edit: diff updated after 1293786

@github-actions github-actions bot added the size/M label Jan 1, 2025
Copy link

github-actions bot commented Jan 1, 2025

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

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

@CrimeMoot CrimeMoot merged commit 8a6a895 into master Jan 1, 2025
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.