Hmm yes

Fansana · Nov 4, 2024 · 580dcf0 · 580dcf0
1 parent 71d6476
commit 580dcf0
Show file tree

Hide file tree

Showing 4 changed files with 6,777 additions and 6 deletions.
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -200,13 +200,11 @@ private bool CanUse(EntityUid user, EntityUid console)
         private bool CanCallOrRecall(CommunicationsConsoleComponent comp)
         {
             // Defer to what the round end system thinks we should be able to do.
-            if (_emergency.EmergencyShuttleArrived || !_roundEndSystem.CanCallOrRecall())
+            if (_emergency.EmergencyShuttleArrived
+                || !_roundEndSystem.CanCallOrRecall()
+                || !comp.CanShuttle)
                 return false;
 
-            // Calling shuttle checks
-            if (_roundEndSystem.ExpectedCountdownEnd is null)
-                return comp.CanShuttle;
-
             // Recalling shuttle checks
             var recallThreshold = _cfg.GetCVar(CCVars.EmergencyRecallTurningPoint);
 

diff --git a/Content.Server/StationEvents/Components/PirateRadioSpawnRuleComponent.cs b/Content.Server/StationEvents/Components/PirateRadioSpawnRuleComponent.cs
@@ -8,7 +8,7 @@ public sealed partial class PirateRadioSpawnRuleComponent : Component
     [DataField]
     public List<string> PirateRadioShuttlePath { get; private set; } = new()
     {
-        "Maps/Shuttles/pirateradio.yml",
+        "Maps/Floof/pirateradio.yml", // Floofstation
     };
 
     [DataField]

diff --git a/Resources/Audio/Floof/Announcements/pirateannounce.ogg b/Resources/Audio/Floof/Announcements/pirateannounce.ogg