Upstream sync #1809
Merged
Upstream sync #1809
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
* Mime hardsuit * small fix * Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml Co-authored-by: lzk <[email protected]> * New sprite * newest sprite * No more CTRL+C CTRL+V * update sprite in hand * final sprite in hand --------- Co-authored-by: lzk <[email protected]>
* commit * fix fucking pixel
Holoprojectors - Dec now have holoprojectors - Sec locker have 0.5 chance to spawn holoprojector
* rework * bruh * all fixed * balance * bb * Update TileAnomalySystem.cs * Update EntityAnomalySystem.cs * spawn on shutdown variant * fix entites, fix DataRecord * fix some review * god forgive me * oh fuck wrong brench * Revert "oh fuck wrong brench" This reverts commit c81f57f7830c8e55fd47982500c57281af40b0dc.
* PACMAN generators show network load/supply. This gives more feedback to players that their PACMAN is properly connected and what the network status is (i.e. you don't have enough generators). * Buff JRPACMAN to 8 kW. Shifted all power values up by +3 kW. They're frequently too weak to power even single rooms so they deserve a buff. * Change unit format helpers number format. Always displays one digit of precision. This avoids jumping around when a value is changing live.
…(#23601) II immunity Make ERT, DeathSquad and Central Command officers immune to being II
* 20blunt8pierce * ShotgunSlugLathe * Commentbecauseapparentlyitdoesntknowichangedthis * nevermindthereweretwo * 28pierce
* fix singulo combining debug assert * oh that wasnt useless --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* add * yea
* Keep reagent dispenser inventory ordered This way, reagents wont be "moving around" in the UI when juggling jugs. The reagent dispensers will also show what reagents their storage slots contain if jugs are not labelled. * Move sorting client-side * Revert "Keep reagent dispenser inventory ordered" This reverts commit 3a1fc2e36d593937d4ecc581ae5a617a273a9d1c.
* Add Repairable to vending machines * Removed fuelcost (outdated)
* balance * gorilla gauntlet fix * magboots update * some more buff * randomwalk speed scales with severity * nerf * content * Revert "content"
* hallway screen refactor pending comms console support * comms console broadcasts * screen and timer localization
Fixed up bartending after the limited reagents update
Fixes space-wizards/space-station-14#24574 Moved back view sprite one pixel to the right.
# Conflicts: # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json # Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-left.png # Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-right.png
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit d9aac14 merging into 5ba0f36 Resources/Textures/Objects/Consumable/Drinks/water.rsi
Resources/Textures/Structures/Specific/anomaly.rsi
Resources/Textures/Clothing/Head/Hardsuits/mime.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi
Resources/Textures/Objects/Consumable/Drinks/generic_jug.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
Медиа
Проверки
Изменения