From 4b960f4bfb6d68659ddbfa7464d06a459592b163 Mon Sep 17 00:00:00 2001
From: murphyneko <47712032+murphyneko@users.noreply.github.com>
Date: Wed, 15 Jul 2026 15:56:21 +0200
Subject: [PATCH] Gamerules with occursDuringRoundEnd=false don't run only when
 roundend is certain (#42199)

gamerule cannot run if we can recall
---
 .../StationEvents/Components/StationEventComponent.cs           | 2 +-
 Content.Server/StationEvents/EventManagerSystem.cs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/StationEvents/Components/StationEventComponent.cs b/Content.Server/StationEvents/Components/StationEventComponent.cs
index a188d5c052..b4f77819f2 100644
--- a/Content.Server/StationEvents/Components/StationEventComponent.cs
+++ b/Content.Server/StationEvents/Components/StationEventComponent.cs
@@ -83,7 +83,7 @@ public sealed partial class StationEventComponent : Component
     public TimeSpan? EndTime;
 
     /// <summary>
-    /// If false, the event won't trigger during ongoing evacuation.
+    /// If false, the event won't trigger after the evacuation shuttle is called and cannot be recalled anymore.
     /// </summary>
     [DataField]
     public bool OccursDuringRoundEnd = true;
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index 3b26be61bf..8531ebbb91 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -342,7 +342,7 @@ public sealed partial class EventManagerSystem : EntitySystem
             return false;
         }
 
-        if (_roundEnd.IsRoundEndRequested() && !stationEvent.OccursDuringRoundEnd)
+        if (_roundEnd.IsRoundEndRequested() && !stationEvent.OccursDuringRoundEnd && !_roundEnd.CanCallOrRecall())
         {
             return false;
         }