From a0d4d09f6ddd7bae8cfbc29202a0f025aa1b77de Mon Sep 17 00:00:00 2001
From: Brandon H <Brandon@brandon-huu.com>
Date: Mon, 29 Jul 2024 16:10:02 -0500
Subject: [PATCH 1/4] .

---
 .../EntitySystems/ContainmentFieldGeneratorSystem.cs         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
index e575b0403b60b1..eff02340e55781 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
@@ -165,11 +165,12 @@ private void RemoveConnections(Entity<ContainmentFieldGeneratorComponent> genera
             ChangeFieldVisualizer(value.Item1);
         }
         component.Connections.Clear();
-        component.IsConnected = false;
         ChangeOnLightVisualizer(generator);
         ChangeFieldVisualizer(generator);
         _adminLogger.Add(LogType.FieldGeneration, LogImpact.Medium, $"{ToPrettyString(uid)} lost field connections"); // Ideally LogImpact would depend on if there is a singulo nearby
-        _popupSystem.PopupEntity(Loc.GetString("comp-containment-disconnected"), uid, PopupType.LargeCaution);
+        if(component.IsConnected)
+            _popupSystem.PopupEntity(Loc.GetString("comp-containment-disconnected"), uid, PopupType.LargeCaution);
+        component.IsConnected = false;
     }
 
     #endregion

From 9b4b486d6c0572230d1f4444247df4d6076714fd Mon Sep 17 00:00:00 2001
From: Brandon H <Brandon@brandon-huu.com>
Date: Mon, 29 Jul 2024 16:42:04 -0500
Subject: [PATCH 2/4]

---
 .../EntitySystems/ContainmentFieldGeneratorSystem.cs           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
index eff02340e55781..778c19bc6f9f74 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
@@ -168,7 +168,8 @@ private void RemoveConnections(Entity<ContainmentFieldGeneratorComponent> genera
         ChangeOnLightVisualizer(generator);
         ChangeFieldVisualizer(generator);
         _adminLogger.Add(LogType.FieldGeneration, LogImpact.Medium, $"{ToPrettyString(uid)} lost field connections"); // Ideally LogImpact would depend on if there is a singulo nearby
-        if(component.IsConnected)
+
+        if (component.IsConnected)
             _popupSystem.PopupEntity(Loc.GetString("comp-containment-disconnected"), uid, PopupType.LargeCaution);
         component.IsConnected = false;
     }

From 34e9b2b5d85fb78a8bec78d0304595fa8f02336c Mon Sep 17 00:00:00 2001
From: Brandon H <Brandon@brandon-huu.com>
Date: Fri, 9 Aug 2024 10:16:10 -0500
Subject: [PATCH 3/4]

---
 .../EntitySystems/ContainmentFieldGeneratorSystem.cs        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
index 778c19bc6f9f74..ac5690a65b4cd1 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
@@ -165,13 +165,13 @@ private void RemoveConnections(Entity<ContainmentFieldGeneratorComponent> genera
             ChangeFieldVisualizer(value.Item1);
         }
         component.Connections.Clear();
+        if (component.IsConnected)
+            _popupSystem.PopupEntity(Loc.GetString("comp-containment-disconnected"), uid, PopupType.LargeCaution);
+        component.IsConnected = false;
         ChangeOnLightVisualizer(generator);
         ChangeFieldVisualizer(generator);
         _adminLogger.Add(LogType.FieldGeneration, LogImpact.Medium, $"{ToPrettyString(uid)} lost field connections"); // Ideally LogImpact would depend on if there is a singulo nearby
 
-        if (component.IsConnected)
-            _popupSystem.PopupEntity(Loc.GetString("comp-containment-disconnected"), uid, PopupType.LargeCaution);
-        component.IsConnected = false;
     }
 
     #endregion

From 54ecb54a8f8548280a52d413ad7399ba118149d6 Mon Sep 17 00:00:00 2001
From: Brandon H <Brandon@brandon-huu.com>
Date: Fri, 9 Aug 2024 10:16:27 -0500
Subject: [PATCH 4/4]

---
 .../Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
index ac5690a65b4cd1..cfb453120c3b4e 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
@@ -171,7 +171,6 @@ private void RemoveConnections(Entity<ContainmentFieldGeneratorComponent> genera
         ChangeOnLightVisualizer(generator);
         ChangeFieldVisualizer(generator);
         _adminLogger.Add(LogType.FieldGeneration, LogImpact.Medium, $"{ToPrettyString(uid)} lost field connections"); // Ideally LogImpact would depend on if there is a singulo nearby
-
     }
 
     #endregion