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

мимикрические шутки #646

Merged
merged 7 commits into from
Nov 1, 2024
Merged

Conversation

Ratyyy
Copy link
Collaborator

@Ratyyy Ratyyy commented Oct 15, 2024

Описание PR

добавила костюм и меч мимикрии

Почему / Баланс

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

https://discord.com/channels/901772674865455115/1281005212429193247

Медиа

Требования

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

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

github-actions bot commented Oct 15, 2024

RSI Diff Bot; head commit 0324de3 merging into 32d8801
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi

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

Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi

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

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

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

Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added
mimicria_tentacle_retract Added
mimicria_tentacle_spawn Added
mimicria_tentacle_wiggle Added

Edit: diff updated after 0324de3

sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi
size: Huge

- type: entity
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/Actions/

- type: SpawnOnDespawn
prototype: ADTEffectiMicriaTentacleRetract

- type: entity
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/Effects/

- type: EffectVisuals
- type: AnimationPlayer

- type: entity
Copy link
Contributor

Choose a reason for hiding this comment

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

Это точно так же

Copy link
Contributor

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

@Schrodinger71 Schrodinger71 marked this pull request as draft October 27, 2024 07:32
@Ratyyy Ratyyy marked this pull request as ready for review November 1, 2024 15:32
Copy link
Contributor

@Darkiich Darkiich left a comment

Choose a reason for hiding this comment

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

Так, все четенько

@Ratyyy Ratyyy added this pull request to the merge queue Nov 1, 2024
Merged via the queue into master with commit 53dcfc8 Nov 1, 2024
15 checks passed
@Ratyyy Ratyyy deleted the lobotomoidiki-ordinis branch November 1, 2024 17: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.

2 participants