Обновление медотдела и не только.. #629
Merged
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
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit f0d1dca merging into 4465996 Resources/Textures/ADT/Clothing/Back/paramedic_backpack.rsi
Resources/Textures/ADT/Clothing/Back/paramedic_duffel.rsi
Resources/Textures/ADT/Clothing/Back/paramedic_satchel.rsi
Resources/Textures/ADT/Clothing/Belt/medical_bag.rsi
Resources/Textures/ADT/Clothing/Ears/Headsets/headset_paramedic.rsi
Resources/Textures/ADT/Clothing/Head/Hardsuits/paramedic_hardsuithead.rsi
Resources/Textures/ADT/Clothing/Head/Hats/beret_paramedic.rsi
Resources/Textures/ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi
Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/paramedic_hardsuit.rsi
Resources/Textures/ADT/Clothing/Shoes/Boots/highboots.rsi
Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/hike_jumpskirt_cmo.rsi
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hike_uniform_cmo.rsi
Resources/Textures/ADT/Objects/Materials/Scrap/securedbox.rsi
Resources/Textures/ADT/Objects/Specific/Chemistry/glass-bottle.rsi
Resources/Textures/ADT/Objects/Specific/Chemistry/packs.rsi
Resources/Textures/ADT/Objects/Specific/Chemistry/pills.rsi
Resources/Textures/ADT/Objects/Specific/Chemistry/plastic-bottle.rsi
Resources/Textures/ADT/Objects/Specific/Chemistry/syringe.rsi
Resources/Textures/ADT/Objects/Specific/Hydroponics/buckwheat.rsi
Resources/Textures/ADT/Objects/Specific/Hydroponics/cannabiswhite.rsi
Resources/Textures/ADT/Objects/Specific/Hydroponics/cocoa.rsi
Resources/Textures/ADT/Objects/Specific/Hydroponics/mandarin.rsi
Resources/Textures/ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi
Resources/Textures/ADT/Objects/Specific/Hydroponics/pumpkin.rsi
Resources/Textures/ADT/Objects/Specific/Medical/briefcase_medical.rsi
|
|
Описание? |
|
так не готово ещё |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
ееее бать |
|
Для справки: PR был протестирован вчера тестерами, а точнее armorkilled, изъяны были только в локализации |
Которые уже решены |
Merged
via the queue into
AdventureTimeSS14:master
with commit Oct 19, 2024
84bab85
15 checks passed
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.
Добавлены следующие вещи:
Таблеткомат и Парашкаф вместе с вещами парамедика.
Вещи для Глав врача, а именно, набор походной одежды, хай-риск дефиб, чемоданчик с особыми лекарствами.
Две мутации растений, конопли и мака.
Немного разнообразия в медицинском инструментарии, а именно бутылочки, шприцы и пачки для таблеток.
Возвращена возможность изучения аппарата клонирования в сервисной ветке.
Новый вид затяжек для ботаников из конопли.
🆑 Filo