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.

Sign up for GitHub

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

Jump to bottom

[ПЕРЕНОС]Закинул одежду Иллизиума #378

Merged
merged 4 commits into from
Aug 31, 2024
Merged

[ПЕРЕНОС]Закинул одежду Иллизиума #378

merged 4 commits into from
Aug 31, 2024

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Aug 30, 2024 •
edited
Loading

Описание PR

Ссылка на публикацию в Discord

Проверки

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

Изменения

🆑 Шрёдька

  • add: Перенёс всю одежду Иллизиума.

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Aug 30, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 30, 2024 •
edited
Loading

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

Resources/Textures/ADT/Clothing/Head/Hardsuits/helmet_ili.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET Added
on-equipped-HELMET Added

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

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Head/Helmets/helmetSolder.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Mask/gasmask_ili.rsi

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

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

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

Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/hardsuit_ili.rsi

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

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

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

Edit: diff updated after 812d8ac

Bolper
Bolper previously requested changes Aug 31, 2024
View reviewed changes
Copy link
Contributor

@Bolper Bolper left a comment

Choose a reason for hiding this comment

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

И ещё в некоторых описаниях в локализации не проставлены точки~

Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hardsuit-helmets.ftl Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl Show resolved Hide resolved
Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml
id: ADTClothingHeadHelmetIlisium
noSpawn: true
name: helmet
description: Ilisium
Copy link
Contributor

Choose a reason for hiding this comment

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

Эт суффикс

Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml Show resolved Hide resolved
Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml
parent: ClothingHeadBase
id: ADTClothingHeadHelmetSolderIlisium
name: Helmet
description: Ilisium
Copy link
Contributor

Choose a reason for hiding this comment

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

Тож суффикс

Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml
parent: ClothingOuterStorageBase
id: ADTClothingOuterCoatIlisium
name: Raincoat Ilisium
description: Ilisium
Copy link
Contributor

Choose a reason for hiding this comment

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

Суффикс

@github-actions github-actions bot added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Aug 31, 2024
@Schrodinger71 Schrodinger71 changed the title [ПЕРЕНОС ]Закинул одежду Иллизиума [ПЕРЕНОС]Закинул одежду Иллизиума Aug 31, 2024
@Schrodinger71 Schrodinger71 merged commit 91fbfd4 into master Aug 31, 2024
13 checks passed
@Schrodinger71 Schrodinger71 deleted the add_illisium branch August 31, 2024 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Bolper Bolper Bolper left review comments

@1Stepka1 1Stepka1 Awaiting requested review from 1Stepka1

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Awaiting Changes Ожидание изменений
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Schrodinger71 @Bolper