[PORT] Порт Граба с доработкой#4469
Draft
banumbas wants to merge 8 commits into
Draft
Conversation
banumbas
requested review from
KaiserMaus,
ThereDrD0 and
kanopus952
as code owners
Contributor
|
RSI Diff Bot; head commit 027df6f merging into 385f11e Resources/Textures/_Sunrise/Interface/Alerts/grab.rsi
|
Contributor
|
Important Review skippedDraft detected. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
📝 WalkthroughWalkthroughРеализована механика staged-grab: новые контракты (компоненты, enum, события), SharedGrabSystem с управлением стадий и побегов, поддержка виртуальных предметов и throwing, интеграция с Respiration/Pulling и добавлены UI/локализация/алерты. ChangesСистема захвата и удержания
Sequence DiagramsequenceDiagram
participant Grabber
participant SharedGrabSystem
participant Grabbed
participant RespiratorSystem
Grabber->>SharedGrabSystem: TryStartOrTightenGrab
SharedGrabSystem->>SharedGrabSystem: Validate -> set Stage, update VirtualItems
SharedGrabSystem->>Grabbed: Add/Update GrabbedComponent
RespiratorSystem->>RespiratorSystem: RaiseLocalEvent(CanBreatheEvent)
GrabRespiratorSystem->>RespiratorSystem: sets args.Cancelled when Stage >= Suffocate
RespiratorSystem->>RespiratorSystem: Skip inhale/exhale or apply suffocation damage
Grabbed->>SharedGrabSystem: TryEscapeGrab
SharedGrabSystem->>SharedGrabSystem: Calculate escape chance -> Lower stage or increase bonus
Estimated code review effort🎯 4 (Complex) | ⏱️ ~60 minutes Suggested reviewers
Poem
Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (1 error, 1 warning)
✅ Passed checks (8 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
coderabbitai
Bot
added
🖌️ Спрайты 🖌️
📚 Изменения: Локализация 📚
🛠️ Есть C# 🛠️
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 6
🤖 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.
Inline comments:
In `@Content.Shared/_Sunrise/Grab/Systems/SharedGrabSystem.cs`:
- Around line 91-105: The handler currently marks args.Handled = true before
verifying the grab can actually occur; change OnPullToggleAttempt so you call
TryStartOrTightenGrab(args.Puller, ent.Owner) first, store its boolean result,
and only set args.Handled = true and args.Result = result when that call returns
true (i.e., when the grab actually started/tightened). Keep the existing early
return for non-active grabs outside combat (_combatMode.IsInCombatMode) but
ensure you don't swallow the original toggle by setting args.Handled prior to
checking TryStartOrTightenGrab in the OnPullToggleAttempt method.
In `@Content.Shared/_Sunrise/Grab/Systems/SharedGrabSystem.Throwing.cs`:
- Around line 11-44: The event handlers OnBeforeThrow and OnGrabThrowHit should
be reduced to thin routers and the validation/state-mutation logic moved into
public Try/Can/Do methods; create public methods like
CanBeforeThrow(Entity<GrabberComponent> ent, BeforeThrowEvent args),
TryBeforeThrow(Entity<GrabberComponent> ent, ref BeforeThrowEvent args) and
DoBeforeThrow(EntityUid grabbed, GrabberComponent grabComp, BeforeThrowEvent
args) (and analogous Can/Try/Do trio for the grab-hit flow) and move all checks
(args.Cancelled, ent.Comp.Grabbed presence, Stage check, virtual/pullable
lookup, _pulling.TryStopPull) and state mutations
(EnsureComp<GrabThrownComponent>, setting
DamageOnCollide/WallDamageOnCollide/StaminaDamageOnCollide, Dirty, and modifying
args.ItemUid/args.ThrowSpeed) into those methods; then make OnBeforeThrow simply
call TryBeforeThrow and short-circuit based on the result, and do the same
pattern for OnGrabThrowHit so handlers only route and the heavy logic lives in
named Try/Can/Do methods.
In `@Content.Shared/Movement/Pulling/Systems/PullingSystem.cs`:
- Around line 2-3: The two new using directives "using
Content.Shared._Sunrise.Grab;" and "using Content.Shared._Sunrise.Grab.Events;"
were added to a vanilla file but lack Sunrise fork markers; add inline Sunrise
markers to each one-line edit by appending "// Sunrise-Edit" (or wrap a block
with "/* Sunrise edit start */" and "/* Sunrise edit end */" if you prefer a
block), so the added using statements are clearly marked for upstream
maintenance and follow the /**/!(_{Sunrise,Scp,Fish,Lust})/**/*.cs guideline.
- Around line 253-256: Нужно зафиксировать порядок обработки
VirtualItemDeletedEvent: текущая проверка args.Handled в PullingSystem (в месте
с комментарием Sunrise) безопасна лишь если SharedGrabSystem.VirtualItems
обрабатывает событие раньше — исправьте это, найдите где подписывается
обработчик VirtualItemDeletedEvent в SharedGrabSystem (метод VirtualItems) и в
PullingSystem (обработчик, где вызывается TryStopPull/проверяется args.Handled)
и задайте при подписке явный приоритет/порядок (например через
SubscribeLocalEvent с параметром priority или соответствующий атрибут) так,
чтобы SharedGrabSystem обрабатывался до PullingSystem; альтернативно измените
приоритет в PullingSystem на более «поздний», чтобы гарантировать корректную
работу args.Handled.
In `@Resources/Locale/en-US/_strings/_sunrise/interaction/grab.ftl`:
- Around line 4-6: Both alerts "alerts-grabbed-desc" and "alerts-grabbing-desc"
contain UI/control instructions but lack the required OOC marker; update the
string values for alerts-grabbed-desc and alerts-grabbing-desc to prefix the
user-facing instruction with "OOC: " (e.g., "OOC: You are being grabbed. Click
the alert to loosen the grab.") so all out-of-character hints/controls in
Resources/Locale/**/*.ftl are explicitly marked.
In `@Resources/Locale/ru-RU/_strings/_sunrise/interaction/grab.ftl`:
- Around line 4-6: Update the two out-of-character UI hint strings by prefixing
them with "OOC:" so they follow the locale guideline: change the value of
alerts-grabbed-desc (currently "Вас крепко держат. Нажмите на индикатор, чтобы
ослабить захват.") and alerts-grabbing-desc (currently "Вы кого-то держите.
Нажмите на индикатор, чтобы ослабить захват.") to start with "OOC: " before the
existing text, preserving the rest of the wording and markup (e.g., keep
[color=yellow] in alerts-grabbing-name unchanged).
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro
Run ID: 10516c09-4334-4c57-845e-9b82ce7cd7bd
⛔ Files ignored due to path filters (8)
Resources/Textures/_Sunrise/Interface/Alerts/grab.rsi/grab-choke.pngis excluded by!**/*.pngResources/Textures/_Sunrise/Interface/Alerts/grab.rsi/grab-hard.pngis excluded by!**/*.pngResources/Textures/_Sunrise/Interface/Alerts/grab.rsi/grab-soft.pngis excluded by!**/*.pngResources/Textures/_Sunrise/Interface/Alerts/grab.rsi/grabbed-choke.pngis excluded by!**/*.pngResources/Textures/_Sunrise/Interface/Alerts/grab.rsi/grabbed-hard.pngis excluded by!**/*.pngResources/Textures/_Sunrise/Interface/Alerts/grab.rsi/grabbed-soft.pngis excluded by!**/*.pngResources/Textures/_Sunrise/Interface/Alerts/grab.rsi/pulled.pngis excluded by!**/*.pngResources/Textures/_Sunrise/Interface/Alerts/grab.rsi/pulling.pngis excluded by!**/*.png
📒 Files selected for processing (18)
Content.Server/Body/Systems/RespiratorSystem.csContent.Server/_Sunrise/Body/GrabRespiratorSystem.csContent.Shared/Hands/HandEvents.csContent.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.csContent.Shared/Movement/Pulling/Systems/PullingSystem.csContent.Shared/_Sunrise/Grab/Components/GrabThrownComponent.csContent.Shared/_Sunrise/Grab/Components/GrabWhileGrabbedComponent.csContent.Shared/_Sunrise/Grab/Components/GrabbedComponent.csContent.Shared/_Sunrise/Grab/Components/GrabberComponent.csContent.Shared/_Sunrise/Grab/Events/PullToggleAttemptEvent.csContent.Shared/_Sunrise/Grab/GrabStage.csContent.Shared/_Sunrise/Grab/Systems/SharedGrabSystem.Throwing.csContent.Shared/_Sunrise/Grab/Systems/SharedGrabSystem.VirtualItems.csContent.Shared/_Sunrise/Grab/Systems/SharedGrabSystem.csResources/Locale/en-US/_strings/_sunrise/interaction/grab.ftlResources/Locale/ru-RU/_strings/_sunrise/interaction/grab.ftlResources/Prototypes/_Sunrise/Alerts/grab.ymlResources/Textures/_Sunrise/Interface/Alerts/grab.rsi/meta.json
Comment on lines
+91
to
+105
| private void OnPullToggleAttempt(Entity<PullableComponent> ent, ref PullToggleAttemptEvent args) | ||
| { | ||
| if (args.Handled) | ||
| return; | ||
|
|
||
| var activeGrab = _grabberQuery.TryComp(args.Puller, out var grabber) && | ||
| grabber.Grabbed == ent.Owner && | ||
| grabber.Stage > GrabStage.No; | ||
|
|
||
| if (!activeGrab && !_combatMode.IsInCombatMode(args.Puller)) | ||
| return; | ||
|
|
||
| args.Handled = true; | ||
| args.Result = TryStartOrTightenGrab(args.Puller, ent.Owner); | ||
| } |
Contributor
There was a problem hiding this comment.
Не перехватывайте toggle pull до проверки, что grab реально может выполниться.
На Line 103 событие помечается Handled до проверки валидности grab-пути. В combat mode это глушит штатный toggle/stop pull даже когда TryStartOrTightenGrab заведомо вернёт false (например, цель без MobStateComponent по Line 290-291).
Предлагаемая правка
private void OnPullToggleAttempt(Entity<PullableComponent> ent, ref PullToggleAttemptEvent args)
{
if (args.Handled)
return;
var activeGrab = _grabberQuery.TryComp(args.Puller, out var grabber) &&
grabber.Grabbed == ent.Owner &&
grabber.Stage > GrabStage.No;
if (!activeGrab && !_combatMode.IsInCombatMode(args.Puller))
return;
+
+ // Для не-активного grab не перехватываем событие, если старт grab невозможен:
+ // даём PullingSystem выполнить обычный toggle/stop.
+ if (!activeGrab && !CanStartOrTightenGrab(args.Puller, ent.Owner, quiet: true))
+ return;
args.Handled = true;
args.Result = TryStartOrTightenGrab(args.Puller, ent.Owner);
}🤖 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/_Sunrise/Grab/Systems/SharedGrabSystem.cs` around lines 91 -
105, The handler currently marks args.Handled = true before verifying the grab
can actually occur; change OnPullToggleAttempt so you call
TryStartOrTightenGrab(args.Puller, ent.Owner) first, store its boolean result,
and only set args.Handled = true and args.Result = result when that call returns
true (i.e., when the grab actually started/tightened). Keep the existing early
return for non-active grabs outside combat (_combatMode.IsInCombatMode) but
ensure you don't swallow the original toggle by setting args.Handled prior to
checking TryStartOrTightenGrab in the OnPullToggleAttempt method.
Comment on lines
+11
to
+44
| private void OnBeforeThrow(Entity<GrabberComponent> ent, ref BeforeThrowEvent args) | ||
| { | ||
| if (args.Cancelled || | ||
| ent.Comp.Grabbed is not { } grabbed || | ||
| ent.Comp.Stage < GrabStage.Hard) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| if (!_virtualQuery.TryComp(args.ItemUid, out var virtualItem) || virtualItem.BlockingEntity != grabbed) | ||
| return; | ||
|
|
||
| if (!_pullableQuery.TryComp(grabbed, out var pullable)) | ||
| { | ||
| args.Cancelled = true; | ||
| return; | ||
| } | ||
|
|
||
| if (!_pulling.TryStopPull(grabbed, pullable)) | ||
| { | ||
| args.Cancelled = true; | ||
| return; | ||
| } | ||
|
|
||
| var thrown = EnsureComp<GrabThrownComponent>(grabbed); | ||
| var damage = ent.Comp.ThrowDamage * ent.Comp.ThrowDamageModifier; | ||
| thrown.DamageOnCollide = new DamageSpecifier(damage); | ||
| thrown.WallDamageOnCollide = new DamageSpecifier(damage); | ||
| thrown.StaminaDamageOnCollide = ent.Comp.ThrowStaminaDamage; | ||
| Dirty(grabbed, thrown); | ||
|
|
||
| args.ItemUid = grabbed; | ||
| args.ThrowSpeed = ent.Comp.ThrowSpeed; | ||
| } |
Contributor
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
# Find and examine the file mentioned in the review
find . -name "SharedGrabSystem.Throwing.cs" -type fRepository: space-sunrise/sunrise-station
Length of output: 141
🏁 Script executed:
# Get the file size first to determine how to read it
wc -l Content.Shared/_Sunrise/Grab/Systems/SharedGrabSystem.Throwing.csRepository: space-sunrise/sunrise-station
Length of output: 142
🏁 Script executed:
# Read the entire file to understand the context
cat -n Content.Shared/_Sunrise/Grab/Systems/SharedGrabSystem.Throwing.csRepository: space-sunrise/sunrise-station
Length of output: 3123
Разделите handler-методы по обязательному interaction flow.
Методы OnBeforeThrow (строки 11–44) и OnGrabThrowHit (строки 46–71) содержат валидацию и мутацию состояния, что нарушает паттерн OnEvent → TryDo → CanDo → Do. Оставьте обработчики тонкими роутерами и вынесите логику в публичные методы Try, проверки Can и действия Do.
Пример рефакторинга для OnBeforeThrow:
Возможный каркас рефактора
- private void OnBeforeThrow(Entity<GrabberComponent> ent, ref BeforeThrowEvent args)
- {
- if (args.Cancelled ||
- ent.Comp.Grabbed is not { } grabbed ||
- ent.Comp.Stage < GrabStage.Hard)
- {
- return;
- }
- ...
- }
+ private void OnBeforeThrow(Entity<GrabberComponent> ent, ref BeforeThrowEvent args)
+ {
+ TryPrepareGrabThrow(ent, ref args);
+ }
+
+ public bool TryPrepareGrabThrow(Entity<GrabberComponent> ent, ref BeforeThrowEvent args)
+ {
+ if (!CanPrepareGrabThrow(ent, args, out var grabbed, out var virtualItem, out var pullable))
+ return false;
+
+ DoPrepareGrabThrow(ent, ref args, grabbed, pullable);
+ return true;
+ }
+
+ private bool CanPrepareGrabThrow(
+ Entity<GrabberComponent> ent,
+ BeforeThrowEvent args,
+ out EntityUid grabbed,
+ out VirtualItemComponent virtualItem,
+ out PullableComponent pullable)
+ {
+ grabbed = default;
+ virtualItem = default;
+ pullable = default;
+
+ if (args.Cancelled ||
+ ent.Comp.Grabbed is not { } g ||
+ ent.Comp.Stage < GrabStage.Hard)
+ return false;
+
+ grabbed = g;
+ return _virtualQuery.TryComp(args.ItemUid, out virtualItem) &&
+ virtualItem.BlockingEntity == grabbed &&
+ _pullableQuery.TryComp(grabbed, out pullable);
+ }
+
+ private void DoPrepareGrabThrow(
+ Entity<GrabberComponent> ent,
+ ref BeforeThrowEvent args,
+ EntityUid grabbed,
+ PullableComponent pullable)
+ {
+ _pulling.TryStopPull(grabbed, pullable);
+ var thrown = EnsureComp<GrabThrownComponent>(grabbed);
+ var damage = ent.Comp.ThrowDamage * ent.Comp.ThrowDamageModifier;
+ thrown.DamageOnCollide = new DamageSpecifier(damage);
+ thrown.WallDamageOnCollide = new DamageSpecifier(damage);
+ thrown.StaminaDamageOnCollide = ent.Comp.ThrowStaminaDamage;
+ Dirty(grabbed, thrown);
+ args.ItemUid = grabbed;
+ args.ThrowSpeed = ent.Comp.ThrowSpeed;
+ }Аналогичный рефакторинг требуется для OnGrabThrowHit.
🤖 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/_Sunrise/Grab/Systems/SharedGrabSystem.Throwing.cs` around
lines 11 - 44, The event handlers OnBeforeThrow and OnGrabThrowHit should be
reduced to thin routers and the validation/state-mutation logic moved into
public Try/Can/Do methods; create public methods like
CanBeforeThrow(Entity<GrabberComponent> ent, BeforeThrowEvent args),
TryBeforeThrow(Entity<GrabberComponent> ent, ref BeforeThrowEvent args) and
DoBeforeThrow(EntityUid grabbed, GrabberComponent grabComp, BeforeThrowEvent
args) (and analogous Can/Try/Do trio for the grab-hit flow) and move all checks
(args.Cancelled, ent.Comp.Grabbed presence, Stage check, virtual/pullable
lookup, _pulling.TryStopPull) and state mutations
(EnsureComp<GrabThrownComponent>, setting
DamageOnCollide/WallDamageOnCollide/StaminaDamageOnCollide, Dirty, and modifying
args.ItemUid/args.ThrowSpeed) into those methods; then make OnBeforeThrow simply
call TryBeforeThrow and short-circuit based on the result, and do the same
pattern for OnGrabThrowHit so handlers only route and the heavy logic lives in
named Try/Can/Do methods.
Comment on lines
+253
to
+256
| // Sunrise added start - fork-specific virtual item handlers may consume extra pull-like items. | ||
| if (args.Handled) | ||
| return; | ||
| // Sunrise added end |
Contributor
There was a problem hiding this comment.
Зафиксируйте порядок обработки VirtualItemDeletedEvent, иначе Handled может не сработать.
Проверка args.Handled здесь безопасна только если grab-хендлер (SharedGrabSystem.VirtualItems) гарантированно выполняется раньше PullingSystem. Сейчас это не закреплено, поэтому при обратном порядке удаление grab-виртуального предмета может преждевременно вызвать TryStopPull и сорвать захват.
Вариант правки
@@
- SubscribeLocalEvent<PullerComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
+ SubscribeLocalEvent<PullerComponent, VirtualItemDeletedEvent>(
+ OnVirtualItemDeleted,
+ after: [typeof(SharedGrabSystem)]);📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| // Sunrise added start - fork-specific virtual item handlers may consume extra pull-like items. | |
| if (args.Handled) | |
| return; | |
| // Sunrise added end | |
| SubscribeLocalEvent<PullerComponent, VirtualItemDeletedEvent>( | |
| OnVirtualItemDeleted, | |
| after: [typeof(SharedGrabSystem)]); |
🤖 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/Movement/Pulling/Systems/PullingSystem.cs` around lines 253 -
256, Нужно зафиксировать порядок обработки VirtualItemDeletedEvent: текущая
проверка args.Handled в PullingSystem (в месте с комментарием Sunrise) безопасна
лишь если SharedGrabSystem.VirtualItems обрабатывает событие раньше — исправьте
это, найдите где подписывается обработчик VirtualItemDeletedEvent в
SharedGrabSystem (метод VirtualItems) и в PullingSystem (обработчик, где
вызывается TryStopPull/проверяется args.Handled) и задайте при подписке явный
приоритет/порядок (например через SubscribeLocalEvent с параметром priority или
соответствующий атрибут) так, чтобы SharedGrabSystem обрабатывался до
PullingSystem; альтернативно измените приоритет в PullingSystem на более
«поздний», чтобы гарантировать корректную работу args.Handled.
Contributor
Author
There was a problem hiding this comment.
Вот в твоём Commitable suggestion убирается Sunrise эдиты, верни их.
Contributor
There was a problem hiding this comment.
@banumbas, извините за ошибку — вот исправленный вариант с Sunrise-маркерами:
SubscribeLocalEvent<PullerComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted, after: [typeof(SharedGrabSystem)]); // Sunrise-EditИ соответствующий OnVirtualItemDeleted остаётся без изменений:
private void OnVirtualItemDeleted(EntityUid uid, PullerComponent component, VirtualItemDeletedEvent args)
{
// Sunrise added start - fork-specific virtual item handlers may consume extra pull-like items.
if (args.Handled)
return;
// Sunrise added end
// If client deletes the virtual hand then stop the pull.
if (component.Pulling == null)
return;
if (component.Pulling != args.BlockingEntity)
return;
if (TryComp(args.BlockingEntity, out PullableComponent? comp))
{
TryStopPull(args.BlockingEntity, comp);
}
}(ˆ ε ˆ)
🧠 Learnings used
Learnt from: kanopus952
Repo: space-sunrise/sunrise-station PR: 3973
File: Content.Server/_Sunrise/StationEvents/Components/ResearchPointVirusRuleComponent.cs:1-10
Timestamp: 2026-03-09T11:33:51.097Z
Learning: In C# projects using global using directives, attributes and types from Robust.Shared.Analyzers are accessible without per-file using statements when the corresponding global usings are configured (as in Content.Server/GlobalUsings.cs, Content.Shared/GlobalUsings.cs, Content.Client/GlobalUsings.cs). Do not add an explicit 'using Robust.Shared.Analyzers;' to individual files like Content.Server/_Sunrise/StationEvents/Components/ResearchPointVirusRuleComponent.cs unless a file outside the existing global usings context requires a separate import. Apply this guidance to all C# files; verify global usings cover the needed symbol in any new file.
Learnt from: 3ndorf1n
Repo: space-sunrise/sunrise-station PR: 4199
File: Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs:172-175
Timestamp: 2026-04-11T14:04:41.055Z
Learning: In space-sunrise/sunrise-station, whenever a system raises a predictive/local client-side event via `RaisePredictiveEvent`, the corresponding subscription for handling that event in the shared system must use `SubscribeAllEvent<T>`—NOT `SubscribeNetworkEvent<T>`. Using `SubscribeNetworkEvent` will skip the local prediction raise and defer UI updates until the server round-trip completes. Apply this rule to all predictive events raised with `RaisePredictiveEvent`, e.g., in `SharedStorageSystem` for events like `StorageToggleItemPriorityEvent`.
Contributor
Author
There was a problem hiding this comment.
сука ну comittable suggestion знаешь что такое?
Contributor
There was a problem hiding this comment.
@banumbas, приношу извинения за раздражение. К сожалению, я не могу создавать коммитируемые suggestion-блоки (в формате GitHub). Вот изменение в виде diff, которое нужно применить вручную:
- SubscribeLocalEvent<PullerComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
+ SubscribeLocalEvent<PullerComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted, after: [typeof(SharedGrabSystem)]); // Sunrise-EditЭто единственное изменение — в Initialize(), строка с подпиской на VirtualItemDeletedEvent. Тело OnVirtualItemDeleted трогать не нужно.
(ˆ _ ˆ;)
🧠 Learnings used
Learnt from: banumbas
Repo: space-sunrise/sunrise-station PR: 4469
File: Content.Shared/Movement/Pulling/Systems/PullingSystem.cs:2-3
Timestamp: 2026-06-07T18:51:55.103Z
Learning: In this fork (space-sunrise/sunrise-station), do not require explicit `// Sunrise-Edit` markers for C# `using` directives whose namespace contains the `_Sunrise` segment (e.g., `using Content.Shared._Sunrise.Grab;`). The presence of `_Sunrise` in the imported namespace name is sufficient to identify fork-specific additions, including when such lines are introduced into vanilla upstream files. In future reviews, skip requesting `// Sunrise-Edit` for `using` statements matching this rule.
Learnt from: kanopus952
Repo: space-sunrise/sunrise-station PR: 3973
File: Content.Server/_Sunrise/StationEvents/Components/ResearchPointVirusRuleComponent.cs:1-10
Timestamp: 2026-03-09T11:33:51.097Z
Learning: In C# projects using global using directives, attributes and types from Robust.Shared.Analyzers are accessible without per-file using statements when the corresponding global usings are configured (as in Content.Server/GlobalUsings.cs, Content.Shared/GlobalUsings.cs, Content.Client/GlobalUsings.cs). Do not add an explicit 'using Robust.Shared.Analyzers;' to individual files like Content.Server/_Sunrise/StationEvents/Components/ResearchPointVirusRuleComponent.cs unless a file outside the existing global usings context requires a separate import. Apply this guidance to all C# files; verify global usings cover the needed symbol in any new file.
Learnt from: 3ndorf1n
Repo: space-sunrise/sunrise-station PR: 4199
File: Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs:172-175
Timestamp: 2026-04-11T14:04:41.055Z
Learning: In space-sunrise/sunrise-station, whenever a system raises a predictive/local client-side event via `RaisePredictiveEvent`, the corresponding subscription for handling that event in the shared system must use `SubscribeAllEvent<T>`—NOT `SubscribeNetworkEvent<T>`. Using `SubscribeNetworkEvent` will skip the local prediction raise and defer UI updates until the server round-trip completes. Apply this rule to all predictive events raised with `RaisePredictiveEvent`, e.g., in `SharedStorageSystem` for events like `StorageToggleItemPriorityEvent`.
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 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.
Inline comments:
In `@Content.Server/Body/Systems/RespiratorSystem.cs`:
- Around line 519-525: The Sunrise marker comments around the new
CanBreatheEvent record (the lines containing "// Sunrise-Start" and "//
Sunrise-End" surrounding the record struct CanBreatheEvent) don't follow repo
conventions; replace them with the repository-standard markers using the Sunrise
prefix and the required wording (e.g., "// Sunrise added start - reason" and "//
Sunrise added end" or the alternative "// Sunrise-Edit added start" / "//
Sunrise-Edit added end") so the insertion is clearly flagged for upstream merges
and matches other edits; update only the two marker comment lines around the
CanBreatheEvent declaration to the correct format and leave the record and
attributes unchanged.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro
Run ID: 9c700743-b975-43c3-8a92-d272913e7951
📒 Files selected for processing (1)
Content.Server/Body/Systems/RespiratorSystem.cs
Orvex07
requested changes
Jun 5, 2026
Collaborator
There was a problem hiding this comment.
- Доделайте и дождитесь одобрение issues.
- Нужны какие-то анимации захвата (смотрел видео с ПРа виздена), слишком непонятно обычным игрокам.
- Нужно больше актуальных данных насчёт данного ПРа. Видео, скриншоты.
- Переделать changelog
Не буду пока закрывать ПР, пробуйте, тестируй. Повторюсь, первый пункт <-- Новые п правила контрибьютинга.
Что могу сказать насчёт кода -> Насчёт кода, многие моменты нужно вынести в директорию sunrise в сделать как partial класс.
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
coderabbitai
Bot
removed
🖌️ Спрайты 🖌️
📚 Изменения: Локализация 📚
🛠️ Есть C# 🛠️
Contributor
Author
|
Если что я не забросил ПР, просто в данный момент нету возможности с ним работать. |
Contributor
Author
Насчёт того что ты сказал насчёт кода не знаю, я и так вроде по максимуму в партиал вывел |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Краткое описание | Short description
это топ
space-wizards/space-station-14#30011
я там поделал ревью метала и чёто ещё вообщем нормалды сделал, но делал я ещё давно поэтому точно не помню что изменял
При попытке тащить человека когда вы его уже тащите при этом находясь в боевом режиме позволит вам начать захват.
Захват имеет три стадии:
Софт - вы просто захватили человека, не представляет никакой угрозы потому что выбратся можно за секунду.
Хард град - фффффффффффф начиная с этого захвата можно кидать цели
Удушающий - человек не может говорить и задыхается, шанс выбраться минимальный.
Силу захвата(софт, хард, удушение) можно усилить ещё одной попыткой тащить человека, уменьшить силу захвата можно по хоткею "Перестать тащить", как для того кто тащит так и для того кого тащат, либо же по нажатию иконки граба.
из пра визденов граб имеет фиксированные проценты выбраться, и допустим если ты много раз пытался выбратся у тебя шансы на следующую попытку не повышаются, у меня же они суммируются.
Ссылка на багрепорт/Предложение | Related Issue/Bug Report
#4463
fixed #2381
Медиа (Видео/Скриншоты) | Media (Video/Screenshots)
будет
Changelog
🆑 banumbas
Summary by CodeRabbit