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

ниан #175

Merged
merged 5 commits into from
Aug 4, 2024
Merged

ниан #175

merged 5 commits into from
Aug 4, 2024

Conversation

Darkiich
Copy link
Contributor

@Darkiich Darkiich commented Aug 3, 2024

Описание PR

Этот ПР переносит ниан
Медиа

Проверки

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

Изменения

  • add: Добавлены нианы

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

github-actions bot commented Aug 3, 2024

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

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

State Old New Status
eyes Added
full Added
head_f Added
head_m Added
icon 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 08a93d7

@Darkiich Darkiich self-assigned this Aug 3, 2024
@Darkiich Darkiich added this to the Расы milestone Aug 3, 2024
@Darkiich Darkiich linked an issue Aug 3, 2024 that may be closed by this pull request
@Darkiich
Copy link
Contributor Author

Darkiich commented Aug 3, 2024

image

Comment on lines 1301 to 1303

- type: Tag
id: ADTMothFriendlyFood
Copy link
Collaborator

Choose a reason for hiding this comment

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

Не порядок, нужно это перенести в tags только в нашей папке. С остальным вроде впоряде

@Darkiich Darkiich requested a review from 1Stepka1 August 3, 2024 19:20
@Darkiich Darkiich added the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Aug 3, 2024
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.

Кое-что есть

Copy link
Collaborator

@1Stepka1 1Stepka1 Aug 4, 2024

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/Species

@Darkiich Darkiich requested a review from 1Stepka1 August 4, 2024 14:04
Comment on lines 341 to 362
# - type: emoteSounds
# id: UnisexMoth
# params:
# variation: 0.125
# sounds:
# Buzz:
# path: /Audio/Voice/Moth/moth_scream.ogg
# Scream:
# path: /Audio/Voice/Moth/moth_scream.ogg
# Laugh:
# path: /Audio/Voice/Moth/moth_laugh.ogg
# Chitter:
# path: /Audio/Voice/Moth/moth_chitter.ogg
# Squeak:
# path: /Audio/Voice/Moth/moth_squeak.ogg
# Weh:
# collection: Weh
# Gasp:
# collection: MaleGasp
# DefaultDeathgasp:
# collection: MothDeathGasp

Copy link
Collaborator

Choose a reason for hiding this comment

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

Подписать # ADT Tweak что для ниан и объяснить зачем

Resources/Prototypes/Species/moth.yml Show resolved Hide resolved
Comment on lines 514 to 517
Male: MaleMoth
Female: FemaleMoth
Unsexed: MaleMoth
wilhelmProbability: 0.001
Copy link
Collaborator

Choose a reason for hiding this comment

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

Подпиши

# Start-ADT Tweak Нианы
Male: MaleMoth
Female: FemaleMoth
Unsexed: MaleMoth
# End-ADT Tweak Нианы

Comment on lines +187 to 192
# - type: damageModifierSet
# id: Moth # Slightly worse at everything but cold
# coefficients:
# Cold: 0.7
# Heat: 1.3

Copy link
Collaborator

Choose a reason for hiding this comment

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

Тож подпиши что для ADT закоментили и не трогали

@Darkiich Darkiich requested a review from Schrodinger71 August 4, 2024 20:53
@Schrodinger71 Schrodinger71 removed the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Aug 4, 2024
@Darkiich Darkiich added this pull request to the merge queue Aug 4, 2024
Merged via the queue into AdventureTimeSS14:master with commit 20b970b Aug 4, 2024
16 checks passed
@Darkiich Darkiich deleted the nian branch August 4, 2024 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Перенести наших Ниан
3 participants