Revert "SOS app for the PDA" (#2907)

Revert "SOS app for the PDA (#2812)" This reverts commit 6879e37ce0.
2025-02-06 18:32:51 +00:00 · 2025-02-06 18:32:51 +00:00 · dd283b8f20
parent 82030e5335
commit dd283b8f20
11 changed files with 1 additions and 183 deletions
--- a/Content.Server/_Impstation/CartridgeLoader/Cartridges/SOSCartridgeComponent.cs
+++ b/Content.Server/_Impstation/CartridgeLoader/Cartridges/SOSCartridgeComponent.cs
@ -1,43 +0,0 @@
-using Content.Shared.CartridgeLoader.Cartridges;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Radio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server._Impstation.CartridgeLoader.Cartridges;
-
-[RegisterComponent]
-public sealed partial class SOSCartridgeComponent : Component
-{
-    [DataField]
-    //Path to the id container
-    public const string PDAIdContainer = "PDA-id";
-
-    [DataField]
-    //Name to use if no id is found
-    public string DefaultName = "sos-caller-defaultname";
-
-    [ViewVariables(VVAccess.ReadOnly)]
-    public string LocalizedDefaultName => Loc.GetString(DefaultName);
-
-    [DataField]
-    //Notification message
-    public string HelpMessage = "sos-message";
-
-    [ViewVariables(VVAccess.ReadOnly)]
-    public string LocalizedHelpMessage => Loc.GetString(HelpMessage);
-
-    [DataField]
-    //Channel to notify
-    public ProtoId<RadioChannelPrototype> HelpChannel = "Security";
-
-    [DataField]
-    //Timeout between calls
-    public const float TimeOut = 90;
-
-    [DataField]
-    //Countdown until next call is allowed
-    public float Timer = 0;
-
-    [ViewVariables(VVAccess.ReadOnly)]
-    public bool CanCall => Timer <= 0;
-}
--- a/Content.Server/_Impstation/CartridgeLoader/Cartridges/SOSCartridgeSystem.cs
+++ b/Content.Server/_Impstation/CartridgeLoader/Cartridges/SOSCartridgeSystem.cs
@ -1,78 +0,0 @@
-using Content.Server.Radio.EntitySystems;
-using Content.Shared.Access.Components;
-using Content.Shared.CartridgeLoader;
-using Content.Shared.PDA;
-using Content.Shared.Popups;
-using Robust.Server.Containers;
-using Robust.Shared.Containers;
-
-namespace Content.Server._Impstation.CartridgeLoader.Cartridges;
-
-public sealed class SOSCartridgeSystem : EntitySystem
-{
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly RadioSystem _radio = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SOSCartridgeComponent, CartridgeActivatedEvent>(OnActivated);
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<SOSCartridgeComponent>();
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (comp.Timer > 0)
-            {
-                comp.Timer -= frameTime;
-            }
-        }
-    }
-
-    private void OnActivated(EntityUid uid, SOSCartridgeComponent component, CartridgeActivatedEvent args)
-    {
-        if (component.CanCall)
-        {
-            //Get the PDA
-            if (!TryComp<PdaComponent>(args.Loader, out var pda))
-                return;
-
-            //Get the id container
-            if (_container.TryGetContainer(args.Loader, SOSCartridgeComponent.PDAIdContainer, out var idContainer))
-            {
-                //If theres nothing in id slot, send message anonymously
-                if (idContainer.ContainedEntities.Count == 0)
-                {
-                    _radio.SendRadioMessage(uid, component.LocalizedDefaultName + " " + component.LocalizedHelpMessage, component.HelpChannel, uid);
-                }
-                else
-                {
-                    //Otherwise, send a message with the full name of every id in there
-                    foreach (var idCard in idContainer.ContainedEntities)
-                    {
-                        if (!TryComp<IdCardComponent>(idCard, out var idCardComp))
-                            return;
-
-                        _radio.SendRadioMessage(uid, idCardComp.FullName + " " + component.LocalizedHelpMessage, component.HelpChannel, uid);
-                    }
-                }
-
-                component.Timer = SOSCartridgeComponent.TimeOut;
-                // DeltaV - send feedback that you succeeded
-                _popupSystem.PopupEntity(Loc.GetString("sos-message-sent-success"), uid, PopupType.Medium);
-            }
-        }
-        // DeltaV - send feedback that you failed
-        else
-        {
-            var seconds = Math.Round(component.Timer);
-            _popupSystem.PopupEntity(Loc.GetString("sos-message-sent-cooldown", ("count", seconds)), uid, PopupType.MediumCaution);
-        }
-    }
-}
--- a/Resources/Locale/en-US/_Impstation/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/_Impstation/cartridge-loader/cartridges.ftl
@ -1,5 +0,0 @@
-sos-program-name = SOS
-sos-caller-defaultname = Unknown
-sos-message = is requesting help!
-sos-message-sent-success = SOS sent successfully.
-sos-message-sent-cooldown = Please wait {$count} second(s) to send another SOS.
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@ -140,7 +140,6 @@
    - id: RubberStampHop
    #- id: WeaponDisabler # DeltaV - There is no reason for the service head to have a disabler.
    - id: ClothingEyesHudCommand
