From cb436eed279fe4026d3fd394f0875ee730c35ae0 Mon Sep 17 00:00:00 2001 From: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Date: Mon, 27 Jan 2025 20:57:39 -0500 Subject: [PATCH] review changes --- .../CartridgeLoader/Cartridges/SOSCartridgeSystem.cs | 9 ++------- .../_Impstation/Entities/Objects/Devices/cartridges.yml | 2 ++ .../_Impstation/Objects/Devices/sos.rsi/meta.json | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Content.Server/_Impstation/CartridgeLoader/Cartridges/SOSCartridgeSystem.cs b/Content.Server/_Impstation/CartridgeLoader/Cartridges/SOSCartridgeSystem.cs index e0e00dd5faf..508fc26de80 100644 --- a/Content.Server/_Impstation/CartridgeLoader/Cartridges/SOSCartridgeSystem.cs +++ b/Content.Server/_Impstation/CartridgeLoader/Cartridges/SOSCartridgeSystem.cs @@ -1,24 +1,17 @@ -using System.Threading.Channels; using Content.Server.Radio.EntitySystems; -using Content.Shared._DV.NanoChat; -using Content.Shared.Access; 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; -using Robust.Shared.Profiling; -using YamlDotNet.Core.Tokens; namespace Content.Server.CartridgeLoader.Cartridges; public sealed class SOSCartridgeSystem : EntitySystem { - [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!; [Dependency] private readonly SharedContainerSystem _container = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly ContainerSystem _containerSystem = default!; [Dependency] private readonly RadioSystem _radio = default!; public override void Initialize() @@ -71,9 +64,11 @@ private void OnActivated(EntityUid uid, SOSCartridgeComponent component, Cartrid } 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 { _popupSystem.PopupEntity(Loc.GetString("sos-message-sent-cooldown"), uid, PopupType.MediumCaution); diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/cartridges.yml index da6fd536361..15249354779 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/cartridges.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/cartridges.yml @@ -4,12 +4,14 @@ 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: diff --git a/Resources/Textures/_Impstation/Objects/Devices/sos.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Devices/sos.rsi/meta.json index bed865afb6b..ea3d9f1b97d 100644 --- a/Resources/Textures/_Impstation/Objects/Devices/sos.rsi/meta.json +++ b/Resources/Textures/_Impstation/Objects/Devices/sos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "impstation at f82f7f0f236179bfdba0dcae5b188ccf4b03506e", + "copyright": "impstation at https://github.com/impstation/imp-station-14/pull/1450", "size": { "x": 32, "y": 32