From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 29 Apr 2023 03:14:15 +0000 (-0400)
Subject: Fix loneops (#15874)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f028b35ce2854bb538d0cd1dc829d7ef24726f1f;p=space-station-14.git

Fix loneops (#15874)
---

diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
index a55189d0f2..4f788e0052 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
@@ -4,7 +4,7 @@ namespace Content.Server.GameTicking.Rules;
 
 public abstract class GameRuleSystem<T> : EntitySystem where T : Component
 {
-    [Dependency] protected GameTicker GameTicker = default!;
+    [Dependency] protected readonly GameTicker GameTicker = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Server/StationEvents/Events/LoneOpsSpawnRule.cs b/Content.Server/StationEvents/Events/LoneOpsSpawnRule.cs
index 57f0a2cbb6..8e1a2f3b3b 100644
--- a/Content.Server/StationEvents/Events/LoneOpsSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/LoneOpsSpawnRule.cs
@@ -20,7 +20,10 @@ public sealed class LoneOpsSpawnRule : StationEventSystem<LoneOpsSpawnRuleCompon
         base.Started(uid, component, gameRule, args);
 
         if (!_nukeopsRuleSystem.CheckLoneOpsSpawn())
+        {
+            ForceEndSelf(uid, gameRule);
             return;
+        }
 
         var shuttleMap = _mapManager.CreateMap();
         var options = new MapLoadOptions
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 5b54e1a60d..7163998af5 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -279,4 +279,3 @@
     reoccurrenceDelay: 25
     duration: 1
   - type: LoneOpsSpawnRule
-  - type: NukeopsRule