[Tweak] Upstream sync #990
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
* 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 armor crate
Co-authored-by: Emisse <[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]>
Co-authored-by: PJBot <[email protected]>
Initial commit
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
Removes Unneeded File
* Initial commit * Minor update
Co-authored-by: PJBot <[email protected]>
* Added support so that smile can use hats Changed Prototypes/Entities/Mobs/NPCs/pets.yml Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi Added smile_displacement.rsi/meta.json Added smile_displacement.rsi/head.png * Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1 Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/ Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi * Minor fixes: removing comments and change naming Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi * Removed smile_inventory_template.yml and used head_inventory_template.yml instead
* add guaranteed cotton pizza to pizza crates * saner parenting * Use clearer suffix on cotton pizza box
…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]>
Update hand_teleporter.yml
|
Important Review skippedMore than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review. 87 files out of 177 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 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? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
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)
Other keywords and placeholders
CodeRabbit Configuration File (
|
github-actions
bot
added
S: Untriaged
size/M
Changes: Sprites
|
RSI Diff Bot; head commit fe93c20 merging into f9aa07e Resources/Textures/Objects/Misc/Lights/lamp.rsi
Resources/Textures/Objects/Misc/Lights/lampint.rsi
Resources/Textures/Objects/Specific/Medical/defib.rsi
Resources/Textures/Objects/Fun/toys.rsi
Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi
Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi
Resources/Textures/Objects/Consumable/Food/ingredients.rsi
Resources/Textures/Objects/Misc/Lights/lampgreen.rsi
Resources/Textures/Objects/Misc/candles.rsi
|
Roudenn
force-pushed
the
upstream-sync
branch
from
6213c15 to
fe93c20
Compare
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.
тут вроде ничего особенного не изменилось?
🆑 Rouden