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

[Port] Heretics #1048

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[Port] Heretics #1048

wants to merge 11 commits into from

Conversation

Roudenn
Copy link
Contributor

@Roudenn Roudenn commented Feb 13, 2025

Описание PR

добавляет еретиков реально
Полностью пофикшены и работают

🆑 Rouden

  • add: Добавлены Еретики.

Ratyyy and others added 3 commits February 12, 2025 20:46
<!-- Что вы изменили в этом пулл реквесте? -->
еретиики, взято с Goob-Station/Goob-Station#563
Goob-Station/Goob-Station#628 и
Goob-Station/Goob-Station#615
<!-- Почему оно было изменено? Ссылайтесь на любые обсуждения или
вопросы здесь. Пожалуйста, обсудите, как это повлияет на игровой баланс.
-->
перенос с сс13

<!-- Если речь идет об изменении кода, кратко изложите на высоком уровне
принцип работы нового кода. Это облегчает рецензирование.- -->
ничего глобально не поменяли, вроде
<!--
Пулл реквесты, которые вносят внутриигровые изменения (добавление
одежды, предметов, новых возможностей и т.д.), должны содержать медиа,
демонстрирующие изменения.
Небольшие исправления/рефакторы не требуют медиа.

Если Вы не уверены в том, что Ваш пулл реквест требует медиа, спросите
мейнтейнера.
-->

<!--
В связи с наплывом ПР'ов нам необходимо убедиться, что ПР'ы следуют
правильным рекомендациям.

Пожалуйста, уделите время прочтению, если делаете пулл реквест (ПР)
впервые.

Отметьте поля ниже, чтобы подтвердить, что Вы действительно видели их
(поставьте X в скобках, например [X]):
-->
- [x] Я прочитал(а) и следую [Руководство по созданию пулл
реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению
мейнтейнера.
- [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие
его изменения в игре, **или** этот пулл реквест не требует демонстрации
в игре

<!--
Перечислите все критические изменения, включая изменения пространства
имён, публичных классов/методов/полей, переименования прототипов, и
предоставьте инструкции по их исправлению.
-->

**Чейнджлог**
<!--
Здесь Вы можете заполнить журнал изменений, который будет автоматически
добавлен в игру при мердже Вашего пулл реквест.

Чтобы игроки узнали о новых возможностях и изменениях, которые могут
повлиять на их игру, добавьте запись в журнал изменений.

Не считайте суффикс типа записи (например, add) "частью" предложения:
плохо: - add: новый инструмент для инженеров
хорошо: - add: добавлен новый инструмент для инженеров

Помещение имени после символа 🆑 изменит имя, которое будет
отображаться в журнале изменений (в противном случае будет
использоваться ваше имя пользователя GitHub).
Например: 🆑 AruMoon
-->

🆑 Ratyyy
- add: На некоторых станциях начали возникать разломы реальности, а
некоторые люди интересоваться ими...
@Roudenn Roudenn requested a review from Rxup as a code owner February 13, 2025 11:06
Copy link
Contributor

coderabbitai bot commented Feb 13, 2025

Important

Review skipped

More than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review.

59 files out of 166 files are above the max files limit of 100. Please upgrade to Pro plan to get higher limits.

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


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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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.

@github-actions github-actions bot added S: Untriaged size/L Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Audio and removed size/L labels Feb 13, 2025
Copy link
Contributor

github-actions bot commented Feb 13, 2025

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

Resources/Textures/ADT/Heretic/Blades/blade_ash-inhand.rsi

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

Resources/Textures/ADT/Heretic/Blades/blade_ash.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Heretic/Blades/blade_blade-inhand.rsi

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

Resources/Textures/ADT/Heretic/Blades/blade_blade.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Heretic/Blades/blade_cosmos-inhand.rsi

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

Resources/Textures/ADT/Heretic/Blades/blade_cosmos.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Heretic/Blades/blade_flesh-inhand.rsi

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

Resources/Textures/ADT/Heretic/Blades/blade_flesh.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Heretic/Blades/blade_lock-inhand.rsi

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

Resources/Textures/ADT/Heretic/Blades/blade_lock.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Heretic/Blades/blade_moon-inhand.rsi

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

Resources/Textures/ADT/Heretic/Blades/blade_moon.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Heretic/Blades/blade_rust-inhand.rsi

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

Resources/Textures/ADT/Heretic/Blades/blade_rust.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Heretic/Blades/blade_void-inhand.rsi

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

Resources/Textures/ADT/Heretic/Blades/blade_void.rsi

State Old New Status
icon Added

Resources/Textures/ADT/Heretic/abilities_heretic.rsi

State Old New Status
aggressive_spread Added
ashen_shift Added
ashlord_rite1 Added
ashlord_rite2 Added
blood_siphon Added
bulglar_finesse Added
cleave Added
construction Added
desperation_wave Added
entropic_plume Added
final_hymn Added
flesh_surgery Added
furious_steel Added
immovable_rod Added
labyrinth Added
last_refuge Added
mansus_grasp Added
mansus_link Added
nightwatcher_rebirth Added
open_store Added
realignment Added
space_phase Added
void_blast Added
void_phase Added
void_pull Added
volcano_blast Added

Resources/Textures/ADT/Heretic/amber_focus.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/ADT/Heretic/combat_marks.rsi

State Old New Status
ash Added
blade Added
flesh Added
lock Added
rust Added
void Added

Resources/Textures/ADT/Heretic/eldritch_armor.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/ADT/Heretic/eldritch_hood.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Heretic/eldritch_horror.rsi

State Old New Status
alive Added
dead Added

Resources/Textures/ADT/Heretic/eldritch_mobs.rsi

State Old New Status
armsy_end Added
armsy_mid Added
armsy_start Added
ash_walker Added
fire_shark Added
moon_mass Added
raw_prophet-move Added
raw_prophet Added
rust_walker_n Added
rust_walker_s Added
stalker Added

Resources/Textures/ADT/Heretic/mad_mask.rsi

State Old New Status
equipped-MASK Added
icon Added

Resources/Textures/ADT/Heretic/mansus_grasp.rsi

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

Resources/Textures/ADT/Heretic/polymorphs.rsi

State Old New Status
ash_jaunt Added
ash_jaunt_end Added

Resources/Textures/ADT/Heretic/reality_fracture.rsi

State Old New Status
icon Added
icon_harvested Added

Resources/Textures/ADT/Heretic/ritual_rune.rsi

State Old New Status
icon Added
icon_drawanim Added
icon_ritualanim Added

Edit: diff updated after e301b60

@Roudenn Roudenn changed the title [Feature] Heretics [Port] Heretics Feb 13, 2025
Copy link
Owner

@Rxup Rxup 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
Contributor

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

@KashRas2
Copy link

Спасибо, обязательно возьмём 🌞

stopped on ImmovableVoidRodSystem: OnCollide
@github-actions github-actions bot added the Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design label Feb 15, 2025
@KayzelW
Copy link
Collaborator

KayzelW commented Feb 15, 2025

В общем, я устал рефакторить этот чудо кусок кода. Пр не будет одобрен пока не будет сделан адекватный рефакторинг

@KayzelW KayzelW added the Needs Refactor Необходимо сделать рефактор label Feb 15, 2025
Copy link
Contributor

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

@Rxup Rxup added Require Testing Требуется тестирование! and removed Needs Refactor Необходимо сделать рефактор labels Feb 23, 2025
Copy link
Owner

@Rxup Rxup left a comment

Choose a reason for hiding this comment

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

Нужно тестирование, что рефактор не сломал

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Require Testing Требуется тестирование! S: Untriaged size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants