From ee68834c0c3f0459bbdbf9c7ba48d5d0cca5b221 Mon Sep 17 00:00:00 2001
From: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com>
Date: Tue, 15 Oct 2024 18:58:54 +0200
Subject: [PATCH] Fix shipyard extra stuff

---
 Content.Server/Shipyard/Systems/ShipyardSystem.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.cs
index 8efe169d22a..1c86a899540 100644
--- a/Content.Server/Shipyard/Systems/ShipyardSystem.cs
+++ b/Content.Server/Shipyard/Systems/ShipyardSystem.cs
@@ -84,7 +84,6 @@ private void OnShipyardStartup(EntityUid uid, ShipyardConsoleComponent component
         if (!_enabled)
             return;
         InitializeConsole();
-        SetupShipyard();
     }
 
     private void OnRoundRestart(RoundRestartCleanupEvent ev)
@@ -101,7 +100,7 @@ private void SetShipyardEnabled(bool value)
 
         if (value)
         {
-            SetupShipyard();
+            SetupShipyardIfNeeded();
         }
         else
         {
@@ -148,6 +147,7 @@ public bool TryPurchaseShuttle(EntityUid stationUid, string shuttlePath, [NotNul
     private bool TryAddShuttle(string shuttlePath, [NotNullWhen(true)] out EntityUid? shuttleGrid)
     {
         shuttleGrid = null;
+        SetupShipyardIfNeeded();
         if (ShipyardMap == null)
             return false;
 
@@ -276,7 +276,7 @@ private void CleanupShipyard()
         _mapManager.DeleteMap(ShipyardMap.Value);
     }
 
-    private void SetupShipyard()
+    private void SetupShipyardIfNeeded()
     {
         if (ShipyardMap != null && _mapManager.MapExists(ShipyardMap.Value))
             return;