Skip to content

Arrivals rework#65

Merged
RedBurningPhoenix merged 5 commits into
TheMaidDev:mainfrom
CREAsTIVE:arrivals-rework
Jun 12, 2026
Merged

Arrivals rework#65
RedBurningPhoenix merged 5 commits into
TheMaidDev:mainfrom
CREAsTIVE:arrivals-rework

Conversation

@CREAsTIVE

@CREAsTIVE CREAsTIVE commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Описание

Небольшой реворк шаттла прибытия

Изменения

🆑 CREAsTIVE

  • remove: Убрана неуязвимость у шаттла прибытия
  • tweak: Теперь начальный спавн всегда происходит через прибытие
  • tweak: Стыковочные порты в прибытии теперь имеют публичный доступ
  • tweak: Для шаттла прибытия был добавлен специальный набор звуков

Summary by CodeRabbit

  • New Features

    • Added support for customizable Faster-Than-Light (FTL) startup, travel, and arrival sounds.
  • Changes

    • Removed the Spawn Priority preference option from character customization.
    • Reworked arrivals shuttle configuration with updated component structure and custom FTL audio integration.

@coderabbitai

coderabbitai Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Warning

Review limit reached

@CREAsTIVE, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 45 minutes and 32 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 3ff99e8f-e5db-4aac-8632-42b58db2fb6c

📥 Commits

Reviewing files that changed from the base of the PR and between bb08e97 and 0bae896.

📒 Files selected for processing (2)
  • Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
  • Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
📝 Walkthrough

Walkthrough

This PR removes the spawn priority user preference from the character creation UI and server persistence, adds a custom sound override system for FTL hyperspace transitions, and performs large-scale cleanup of the arrivals shuttle map by removing Godmode components and refining entity damage/construction constraints.

Changes

Spawn Priority Removal

Layer / File(s) Summary
Spawn Priority UI and persistence removal
Content.Client/Lobby/UI/HumanoidProfileEditor.xaml, Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs, Content.Server/Database/ServerDbBase.cs
The spawn priority selection control is removed from the character editor XAML, constructor wiring is disabled, profile loading no longer syncs the UI state, the update method is commented out, and the database always persists spawn priority as None.

Arrivals Shuttle Rework

Layer / File(s) Summary
Custom FTL sound system and integration
Content.Server/_Maid/FasterThanLight/Components/CustomFTLSoundComponent.cs, Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs, Resources/Maps/Shuttles/arrivals.yml
New CustomFTLSoundComponent exposes optional StartupSound, TravelSound, and ArrivalSound properties. FTL system checks for custom sounds at startup, travel, and arrival phases, playing overrides when available or falling back to built-in defaults. Arrivals shuttle is configured with custom hyperspace sounds.
Arrivals map entity property cleanup
Resources/Maps/Shuttles/arrivals.yml, Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
Godmode components are removed from all entities throughout the arrivals map. missingComponents lists are narrowed to construction/RCD/anchorable constraints only, eliminating Destructible from prior states. AirlockExternalGlassShuttleArrivals is marked Public and its ContainerFill is disabled.

🎯 3 (Moderate) | ⏱️ ~20 minutes

Suggested labels

S: Untriaged, Changes: Audio, Changes: Map, Changes: UI

Suggested reviewers

  • RedBurningPhoenix

🐰 A shuttle sings new tunes in space so wide,
While spawn priorities fade from the client-side,
Godmode sleeps as components align,
The arrivals now perfect, redesigned!

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title 'Arrivals rework' accurately summarizes the main change—a refactor of the arrivals shuttle system with multiple related modifications (removal of invulnerability, spawn priority changes, public access, custom FTL sounds).
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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

Warning

Review ran into problems

🔥 Problems

Stopped waiting for pipeline failures after 30000ms. One of your pipelines takes longer than our 30000ms fetch window to run, so review may not consider pipeline-failure results for inline comments if any failures occurred after the fetch window. Increase the timeout if you want to wait longer or run a @coderabbit review after the pipeline has finished.


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.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🧹 Nitpick comments (1)
Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs (1)

1531-1535: 💤 Low value

Unreachable dead code after spawn priority UI removal.

