Upstream sync #1430
Merged
Upstream sync #1430
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
Co-authored-by: deltanedas <@deltanedas:kde.org>
* add names for power infrastructureon aspid * added missing SMES names on Aspid
* ninja can spawn earlier, 1h reoccurence * need 40p --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
This reverts commit 8084a69.
Co-authored-by: deltanedas <@deltanedas:kde.org>
* syndicate bomb tweaks & ss13 parity * 100s * 90s timer * fuck. my furniture * timer back to 120s, no more wire mirroring
* telescopic shield * research * removed the shield from the locker * sound * eh * fix
…and voice mask (#20131)
* slime space damage * base space damage
* Fixed logs * fix dumb entity stuff
* Add berries * Berry recipes * Add bungo fruit * yml tweaks * yummy poisonous pits * Technically it's a seed * Revert "Technically it's a seed" This reverts commit be892cf119c1e733ac2922b878aaa476f435152a. Slapping the seed component onto it led to unforeseen consequences, and I don't want to mess with the seed system for a mostly useless gimmick. * Revert 2 Electric Boogaloo This reverts commit 2c4fb34250e9369085d49e730de3dab0e077b687. * Small rewording * Cocoa balancing * Oops
# Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml
Morb0
force-pushed
the
upstream-sync
branch
from
8107772 to
60a0a98
Compare
Morb0
added a commit
that referenced
this pull request
Sep 19, 2023
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
Медиа
Проверки
Изменения