upstream: september 2025 #494
Merged
Conversation
This file contains hidden or 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
…slip properties (#40201) Crashed the snakeskin boots stockmarket by removing their non-slip properties
…on clearer (#40375) * Renamed regular implanter (the extractor from the medifab) to implant extractor * wrong way
silence!!! Co-authored-by: iaada <[email protected]>
* Added tactical katana + tactical katana shipment (placeholder descriptions) * Revert "Added tactical katana + tactical katana shipment (placeholder descriptions)" This reverts commit aa1928be7f4d938df1838943781e63c47a03cc11. Whoops, committed to master by mistake * Made ninja items highly illegal * Rerun checks
* Make ichor heal brute, burn, and toxin evenly * Nerf healing to more reasonable values
* Initial commit * Minor changes
* Added Cutting Slicing and Executing options to the cane blade * swaped from BaseItem to BaseSword for cleaner code * fixed a double gap in code
Sent tarantulas to the gym
* finally some good objectives * oopsie * guh fuck * more steal objectives that are actually good * i want to die * fucking upload to github please * adding it to the objectiveGroups.yml * higher weights for testing * upload * just need to do text shit. coding done waow * OBJECTIVES WORK AND HAVE TEXT. FIX VIS * I THINK ITS DONE AAAAAAAAAAAAAAA * grammatical fix * more formatting fixes * i might be stupid * forgot to fix a weight issue * more grammar grrrrrrrrrrrrr * made the double barrel obj have higher difficulty since it's cared about more than beer goggles * Requested Changes * forgot a thing oopsie
* XL8 files * slap dat on the ERT lead * oop mag indicator offset * fix newline
fix chasm test
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Vulpekin emotes are missing
|
AAC tablet typing indicator regression
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
70 participants
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.
Sync with Wizden @ 2dc0cef.
An earnest attempt to catch up with months of technical debt from cherry-picking and squash merging. Perhaps this will retroactively correct inaccuracy with git blame.
Notable Upstream Changes
check out our forum for a fuller readout of changes and discussions thereof! here are the highlights:
Relevant History
Tasks
Resources/Locale/en-US/datasets/arcade_villain.ftlClothingEyesHudCommand, probably requires Syndicate respriteWeaponPulsePistolwas made Centcomm contraband and may need to be changed to Syndcomm contraband_starcupusingFoodorDrinkcomponent needs to be made to useEdibleinstead[ERRO] system.sprite: Layer with key 'BaseCharging' does not exist on entity space disposal unit (24917/n33540, SpaceDisposalUnit)! Trace:RipleyChassiswas removed upstream and migrated out, revert this