Upstream2 #161
Merged
Upstream2 #161
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 handcuffed deletion error * Fix mind shutdown error
* Update desert planet walls to WallRockSand * This
* added bananadine and its functionallity (and backed banana peel) * added baked banana peals sprites * fixed typos and changed the sprite used by backed banan peel to the right one * Changed the cooktime and now grinded baked banana leaves have carbon * Updated bananadine description * Ficed typo in ragent-desc-bananadine * Reverted actidental change to nocturine
- Station map - FTL map
- Don't send stale chunks for deleted grid as client just errors it anyway. - Store some allocations in fields.
* Fix cyborg locking * Revert "Fix cyborg locking" This reverts commit bd5bbbb8b46edb720a9d479772f7931f5f497907. * create generic component * update submodules * Revert "update submodules" This reverts commit 303200f298f1c56660955d13caa8218b02e306ad.
* Cat cake. A small update. * up1 * up2
…t state through UpdateMobStateEvent (#21741)
Co-authored-by: DrSmugleaf <[email protected]>
# Conflicts: # Content.Shared/CCVar/CCVars.cs
|
RSI Diff Bot; head commit c122985 merging into bfdcc82 Resources/Textures/Mobs/Pets/cat.rsi
Resources/Textures/Objects/Specific/Hydroponics/banana.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
Проверки
Изменения
🆑