Upstream sync #1616
Merged
Upstream sync #1616
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
* Added Emergency Nitrogen tanks and added both variants to the Emergency Closet loot pool. * Restored O2 tank I deleted :) * Fixed accident with extended emergency oxygen tanks * Fixed an issue with emergency oxygen tanks --------- Co-authored-by: DangerRevoltion <[email protected]>
Co-authored-by: Lazzi0706 <[email protected]>
* removes paramedic EVA suit from medidrobe * oops * removes paramedic suit from medidrobe * caved in * i actually forgot to remove the regular clothes * Update medidrobe.yml
* ActionComponents subscribe to RejuvenateEvent, resets cooldowns * forgo a line * Update Content.Shared/Actions/SharedActionsSystem.cs Co-authored-by: faint <[email protected]> --------- Co-authored-by: Nemanja <[email protected]> Co-authored-by: faint <[email protected]>
* add water cup bin to water cooler * Fix punctuation, and add proper components/tags on init * I forgor and refactoring event construction
* First brick laid. * Revert "First brick laid." This reverts commit f5e74af1bfe70cc083a14d9d668ea08f9d36befa. * Removed power cell requirement from cyborg construction, minor correction.
* Gridinv fixes * eek * oh yeah this too * eek
* empty wallmount board at user * change to DropNextTo * add emptyAtUser to doors
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 8e82b67 merging into 52ddb40 Resources/Textures/Clothing/Shoes/Misc/snakeskin.rsi
Resources/Textures/Mobs/Animals/spacecobra.rsi
Resources/Textures/Mobs/Customization/human_hair.rsi
Resources/Textures/Mobs/Customization/reptilian_parts.rsi
Resources/Textures/Mobs/Demons/honkmother.rsi
Resources/Textures/Mobs/Demons/narsie.rsi
Resources/Textures/Objects/Consumable/Food/meat.rsi
Resources/Textures/Objects/Tanks/emergency_red.rsi
Resources/Textures/Objects/Tools/crowbar.rsi
Resources/Textures/Objects/Tools/wrench.rsi
Resources/Textures/Structures/Furniture/furniture.rsi
|
Co-authored-by: deltanedas <@deltanedas:kde.org>
* implements greyscale chairs * bob
* CMO has external access * the tides have turned. If cmo cant have it nobody can >:)
# Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Textures/Objects/Tools/crowbar.rsi/meta.json # Resources/Textures/Objects/Tools/wrench.rsi/meta.json
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
Медиа
Проверки
Изменения