Upstream merge 60 #1680
Merged
Upstream merge 60 #1680
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
* Fix the folded folding chair * Whoops
add new loot into vgroid procgen
* add space debris to salvage magnet * multiplication * necessary mercy for NPCs * back and forth on mercy
make snapCardinals false for the nanotrasen sign. Co-authored-by: Zachary Yona <[email protected]>
…ds#31394) * Delete Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png * Add files via upload
…zards#31380) * Make holding down an arrow key traverse the pointer in chat * Better way
Dinnerware Vending Machine access changed from Service to Kitchen Co-authored-by: Preston Smith <[email protected]>
…wizards#31401) chrisp is spelled as crisp
* Update bandanas.yml * Update bandanas.yml * Re-add ClothMade to botany bandana
Co-authored-by: PJBot <[email protected]>
ChangePermissionFlagToHost
* Remove client state from server AirAlarmComponent Send information for all connected devices, not just the ones for the current tab, as attempting to limit this breaks multiple users viewing the same UI. Fixes space-wizards#12842 * Send device data as a list, rather than a dictionary --------- Co-authored-by: Eoin Mcloughlin <[email protected]>
This re-introduces the dummy entity naming code, originally introduced in space-wizards#29178 and randomly removed by space-wizards#30064 with no technical justification given. Fixes space-wizards#31373
TheArturZh
force-pushed
the
upstream-merge-60
branch
from
c7ea464 to
a530ae7
Compare
TheArturZh
force-pushed
the
upstream-merge-60
branch
from
a530ae7 to
c52aa16
Compare
* Makes meteor swarms spawn meteorite walls with 1/10 health of an asteroid wall. * Changed MeteorRock prototype base - Rebased MeteorRock to AsteroidRock from Basewall - MeteorRock now only changes the Destructible damage value * Tried to fix comments
This reverts commit 0616261.
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…ation-14 into upstream-merge-60
TheArturZh
force-pushed
the
upstream-merge-60
branch
from
e9c7d70 to
271749c
Compare
|
Готово |
|
#1582 откатил в пользу space-wizards#30092 |
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
апстрим
Медиа
Проверки
Изменения
no cl