BlueShield Rework

[EstKemran]

Описание PR

ХЗ можно ли это назвать реворком, но пихуй

Медиа

todo

• Комбинезоны:

1. Стандартный комбинезон; ✔
2. Рубашка; ✔
3. Футболка; ✔
4. Тактический комбинезон оперативника; ✔
5. Комбинезон за 100ч. ✔

• Верхняя одежда:

1. Пуленепробиваемый жилет СЩ; ✔
2. Чешуйчатый жилет СЩ; ✔
3. Пальто оперативника СЩ; ✔

• [] На голову:

1. Противогаз; ✔
2. Очки; ✔
3. Тактический очки;
4. Берет ✔
5. Шлем

• [] На шею:

1. Стандартный плащ; ✔
2. Наплечный;
3. Кобура;
4. Защитный комплект. ✔

• Пояса:

1. Пояс; ✔
2. РПС; ✔

• [] Оружие:

1. Синергетический пистолет; ✔
2. Альтернатива дрозда - Бластер; ✔
3. Посох

• Скафандры:

1. Лёгкий; ✔
2. Тяжелый; ✔
3. Шлем лёгкого; ✔
4. Шлем тяжёлого. ✔

• [] Разное:

1. КПК;
2. Гарнитура;✔
3. Джетпак; ✔

Проверки

• PR полностью завершён и мне не нужна помощь чтобы его закончить.
• Я ознакомился с наставлениями по работе с репозиторием и следовал им при создании PR'а.
• Я внимательно просмотрел все свои изменения и багов в них не нашёл.
• Я запускал локальный сервер со своими изменениями и всё протестировал.
• Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

[github-actions]

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

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

State	Old	New	Status
equipped-HAND-kangaroo			Modified
equipped-HAND			Modified

Resources/Textures/SS220/Clothing/Neck/Cloaks/Blueshield.rsi

State	Old	New	Status
equipped-NECK			Modified
icon			Modified
inhand-left			Modified
inhand-right			Modified
equipped-NECK-vox			Added

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_turtle.rsi

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

Resources/Textures/SS220/Objects/Misc/stamps.rsi

State	Old	New	Status
stamp-blue-shield			Modified

Resources/Textures/SS220/Clothing/OuterClothing/Coats/SRTCoat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Removed
icon			Removed
inhand-left			Removed
inhand-right			Removed

Resources/Textures/SS220/Clothing/Uniforms/Blueshield_uniform.rsi

State	Old	New	Status
equipped-INNERCLOTHING-monkey			Removed
equipped-INNERCLOTHING			Removed
icon			Removed
inhand-left			Removed
inhand-right			Removed

Resources/Textures/SS220/Clothing/Back/Backpacks/blueshield.rsi

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

Resources/Textures/SS220/Clothing/Belt/blueshieldbelt.rsi

State	Old	New	Status
equipped-BELT			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/Belt/blueshieldwebbing.rsi

State	Old	New	Status
equipped-BELT			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/Ears/Headsets/blueshield.rsi

State	Old	New	Status
equipped-EARS-secdog			Added
equipped-EARS			Added
icon			Added

Resources/Textures/SS220/Clothing/Eyes/blueshield_glasses.rsi

State	Old	New	Status
equipped-EYES			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/Eyes/blueshield_tactic_glasses.rsi

State	Old	New	Status
equipped-EYES			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/Head/Hardsuits/blueshield_light.rsi

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET-vox			Added
off-equipped-HELMET			Added
on-equipped-HELMET-vox			Added
on-equipped-HELMET			Added

Resources/Textures/SS220/Clothing/Head/Hats/beret_blueshield.rsi

State	Old	New	Status
equipped-HELMET-hamster			Added
equipped-HELMET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/Mask/blueshield_mask.rsi

State	Old	New	Status
equipped-MASK-hamster			Added
equipped-MASK-reptilian			Added
equipped-MASK-vox			Added
equipped-MASK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/Neck/Misc/tactical_blue.rsi

