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

RespriteAndFixBandan #1683

Merged
merged 4 commits into from
Aug 29, 2024
Merged

RespriteAndFixBandan #1683

merged 4 commits into from
Aug 29, 2024

Conversation

yulilok
Copy link

@yulilok yulilok commented Aug 29, 2024

Описание PR

Исправление отображение бандан у расы Vox и Reptiloan. Сделайн респрайт всех бандан, а также сделан респрайт берета наёмника.

Медиа
Урист МакВокс-North-2402Урист МакВокс-East-2402Урист МакВокс-South-2402Урист МакВокс-West-2402
Урист МакХэндс Унатх-North-2549Урист МакХэндс Унатх-East-2549Урист МакХэндс Унатх-South-2549Урист МакХэндс Унатх-West-2549

Проверки

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

Изменения
🆑 Dinazewwr, yulilok

  • fix: Исправлены спрайты банданы у расы Vox.
  • fix: Исправлены спрайты банданы у расы Reptilian.
  • tweak: Сделан респрайт всех бандан.
  • tweak: Сделан респрайт берета наёмника.

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

github-actions bot commented Aug 29, 2024

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

Resources/Textures/Clothing/Head/Bandanas/black.rsi

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

Resources/Textures/Clothing/Head/Bandanas/blue.rsi

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

Resources/Textures/Clothing/Head/Bandanas/brown.rsi

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

Resources/Textures/Clothing/Head/Bandanas/gold.rsi

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

Resources/Textures/Clothing/Head/Bandanas/green.rsi

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

Resources/Textures/Clothing/Head/Bandanas/grey.rsi

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

Resources/Textures/Clothing/Head/Bandanas/merc.rsi

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

Resources/Textures/Clothing/Head/Bandanas/red.rsi

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

Resources/Textures/Clothing/Head/Bandanas/skull.rsi

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

Resources/Textures/Clothing/Head/Hats/beret_merc.rsi

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

Resources/Textures/Clothing/Head/Bandanas/botany.rsi

State Old New Status
equipped-MASK-reptilian Added

Resources/Textures/SS220/Clothing/Head/Bandanas/botanyblue.rsi

State Old New Status
equipped-MASK-reptilian Added

Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi

State Old New Status
equipped-HELMET-vox Added
equipped-MASK-reptilian Added
equipped-MASK-vox Added

Edit: diff updated after 70a1078

@Ady4ik
Copy link

Ady4ik commented Aug 29, 2024

@EstKemran жду аппрув

@EstKemran
Copy link

@yulilok Во всех метах нужно вернуть лицензию CC-BY-SA-3.0.

В копирайте пишешь оригинальный копирайт, и к нему дописиваешь , resprited by dinazewwr (Discord) for SS220

Copy link

@DexlerXD DexlerXD left a comment

Choose a reason for hiding this comment

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

исправить моменты, подмеченные Кемраном

@yulilok
Copy link
Author

yulilok commented Aug 29, 2024

исправить моменты, подмеченные Кемраном

Готово

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi, resprited by dinazewwr for SS220",

Choose a reason for hiding this comment

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

тут так и должно быть?

Copy link
Author

Choose a reason for hiding this comment

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

возможно буфер затупил

@yulilok yulilok requested a review from DexlerXD August 29, 2024 21:15
@DexlerXD DexlerXD merged commit b8eb918 into SerbiaStrong-220:master Aug 29, 2024
15 checks passed
@yulilok yulilok deleted the ResprightAndFixBandan branch August 31, 2024 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png"
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants