fixes the statuscontrol disappearing if you eject the cartridge but s…

…till have it installed
space-wizards · Sep 19, 2024 · f66026c · f66026c
1 parent 807d60b
commit f66026c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs
@@ -6,7 +6,7 @@ namespace Content.Server.CartridgeLoader.Cartridges;
 
 public sealed class AstroNavCartridgeSystem : EntitySystem
 {
-    [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!;
+    [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!;
 
     public override void Initialize()
     {
@@ -23,6 +23,10 @@ private void OnCartridgeAdded(Entity<AstroNavCartridgeComponent> ent, ref Cartri
 
     private void OnCartridgeRemoved(Entity<AstroNavCartridgeComponent> ent, ref CartridgeRemovedEvent args)
     {
-        RemComp<HandheldGPSComponent>(args.Loader);
+        // only remove when the program itself is removed
+        if (!_cartridgeLoaderSystem.HasProgram<AstroNavCartridgeComponent>(args.Loader))
+        {
+            RemComp<HandheldGPSComponent>(args.Loader);
+        }
     }
 }
diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
@@ -85,9 +85,6 @@
     {
       "name": "cart-y"
     },
-    {
-      "name": "cart-sec"
-    },
     {
       "name": "insert_overlay"
     }