State	Old	New	Status
equipped-NECK-vox			Added
equipped-NECK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/OuterClothing/Armor/blueshield_bulletproof.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/OuterClothing/Armor/blueshield_reflec.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/OuterClothing/Coats/blueshield_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_hight.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/blueshield_light.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/Shoes/Boots/jackboots_blueshield.rsi

State	Old	New	Status
equipped-FEET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield.rsi

State	Old	New	Status
equipped-INNERCLOTHING-monkey			Added
equipped-INNERCLOTHING			Added
icon			Added
icon_tie			Added
inhand-left			Added
inhand-right			Added
tie-equipped-INNERCLOTHING-monkey			Added
tie-equipped-INNERCLOTHING			Added

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_combat.rsi

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

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_combez.rsi

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

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_operative.rsi

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

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/blueshield_t-shirt.rsi

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

Resources/Textures/SS220/Objects/Tanks/Jetpacks/mini_blue.rsi

State	Old	New	Status
equipped-BACKPACK			Added
equipped-SUITSTORAGE			Added
icon-on			Added
icon			Added
inhand-left			Added
inhand-right			Added
on-equipped-BACKPACK			Added
on-equipped-SUITSTORAGE			Added

Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/krs_magblaster.rsi

State	Old	New	Status
base			Added
disabler-mag-unshaded-0			Added
disabler-mag-unshaded-1			Added
laser-mag-unshaded-0			Added
laser-mag-unshaded-1			Added

Resources/Textures/SS220/Objects/Weapons/Guns/synergistic_enetgy_gun.rsi

State	Old	New	Status
base			Added
enhanced-mag-0			Added
enhanced-mag-1			Added
enhanced-mag-2			Added
enhanced-mag-3			Added
enhanced-mag-unshaded-0			Added
enhanced-mag-unshaded-1			Added
enhanced-mag-unshaded-2			Added
enhanced-mag-unshaded-3			Added
equipped-BELT			Added
equipped-SUITSTORAGE			Added
icon			Added
inhand-left-0			Added
inhand-left-1			Added
inhand-left-2			Added
inhand-left-3			Added
inhand-left			Added
inhand-right-0			Added
inhand-right-1			Added
inhand-right-2			Added
inhand-right-3			Added
inhand-right			Added
laser-mag-0			Added
laser-mag-1			Added
laser-mag-2			Added
laser-mag-3			Added
laser-mag-unshaded-0			Added
laser-mag-unshaded-1			Added
laser-mag-unshaded-2			Added
laser-mag-unshaded-3			Added

Edit: diff updated after 227555f

[UrPrice]

Палитра стремная какая-то

[FriedrichStrassen]

Палитра стрёмная. Капец яркий. Думаю от изначального варианта далеко уходить не стоит

[EstKemran]

Эта палитра, которая была в палитре ещё до моего рождения

[FriedrichStrassen]

Это залупа какая-то. Китовразу покажи
Хотя в этом что-то всё таки есть

[UrPrice]

Эта палитра, которая была в палитре ещё до моего рождения

Я ничего не понимаю в спрайтах, не слушай меня. Мне может быть с не привычки.

[Abiergo]

Какая красота... Ещеб ему конечно лодаут за 100 часов... Но а так пиздец круто

[github-actions]

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

[github-actions]

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

[EstKemran]

@Ady4ik По механическим и балансным изменениям всё. Осталась косметика.

Синергетический пистолет имеет два режима стрельбы: лазер на 13 урона, лазер на 45 урона (Скорострельный и сконцентрированный). После того, как кодеры закодят, у режимов будет разная скорострельность, и ДПС будет 52 у первого и 55 у второго (У антиквара 48). Ну и собственно, у него нет автозарядки

[github-actions]

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

[github-actions]

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

[github-actions]

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