-    - id: SOSCartridge # DeltaV - adds SOS app https://github.com/DeltaV-Station/Delta-v/pull/2812

 - type: entity
  id: LockerHeadOfPersonnelFilled
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@ -86,7 +86,6 @@
      - NotekeeperCartridge
      - NewsReaderCartridge
      - NanoChatCartridge # DeltaV
-      - SOSCartridge # Imp
    cartridgeSlot:
      priority: -1
      name: device-pda-slot-component-slot-name-cartridge
@ -140,7 +139,6 @@
    - CrimeAssistCartridge # DeltaV
    - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
    - NanoChatCartridge # DeltaV
-    - SOSCartridge # Imp

 - type: entity
  parent: BasePDA
@ -155,7 +153,6 @@
      - NewsReaderCartridge
      - MedTekCartridge
      - NanoChatCartridge # DeltaV
-      - SOSCartridge # Imp

 - type: entity
  parent: BasePDA
@ -471,7 +468,6 @@
      - MailMetricsCartridge # DeltaV - MailMetrics courier tracker
      - StockTradingCartridge # DeltaV - StockTrading
      - NanoChatCartridge # DeltaV
-      - SOSCartridge # Imp

 - type: entity
  parent: BasePDA
@ -497,7 +493,6 @@
    - NewsReaderCartridge
    - StockTradingCartridge # DeltaV - StockTrading
    - NanoChatCartridge # DeltaV
-    - SOSCartridge # Imp

 - type: entity
  parent: BasePDA
@ -525,7 +520,6 @@
      - NewsReaderCartridge
      - AstroNavCartridge
      - NanoChatCartridge # DeltaV
-      - SOSCartridge # Imp

 - type: entity
  parent: BasePDA
@ -838,7 +832,6 @@
      - NewsReaderCartridge
      - GlimmerMonitorCartridge
      - NanoChatCartridge # DeltaV
-      - SOSCartridge # Imp

 - type: entity
  parent: BasePDA
@ -865,7 +858,6 @@
      - NewsReaderCartridge
      - GlimmerMonitorCartridge
      - NanoChatCartridge # DeltaV
-      - SOSCartridge # Imp

 - type: entity
  parent: BaseSecurityPDA
@ -894,7 +886,6 @@
    - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
    - LogProbeCartridge
    - NanoChatCartridge # DeltaV
-    - SOSCartridge # Imp

 - type: entity
  parent: BaseSecurityPDA
@ -966,7 +957,6 @@
      - LogProbeCartridge
      - AstroNavCartridge
      - NanoChatCartridge # DeltaV
-      - SOSCartridge # Imp

 - type: entity
  parent: CentcomPDA
@ -994,7 +984,6 @@
      - AstroNavCartridge
      - StockTradingCartridge # Delta-V
      - NanoChatCartridge # DeltaV
-      - SOSCartridge # Imp
  - type: Tag #  Ignore Chameleon tags
    tags:
    - DoorBumpOpener
@ -1152,7 +1141,6 @@
      - LogProbeCartridge
      - AstroNavCartridge
      - NanoChatCartridge # DeltaV
-      - SOSCartridge # Imp

 - type: entity
  parent: ERTLeaderPDA
@ -1266,7 +1254,6 @@
    - NewsReaderCartridge
    - StockTradingCartridge # DeltaV - StockTrading
    - NanoChatCartridge # DeltaV
-    - SOSCartridge # Imp

 - type: entity
  parent: BasePDA
@ -1331,7 +1318,6 @@
    - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
    - LogProbeCartridge
    - NanoChatCartridge # DeltaV
-    - SOSCartridge # Imp

 - type: entity
  parent: BaseMedicalPDA
@ -1361,7 +1347,6 @@
    - SecWatchCartridge # DeltaV: SecWatch replaces WantedList
    - MedTekCartridge
    - NanoChatCartridge # DeltaV
-    - SOSCartridge # Imp

 - type: entity
  parent: ClownPDA
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
@ -14,7 +14,6 @@
    - CrimeAssistCartridge
    - SecWatchCartridge
    - NanoChatCartridge
-    - SOSCartridge # Imp
    - MedTekCartridge
  - type: Pda
    id: BrigmedicIDCard
@ -85,7 +84,6 @@
    - CrimeAssistCartridge
    - SecWatchCartridge
    - NanoChatCartridge
-    - SOSCartridge # Imp

 - type: entity
  parent: BaseJusticePDA
@ -200,7 +198,6 @@
    - NewsReaderCartridge
    - MailMetricsCartridge
    - NanoChatCartridge
-    - SOSCartridge # Imp

 - type: entity
  parent: CourierPDA
--- a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/cartridges.yml
@ -1,20 +0,0 @@
- type: entity
-  parent: BaseItem
-  id: SOSCartridge
-  name: SOS cartridge
-  description: A program to call for help.
-  components:
-    # Begin Delta-V Section - added cartridge sprite
-    - type: Sprite
-      sprite: _DV/Objects/Devices/cartridge.rsi
-      state: cart-sos
-    - type: Icon
-      sprite: _DV/Objects/Devices/cartridge.rsi
-      state: cart-sos
-    # End Delta-V Section
-    - type: Cartridge
-      programName: sos-program-name
-      icon:
-        sprite: _Impstation/Objects/Devices/sos.rsi
-        state: icon
-    - type: SOSCartridge
--- a/Resources/Textures/_DV/Objects/Devices/cartridge.rsi/cart-sos.png
+++ b/Resources/Textures/_DV/Objects/Devices/cartridge.rsi/cart-sos.png
--- a/Resources/Textures/_DV/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Devices/cartridge.rsi/meta.json
@ -1,7 +1,7 @@
 {
    "version": 1,
    "license": "CC-BY-SA-3.0",
-    "copyright": "cart-chat made by kushbreth (discord), cart-cri, cart-mail, cart-psi, cart-stonk made by Monotheonist (github), edited from cart-log, cart-nav & cart-med cartridges; cart-log made by Skarletto (github), cart-nav, cart-med made by ArchRBX (github), cart-sos modified from cart-chat by rosieposieeee (github)",
+    "copyright": "cart-chat made by kushbreth (discord), cart-cri, cart-mail, cart-psi, cart-stonk made by Monotheonist (github), edited from cart-log, cart-nav & cart-med cartridges; cart-log made by Skarletto (github), cart-nav, cart-med made by ArchRBX (github)",
    "size": {
        "x": 32,
        "y": 32
@ -21,9 +21,6 @@
        },
        {
            "name": "cart-chat"
-        },
-        {
-            "name": "cart-sos"
        }
    ]
 }
--- a/Resources/Textures/_Impstation/Objects/Devices/sos.rsi/icon.png
+++ b/Resources/Textures/_Impstation/Objects/Devices/sos.rsi/icon.png
--- a/Resources/Textures/_Impstation/Objects/Devices/sos.rsi/meta.json
+++ b/Resources/Textures/_Impstation/Objects/Devices/sos.rsi/meta.json
@ -1,14 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "impstation at https://github.com/impstation/imp-station-14/pull/1450",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        }
-    ]
-}