Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Косметика для шлёп #729

Merged
merged 23 commits into from
Feb 18, 2024
Merged

[WIP] Косметика для шлёп #729

merged 23 commits into from
Feb 18, 2024

Conversation

WhitlyOfficial
Copy link

@WhitlyOfficial WhitlyOfficial commented Feb 12, 2024

Описание PR

База, Базис, Основа спонсорских шмоток.
Требует теста от дяди Вера.

  • Доделать
  • Пофиксить

Медиа
banner

Проверки

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

Изменения
🆑 Meower

  • add: Добавлены спонсорские предметы
  • add: Добавлено выделение ника в OOC чате

@github-actions github-actions bot added the Changes: Sprites Изменение затронуло файлы ".rsu / .png" label Feb 12, 2024
Copy link

github-actions bot commented Feb 12, 2024

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

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

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

Resources/Textures/SS220/Clothing/Sponsor/dallas/mask.rsi

State Old New Status
equipped-MASK-reptilian Added
equipped-MASK Added
icon Added

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

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

Resources/Textures/SS220/Clothing/Sponsor/goldclown/goldclownboots.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/goldclown/goldclownmask.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/goldclown/goldclownsuit.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/mafia/black/boots.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/mafia/black/hat.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/mafia/black/suit.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/mafia/boots.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/mafia/hat.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/mafia/suit.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/maid/head.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/maid/suit.rsi

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

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

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

Resources/Textures/SS220/Clothing/Sponsor/neck-wreath.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/SS220/Clothing/Sponsor/scarf-tube.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/student/black.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/student/suit.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/tyler/redcoat.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/tyler/redglasses.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/tyler/under.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/waltuh/beard.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/waltuh/glasses.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/waltuh/hat.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/waltuh/innershirt.rsi

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

Resources/Textures/SS220/Clothing/Sponsor/waltuh/outershirt.rsi

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

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

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

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

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

Resources/Textures/SS220/Objects/Sponsor/candy/base.rsi

State Old New Status
icon Added

Resources/Textures/SS220/Objects/Sponsor/candy/package.rsi

State Old New Status
icon Added

Resources/Textures/SS220/Objects/Sponsor/cigs/carton.rsi

State Old New Status
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/SS220/Objects/Sponsor/cigs/cigarette.rsi

State Old New Status
burnt-icon Added
lit-equipped-MASK Added
lit-icon Added
lit-inhand-left Added
lit-inhand-right Added
unlit-equipped-MASK Added
unlit-icon Added
unlit-inhand-left Added
unlit-inhand-right Added

Resources/Textures/SS220/Objects/Sponsor/cigs/pack.rsi

State Old New Status
cig1 Added
cig2 Added
cig3 Added
cig4 Added
cig5 Added
cig6 Added
closed Added
equipped-BELT Added
inhand-left Added
inhand-right Added
open Added
trash Added

Resources/Textures/SS220/Objects/Sponsor/elwycco.rsi

State Old New Status
axe Added
axe_icon Added
icon Added

Resources/Textures/SS220/Objects/Sponsor/sponsorbox.rsi

State Old New Status
icon Added

Edit: diff updated after 30523c0

@WhitlyOfficial
Copy link
Author

у меня ветка совершила самооткат на локале O_o

@WhitlyOfficial WhitlyOfficial changed the title Shlepi [WIP] Косметика для шлёп Feb 17, 2024
@WhitlyOfficial WhitlyOfficial marked this pull request as ready for review February 18, 2024 13:11

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

пометки на изменения добавить бы

@DexlerXD DexlerXD merged commit 404b1a1 into SerbiaStrong-220:master Feb 18, 2024
14 checks passed
@WhitlyOfficial WhitlyOfficial deleted the shlepi branch February 18, 2024 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Изменение затронуло файлы ".rsu / .png"
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants