Upstream sync #1026
Merged
Upstream sync #1026
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
* Add Reagent gold and silver solification with frost oil * Update Resources/Prototypes/Recipes/Reactions/fun.yml * Update Resources/Prototypes/Recipes/Reactions/fun.yml * edit frostOil value * Update Resources/Prototypes/Recipes/Reactions/fun.yml * Update Resources/Prototypes/Recipes/Reactions/fun.yml --------- Co-authored-by: slarticodefast <[email protected]>
* Only randomize orbit parameters once * Revert "Only randomize orbit parameters once" This reverts commit e828c51e66600bf11b66308169da1d1daf7501e3. * Derive orbit properties from current time * Derive orbit progress from current time * Remove now-unused orbit animation * Remove OrbitVisualsComponent.Orbit as it is no longer used * Update AnimationPlayerSystem method calls to Entity<T> versions
* Changed law Changed a must always law to have wording that does not encourage message spamming. * Fixed a mistake Forgot to remove the "YOU MUST ALWAYS" from the commit. * Reworded the law Reworded the law to be more open the other potential options.
* Renames Smite Spells yml to Touch Spells and Renames Smite Spells region to the same * Adds wizard clothes requirement to Smite. Adds Cluwne spell. Adds EnsureCompOnTouchSpellEvent and implements it in the magicsystem * Adds Smite and Cluwne to the grimore and loc for them * Adds Slippery Slope spell and SlipOnCollide * Adds handled for comp spell event * Removes super slippery * Removes EnsureCompOnTouchSpell it was redundant with ChangeComponentsSpellEvent * Makes requirement-free action for smite * checks if we should be slipping what we touch * Removes SlipOnCollide, adds negative speed for steptrigger * Removes slip on collide adds negative speed for steptrigger
gods forgive me
* hypereutactic textures * adds hypereutactic blade * adjusts attack speed and damage * adjust attack speed and adds movement modifier * Adds structural damage * Readjusts the attack rate to be 0.8 * Adds Hypereutactic blade to the upliink * Adds use delay and structural damage, fixes disappearing wielded sprite * Changes wideAngleAnimation to 180 and range to 2.5 * Adds copyright. Changes range to 2.0 * Required wield * Changes reflect chance to 100% * Comments for future todos * Description update * Removes duplicate mapping * removes from uplink * Reorder and remove indents
fixed typos
* Reimport of .yml files, edit to medidrobe.yml * Fixed typo for "Richard" in AutoDrobe contrabandInventory * contrabandInventory Revision * Add a spare bible to PietyVend (#32363) Update chapel.yml * Bible to normal inventory, not contraband * Balance changes based on maintainer feedback. * VendoMat change to Proximity Sensor and Borg Arm. * Revert "VendoMat change to Proximity Sensor and Borg Arm." This reverts commit 44c68daaaedeea26f9376db7f65d1e01771a761e. * PR Rebase, Fixing Reversion * seeds.yml Bungo Seeds swapped for Tobacco Seeds. --------- Co-authored-by: Jarmer123 <[email protected]>
* Resprite Boxes and Icons + Remove Boxes * Update Meta * Update Flatpacks * Update Shotgun Ammo Boxes * Remove Leftover Ammo Box Icons * Update Donk Pocket Boxes * Update Briefcase * Update Happyhonk + Remove Open Sprites * Update Medal Case * Update Cigarette Packs * Update Cigarette Cartons * Update Medkits * fix positioning for medkits * Update Junk Medkit * Update Present * Tweak Rad and Burn Medkits * Tweak Briefcase * Update Toolboxes * Update Decoy Boxes * Fix Meta for Healing toolbox * Update Cow tool box * Update Donut Box * Removal of left over rubber bullet sprites and duplicate ammo box sprites * Removal of Duplicate Ammo Boxes * Update .20 rifle ammo box * Update .35 ammo box + fix meta * Update .45 magnum ammo box Sprites * Update .25 caseless ammo * Remove leftover box * Update cargo_service.yml * Fix Icon Cigs * fix big .20 ammo box * Update Black Cigs Pack * Update Cig Placement * Update Blue Cigs * Update Cig Packs * Re-Add Big Ammo box for the USA guns vending machine lol * Remove 10x24 mention in migration.yml * Update Big Cig Cartons * Remove Toolbox Changes
This reverts commit 3e091c4.
This reverts commit fd25dac.
This reverts commit 3ad8337.
* added optional delay to DragInsertContainerComponent * comments * Change EntryDelay on DragInsertContainerComponent to use TimeSpan + cleanup * changed drag insert container comp to match naming conventions
* Reduce NukeOps Reinforcement to 25TC from 35TC * price adjustment to 30 * Revert "price adjustment to 30" This reverts commit f337f5a178a344db34a414a47283f43242ea531f. * revert "price adjustment to 30" This reverts commit f337f5a178a344db34a414a47283f43242ea531f. submodule?! YAML preserve me... * Revert "price adjustment to 30" This reverts commit f337f5a178a344db34a414a47283f43242ea531f. submodule!?!? yaml save me * attempt #2 at changing to 30
* Elf Supremacy * Delete old ears * Review Fix
* Make hacking energy swords predicted * Fix up component, add dirty call * access * Dirty Entity<T> * false
* Increases Disabler Bolt to 47 stamina damage per. Increases fire rate to 3 and lowers shot cost by 50 for practice and disabler * lowers stam per shot to 40 * increases disabler proj speed to 35 * ACTUALLY 4 shot * Reverts disabler projectile to be 33 stamina damage per again. decreased disabler fire rate to 2.5 and increased projectile speed to 35. decrease disabler smg fire rate to 3.5 * Fire rate back down to 2
|
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. 94 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
size/L
S: Untriaged
Changes: Sprites
|
RSI Diff Bot; head commit 3b2b397 merging into c43a6d0 Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi
Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi
Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
Resources/Textures/Objects/Decoration/present.rsi
Resources/Textures/Objects/Devices/flatpack.rsi
Resources/Textures/Objects/Materials/Scrap/generic.rsi
Resources/Textures/Objects/Misc/utensils.rsi
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi
Resources/Textures/Mobs/Customization/ears.rsi
|
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.
🆑