From 1d0a860c34c53f03b13bfa783743b1650974d976 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 21 Sep 2023 23:21:43 +1000
Subject: [PATCH] Fix exped ghost roles (#20392)

---
 Content.Server/Salvage/SpawnSalvageMissionJob.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index f38114cc44..276f35a836 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -288,7 +288,9 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
                     continue;
                 }
 
-                _entManager.SpawnAtPosition(entry.Proto, grid.GridTileToLocal(tile));
+                var uid = _entManager.SpawnAtPosition(entry.Proto, grid.GridTileToLocal(tile));
+                _entManager.RemoveComponent<GhostRoleComponent>(uid);
+                _entManager.RemoveComponent<GhostTakeoverAvailableComponent>(uid);
                 return;
             }
         }
-- 
2.51.2