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

генокрады #669

Merged
merged 53 commits into from
Nov 15, 2024
Merged

генокрады #669

merged 53 commits into from
Nov 15, 2024

Conversation

Inconnu1337
Copy link
Contributor

@Inconnu1337 Inconnu1337 commented Oct 23, 2024

Описание PR

перенесен генокрад @FaDeOkno <3

Ссылка на публикацию в Discord
Перечислять все ПРы не буду, потому что это заеб, поэтому оставлю только самый первый

Медиа

image

Требования

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

TODO

Фиксы

  • После использования способности "Последний Шанс", удачного перевоплощения в обезьяну после проникания внутрь какого-нибудь тела, после успешного перевоплощения в какого-нибудь гуманоида становится невозможно использовать руку-клинок. Пишет "Вы не можете использовать данную способность в этой форме"
  • При превращении УристВульпы в унатха пигментация кожи не сохранилась, как и внешние признаки по типу жабр.
  • Если в обличии обезьяны, в которую превращается генокрад, впасть в крит, то превратишься обратно, но все абилки генокрада пропадают.

Фичи

  • Убедиться в работоспособности целей.
  • Цифровой камуфляж
  • Термальное зрение?
  • Костяной сюрикен

Чейнджлог
🆑 Inconnu & Котя

  • add: Добавлен старый новый антагонист - генокрад!
  • add: Добавлены визуальные галлюцинации при воздействии наркотиков
  • tweak: Генокрад был значительно переработан в сравнении со старой версией. Подробности на вики.

@Inconnu1337 Inconnu1337 requested a review from FaDeOkno October 23, 2024 17:16
@github-actions github-actions bot added Status: Needs Review Changes: Sprites Изменение спрайтов and removed Status: Needs Review labels Oct 23, 2024
Copy link
Contributor

github-actions bot commented Oct 23, 2024

RSI Diff Bot; head commit 316a4ee merging into 8b1c3bc
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Changeling/Actions/actions_ling.rsi

State Old New Status
absorb_dna Added
adrenaline Added
armblade Added
armhammer Added
augmented_eyesight Added
background Added
biodegrade Added
bone_shard Added
chameleon_skin Added
changeling_channel Added
changelingsting Added
chitinous_armor Added
darkness_adaptation Added
digital_camo Added
dissonant_shriek Added
fake_death Added
fleshmend Added
hive_absorb Added
hive_head Added
hive_link Added
human_form Added
last_resort Added
lesser_form Added
mimic_voice Added
organic_shield Added
organic_suit Added
panacea Added
regenerate Added
resonant_shriek Added
revive Added
spread_infestation Added
sting_armblade Added
sting_blind Added
sting_cryo Added
sting_extract Added
sting_lsd Added
sting_mute Added
sting_transform Added
strained_muscles Added
tentacle Added
transform Added

Resources/Textures/ADT/Changeling/Alerts/chemicals_counter.rsi

State Old New Status
chemicals0 Added
chemicals1 Added
chemicals2 Added
chemicals3 Added
chemicals4 Added
chemicals5 Added
chemicals6 Added
chemicals7 Added

Resources/Textures/ADT/Changeling/Mobs/headslug.rsi

State Old New Status
headslug Added
headslug_dead Added

Resources/Textures/ADT/Changeling/Objects/armblade.rsi

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

Resources/Textures/ADT/Changeling/Objects/armmace.rsi

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

Resources/Textures/ADT/Changeling/Objects/armshield.rsi

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

Resources/Textures/ADT/Changeling/Objects/bone_shard.rsi

State Old New Status
icon Added

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

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

Edit: diff updated after 316a4ee

@github-actions github-actions bot added the Changes: UI Изменение интерфейса label Oct 25, 2024
@github-actions github-actions bot added Changes: Localization Изменение локализации Merge Conflict labels Oct 31, 2024
Copy link
Contributor

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

Copy link
Contributor

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

Copy link
Contributor

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

@github-actions github-actions bot added the Changes: Map Изменение карт label Nov 13, 2024
Copy link
Contributor Author

@Inconnu1337 Inconnu1337 left a comment

Choose a reason for hiding this comment

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

ы

@Schrodinger71
Copy link
Collaborator

@coderabbitai review

Copy link

coderabbitai bot commented Nov 13, 2024

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

Copy link

coderabbitai bot commented Nov 13, 2024

Important

Review skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Note

Reviews paused

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@Schrodinger71
Copy link
Collaborator

Даже бот ахуел от количества файлов

@Schrodinger71
Copy link
Collaborator

@coderabbitai pause

Copy link

coderabbitai bot commented Nov 13, 2024

✅ Actions performed

Reviews paused.

@FaDeOkno FaDeOkno removed the Ожидает Тестирования(QA Engineer) Нужно протестить полуготовый пулл реквест label Nov 15, 2024
Copy link
Collaborator

@KashRas2 KashRas2 left a comment

Choose a reason for hiding this comment

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

Гойда

@KashRas2 KashRas2 merged commit e9cc76a into AdventureTimeSS14:master Nov 15, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants