[Tweak] Upstream sync #1051
Merged
[Tweak] Upstream sync #1051
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
* Added Genderqueer pin! (Properly this time.) * Update meta.json
bagel update
* > Swapped the butter in boiled spaghetti with olive oil * Update meal_recipes.yml --------- Co-authored-by: beck-thompson <[email protected]>
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Test entered tree fix * Use Opened override * Fix keyboard focus on window open for DialogWindow This affects Phone, Pray, Rename, and multiple other admin verbs. * Clean up
fix minibomb implant not exploding
* cleanup not needed locale string * Update Resources/Prototypes/Actions/types.yml --------- Co-authored-by: slarticodefast <[email protected]>
* Remove custom character description after using DNA scrambler * Mark grammar as dirty when updating identity * Update Content.Server/Implants/SubdermalImplantSystem.cs --------- Co-authored-by: slarticodefast <[email protected]>
fixed control button - a single line of code
* Buff the Combat Bakery Kit uplink item * whitespace
fixed
Switches over all extant uses of TransformComponent.AttachToGridOrMap to use SharedTransformSystem.AttachToGridOrMap
…095) * add LatheRecipePackPrototype * change Lathe and EmagLathe to use packs * add AddRecipesFromPacks helper to SharedLatheSystem * update lathe logic to work with packs and clean up some stuff * migrate individual recipes to recipe packs * update client * remove node/artifact scanner from techs ** fix test and make it include emag recipes * add test that every dynamic recipe must be researched * pro * fix * fix * fix all tests, genuinely good test i wonder who made it * add unused uranium and incendiary drozd mags to tech and lathe * add recipes * add incendiary prototype * undo some changes * troll *
Update plasma.yml Co-authored-by: jbox1 <[email protected]>
* Add paper door sound * Update attributions yml * Update material_doors.yml * Update attributions.yml
* wooden grip on antique laser, changes description to match. * darker grip * update meta.json * redesigned shape similar to ps3moira, edited mag to match, changed lights colors to match each other * fixing an only SLIGHTLY catastrophic fuckup with an experimental inhand sprite that I didn't mean to save and sleepily added to the previous commit * I DID IT AGAIN * red kammerer bottom text * killed the cap laser things (hopefully) --------- Co-authored-by: gaussiarson-admin <[email protected]>
The flammable effect does it but we don't do it here for reasons. Sometimes this heisentests.
…(#33447) * Fix sprite layering upon strapping/unstrapping * switch from strap to buckle events * Use screen-local North for the checks instead Build on top of PR #31625, but I'm not wanting to just push to someone's older PR without a warning. --------- Co-authored-by: themias <[email protected]>
* Slime plushie now squishes * Remove useSound
* Grilled Cheese Prototype * Typos * Removed butter reagent to test flavour changes. * Flavour corrections. * CC-BY-SA-3.0 attribution * Fixing meta.json * I lost an hour of my life to a missing comma in meta.json * Merge Conflict Rebase and Test Fixing * Cook time to 10 seconds. * Sandwich nutritional balance * Grilled cheese sprite fixed, found the actual original source for copyright.
|
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. 120 files out of 299 files are above the max files limit of 100. 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
size/M
S: Untriaged
Changes: Sprites
Rxup
approved these changes
Feb 13, 2025
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