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

Sprite repo clearing #2485

Merged
merged 19 commits into from
Jan 16, 2025
Merged

Conversation

EstKemran
Copy link

@EstKemran EstKemran commented Jan 14, 2025

Описание PR

Почистил всё то, что мозолило глаза

Медиа

Проверки

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

Изменения

@github-actions github-actions bot added Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: Localization Изменение затронуло файлы ".ftl" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" labels Jan 14, 2025
Copy link

github-actions bot commented Jan 14, 2025

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

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

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

Resources/Textures/SS220/Clothing/Back/Duffels/cult_yogg_pack.rsi

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

Resources/Textures/SS220/Clothing/Back/Duffels/ussp_back.rsi

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

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

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

Edit: diff updated after 74a1d34

Забыл, что Гит не принимает изменение регистра у папок
@github-actions github-actions bot added the Merge Conflict Some content has conflicts. label Jan 15, 2025
Copy link

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

@github-actions github-actions bot removed the Merge Conflict Some content has conflicts. label Jan 15, 2025
@stalengd stalengd merged commit 9ca4738 into SerbiaStrong-220:master Jan 16, 2025
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение затронуло файлы ".ftl" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png"
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants