Первый апстрим с мержконфликтом (просто смотрю ошибки)

[Vonsant]

Описание PR

Почему / Баланс

Ссылка на ветку

Технические детали

Медиа

Критические изменения

Список изменений

[github-actions]

Благодарим вас за вклад в репозиторий Space Station 14. К сожалению, похоже, что вы отправили свой PR из master-ветки. Мы предлагаем вам следовать нашей документации по использованию git

Вы можете переместить текущую работу из master-ветки в другую ветку, выполнив команду git branch <название_ветки> и сбросив измененив в master-ветке.

[github-actions]

This pull request has conflicts, please resolve those before we can evaluate the pull request.

[github-actions]

RSI Diff Bot; head commit dc4df2e merging into 828bc25
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Back/Backpacks/captain.rsi

State	Old	New	Status
equipped-BACKPACK			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/Back/Duffels/captain.rsi

State	Old	New	Status
equipped-BACKPACK			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/Back/Satchels/captain.rsi

State	Old	New	Status
equipped-BACKPACK			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/Hands/Gloves/captain.rsi

State	Old	New	Status
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi

State	Old	New	Status
equipped-HELMET-vox			Modified

Resources/Textures/Clothing/Head/Hats/capcap.rsi

State	Old	New	Status
equipped-HELMET-hamster			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/Head/Hats/captain.rsi

State	Old	New	Status
equipped-HELMET-hamster			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/Mask/gascaptain.rsi

State	Old	New	Status
equipped-MASK-reptilian			Modified
equipped-MASK-vox			Modified
equipped-MASK			Modified
icon			Modified

Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi

State	Old	New	Status
CAP-equipped-OUTERCLOTHING-vox			Modified
CAP-inhand-left			Modified
CAP-inhand-right			Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi

State	Old	New	Status
equipped-INNERCLOTHING-monkey			Modified
equipped-INNERCLOTHING			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified
equipped-INNERCLOTHING-reptilian			Added

Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi

State	Old	New	Status
equipped-INNERCLOTHING-monkey			Modified
inhand-left			Modified
inhand-right			Modified

Resources/Textures/Effects/weather.rsi

State	Old	New	Status
rain			Modified
snowfall_light			Modified
snowfall_med			Modified

Edit: diff updated after dc4df2e