Вторая шлёпская итерация #1742

EstKemran · 2024-09-04T11:25:27Z

Описание PR

Анимированные плащи

Для игроков

Для администрации

Для кодеров

Для мапперов

Для спрайтеров

Для QA(?)

Трубка и сигары + зиппо (по аналогии с Шлёпскими сигаретами)

Трубка

Сигары

Зиппо

Упаковка пива "Tracker"
Костюмы из деревни дураков для клоуна и мима.**

Костюм для клоуна "Мужик" из деревни дураков (респрайт)

Костюм для мима "Морячок" из деревни дураков (респрайт)

Cybеrpunk 2077

Самурайская куртка (Куртка ГГ)

4 визора

4 куртки

Медиа

Проверки

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

Изменения
🆑 Kemran, DaGo, Dinazewwr, Vimenant, Okroshka, NightmareStalker, Starkus, Коман

add: Добавлена Вторая Шлёпская Итерация!

github-actions · 2024-09-04T11:26:07Z

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

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

State	Old	New	Status
icon			Removed

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

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

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

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

Resources/Textures/SS220/Clothing/Neck/Scarfs/ysatyu.rsi

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

Resources/Textures/SS220/Clothing/Shoes/Specific/ysatyu.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/1984.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Afterlife/devils_horns.rsi

State	Old	New	Status
icon			Added

Resources/Textures/SS220/Clothing/Sponsor/Afterlife/halo-alt.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Afterlife/halo.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cloak/administrator.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cloak/coder.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cloak/mapper.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cloak/pivocloak.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cloak/spriter.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cloak/ss220.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cyberpunk/Coats/cyberengijacket.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cyberpunk/Coats/cybermedsuit.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cyberpunk/Coats/cyberrndsweater.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cyberpunk/Coats/cybersecarmor.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cyberpunk/Coats/vbomberjacket.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cyberpunk/Visors/chemvisor.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cyberpunk/Visors/civvisor.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cyberpunk/Visors/engivisor.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cyberpunk/Visors/medvisor.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Cyberpunk/Visors/secvisor.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Fools/Head/Hats/moryachok.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Fools/Head/Hats/muzhik.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Fools/Jumpsuit/moryachok.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Fools/Jumpsuit/muzhik.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Fools/Mask/moryachok.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Fools/Mask/muzhik.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Fools/Neck/Scarfs/muzhik.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Fools/Shoes/Boots/laceups_red.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/Fools/Shoes/Boots/moryachok_flops.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/JujutsuShlepa/nanamigoggles.rsi

State	Old	New	Status
equipped-EYES			Added
icon			Added

Edit: diff updated after 8274151

DexlerXD · 2024-09-04T11:34:17Z

а где костюм Кенто? :XyliPizdish:

Ooops

*ба*нные лодауты б**ть

github-actions · 2024-09-04T18:17:14Z

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

чтоооооооо-то не работает, гагага

Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml

Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Ady4ik <[email protected]>

Намаппили на мою голову

…pace-station-14 into two-shlepa-iteration

Resources/Prototypes/SS220/Loadouts/sponsor_loadouts.yml

EstKemran · 2024-09-24T21:32:27Z

@DexlerXD @Surani1 @Kit0vras

Чекеры упали из-за мапы. Не знаю, по приколу они или я где-то накосячил. (Возможно из-за замапленных шмоток морячка и мужичка)
Удачи вам в ревью, гагага

github-actions · 2024-09-25T12:57:39Z

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

…pace-station-14 into two-shlepa-iteration

EstKemran · 2024-09-25T19:22:39Z

@DexlerXD Раз ты тут, хелпани немного. Он говорит, что не загружается обломок, по причине, как я понял, Тест был утилизирован грязным способом.

На что он жалуется и как это исправить? Мапы я вроде не трогал

DexlerXD · 2024-09-25T20:40:09Z

ебать заработало

EstKemran added 6 commits September 4, 2024 12:53

floppa-cigar

fedf0f0

smoking-fish

c008390

floppa-zippo

4b4744b

plushshlepa

9a2faf6

devil-horns

36457c1

vip-crock

7ede448

EstKemran added 4 commits September 4, 2024 15:34

floppa-champage

f9d229d

redcoat-repsrite

03a7790

pink-mafia-resprite

e9b3a8e

