fix part 2 (micro fix)

Lemirda · Apr 12, 2024 · a50d09d · a50d09d
1 parent 949fbe0
commit a50d09d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -38,7 +38,6 @@
 using Content.Shared.Roles;
 using Content.Shared.Store;
 using Content.Shared.Tag;
-using Content.Shared.Zombies;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
@@ -456,7 +455,7 @@ private void DistributeExtraTc(NukeopsRuleComponent nukieRule)
             if (Transform(uid).MapID != Transform(nukieRule.NukieOutpost.Value).MapID) // Will receive bonus TC only on their start outpost
                 continue;
 
-            _store.TryAddCurrency(new () { { TelecrystalCurrencyPrototype, nukieRule.WarTCAmountPerNukie } }, uid, component);
+            _store.TryAddCurrency(new() { { TelecrystalCurrencyPrototype, nukieRule.WarTCAmountPerNukie } }, uid, component);
 
             var msg = Loc.GetString("store-currency-war-boost-given", ("target", uid));
             _popupSystem.PopupEntity(msg, uid);

diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -63,10 +63,10 @@ public sealed partial class EmergencyShuttleSystem
     /// </summary>
     private float _authorizeTime;
 
-    private float _AndromedaEmergency60 = 60; // Andromeda Emergency
-    private float _AndromedaEmergency30 = 30; // Andromeda Emergency
-    private float trashcheck60 = 0; // Andromeda Emergency
-    private float trashcheck30 = 0; // Andromeda Emergency
+    private float _andromedaEmergency60 = 60; // Andromeda Emergency
+    private float _andromedaEmergency30 = 30; // Andromeda Emergency
+    private float _trashcheck60 = 0; // Andromeda Emergency
+    private float _trashcheck30 = 0; // Andromeda Emergency
 
     private CancellationTokenSource? _roundEndCancelToken;
 
@@ -161,25 +161,25 @@ private void UpdateEmergencyConsole(float frameTime)
                 AnnounceLaunch();
         }
         // Andromeda Emergency start
-        if (!_launchedShuttles && !_announced && _consoleAccumulator <= _AndromedaEmergency60 && trashcheck60 == 0)
+        if (!_launchedShuttles && !_announced && _consoleAccumulator <= _andromedaEmergency60 && _trashcheck60 == 0)
         {
             _chatSystem.DispatchGlobalAnnouncement(
-                Loc.GetString("emergency-shuttle-andromeda-60", ("AndromedaEmergency60", $"{_AndromedaEmergency60:0}")),
+                Loc.GetString("emergency-shuttle-andromeda-60", ("AndromedaEmergency60", $"{_andromedaEmergency60:0}")),
                 playSound: false,
                 colorOverride: DangerColor);
             _audio.PlayGlobal("/Audio/Announcements/announce.ogg", Filter.Broadcast(), recordReplay: true);
-            trashcheck60++;
+            _trashcheck60++;
         }
-        if (!_launchedShuttles && _consoleAccumulator <= _AndromedaEmergency30 && trashcheck30 == 0)
+        if (!_launchedShuttles && _consoleAccumulator <= _andromedaEmergency30 && _trashcheck30 == 0)
         {
             if (_announced == false)
             {
                 _chatSystem.DispatchGlobalAnnouncement(
-                  Loc.GetString("emergency-shuttle-andromeda-30", ("AndromedaEmergency30", $"{_AndromedaEmergency30:0}")),
+                  Loc.GetString("emergency-shuttle-andromeda-30", ("AndromedaEmergency30", $"{_andromedaEmergency30:0}")),
                   playSound: false,
                   colorOverride: DangerColor);
                 _audio.PlayGlobal("/Audio/Announcements/announce.ogg", Filter.Broadcast(), recordReplay: true);
-                trashcheck30++;
+                _trashcheck30++;
             }
         }
         // Andromeda Emergency end
@@ -352,8 +352,8 @@ private void CleanupEmergencyConsole()
         ShuttlesLeft = false;
         _launchedShuttles = false;
         _consoleAccumulator = float.MinValue;
-        trashcheck60 = 0; // Andromeda Emergency
-        trashcheck30 = 0; // Andromeda Emergency
+        _trashcheck60 = 0; // Andromeda Emergency
+        _trashcheck30 = 0; // Andromeda Emergency
         EarlyLaunchAuthorized = false;
         EmergencyShuttleArrived = false;
         TransitTime = MinimumTransitTime + (MaximumTransitTime - MinimumTransitTime) * _random.NextFloat();