Upstream merge 41 #558
Merged
Upstream merge 41 #558
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 cryo syringe, sprite courtesy of Ubaser * I failed to put a comma in meta.json file because I was so shocked by jeneral that I couldn't think clearly * IN MY DEFENSE JENERAL IS SCARY I THINK THE FORMATTING IS FIXED NOW * added canReact at the wrong place, fixed now * made the transfer good * more issues with the sprites * not much to say, one must imagine sisyphus happy * mmm yes give me 0 of layers * I oughta double check shit more * Should be all done! * I didn't add it to the lathe, I am le stupide * Forgot to add the recipe somewhere * final touches, can actually be made at the medlathe now * added the recipe to the protolathe as well
* Add more playaudio debugging * Even more hacks * a
* add * fix error * Revert "fix error" This reverts commit 1958004. * readd * change name * typo
… for emotes and LOOC! (space-wizards#21999)
* makes a whole bunch of raw materials grindable * fix tests maybe
* Banana Clown Outfit * Update SkatesComponent.cs
|
Если еще коммитов втянуть, то возможно перестанет крашить: |
* 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
fix backpacks replace NT flag cryopod to new interface Gemini lawyer chaged to iaa
Werzet
force-pushed
the
upstream-merge-41
branch
from
c4828ac to
745e9e3
Compare
TheArturZh
approved these changes
Dec 6, 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
Мерж обновлений от оффов
Медиа
Проверки
Изменения