The SetSpawnPriority method is no longer called now that the spawn priority UI (specifically SpawnPriorityButton.OnItemSelected at line 583) is disabled. Consider commenting it out or removing it for consistency with the other disabled spawn priority code.

♻️ Optional refactor to comment out unused method
+    // MAID BEGIN remove-spawn-priority
+    /*
     private void SetSpawnPriority(SpawnPriorityPreference newSpawnPriority)
     {
         Profile = Profile?.WithSpawnPriorityPreference(newSpawnPriority);
         SetDirty();
     }
+    */
+    // MAID END remove-spawn-priority
🤖 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.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs` around lines 1531 -
1535, The SetSpawnPriority method is dead code because the spawn priority UI
(SpawnPriorityButton.OnItemSelected) is disabled; remove or comment out the
private SetSpawnPriority(SpawnPriorityPreference newSpawnPriority) method in
HumanoidProfileEditor.xaml.cs to keep code consistent with other disabled
spawn-priority logic, and run a search for any remaining references to
SetSpawnPriority or SpawnPriorityButton.OnItemSelected to ensure no callers
remain before committing.
🤖 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/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs`:
- Around line 445-448: The startup code chooses a custom sound via TryComp +
CustomFTLSoundComponent.StartupSound but UpdateFTLStarting still uses the
hardcoded _startupSound, so the custom override is lost mid-sequence; modify the
selection to persist the chosen clip (e.g., write the chosen sound resource into
the component like CustomFTLSoundComponent.CurrentStartupSound or another
shuttle-state field when calling _audio.PlayPvs) and then change
UpdateFTLStarting to read that persisted value (falling back to _startupSound if
null) instead of always using _startupSound so the same clip plays for the
departure clip.

In `@Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml`:
- Around line 1229-1237: AirlockExternalGlassShuttleArrivals still inherits a
ContainerFill and AccessReader from its parent chain so it isn't truly public;
override the inherited components in this prototype by adding a local
ContainerFill that removes the `board` electronics (e.g., set `containers:` with
no `board` entry or an empty list) and also override/remove the AccessReader
(clear `containerAccessProvider` or remove the AccessReader component) so no
inherited `board` or `containerAccessProvider: board` remains; reference the
prototype name AirlockExternalGlassShuttleArrivals and components PriorityDock,
ContainerFill, DoorElectronics/DoorElectronicsExternal, and AccessReader when
making these overrides.

---

Nitpick comments:
In `@Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs`:
- Around line 1531-1535: The SetSpawnPriority method is dead code because the
spawn priority UI (SpawnPriorityButton.OnItemSelected) is disabled; remove or
comment out the private SetSpawnPriority(SpawnPriorityPreference
newSpawnPriority) method in HumanoidProfileEditor.xaml.cs to keep code
consistent with other disabled spawn-priority logic, and run a search for any
remaining references to SetSpawnPriority or SpawnPriorityButton.OnItemSelected
to ensure no callers remain before committing.
🪄 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: defaults

Review profile: CHILL

Plan: Pro

Run ID: 43912285-c47c-46db-8aaf-d2bf13a261b5

📥 Commits

Reviewing files that changed from the base of the PR and between 13e9595 and bb08e97.

⛔ Files ignored due to path filters (3)
  • Resources/Audio/Effects/Shuttle/Arrivals/hyperspace_begin.ogg is excluded by !**/*.ogg
  • Resources/Audio/Effects/Shuttle/Arrivals/hyperspace_end.ogg is excluded by !**/*.ogg
  • Resources/Audio/Effects/Shuttle/Arrivals/hyperspace_progress.ogg is excluded by !**/*.ogg
📒 Files selected for processing (7)
  • Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
  • Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
  • Content.Server/Database/ServerDbBase.cs
  • Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
  • Content.Server/_Maid/FasterThanLight/Components/CustomFTLSoundComponent.cs
  • Resources/Maps/Shuttles/arrivals.yml
  • Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

Comment thread Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
Comment thread Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml Outdated
@RedBurningPhoenix RedBurningPhoenix merged commit 972f776 into TheMaidDev:main Jun 12, 2026
10 of 11 checks passed
github-actions Bot pushed a commit that referenced this pull request Jun 12, 2026
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