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

одежда торговцев #457

Merged
merged 2 commits into from
Mar 7, 2024
Merged

одежда торговцев #457

merged 2 commits into from
Mar 7, 2024

Conversation

Xelasto
Copy link
Collaborator

@Xelasto Xelasto commented Mar 6, 2024

Описание PR

image

Проверки

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

Изменения

🆑 Xelasto

  • add: Добавлена одежда торговцев. Автор спрайтов - prazat911

Copy link
Contributor

github-actions bot commented Mar 6, 2024

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

Resources/Textures/ADT/Clothing/Ears/Headsets/trader.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/ADT/Clothing/Head/Hats/trader.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/OuterClothing/Coats/bomber_tsf.rsi

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

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/trader.rsi

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

Resources/Textures/ADT/Objects/Misc/trader_id.rsi

State Old New Status
idtrader_tsf Added
tsf Added

Resources/Textures/ADT/Objects/Misc/trader_pda.rsi

State Old New Status
id_overlay Added
inhand-left Added
inhand-right Added
light_overlay Added
pda-tradertsf Added

Resources/Textures/ADT/Structures/Decoration/tsf_banner.rsi

State Old New Status
humanflag Added

Edit: diff updated after 2a8d99e

Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

ок

@Schrodinger71 Schrodinger71 merged commit a57ba17 into AdventureTimeSS14:master Mar 7, 2024
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants