Skip to content

[Fix] Исправление имплантов.#2799

Open
Armorkillerd wants to merge 4 commits into
AdventureTimeSS14:masterfrom
Armorkillerd:131
Open

[Fix] Исправление имплантов.#2799
Armorkillerd wants to merge 4 commits into
AdventureTimeSS14:masterfrom
Armorkillerd:131

Conversation

@Armorkillerd
Copy link
Copy Markdown
Contributor

Описание PR

Сандевиндстан: Поднял урон от эми импульса, вернул проверку if на активацию санда.
Клинки богомола: Урон от эми импульса понижен, кд после эми импульса сниженно. все так же пассивно получает урон.

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

Техническая информация

  • Изменения были протестированы на локальном сервере, и всё работает отлично.
  • PR закончен и требует просмотра изменений.

Медиа

Чейнджлог

🆑 Armorkillerd

  • fix: Сандевиндстан вновь реагирует на эми импульсы как прежде (Они вводят в стан и наносят урон владельцу только если сандвиндстан активен. В ином случае просто уводят абилку на кд)
  • tweak: Урон и время оглушения повышено при использовании эми во время активированного сандевиндстана.
  • tweak: Время задержки после эми импульса клинкам богомола снижено до 10 секунд.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 24, 2026

Review Change Stack

Walkthrough

PR содержит баланс-патч для двух имплантов: Mantis Daggers и Sandevistan. Для Mantis Daggers уменьшены параметры EMP-активации: кулдаун с 15 до 10 секунд и длительность джиттера-эффекта с 15 до 10 секунд. Для Sandevistan добавлена проверка активного состояния перед применением EMP-логики, увеличен урон типа Shock с 30 до 40 и увеличена длительность парализации с 5 до 6 секунд.

Possibly related PRs

  • AdventureTimeSS14/space_station_ADT#2354: Также изменяет логику OnEmpPulse для Mantis Daggers в VisibleImplantSystem и значение EmpCooldown в MantisDaggersComponent.

  • AdventureTimeSS14/space_station_ADT#2214: Правит те же пути кода в VisibleImplantSystem.OnEmpPulse для обоих имплантов и баланс-поля MantisDaggersComponent.EmpCooldown и Sandevistan Shock-урона.

Suggested labels

S: Untriaged

Suggested reviewers

  • Red-Lis
  • Unlumy
  • FaDeOkno
🚥 Pre-merge checks | ✅ 3 | ❌ 2

❌ Failed checks (1 warning, 1 inconclusive)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
Title check ❓ Inconclusive Заголовок '[Fix] Исправление имплантов' неточен: вносятся как исправления (fix), так и балансные изменения (tweaks), но заголовок упоминает только 'исправление'. Рекомендуется уточнить заголовок, чтобы он отражал полный объём изменений: '[Fix/Balance] Исправление и балансировка имплантов' или указать конкретный основной компонент.
✅ Passed checks (3 passed)
Check name Status Explanation
Description check ✅ Passed Описание PR содержит релевантную информацию: детально описаны изменения для Sandevistan и Mantis Daggers, объяснены причины (баланс), указаны технические детали и статус тестирования.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown
Collaborator

@MinokaaUWU MinokaaUWU left a comment

Choose a reason for hiding this comment

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

В целом все гуд, но пофикси форматинг и все

Comment thread Content.Server/ADT/Sandevistan/SandevistanSystem.cs Outdated
Copy link
Copy Markdown
Collaborator

@MinokaaUWU MinokaaUWU 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
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (5)
Content.Server/ADT/Sandevistan/SandevistanUserComponent.cs (1)

1-6: 🛠️ Refactor suggestion | 🟠 Major | ⚡ Quick win

Нарушен алфавитный порядок using директив.

Согласно coding guidelines, в файлах /ADT/ using директивы должны быть отсортированы в алфавитном порядке. Текущий порядок нарушает это требование.

♻️ Предложенное исправление порядка using
-using Content.Shared.FixedPoint;
+using Content.Shared.ADT.Abilities;
 using Content.Shared.ADT.Sandevistan;
 using Content.Shared.ADT.Trail;
-using Content.Shared.ADT.Abilities;
 using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;

As per coding guidelines: "И ещё смотри за тем чтобы using был в алфавитном порядке в наших /ADT/ системах и компонентах".

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Content.Server/ADT/Sandevistan/SandevistanUserComponent.cs` around lines 1 -
6, The using directives at the top of SandevistanUserComponent.cs are not
alphabetized; reorder the using statements in the file so they follow
alphabetical order (by namespace) as required for /ADT/ systems — e.g., sort the
existing directives (Content.Shared.ADT.Abilities,
Content.Shared.ADT.Sandevistan, Content.Shared.ADT.Trail, Content.Shared.Damage,
Content.Shared.FixedPoint, Robust.Shared.Audio) into proper alphabetical order
and replace the current block in the file (the using block that includes these
namespaces) with the sorted list, preserving any needed usings and removing
duplicates if present.
Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs (1)

1-9: 🛠️ Refactor suggestion | 🟠 Major | ⚡ Quick win

Нарушен алфавитный порядок using директив.

Согласно coding guidelines, в файлах /ADT/ using директивы должны быть отсортированы в алфавитном порядке. Текущий порядок нарушает это требование.

♻️ Предложенное исправление порядка using
-using Content.Shared.Anomaly.Effects;
-using Content.Shared.Body.Prototypes;
 using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using Content.Shared.FixedPoint;

As per coding guidelines: "И ещё смотри за тем чтобы using был в алфавитном порядке в наших /ADT/ системах и компонентах".

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs` around
lines 1 - 9, Using directives in MantisDaggersComponent.cs are out of
alphabetical order; reorder them into strict alphabetical order
(case-insensitive) so they follow the project's /ADT/ guideline — locate the
using block at the top of the file in the MantisDaggersComponent
(class/namespace) file and sort entries such as Content.Shared.Anomaly.Effects,
Content.Shared.Body.Prototypes, Content.Shared.Damage,
Content.Shared.FixedPoint, Robust.Shared.Audio, Robust.Shared.Containers,
Robust.Shared.GameStates, Robust.Shared.Prototypes, Robust.Shared.Utility so the
list is alphabetized.
Content.Server/ADT/Implants/VisibleImplantSystem.cs (2)

7-7: ⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Дублирующийся using директива.

Content.Shared.Damage импортируется дважды (строки 7 и 28). Необходимо удалить один из дубликатов.

🔧 Предложенное исправление
 using Content.Shared.Armor;
 using Content.Shared.Damage;
 using Content.Shared.Explosion;

И удалить дубликат на строке 28:

 using Content.Shared.Jittering;
-using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;

Also applies to: 28-28

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Content.Server/ADT/Implants/VisibleImplantSystem.cs` at line 7, Remove the
duplicate using directive for Content.Shared.Damage in the VisibleImplantSystem
file: locate the top-of-file using imports in the VisibleImplantSystem
class/namespace and delete the redundant "using Content.Shared.Damage;"
occurrence so it only appears once among the using statements.

1-32: 🛠️ Refactor suggestion | 🟠 Major | ⚡ Quick win

Нарушен алфавитный порядок using директив.

Согласно coding guidelines, в файлах /ADT/ using директивы должны быть отсортированы в алфавитном порядке. Текущий порядок значительно нарушает это требование.

♻️ Предложенное исправление порядка using
+using Content.Server.Emp;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Stealth;
 using Content.Shared.Actions;
+using Content.Shared.ADT.CantShoot;
 using Content.Shared.ADT.Crawling;
 using Content.Shared.ADT.Implants;
 using Content.Shared.Armor;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Emp;
 using Content.Shared.Explosion;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Inventory;
+using Content.Shared.Jittering;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Stealth.Components;
 using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Stunnable;
 using Content.Shared.Tag;
+using Content.Shared.Weapons.Reflect;
 using Content.Shared.Weapons.Melee;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Content.Shared.Interaction.Components;
 using Robust.Shared.Timing;
-using Robust.Shared.Prototypes;
-using Content.Shared.Damage.Prototypes;
-using Content.Server.Emp;
-using Content.Shared.Stunnable;
-using Content.Shared.Jittering;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Systems;
-using Content.Shared.Weapons.Reflect;
-using Content.Shared.ADT.CantShoot;
-using Content.Shared.Emp;

As per coding guidelines: "И ещё смотри за тем чтобы using был в алфавитном порядке в наших /ADT/ системах и компонентах".

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Content.Server/ADT/Implants/VisibleImplantSystem.cs` around lines 1 - 32, The
using directives in VisibleImplantSystem (VisibleImplantSystem.cs) are out of
alphabetical order and contain duplicates (e.g., Content.Shared.Damage,
Content.Shared.Emp); reorder all using statements alphabetically and remove
duplicate using lines so the top-of-file usings follow the project's /ADT/
alphabetical guideline (ensure the order includes Robust.*, Content.Server.*,
Content.Shared.* groups sorted as strings).
Content.Server/ADT/Sandevistan/SandevistanSystem.cs (1)

1-19: 🛠️ Refactor suggestion | 🟠 Major | ⚡ Quick win

Нарушен алфавитный порядок using директив.

