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

Drask #28

Merged
merged 24 commits into from
Jul 9, 2024
Merged

Drask #28

merged 24 commits into from
Jul 9, 2024

Conversation

nixsilvam404
Copy link
Contributor

Перенос драска

no cl

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

github-actions bot commented Jun 29, 2024

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

Resources/Textures/ADT/Mobs/Drask/custom.rsi

State Old New Status
l_arm Added
r_arm Added

Resources/Textures/ADT/Mobs/Drask/organs.rsi

State Old New Status
eyes Added
heart_on Added
innards Added
kidneys Added
lungs Added

Resources/Textures/ADT/Mobs/Drask/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 455a391

@Schrodinger71 Schrodinger71 added this to the Расы milestone Jul 3, 2024
@Schrodinger71 Schrodinger71 linked an issue Jul 3, 2024 that may be closed by this pull request
@@ -0,0 +1,2 @@
ent-MobDrask = { ent-BaseMobDrask }
.desc = { ent-BaseMobDrask.desc }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Меняем путь

@@ -9,3 +9,4 @@ metabolizer-type-plant = Растение
metabolizer-type-dwarf = Дварф
metabolizer-type-moth = Ниан
metabolizer-type-arachnid = Арахнид
metabolizer-type-drask = Драск
Copy link
Collaborator

Choose a reason for hiding this comment

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

Путь /ADT/

@1Stepka1
Copy link
Collaborator

1Stepka1 commented Jul 3, 2024

Вот это тут коммитов, Апрув👍

files:
- /Audio/ADT/Drask/drasktalk.ogg

- type: speechSounds
Copy link
Collaborator

Choose a reason for hiding this comment

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

Resources\Prototypes\ADT\Voice\speech_sounds.yml

Whistle:
collection: Whistles

- type: emoteSounds
Copy link
Collaborator

Choose a reason for hiding this comment

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

Resources\Prototypes\ADT\Voice\speech_emote_sounds.yml

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Это мне тут надо путь прописать в 112 вместо просто названия прототипа, да? Или как?

Copy link
Collaborator

Choose a reason for hiding this comment

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

С такими типами emoteSound переместить по такому пути

Whistle:
collection: Whistles

- type: soundCollection
Copy link
Collaborator

Choose a reason for hiding this comment

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

Resources\Prototypes\ADT\SoundCollections\emotes.yml

Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

Меняем

@nixsilvam404
Copy link
Contributor Author

Меняем

Жесть строгий

Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

м

@Schrodinger71 Schrodinger71 added the Status: Awaiting Changes Ожидание изменений label Jul 3, 2024
@nixsilvam404
Copy link
Contributor Author

Проверяйте, босс

@github-actions github-actions bot added Status: Needs Review and removed Status: Awaiting Changes Ожидание изменений labels Jul 8, 2024
@nixsilvam404 nixsilvam404 requested review from Schrodinger71 and removed request for Schrodinger71 and 1Stepka1 July 8, 2024 15:16
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

Гуд

@nixsilvam404 nixsilvam404 added this pull request to the merge queue Jul 9, 2024
Merged via the queue into AdventureTimeSS14:master with commit 91e936e Jul 9, 2024
13 of 14 checks passed
@nixsilvam404 nixsilvam404 deleted the drask branch July 9, 2024 22:43
@Schrodinger71 Schrodinger71 self-assigned this Jul 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Перенос Драсков
3 participants