dante-resprite

f18fc22

Ady4ik approved these changes Sep 4, 2024

View reviewed changes

EstKemran added 7 commits September 4, 2024 16:42

pivozavr-(not loadout)

ede4dbd

muzhik-(not loadout)

b5c83f8

nanami-(not loadout)

ebc9262

transfer

4bf11b4

Ooops

transfer-2

7e93ac2

pivozavr&nanani_kento-loadout

2f09d1a

muzhik-loadout

e36e8b0

*ба*нные лодауты б**ть

github-actions bot added the Merge Conflict Some content has conflicts. label Sep 4, 2024

Merge branch 'master' into two-shlepa-iteration

87d9a4f

github-actions bot removed the Merge Conflict Some content has conflicts. label Sep 4, 2024

EstKemran added 3 commits September 5, 2024 17:05

survival-box

e9540c0

floppa-pipe

c3aef77

blackcoat-resprite

690e4ff

halo

198cbf0

чтоооооооо-то не работает, гагага

EstKemran requested a review from Ady4ik September 23, 2024 19:05

github-actions bot added the Status: Needs Review label Sep 23, 2024

Ady4ik requested changes Sep 23, 2024

View reviewed changes

EstKemran and others added 7 commits September 23, 2024 22:43

cyber-vox

f4892f3

Update Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml

f8a0d06

Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Loadouts/loadout_groups.yml

20e5e56

Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Loadouts/loadout_groups.yml

d8190e5

Co-authored-by: Ady4ik <[email protected]>

Update Resources/Prototypes/Loadouts/loadout_groups.yml

1696dae

Co-authored-by: Ady4ik <[email protected]>

moryak-shoes-fix

79a05d2

Намаппили на мою голову

Merge branch 'two-shlepa-iteration' of https://github.com/EstKemran/s…

a811f30

…pace-station-14 into two-shlepa-iteration

Ady4ik requested a review from DexlerXD September 24, 2024 04:30

Ady4ik approved these changes Sep 24, 2024

View reviewed changes

DexlerXD suggested changes Sep 24, 2024

View reviewed changes

Resources/Prototypes/SS220/Loadouts/sponsor_loadouts.yml Show resolved Hide resolved

Resources/Prototypes/SS220/Loadouts/sponsor_loadouts.yml Outdated Show resolved Hide resolved

EstKemran added 2 commits September 24, 2024 23:52

final-update

05b0480

fix

92be3cd

github-actions bot added the Merge Conflict Some content has conflicts. label Sep 25, 2024

EstKemran and others added 2 commits September 25, 2024 20:51

Floppa

4c52172

Merge branch 'master' into two-shlepa-iteration

ddedc8f

github-actions bot removed the Merge Conflict Some content has conflicts. label Sep 25, 2024

Merge branch 'two-shlepa-iteration' of https://github.com/EstKemran/s…

073cd9c

…pace-station-14 into two-shlepa-iteration

fix

46259eb

github-actions bot added the Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" label Sep 25, 2024

fixx

8274151

DexlerXD approved these changes Sep 25, 2024

View reviewed changes

DexlerXD merged commit 5c46a69 into SerbiaStrong-220:master Sep 25, 2024
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Вторая шлёпская итерация #1742

Вторая шлёпская итерация #1742

EstKemran commented Sep 4, 2024 •

edited

Loading

github-actions bot commented Sep 4, 2024 •

edited

Loading

DexlerXD commented Sep 4, 2024

github-actions bot commented Sep 4, 2024

EstKemran commented Sep 24, 2024

github-actions bot commented Sep 25, 2024

EstKemran commented Sep 25, 2024

DexlerXD commented Sep 25, 2024

Вторая шлёпская итерация #1742

Вторая шлёпская итерация #1742

Conversation

EstKemran commented Sep 4, 2024 • edited Loading

Описание PR

github-actions bot commented Sep 4, 2024 • edited Loading

DexlerXD commented Sep 4, 2024

github-actions bot commented Sep 4, 2024

EstKemran commented Sep 24, 2024

github-actions bot commented Sep 25, 2024

EstKemran commented Sep 25, 2024

DexlerXD commented Sep 25, 2024

EstKemran commented Sep 4, 2024 •

edited

Loading

github-actions bot commented Sep 4, 2024 •

edited

Loading