From 8dd91f7eecb0679fa8da47f0a25d2c6cd7d3d38c Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sun, 20 Oct 2024 14:13:56 -0400
Subject: [PATCH] Fix Arrivals Not Respecting Force Spawn

---
 Content.Server/Shuttles/Systems/ArrivalsSystem.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index 4a2dc5df53e..fef671fc304 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -18,6 +18,7 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Parallax.Biomes;
+using Content.Shared.Roles;
 using Content.Shared.Salvage;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Tiles;
@@ -311,6 +312,12 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev)
         if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound)
             return;
 
+        if (ev.Job is not null
+            && ev.Job.Prototype is not null
+            && _protoManager.Index<JobPrototype>(ev.Job.Prototype.Value.Id).AlwaysUseSpawner)
+            return;
+
+
         if (!HasComp<StationArrivalsComponent>(ev.Station))
             return;