Skip to content

Commit 42589dc

Browse files
Prisoner arrivals fix (DeltaV-Station#5885)
* doesn't work * akesi fixed it * Apply suggestions from code review Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> Signed-off-by: pathetic meowmeow <uhhadd@gmail.com> --------- Signed-off-by: pathetic meowmeow <uhhadd@gmail.com> Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
1 parent be5093f commit 42589dc

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

Content.Server/Shuttles/Systems/ArrivalsSystem.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,11 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev)
349349
if (!HasComp<StationArrivalsComponent>(ev.Station))
350350
return;
351351

352+
// Begin DeltaV - some jobs may not use arrivals
353+
if (ev.Job is { } jobId && _protoManager.Index(ev.Job).AlwaysUseSpawner)
354+
return;
355+
// End DeltaV
356+
352357
TryGetArrivals(out var arrivals);
353358

354359
if (!TryComp(arrivals, out TransformComponent? arrivalsXform))

0 commit comments

Comments
 (0)