[Tweak] Upstream sync #1019
Merged
[Tweak] Upstream sync #1019
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 option to disable bwoink sound. * Now it's working only with active admin status. * No bwoink, only "notification sound" * Moar changes * Another one
* More scarfs (Rxup#216) * Sprites + Colored Scarf Implimentation Doesn't include into quickthreads or other clothing vendors * File Paths are important * Metas, items exist, winterdrobe I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk * File Path Fix * Typo fix * Resolved merge conflict * Moved scarves around * Moved scarf textures out of the _CD directory * Removed final CD folder * Removed extra scarfs * Removed extra scarfs, again * Replaced ClothingNeckBase with ClothingScarfBase --------- Co-authored-by: PursuitInAshes <[email protected]> Co-authored-by: TakoDragon <[email protected]>
* Add Freelance intercom prototype, and replace the djstation ruin with them instead of three master keys * removed a new line
* Initial commit * Finalizing main changes * Addressed reviews * Fixed a few issues * Switched to using global overrides * Removed unnecessary references
I noticed that enumerating gases is frequently done in an annoying way with Enum.GetValues. So I made it better. Now GasMixture is IEnumerable<(Gas gas, float moles)> and it just works.
1. Now clearly says "opened"/"closed" when changing the release valve. 2. Clearly says whether the valve was opened while a canister was inserted or not. 3. When a tank is ejected, logs if the valve is open and the ejection started spilling into the environment. Fixes #34488
* Optimize & clean up RadiationSystem * comments * Update Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs Co-authored-by: Thomas <[email protected]> --------- Co-authored-by: Thomas <[email protected]>
Random spelling error and FTL linting (+PowersinkSystem because there was an misspelt locale for that)
* space weh can now be work on top of head * space weh can now be worn on top of head * trim out unnecessary comps
Co-authored-by: Winkarst <[email protected]>
Add 10u plasma to the chemistry locker so the chemists stop stealing tables.
* Removed highcap from seclite * Changed cyborg starting battery to highcap, reduced seclite wattage to make it last as long as it used to. * Gave cyborgs back their medcap * Rounded seclite wattage down to 0.5
* new empty.ogg * source to tg commit
* Make radioactive material radioactive * Increase the slopes of item uranium No free power for engineering * Glowing uranium * Revert "Increase the slopes of item uranium" This reverts commit 2acbda26 * Nerf Wall Rocks
* Fixed a few minor things, removed salvage's shuttle parts (sorry), added more equipment to armory. * Added back salvage shuttle equipment, now in a crate * Fix
replace all instances of "department-{id}" with department.name"
* Renamed sexy clown and mime mask and removed lusty xenomorph poster. * removing odd file changes. not sure why these were edited at all. * gaaaahhh * removed some of the old templates * Renaming sexy mime and clown instances. * removed unwanted gitignore edit * Renaming sexy clown and sexy mime mask and Removing lusty exomorph poster. * Remove lusty xenomorph poster. * reverted changes to maps files, actually. Other contrib is learning, appologies for excessive commits * requested changes * lusty migration removal * dirty hanging whitespace * correct date format comment --------- Co-authored-by: NathanielJ14 <[email protected]>
… (#34612) Moved Cyborg Recharging Cirbuit Board from Lathe to Circuit Imprinter
THE FLESH IS WEAK
* fixed grav gen room, gave atmos room to branch off, replaced AME controller crate with AME controller * added rust to maints, expanded atmos, expanded bar, expanded cap bedroom, fixed some tiles under doors, removed some gamer loot * removed interrogator lamp and some more gamer loot * fixed some more tiles under doors, replaced intercomall with intercomcommand in bridge and vault * added clothing drobes to arrivals, added bin to HoP, more stuff i forgot * i forgot to move the file from /bin to /resources...
|
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. 153 files out of 245 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 cc6b03a merging into d366ab5 Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/pan.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/trans.rsi
Resources/Textures/Objects/Consumable/Food/ingredients.rsi
Resources/Textures/Objects/Fun/toys.rsi
Resources/Textures/Objects/Weapons/Bombs/c4.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.
🆑 Rouden