Upstream sync #1514
Merged
Upstream sync #1514
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 * Update meta.json * tweaaaak
Add omnizine and increase nutriment as the comment suggest.
Co-authored-by: onoira <[email protected]> LGTM!
LGTM, Just a warning that this will probably get overriden when medical refactor gets merged since it refactors gibbing.
Co-authored-by: Jeff <[email protected]>
* Add sufix to flash * It's 4 am please help
* Pixels go brrr * Update meta.json
* Fixy fix fix uwu merge pwease * admin message to inform them * oop
* make meat sizzle when cooked * fixy * better sound * vorbis ops * fade out --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* wet floor bomb prop made it more powerful * Update uplink_catalog.yml Made it clearer and credited myself
* add textures * fix cargo/cargo-fun.ftl * fix cargo/cargo-fun.ftl again * update icons and resize hitbox * really fixed cargo.ftl * fix soundSpecifier * balance changes: solution transfer has been reduced from 2 to 1. Now the transfer does not work on targets wearing anything in the outerclothing slot * add hypodart to uplink * return of darts solution capacity to 2u * Update uplink-catalog.ftl * Update uplink_catalog.yml * Update darts.yml * remove hypodart sprite * Update darts.yml * Update fun.yml * add random popups component, resprite dartboard * localize darts * fix * Update darts.yml
c4 is reduced to 2 from 4 and the bundle to 12 from 20
# Conflicts: # Content.Server/MassMedia/Systems/NewsSystem.cs # Resources/Prototypes/Catalog/uplink_catalog.yml # Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json # Resources/Textures/Objects/Storage/boxes.rsi/meta.json
github-actions
bot
added
Status: Needs Review
Morb0
added a commit
that referenced
this pull request
Oct 20, 2023
Co-authored-by: Morb <[email protected]>
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
Медиа
Проверки
Изменения