diff --git a/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs index 064a02d1e594da..60d14789fa011a 100644 --- 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 ent, ref Cartri private void OnCartridgeRemoved(Entity ent, ref CartridgeRemovedEvent args) { - RemComp(args.Loader); + // only remove when the program itself is removed + if (!_cartridgeLoaderSystem.HasProgram(args.Loader)) + { + RemComp(args.Loader); + } } } diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json index 95afd0d501914b..e7415fe1c271c5 100644 --- 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" }