Согласно coding guidelines, в файлах /ADT/ using директивы должны быть отсортированы в алфавитном порядке. Текущий порядок нарушает это требование.

♻️ Предложенное исправление порядка using
 using Content.Shared.ADT.Abilities;
-using Content.Shared.ADT.Trail;
 using Content.Shared.ADT.Sandevistan;
+using Content.Shared.ADT.Trail;
 using Content.Shared.Actions;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
-using Content.Server.Emp;
+using Content.Shared.Emp;
 using Content.Shared.Jittering;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
+using Content.Server.Emp;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 using System.Numerics;
-using Content.Shared.Emp;

As per coding guidelines: "И ещё смотри за тем чтобы using был в алфавитном порядке в наших /ADT/ системах и компонентах".

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Content.Server/ADT/Sandevistan/SandevistanSystem.cs` around lines 1 - 19, The
using directives at the top of SandevistanSystem.cs are out of alphabetical
order and contain a duplicate (Content.Shared.Emp); reorder the entire using
block into a single alphabetically sorted list (case-insensitive) and remove
duplicates so all namespaces (e.g., Content.Shared.ADT.Abilities,
Content.Shared.ADT.Sandevistan, Content.Shared.Emp, Robust.Shared.Audio.Systems,
System.Numerics, etc.) appear once in proper alphabetical order.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Outside diff comments:
In `@Content.Server/ADT/Implants/VisibleImplantSystem.cs`:
- Line 7: Remove the duplicate using directive for Content.Shared.Damage in the
VisibleImplantSystem file: locate the top-of-file using imports in the
VisibleImplantSystem class/namespace and delete the redundant "using
Content.Shared.Damage;" occurrence so it only appears once among the using
statements.
- Around line 1-32: The using directives in VisibleImplantSystem
(VisibleImplantSystem.cs) are out of alphabetical order and contain duplicates
(e.g., Content.Shared.Damage, Content.Shared.Emp); reorder all using statements
alphabetically and remove duplicate using lines so the top-of-file usings follow
the project's /ADT/ alphabetical guideline (ensure the order includes Robust.*,
Content.Server.*, Content.Shared.* groups sorted as strings).

In `@Content.Server/ADT/Sandevistan/SandevistanSystem.cs`:
- Around line 1-19: The using directives at the top of SandevistanSystem.cs are
out of alphabetical order and contain a duplicate (Content.Shared.Emp); reorder
the entire using block into a single alphabetically sorted list
(case-insensitive) and remove duplicates so all namespaces (e.g.,
Content.Shared.ADT.Abilities, Content.Shared.ADT.Sandevistan,
Content.Shared.Emp, Robust.Shared.Audio.Systems, System.Numerics, etc.) appear
once in proper alphabetical order.

In `@Content.Server/ADT/Sandevistan/SandevistanUserComponent.cs`:
- Around line 1-6: The using directives at the top of
SandevistanUserComponent.cs are not alphabetized; reorder the using statements
in the file so they follow alphabetical order (by namespace) as required for
/ADT/ systems — e.g., sort the existing directives
(Content.Shared.ADT.Abilities, Content.Shared.ADT.Sandevistan,
Content.Shared.ADT.Trail, Content.Shared.Damage, Content.Shared.FixedPoint,
Robust.Shared.Audio) into proper alphabetical order and replace the current
block in the file (the using block that includes these namespaces) with the
sorted list, preserving any needed usings and removing duplicates if present.

In `@Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs`:
- Around line 1-9: Using directives in MantisDaggersComponent.cs are out of
alphabetical order; reorder them into strict alphabetical order
(case-insensitive) so they follow the project's /ADT/ guideline — locate the
using block at the top of the file in the MantisDaggersComponent
(class/namespace) file and sort entries such as Content.Shared.Anomaly.Effects,
Content.Shared.Body.Prototypes, Content.Shared.Damage,
Content.Shared.FixedPoint, Robust.Shared.Audio, Robust.Shared.Containers,
Robust.Shared.GameStates, Robust.Shared.Prototypes, Robust.Shared.Utility so the
list is alphabetized.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: c167f3d9-3567-4fe9-95c4-0fb5e5aa5cc8

📥 Commits

Reviewing files that changed from the base of the PR and between 392bdfe and 1757d47.

📒 Files selected for processing (4)
  • Content.Server/ADT/Implants/VisibleImplantSystem.cs
  • Content.Server/ADT/Sandevistan/SandevistanSystem.cs
  • Content.Server/ADT/Sandevistan/SandevistanUserComponent.cs
  • Content.Shared/ADT/Implants/Components/MantisDaggersComponent.cs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants