Upstream sync #1629
Merged
Upstream sync #1629
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
This was removed a while ago to prevent griefing. Since then we've obtained gas canister locks and are also trying to limit the amount of frezon that can be produced, so bring it back.
Wasn't sure where to put it but this seems least likely to break stuff.
* Remove plasma miners from maps * Revert "Remove gas prices temporarily (#22285)" This reverts commit 8b2579d.
Add atmos.speedup which is effectively a atmos-only time compression CVar. This adjusts heat capacities and transfer rates to effectively globally speed up the time constants of atmos. This allows faster response to heating/cooling changes and faster cleanups (by buffing scrubbers, pumps, and everything else) that is tunable through one global time compression CVar. It also achieves this without any thermodynamic unsoundness.
Co-authored-by: MouseHatsForAll <[email protected]>
* pt 1 * Miscellaneous gridinv UX
* add more pill canisters, Depends on Big Spin PR. * Ill just put the change here too and be mad when it merge conflicts fuck it. * Fix test fail.
* Jar * jar rsi
* reduce carton fill, depends on Big Spin PR * cursed packs
# Conflicts: # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Maps/europa.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Maps/omega.yml # Resources/Prototypes/Maps/packed.yml # Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 9cc7771 merging into 98094c8 Resources/Textures/Objects/Consumable/Drinks/jar.rsi
Resources/Textures/Structures/Machines/artifact_crusher.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.
Описание PR
Медиа
Проверки
Изменения