From 2019c0f9f00ed49ce865ae3ff879c3a31fb5ff95 Mon Sep 17 00:00:00 2001 From: ReeZer2 Date: Wed, 19 Feb 2025 00:17:48 +0200 Subject: [PATCH 1/8] ADD: Adrenal Implanter --- .../Implants/SubdermalImplantSystem.cs | 32 ++++++++++++++- Content.Shared/Actions/SharedActionsSystem.cs | 5 ++- .../Components/SubdermalImplantComponent.cs | 7 ++++ .../hidden-description/hiddenDescription.ftl | 16 ++++++++ .../SS220/Catalog/uplink_catalog.yml | 14 +++++++ .../AdrenalImplant/adrenalimplant.yml | 13 ++++++ .../Entities/Objects/Misc/implanters.yml | 6 +++ .../Objects/Misc/subdermal_implants.yml | 41 +++++++++++++++++++ 8 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 5320e4ad2062..b54bc9c5d9dd 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -28,10 +28,12 @@ using Content.Shared.Movement.Pulling.Systems; using Content.Server.IdentityManagement; using Content.Server.DetailExaminable; +using Content.Shared.Actions; using Content.Shared.Store.Components; using Robust.Shared.Collections; using Robust.Shared.Map.Components; using Content.Shared.DoAfter; +using Content.Shared.FixedPoint; using Content.Shared.SS220.Store; namespace Content.Server.Implants; @@ -53,10 +55,14 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem [Dependency] private readonly SharedMapSystem _mapSystem = default!; [Dependency] private readonly IdentitySystem _identity = default!; [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; //SS220-insert-currency-doafter + [Dependency] private readonly SharedActionsSystem _actions = default!; //ss220 add adrenal implant private EntityQuery _physicsQuery; private HashSet> _targetGrids = []; + private const string BeakerSolution = "beaker"; //ss220 add adrenal implant + private const string ChemicalSolution = "chemicals"; //ss220 add adrenal implant + public override void Initialize() { base.Initialize(); @@ -69,6 +75,7 @@ public override void Initialize() SubscribeLocalEvent(OnActivateImplantEvent); SubscribeLocalEvent(OnScramImplant); SubscribeLocalEvent(OnDnaScramblerImplant); + SubscribeLocalEvent(OnAdrenalImplant); //ss220 add adrenal implant } @@ -277,7 +284,7 @@ private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent comp { fingerprint.Fingerprint = _forensicsSystem.GenerateFingerprint(); } - RemComp(ent); // remove MRP+ custom description if one exists + RemComp(ent); // remove MRP+ custom description if one exists _identity.QueueIdentityUpdate(ent); // manually queue identity update since we don't raise the event _popup.PopupEntity(Loc.GetString("scramble-implant-activated-popup"), ent, ent); } @@ -285,4 +292,27 @@ private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent comp args.Handled = true; QueueDel(uid); } + + //ss220 add adrenal implant start + private void OnAdrenalImplant(Entity ent, ref UseAdrenalImplantEvent args) + { + if (!TryComp(ent.Owner, out var solutionImplantComp)) + return; + + if (!TryComp(args.Performer, out var solutionUserComp)) + return; + + if (!_solutionContainer.TryGetSolution((ent.Owner, solutionImplantComp), BeakerSolution, out var solutionImplant)) + return; + + if (!_solutionContainer.TryGetSolution((args.Performer, solutionUserComp), ChemicalSolution, out var solutionUser)) + return; + + _solutionContainer.TryTransferSolution(solutionUser.Value, + solutionImplant.Value.Comp.Solution, + solutionImplant.Value.Comp.Solution.Volume / FixedPoint2.New(args.Action.Comp.Charges!.Value)); + + args.Handled = true; + } + //ss220 add adrenal implant end } diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index 69ced9d718d6..3ca5b54c1981 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -711,11 +711,14 @@ public void PerformAction(EntityUid performer, ActionsComponent? component, Enti } action.Cooldown = null; - if (action is { UseDelay: not null, Charges: null or < 1 }) + + //ss220 add adrenal implant start (ВЫ ВООБЩЕ ТЕСТИТЕ СВОИ ГОВНО АПДЕЙТЫ, ОФФЫ?) + if (action is { UseDelay: not null, Charges: null or > 0 }) { dirty = true; action.Cooldown = (curTime, curTime + action.UseDelay.Value); } + //ss220 add adrenal implant end if (dirty) { diff --git a/Content.Shared/Implants/Components/SubdermalImplantComponent.cs b/Content.Shared/Implants/Components/SubdermalImplantComponent.cs index c93922e310a1..444ed20be1d9 100644 --- a/Content.Shared/Implants/Components/SubdermalImplantComponent.cs +++ b/Content.Shared/Implants/Components/SubdermalImplantComponent.cs @@ -99,3 +99,10 @@ public sealed partial class UseDnaScramblerImplantEvent : InstantActionEvent { } + +//ss220 add adrenal implant start +public sealed partial class UseAdrenalImplantEvent : InstantActionEvent +{ + +} +//ss220 add adrenal implant end diff --git a/Resources/Locale/ru-RU/ss220/hidden-description/hiddenDescription.ftl b/Resources/Locale/ru-RU/ss220/hidden-description/hiddenDescription.ftl index 5b2f6c50168a..e990c4fc904c 100644 --- a/Resources/Locale/ru-RU/ss220/hidden-description/hiddenDescription.ftl +++ b/Resources/Locale/ru-RU/ss220/hidden-description/hiddenDescription.ftl @@ -13,6 +13,10 @@ hidden-desc-MindSlaveImplant-medical = [color=#52B4E9]Сверив номера hidden-desc-MindSlaveImplant-research = [color=#D381C9]Внимательно осмотрев имплант, вы понимаете, что это внутри имплант, губительно влияющий на нервную систему.[/color] hidden-desc-MindSlaveImplant-syndicate = [color=#e31735]Этот имплант подчиняет разум владельца тому, кто установил имлпант. При извлечении импланта контроль над разумом теряется.[/color] +hidden-desc-AdrenalImplant-medical = [color=#52B4E9]Этот имплант содержит медицинские препараты, способствующие восстановлению организма.[/color] +hidden-desc-AdrenalImplant-research = [color=#D381C9]Имплант с запасом лечебных растворов, предназначенных для поддержки жизненных функций.[/color] +hidden-desc-AdrenalImplant-syndicate = [color=#E31735]Имплант с инъекционным механизмом, содержащий жидкости для ускоренного восстановления организма.[/color] + # Regular decriptions below ent-ThermalVisorImplanter = { ent-Implanter } @@ -21,6 +25,15 @@ ent-ThermalVisorImplanter = { ent-Implanter } ent-ThermalVisionImplant = имплант Термального Зрения .desc = Микрочип, который вживляют под кожу. +ent-AdrenalImplanter = { ent-Implanter } + .desc = { ent-Implanter.desc } + .suffix = Адреналин + +ent-AdrenalImplant = имплант Адреналина + .desc = Микрочип, который вживляют под кожу. + +ent-ActionActivateAdrenalImplant = Ввести жидкость + .desc = Вводит небольшую дозу разных лечащих веществ, эффект держится около 30 секунд. # Uplink locale uplink-thermal-glasses-name = Термальные очки @@ -29,6 +42,9 @@ uplink-thermal-glasses-desc = Очки со встроенными термал uplink-thermal-visor-implanter-name = Имплант термального зрения uplink-thermal-visor-implanter-desc = Новейшая разработка синдиката, имплант позволяет глазу носителя различать тепловые сигнатуры сквозь преграды. +uplink-adrenal-implanter-name = Имплант Адреналина +uplink-adrenal-implanter-desc = Внутри импланта содержится жидкость, которая ускоренно восстанавливает организм. + # silent shoes hidden-desc-SilentShoes-syndicate = [color=#e31735]Разработанные специально для шпионских миссий Синдиката, эти ботинки совершенно бесшумны на любых поверхностях[/color] hidden-desc-SilentShoes-research = [color=#D381C9]Вы можете различить скрытый слой поглощающего материала, полностью глушащий любые звуки шагов[/color] diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml index 8a3cbe5e84bb..2a820f913ead 100644 --- a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml @@ -173,6 +173,20 @@ categories: - UplinkImplants +- type: listing + id: AdrenalImplanter + name: uplink-adrenal-implanter-name + description: uplink-adrenal-implanter-desc + icon: {sprite: /Textures/Mobs/Species/Human/organs.rsi, state: heart-off} + productEntity: AdrenalImplanter + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 4 + cost: + Telecrystal: 7 + categories: + - UplinkImplants + - type: listing id: ClothingHeadHelmetSwatSyndicate name: uplink-helmet-swat-syndicate-name diff --git a/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml b/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml new file mode 100644 index 000000000000..b597a70b63df --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml @@ -0,0 +1,13 @@ +- type: entity + id: ActionActivateAdrenalImplant + components: + - type: InstantAction + charges: 3 + useDelay: 60 #60 seconds delay + temporary: true + itemIconStyle: BigAction + priority: -20 + icon: + sprite: /Textures/Mobs/Species/Human/organs.rsi + state: heart-off + event: !type:UseAdrenalImplantEvent diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/implanters.yml index 73a0db401546..3aecabf73df0 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/implanters.yml @@ -18,3 +18,9 @@ - type: Implanter implant: ThermalVisionImplant +- type: entity + id: AdrenalImplanter + parent: BaseImplantOnlyImplanterSyndi + components: + - type: Implanter + implant: AdrenalImplant diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml index 57fa2d5f8a8d..3b6d559f8334 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml @@ -78,3 +78,44 @@ - TraitorRole - NukeOperative +- type: entity + parent: BaseSubdermalImplant + id: AdrenalImplant + categories: [ HideSpawnMenu ] + components: + - type: SubdermalImplant + implantAction: ActionActivateAdrenalImplant + - type: SolutionContainerManager + solutions: + beaker: + maxVol: 90 + canReact: false + reagents: + - ReagentId: Bicaridine + Quantity: 30 + - ReagentId: TranexamicAcid + Quantity: 30 + - ReagentId: Dylovene + Quantity: 30 + - type: TriggerImplantAction + - type: HiddenDescription + entries: + - label: hidden-desc-AdrenalImplant-medical + jobRequired: + - Paramedic + - MedicalDoctor + - SeniorPhysician + - ChiefMedicalOfficer + - Brigmedic + - label: hidden-desc-AdrenalImplant-research + jobRequired: + - ResearchAssistant + - ResearchDirector + - Scientist + - Borg + - label: hidden-desc-AdrenalImplant-syndicate + whitelistMind: + mindRoles: + - TraitorRole + - NukeOperative + From 8126d5db612bf4f67e6c8ac7ac4802d4a4baab24 Mon Sep 17 00:00:00 2001 From: ReeZer2 Date: Wed, 19 Feb 2025 00:25:31 +0200 Subject: [PATCH 2/8] mmmmmm --- .../Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml b/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml index b597a70b63df..67fca6781763 100644 --- a/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml +++ b/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml @@ -4,7 +4,6 @@ - type: InstantAction charges: 3 useDelay: 60 #60 seconds delay - temporary: true itemIconStyle: BigAction priority: -20 icon: From 70b78e4d44240a65e377aaeabc2c479254579746 Mon Sep 17 00:00:00 2001 From: ReeZer2 Date: Wed, 19 Feb 2025 00:27:01 +0200 Subject: [PATCH 3/8] mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm --- Content.Server/Implants/SubdermalImplantSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index b54bc9c5d9dd..167d1a5654da 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -284,7 +284,7 @@ private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent comp { fingerprint.Fingerprint = _forensicsSystem.GenerateFingerprint(); } - RemComp(ent); // remove MRP+ custom description if one exists + RemComp(ent); // remove MRP+ custom description if one exists _identity.QueueIdentityUpdate(ent); // manually queue identity update since we don't raise the event _popup.PopupEntity(Loc.GetString("scramble-implant-activated-popup"), ent, ent); } From 24adac1853248f2e8bb6dfa12d8aa4e444ac0790 Mon Sep 17 00:00:00 2001 From: ReeZer2 Date: Wed, 19 Feb 2025 01:59:49 +0200 Subject: [PATCH 4/8] fix dna scrambler locale --- Content.Server/Implants/SubdermalImplantSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 167d1a5654da..4b6576e3c359 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -284,9 +284,9 @@ private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent comp { fingerprint.Fingerprint = _forensicsSystem.GenerateFingerprint(); } - RemComp(ent); // remove MRP+ custom description if one exists + RemComp(ent); // remove MRP+ custom description if one exists _identity.QueueIdentityUpdate(ent); // manually queue identity update since we don't raise the event - _popup.PopupEntity(Loc.GetString("scramble-implant-activated-popup"), ent, ent); + _popup.PopupEntity(Loc.GetString("scramble-implant-activated-popup", ("identity", newProfile.Name)), ent, ent); //ss220 fix locale } args.Handled = true; From 058d47d238ef36042c064ff37da6ff92ae329161 Mon Sep 17 00:00:00 2001 From: ReeZer2 Date: Wed, 19 Feb 2025 02:00:34 +0200 Subject: [PATCH 5/8] mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm --- Content.Server/Implants/SubdermalImplantSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 4b6576e3c359..9f9597343e2f 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -284,7 +284,7 @@ private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent comp { fingerprint.Fingerprint = _forensicsSystem.GenerateFingerprint(); } - RemComp(ent); // remove MRP+ custom description if one exists + RemComp(ent); // remove MRP+ custom description if one exists _identity.QueueIdentityUpdate(ent); // manually queue identity update since we don't raise the event _popup.PopupEntity(Loc.GetString("scramble-implant-activated-popup", ("identity", newProfile.Name)), ent, ent); //ss220 fix locale } From 4b22467db1fd52e1c636e354575be050b1dad5bf Mon Sep 17 00:00:00 2001 From: ReeZer2 Date: Wed, 19 Feb 2025 18:51:29 +0200 Subject: [PATCH 6/8] can consciousness use, change reagents --- .../Entities/AdrenalImplant/adrenalimplant.yml | 4 +++- .../Entities/Objects/Misc/subdermal_implants.yml | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml b/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml index 67fca6781763..0213ade285e5 100644 --- a/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml +++ b/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml @@ -3,7 +3,9 @@ components: - type: InstantAction charges: 3 - useDelay: 60 #60 seconds delay + useDelay: 80 #80 seconds delay + checkCanInteract: false + checkConsciousness: false itemIconStyle: BigAction priority: -20 icon: diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml index 3b6d559f8334..0b7002d5b956 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/subdermal_implants.yml @@ -91,12 +91,20 @@ maxVol: 90 canReact: false reagents: - - ReagentId: Bicaridine - Quantity: 30 + - ReagentId: Rororium + Quantity: 3 + - ReagentId: Ephedrine + Quantity: 3 - ReagentId: TranexamicAcid - Quantity: 30 + Quantity: 15 - ReagentId: Dylovene - Quantity: 30 + Quantity: 15 + - ReagentId: Bicaridine + Quantity: 24 + - ReagentId: Pyrazine + Quantity: 15 + - ReagentId: Epinephrine + Quantity: 15 - type: TriggerImplantAction - type: HiddenDescription entries: From fccbbbbb52bcd1f782b7b0348af68e23ac72561e Mon Sep 17 00:00:00 2001 From: ReeZer2 Date: Wed, 19 Feb 2025 23:49:11 +0200 Subject: [PATCH 7/8] fix fix fix fix commit --- Content.Shared/Actions/BaseActionComponent.cs | 7 +++++++ Content.Shared/Actions/SharedActionsSystem.cs | 11 ++++++++--- .../Prototypes/SS220/Catalog/uplink_catalog.yml | 2 +- .../Entities/AdrenalImplant/adrenalimplant.yml | 6 +++--- .../Medical/implant-adrenal.rsi/adrenal.png | Bin 0 -> 599 bytes .../Medical/implant-adrenal.rsi/meta.json | 14 ++++++++++++++ 6 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/SS220/Objects/Specific/Medical/implant-adrenal.rsi/adrenal.png create mode 100644 Resources/Textures/SS220/Objects/Specific/Medical/implant-adrenal.rsi/meta.json diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs index 25b36df2afe9..c4f4c771474c 100644 --- a/Content.Shared/Actions/BaseActionComponent.cs +++ b/Content.Shared/Actions/BaseActionComponent.cs @@ -194,6 +194,11 @@ public EntityUid? EntityIcon /// If not null, this sound will be played when performing this action. /// [DataField("sound")] public SoundSpecifier? Sound; + + //ss220 add time between charges start + [DataField] + public TimeSpan? TimeBetweenCharges = null; + //ss220 add time between charges end } [Serializable, NetSerializable] @@ -225,6 +230,7 @@ public abstract class BaseActionComponentState : ComponentState public bool Temporary; public ItemActionIconStyle ItemIconStyle; public SoundSpecifier? Sound; + public TimeSpan? TimeBetweenCharges; //ss220 add time between charges protected BaseActionComponentState(BaseActionComponent component, IEntityManager entManager) { @@ -254,5 +260,6 @@ protected BaseActionComponentState(BaseActionComponent component, IEntityManager Temporary = component.Temporary; ItemIconStyle = component.ItemIconStyle; Sound = component.Sound; + TimeBetweenCharges = component.TimeBetweenCharges; //ss220 add time between charges } } diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index 3ca5b54c1981..944d74490866 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -712,13 +712,18 @@ public void PerformAction(EntityUid performer, ActionsComponent? component, Enti action.Cooldown = null; - //ss220 add adrenal implant start (ВЫ ВООБЩЕ ТЕСТИТЕ СВОИ ГОВНО АПДЕЙТЫ, ОФФЫ?) - if (action is { UseDelay: not null, Charges: null or > 0 }) + //ss220 add time between charges start + if (action is { TimeBetweenCharges: not null, Charges: > 0 }) + { + dirty = true; + action.Cooldown = (curTime, curTime + action.TimeBetweenCharges.Value); + } + else if (action is { UseDelay: not null, Charges: null or < 1 }) { dirty = true; action.Cooldown = (curTime, curTime + action.UseDelay.Value); } - //ss220 add adrenal implant end + //ss220 add time between charges end if (dirty) { diff --git a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml index 2a820f913ead..e3bfca744b9b 100644 --- a/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/SS220/Catalog/uplink_catalog.yml @@ -177,7 +177,7 @@ id: AdrenalImplanter name: uplink-adrenal-implanter-name description: uplink-adrenal-implanter-desc - icon: {sprite: /Textures/Mobs/Species/Human/organs.rsi, state: heart-off} + icon: {sprite: /Textures/SS220/Objects/Specific/Medical/implant-adrenal.rsi, state: adrenal} productEntity: AdrenalImplanter discountCategory: rareDiscounts discountDownTo: diff --git a/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml b/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml index 0213ade285e5..d5b872250b15 100644 --- a/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml +++ b/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml @@ -3,12 +3,12 @@ components: - type: InstantAction charges: 3 - useDelay: 80 #80 seconds delay + timeBetweenCharges: 80 #80 seconds delay checkCanInteract: false checkConsciousness: false itemIconStyle: BigAction priority: -20 icon: - sprite: /Textures/Mobs/Species/Human/organs.rsi - state: heart-off + sprite: /Textures/SS220/Objects/Specific/Medical/implant-adrenal.rsi + state: adrenal event: !type:UseAdrenalImplantEvent diff --git a/Resources/Textures/SS220/Objects/Specific/Medical/implant-adrenal.rsi/adrenal.png b/Resources/Textures/SS220/Objects/Specific/Medical/implant-adrenal.rsi/adrenal.png new file mode 100644 index 0000000000000000000000000000000000000000..c3fc7b50d7d3f59344e037382233b23c9d764cf1 GIT binary patch literal 599 zcmV-d0;v6oP)Px%5lKWrR9J=WRxxSN%?d)=c z;3Xu5N3amwVhU53LW0PokiX83v$Nx>gn$p0U74Bx-k&%BJHQqH1&n#(5^-;A$&3Ax zRs>_7xRkh%;OYHE$ZvUU(d~#uw{sa0DyjUNF;Bd?W%1^g#b@?WE5b(9fdv$tF;8Th z1A)Np0-o}cLvrWdGx=0TGHCTk?1kM8o0~mu6`P`qO*e?P8 ze!dznB0vqUPNrTb%Q3qq5;5=}SA-56$AVOXl zjxbqo6Ghwhg*($==)1cokHdJAN0sdk@U&3}091w}k+dU50l+SMozE&J>n+B}1K8Oz zS#N<%QgllTWS`YBd1of;ZTR#uORK|Z+yTx5r^+D4n|z|kUS@f)HgOS-C`0K;I(RD z)@nl{Yfcei6d-p#ss!DEQ$?HwayzBlPu$gu#^Y{AXBQMFAPu=yCjsbl~E002ovPDHLkV1iyT34Q Date: Thu, 20 Feb 2025 11:40:11 +0200 Subject: [PATCH 8/8] add time between charges for emp & scram implants --- .../ru-RU/ss220/hidden-description/hiddenDescription.ftl | 4 ++-- Resources/Prototypes/Actions/types.yml | 4 ++-- .../SS220/Entities/AdrenalImplant/adrenalimplant.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/hidden-description/hiddenDescription.ftl b/Resources/Locale/ru-RU/ss220/hidden-description/hiddenDescription.ftl index e990c4fc904c..bae557f5511c 100644 --- a/Resources/Locale/ru-RU/ss220/hidden-description/hiddenDescription.ftl +++ b/Resources/Locale/ru-RU/ss220/hidden-description/hiddenDescription.ftl @@ -33,7 +33,7 @@ ent-AdrenalImplant = имплант Адреналина .desc = Микрочип, который вживляют под кожу. ent-ActionActivateAdrenalImplant = Ввести жидкость - .desc = Вводит небольшую дозу разных лечащих веществ, эффект держится около 30 секунд. + .desc = Вводит небольшую дозу разных лечащих веществ, эффект держится около 45 секунд. Можно ввести в предсмертном состоянии # Uplink locale uplink-thermal-glasses-name = Термальные очки @@ -43,7 +43,7 @@ uplink-thermal-visor-implanter-name = Имплант термального зр uplink-thermal-visor-implanter-desc = Новейшая разработка синдиката, имплант позволяет глазу носителя различать тепловые сигнатуры сквозь преграды. uplink-adrenal-implanter-name = Имплант Адреналина -uplink-adrenal-implanter-desc = Внутри импланта содержится жидкость, которая ускоренно восстанавливает организм. +uplink-adrenal-implanter-desc = Внутри импланта содержится жидкость, которая ускоренно восстанавливает организм. Впрыскивается по малейшему импульсу даже в предсмертном состоянии # silent shoes hidden-desc-SilentShoes-syndicate = [color=#e31735]Разработанные специально для шпионских миссий Синдиката, эти ботинки совершенно бесшумны на любых поверхностях[/color] diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 1d34e119cc7e..ee7cd2fe8fc0 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -124,7 +124,7 @@ - type: InstantAction checkCanInteract: false charges: 5 #SS220-underused-uplinks-stuff begin - useDelay: 5 + timeBetweenCharges: 5 #ss220 add time between charges itemIconStyle: BigAction priority: -20 icon: @@ -143,7 +143,7 @@ - type: InstantAction checkCanInteract: false charges: 12 #SS220 changed - useDelay: 5 + timeBetweenCharges: 5 #ss220 add time between charges itemIconStyle: BigAction priority: -20 icon: diff --git a/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml b/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml index d5b872250b15..7166fd7cbb33 100644 --- a/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml +++ b/Resources/Prototypes/SS220/Entities/AdrenalImplant/adrenalimplant.yml @@ -3,7 +3,7 @@ components: - type: InstantAction charges: 3 - timeBetweenCharges: 80 #80 seconds delay + timeBetweenCharges: 30 #30 seconds delay checkCanInteract: false checkConsciousness: false itemIconStyle: BigAction