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

Сумеречники #179

Merged
merged 13 commits into from
Aug 6, 2024
Merged

Сумеречники #179

merged 13 commits into from
Aug 6, 2024

Conversation

FaDeOkno
Copy link
Collaborator

@FaDeOkno FaDeOkno commented Aug 5, 2024 •
edited
Loading

Описание PR

Перенос сумеречников на новую сборку
И НАКОНЕЦ-ТО они названы Shadekin вместо Shadowkin

Медиа

ezgif-2-2197192745

Проверки

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

Изменения

🆑

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

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

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

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

Resources/Textures/ADT/Mobs/Customization/Shadekin/shadekin_ears.rsi

State Old New Status
shadekin Added
shadekin_stripes Added

Resources/Textures/ADT/Mobs/Customization/Shadekin/shadekin_tails_32x32.rsi

State Old New Status
shadekin_medium Added
shadekin_shorter Added

Resources/Textures/ADT/Mobs/Customization/Shadekin/shadekin_tails_64x32.rsi

State Old New Status
shadekin Added
shadekin_big Added
shadekin_big_fluff Added

Resources/Textures/ADT/Mobs/Species/Shadekin/displacement.rsi

State Old New Status
hand Added
head Added
jumpsuit Added
shoes Added

Resources/Textures/ADT/Mobs/Species/Shadekin/parts.rsi

State Old New Status
eyes Added
full Added
head_f Added
head_m Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso_f Added
torso_m Added

Edit: diff updated after a2e10b3

@FaDeOkno FaDeOkno requested a review from Schrodinger71 August 5, 2024 05:22
@Schrodinger71 Schrodinger71 linked an issue Aug 5, 2024 that may be closed by this pull request
Перенос Сумеречников #157
Closed
Schrodinger71
Schrodinger71 previously requested changes Aug 5, 2024
View reviewed changes
Resources/Locale/ru-RU/ADT/species/species.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/reagents/meta/biological.ftl Outdated Show resolved Hide resolved
@Schrodinger71
Copy link
Collaborator

Может Стёпка ещё чего найдёт

@Schrodinger71 Schrodinger71 requested a review from 1Stepka1 August 5, 2024 10:04
@FaDeOkno
Copy link
Collaborator Author

FaDeOkno commented Aug 5, 2024

@Schrodinger71 Пути поправил

@Schrodinger71 Schrodinger71 dismissed their stale review August 5, 2024 17:00

исправлено

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

1Stepka1
1Stepka1 reviewed Aug 6, 2024
View reviewed changes
Resources/Prototypes/ADT/Entities/Mobs/Species/shadekin.yml
Comment on lines +130 to +134
# - type: SizeAttributeWhitelist # Frontier
# tall: true
# tallscale: 1
# short: true
# shortscale: 0.85
Copy link
Collaborator

Choose a reason for hiding this comment

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

У нас же есть система ростал,может раскоментить это? Если же это не надо то просто убрать

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

На ветке сумеречников её вроде ещё нет

Copy link
Collaborator

Choose a reason for hiding this comment

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

Но на сборке она есть

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Есть, но только тогда тесты полетят. Проще отдельно раскомментить после мерджа

1Stepka1
1Stepka1 previously requested changes Aug 6, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

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

А так к остальному вроде вопросов нету

Resources/Prototypes/ADT/Entities/Mobs/shadekin_ears.yml Outdated Show resolved Hide resolved
Resources/Prototypes/ADT/Entities/Mobs/shadekin_tails.yml Outdated Show resolved Hide resolved
@Schrodinger71 Schrodinger71 added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Aug 6, 2024
@FaDeOkno FaDeOkno dismissed 1Stepka1’s stale review August 6, 2024 17:47

Исправлено

@FaDeOkno FaDeOkno removed the Status: Awaiting Changes Ожидание изменений label Aug 6, 2024
@Schrodinger71
Copy link
Collaborator

Конфликты

@Schrodinger71 Schrodinger71 enabled auto-merge August 6, 2024 20:18
@Schrodinger71 Schrodinger71 added this pull request to the merge queue Aug 6, 2024
Merged via the queue into AdventureTimeSS14:master with commit d65b910 Aug 6, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1Stepka1 1Stepka1 1Stepka1 left review comments

@Schrodinger71 Schrodinger71 Schrodinger71 approved these changes

Assignees

@1Stepka1 1Stepka1

@Schrodinger71 Schrodinger71

@FaDeOkno FaDeOkno

Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Перенос Сумеречников
3 participants
@FaDeOkno @Schrodinger71 @1Stepka1