From fbaa50f0a22583e275b916c8203396076d9b2961 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 20 Sep 2024 13:45:05 -0400
Subject: [PATCH 01/13] Psionic Heal Other Powers

---
 .../Abilities/HealOtherPowerSystem.cs         | 141 ++++++++++++++++++
 .../PsionicHealOtherPowerActionEvent.cs       |  55 +++++++
 .../HealingWord/HealingWordPowerComponent.cs  |  28 ++++
 Content.Shared/Psionics/Events.cs             |  63 ++++++--
 Content.Shared/Psionics/PsionicComponent.cs   |  15 +-
 Resources/Prototypes/Actions/psionics.yml     |  67 +++++++++
 Resources/Prototypes/Psionics/psionics.yml    |  22 +++
 .../Interface/VerbIcons/healing_word.png      | Bin 0 -> 2189 bytes
 .../Textures/Interface/VerbIcons/revivify.png | Bin 0 -> 1977 bytes
 9 files changed, 374 insertions(+), 17 deletions(-)
 create mode 100644 Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
 create mode 100644 Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
 create mode 100644 Content.Shared/Psionics/Abilities/HealingWord/HealingWordPowerComponent.cs
 create mode 100644 Resources/Textures/Interface/VerbIcons/healing_word.png
 create mode 100644 Resources/Textures/Interface/VerbIcons/revivify.png

diff --git a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
new file mode 100644
index 00000000000..d565d46b1e5
--- /dev/null
+++ b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
@@ -0,0 +1,141 @@
+using Robust.Shared.Player;
+using Content.Server.DoAfter;
+using Content.Shared.Abilities.Psionics;
+using Content.Shared.Damage;
+using Content.Shared.DoAfter;
+using Content.Shared.Popups;
+using Content.Shared.Psionics.Events;
+using Content.Shared.Examine;
+using static Content.Shared.Examine.ExamineSystemShared;
+using Robust.Shared.Timing;
+using Content.Shared.Actions.Events;
+using Robust.Server.Audio;
+using Content.Server.Atmos.Rotting;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Psionics.Glimmer;
+
+namespace Content.Server.Abilities.Psionics;
+
+public sealed class RevivifyPowerSystem : EntitySystem
+{
+    [Dependency] private readonly AudioSystem _audioSystem = default!;
+    [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly ExamineSystemShared _examine = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly RottingSystem _rotting = default!;
+    [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly GlimmerSystem _glimmer = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<PsionicComponent, PsionicHealOtherPowerActionEvent>(OnPowerUsed);
+        SubscribeLocalEvent<PsionicComponent, DispelledEvent>(OnDispelled);
+        SubscribeLocalEvent<PsionicComponent, PsionicHealOtherDoAfterEvent>(OnDoAfter);
+    }
+
+    private void OnPowerUsed(EntityUid uid, PsionicComponent component, PsionicHealOtherPowerActionEvent args)
+    {
+        if (component.DoAfter is not null)
+            return;
+
+        if (!args.Immediate)
+            AttemptDoAfter(uid, component, args);
+        else ActivatePower(uid, component, args);
+
+        if (args.PopupText is not null
+            && _glimmer.Glimmer > args.GlimmerObviousPopupThreshold * component.CurrentDampening)
+            _popupSystem.PopupEntity(Loc.GetString(args.PopupText, ("entity", uid)), uid,
+                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)),
+                true,
+                args.PopupType);
+
+        if (args.PlaySound
+            && _glimmer.Glimmer > args.GlimmerObviousSoundThreshold * component.CurrentDampening)
+            _audioSystem.PlayPvs(args.SoundUse, uid, args.AudioParams);
+
+        // Sanitize the Glimmer inputs because otherwise the game will crash if someone makes MaxGlimmer lower than MinGlimmer.
+        var minGlimmer = (int) Math.Round(MathF.MinMagnitude(args.MinGlimmer, args.MaxGlimmer)
+            + component.CurrentAmplification - component.CurrentDampening);
+        var maxGlimmer = (int) Math.Round(MathF.MaxMagnitude(args.MinGlimmer, args.MaxGlimmer)
+            + component.CurrentAmplification - component.CurrentDampening);
+
+        _psionics.LogPowerUsed(uid, args.PowerName, minGlimmer, maxGlimmer);
+        args.Handled = true;
+    }
+
+    private void AttemptDoAfter(EntityUid uid, PsionicComponent component, PsionicHealOtherPowerActionEvent args)
+    {
+        var ev = new PsionicHealOtherDoAfterEvent(_gameTiming.CurTime);
+        ev.HealingAmount = args.HealingAmount;
+        ev.RotReduction = args.RotReduction;
+        ev.DoRevive = args.DoRevive;
+        var doAfterArgs = new DoAfterArgs(EntityManager, uid, args.UseDelay, ev, uid)
+        {
+            BreakOnUserMove = true,
+            BreakOnTargetMove = false,
+        };
+
+        if (!_doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId))
+            return;
+
+        component.DoAfter = doAfterId;
+    }
+
+    private void OnDispelled(EntityUid uid, PsionicComponent component, DispelledEvent args)
+    {
+        if (component.DoAfter is null)
+            return;
+
+        _doAfterSystem.Cancel(component.DoAfter);
+        component.DoAfter = null;
+        args.Handled = true;
+    }
+
+    private void OnDoAfter(EntityUid uid, PsionicComponent component, PsionicHealOtherDoAfterEvent args)
+    {
+        if (component is null)
+            return; // It's entirely possible for the caster to stop being Psionic(due to mindbreaking) mid cast.
+        component.DoAfter = null;
+
+        if (args.Target is null)
+            return; // The target can also cease existing mid-cast.
+
+        _rotting.ReduceAccumulator(args.Target.Value, TimeSpan.FromSeconds(args.RotReduction * component.CurrentAmplification));
+        _damageable.TryChangeDamage(args.Target, args.HealingAmount * component.CurrentAmplification, true, origin: uid);
+
+        if (!args.DoRevive
+            || !TryComp<MobStateComponent>(args.Target, out var mob)
+            || !_mobThreshold.TryGetThresholdForState(args.Target.Value, MobState.Dead, out var threshold)
+            || !TryComp<DamageableComponent>(args.Target.Value, out var damageableComponent)
+            || damageableComponent.TotalDamage > threshold)
+            return;
+
+        _mobState.ChangeMobState(args.Target.Value, MobState.Critical, mob, uid);
+    }
+
+    // This would be the same thing as OnDoAfter, except that here the target isn't nullable, so I have to reuse code with different arguments.
+    private void ActivatePower(EntityUid uid, PsionicComponent component, PsionicHealOtherPowerActionEvent args)
+    {
+        if (component is null)
+            return;
+
+        _rotting.ReduceAccumulator(args.Target, TimeSpan.FromSeconds(args.RotReduction * component.CurrentAmplification));
+        _damageable.TryChangeDamage(args.Target, args.HealingAmount * component.CurrentAmplification, true, origin: uid);
+
+        if (!args.DoRevive
+            || !TryComp<MobStateComponent>(args.Target, out var mob)
+            || !_mobThreshold.TryGetThresholdForState(args.Target, MobState.Dead, out var threshold)
+            || !TryComp<DamageableComponent>(args.Target, out var damageableComponent)
+            || damageableComponent.TotalDamage > threshold)
+            return;
+
+        _mobState.ChangeMobState(args.Target, MobState.Critical, mob, uid);
+    }
+}
diff --git a/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs b/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
new file mode 100644
index 00000000000..2449c1ad42c
--- /dev/null
+++ b/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
@@ -0,0 +1,55 @@
+using Robust.Shared.Audio;
+using Content.Shared.Damage;
+using Content.Shared.Popups;
+
+namespace Content.Shared.Actions.Events;
+public sealed partial class PsionicHealOtherPowerActionEvent : EntityTargetActionEvent
+{
+    [DataField]
+    public DamageSpecifier HealingAmount = default!;
+
+    [DataField]
+    public string PowerName;
+
+    /// <summary>
+    ///     Controls whether or not a power fires immediately and with no DoAfter.
+    /// </summary>
+    [DataField]
+    public bool Immediate;
+
+    [DataField]
+    public string? PopupText;
+
+    [DataField]
+    public float RotReduction;
+
+    [DataField]
+    public bool DoRevive;
+
+    [DataField]
+    public float UseDelay = 8f;
+
+    [DataField]
+    public int MinGlimmer = 8;
+
+    [DataField]
+    public int MaxGlimmer = 12;
+
+    [DataField]
+    public int GlimmerObviousSoundThreshold;
+
+    [DataField]
+    public int GlimmerObviousPopupThreshold;
+
+    [DataField]
+    public PopupType PopupType = PopupType.Medium;
+
+    [DataField]
+    public AudioParams AudioParams = default!;
+
+    [DataField]
+    public bool PlaySound;
+
+    [DataField]
+    public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Psionics/heartbeat_fast.ogg");
+}
diff --git a/Content.Shared/Psionics/Abilities/HealingWord/HealingWordPowerComponent.cs b/Content.Shared/Psionics/Abilities/HealingWord/HealingWordPowerComponent.cs
new file mode 100644
index 00000000000..dbad62b8a98
--- /dev/null
+++ b/Content.Shared/Psionics/Abilities/HealingWord/HealingWordPowerComponent.cs
@@ -0,0 +1,28 @@
+using Robust.Shared.Audio;
+using Content.Shared.DoAfter;
+using Content.Shared.Damage;
+
+namespace Content.Shared.Abilities.Psionics
+{
+    [RegisterComponent]
+    public sealed partial class HealingWordPowerComponent : Component
+    {
+        [DataField]
+        public DoAfterId? DoAfter;
+
+        [DataField]
+        public DamageSpecifier HealingAmount = default!;
+
+        [DataField]
+        public float RotReduction;
+
+        [DataField]
+        public float UseDelay = 1f;
+
+        [DataField]
+        public AudioParams AudioParams = default!;
+
+        [DataField]
+        public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Psionics/heartbeat_fast.ogg");
+    }
+}
diff --git a/Content.Shared/Psionics/Events.cs b/Content.Shared/Psionics/Events.cs
index cf9a50c6e18..30e7ab332d1 100644
--- a/Content.Shared/Psionics/Events.cs
+++ b/Content.Shared/Psionics/Events.cs
@@ -1,28 +1,59 @@
 using Robust.Shared.Serialization;
+using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 
-namespace Content.Shared.Psionics.Events
+namespace Content.Shared.Psionics.Events;
+
+[Serializable, NetSerializable]
+public sealed partial class PsionicRegenerationDoAfterEvent : DoAfterEvent
 {
-    [Serializable, NetSerializable]
-    public sealed partial class PsionicRegenerationDoAfterEvent : DoAfterEvent
+    [DataField("startedAt", required: true)]
+    public TimeSpan StartedAt;
+
+    public PsionicRegenerationDoAfterEvent(TimeSpan startedAt)
     {
-        [DataField("startedAt", required: true)]
-        public TimeSpan StartedAt;
+        StartedAt = startedAt;
+    }
 
-        private PsionicRegenerationDoAfterEvent()
-        {
-        }
+    public override DoAfterEvent Clone() => this;
+}
 
-        public PsionicRegenerationDoAfterEvent(TimeSpan startedAt)
-        {
-            StartedAt = startedAt;
-        }
+[Serializable, NetSerializable]
+public sealed partial class GlimmerWispDrainDoAfterEvent : SimpleDoAfterEvent { }
 
-        public override DoAfterEvent Clone() => this;
-    }
+[Serializable, NetSerializable]
+public sealed partial class HealingWordDoAfterEvent : DoAfterEvent
+{
+    [DataField(required: true)]
+    public TimeSpan StartedAt;
 
-    [Serializable, NetSerializable]
-    public sealed partial class GlimmerWispDrainDoAfterEvent : SimpleDoAfterEvent
+    public HealingWordDoAfterEvent(TimeSpan startedAt)
     {
+        StartedAt = startedAt;
     }
+
+    public override DoAfterEvent Clone() => this;
 }
+
+[Serializable, NetSerializable]
+public sealed partial class PsionicHealOtherDoAfterEvent : DoAfterEvent
+{
+    [DataField(required: true)]
+    public TimeSpan StartedAt;
+
+    [DataField]
+    public DamageSpecifier HealingAmount = default!;
+
+    [DataField]
+    public float RotReduction;
+
+    [DataField]
+    public bool DoRevive;
+
+    public PsionicHealOtherDoAfterEvent(TimeSpan startedAt)
+    {
+        StartedAt = startedAt;
+    }
+
+    public override DoAfterEvent Clone() => this;
+}
\ No newline at end of file
diff --git a/Content.Shared/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
index 63529576152..6f481f1e49b 100644
--- a/Content.Shared/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Psionics/PsionicComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.DoAfter;
 using Content.Shared.Psionics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -146,6 +147,18 @@ private set
         ///     unneccesary subs for unique psionic entities like e.g. Oracle.
         /// </summary>
         [DataField]
-        public List<String>? PsychognomicDescriptors = null;
+        public List<string>? PsychognomicDescriptors = null;
+
+        /// <summary>
+        ///     Used for tracking what spell a Psion is actively casting.
+        /// </summary>
+        [DataField]
+        public DoAfterId? DoAfter;
+
+        /// <summary>
+        ///     Popup to play if a Psion attempts to start casting a power while already casting one.
+        /// </summary>
+        [DataField]
+        public string AlreadyCasting = "already-casting";
     }
 }
diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
index 981d53884ea..65e655ca2c2 100644
--- a/Resources/Prototypes/Actions/psionics.yml
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -146,3 +146,70 @@
     icon: Interface/VerbIcons/psionic_invisibility_off.png
     event: !type:RemovePsionicInvisibilityOffPowerActionEvent
 
+- type: entity
+  id: ActionHealingWord
+  name: action-name-healing-word
+  description: action-description-healing-word
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Interface/VerbIcons/healing_word.png
+    useDelay: 10
+    checkCanAccess: false
+    range: 6
+    itemIconStyle: BigAction
+    canTargetSelf: true
+    blacklist:
+      components:
+        - PsionicInsulation
+        - Mindbroken
+    event: !type:PsionicHealOtherPowerActionEvent
+            healingAmount:
+              types:
+                Asphyxiation: -2.5
+                Brute: -2.5
+                Burn: -2.5
+                Cellular: -2.5
+            rotReduction: 10
+            doRevive: true
+            powerName: Healing Word
+            popupText: healing-word-begin
+            playSound: true
+            minGlimmer: 2
+            maxGlimmer: 4
+            glimmerObviousSoundThreshold: 100
+            glimmerObviousPopupThreshold: 200
+
+- type: entity
+  id: ActionRevivify
+  name: action-name-revivify
+  description: action-description-revivify
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Interface/VerbIcons/revivify.png
+    useDelay: 120
+    checkCanAccess: false
+    range: 2
+    itemIconStyle: BigAction
+    canTargetSelf: false
+    blacklist:
+      components:
+        - PsionicInsulation
+        - Mindbroken
+    event: !type:PsionicHealOtherPowerActionEvent
+            healingAmount:
+              types:
+                Asphyxiation: -10
+                Brute: -10
+                Burn: -10
+                Cellular: -10
+            rotReduction: 60
+            doRevive: true
+            powerName: Revivify
+            popupText: revivify-begin
+            playSound: true
+            minGlimmer: 10
+            maxGlimmer: 15
+            glimmerObviousSoundThreshold: 50
+            glimmerObviousPopupThreshold: 100
\ No newline at end of file
diff --git a/Resources/Prototypes/Psionics/psionics.yml b/Resources/Prototypes/Psionics/psionics.yml
index b8f798d4b63..e0174675868 100644
--- a/Resources/Prototypes/Psionics/psionics.yml
+++ b/Resources/Prototypes/Psionics/psionics.yml
@@ -137,3 +137,25 @@
     - type: Telepathy
   initializationFeedback: telepathy-power-initialization-feedback
   metapsionicFeedback: psionic-language-power-feedback # Reuse for telepathy, clairaudience, etc
+
+- type: psionicPower
+  id: HealingWordPower
+  name: HealingWord
+  description: healing-word-power-description
+  actions:
+    - ActionHealingWord
+  initializationFeedback: healing-word-power-initialization-feedback
+  metapsionicFeedback: healing-word-power-feedback
+  amplificationModifier: 0.5
+  dampeningModifier: 0.5
+
+- type: psionicPower
+  id: RevivifyPower
+  name: Revivify
+  description: revivify-power-description
+  actions:
+    - ActionRevivify
+  initializationFeedback: revivify-power-initialization-feedback
+  metapsionicFeedback: revivify-power-feedback
+  amplificationModifier: 0.5
+  dampeningModifier: 0.5
\ No newline at end of file
diff --git a/Resources/Textures/Interface/VerbIcons/healing_word.png b/Resources/Textures/Interface/VerbIcons/healing_word.png
new file mode 100644
index 0000000000000000000000000000000000000000..800e2a46e6139ae17b21fb4509242b317c6445c5
GIT binary patch
literal 2189
zcmV;82y*v{P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004QX+uL$X=7sm
z04R}lkvmHRK@^3*Bx=M5DHIVENfE`uKu{1%iC~&&kwh?RlWbl>9?Ncm1Y5zzB48of
z_$vGd+6uM`f}jW@me#%+k@Zd@BuJcP_I{k1bD22<_Fz`anJqrZ<%>or;CC-Ym)*`6
z+8CyfL3}aI)aS!<5&j*Yci2?D^{QU~?`t|b6G>A8Tf6X-rW-}!8R6i1QCGYz+^c0`
z3E@NGaYGI$e5Lewjh_{#Yy7U*h=gXru6nxD4IFP^Eo0<_$Amq(Y)Sh)kGe@$GQSv>
zIv{fhlMn&?xQSC@jVwjHQuC5obDyv3Tc98wP5wG%3~{8%h<9Anl5|Z<O^KeAFH2eF
z{x?rEH91l1-sOkZC(C*p0p|{US1jx6$g;kV!SM(e`MSR#IZc0vUa4!I18{A^*=1de
z@51>O^grk^BUY6hGVQ4pyq-dL6nbu;W2KhW?>Z;<5ZRC?x`w@d7?u65)gMjJXf8<g
z4H^Id010qNS#tmYE+YT{E+YYWr9XB600yf`L_t(|UhP{=Y*j@R9tuq;idbvFh>H>^
zJath878q+2OxT#PaA736l+>sT;>L|8mc+g3LXC|kE)X>?T-3NRv9S>CqFB2iEmR{5
zH9oMZ#UDs2t@k^(=l0xrbARUNzG8Wk-0<GLb7#)?&3ArgUQw#mS`6IM3~X2n^c}Zt
zUe@Qm_V@KQv1L=U2>|#Luf3U?cIb_ln{7riUuCT8tBe&kfoDrV!dj@H5(Vf$0nQ}*
zyk(dDt0X2k0Wkda!9n%MzpL;d`7cJ^R<l#H>ds9I(X(y2k~a{zTonmzRXHDk%J#(3
z7n860Gx^=*CLq*SL1l4OLO|Q%&osXTmIa#cKX9y88OS^`f)apL0uVGwf)1Vy;``he
z_p#c|Y(WWN!)Jc_s{zBOGasjj;SLhKPK>UiDu@YAz{2HuHMR7;0tpOGf*k&KgzobN
zP@nvGRxM87Abb}u&Lr+*Qb=eLf)mhx&tWA=03ZOwJ+v)zcPNk`8$ZiZg-KDNhzOnr
zVc7Bh7gDKi;hRzQ%U5->8L6<Rw<kpcNWpzHsHdj-67}#syc6}IbQrQm2&MoSwe#^E
zYVY1S2tvMmfe<`HLy$Z8-~mzsU;lJnO&0XXp65w1+@yMNkJBV-3tYbGF}MQY+e_{D
zr4%Y-06v2xCW`%jqW4@<C=m%iyh~%iJ>XUobLZ&0zK;N*CkF?e3#Fh0U`4TFPw(za
z5g>h-pX(&a7oZ%FKy6Q~rit@00eZiNo0d0%xd7&cA7jO&gaLl+w^5QiuPA2-&IIs#
z6F7FEqEu;#In_O=0x&XwE~tnE75gy=i34C91o3=KjYgji(|3SJpDijT2w6kAhYtR(
z<@3~UNv*n>43M^DI4J;uhc7uH3_(Bx$lkVx=)z~*=LVG!36Uxi@FEM~K1h&tf^?x%
zpMOn5@pCS)Y=LusYXy|qsUgbOcHO=*$AJd_<y5#hcY{`*Q=qO89)nzHMIq>WD(cvN
z|HedN{LF;}s{;{$Kl$o$it=(x%O^Tm=`{G*B&^^^r{hu>4gCNB3V{kx1xgZFN!(x7
z3H&aCBx1ySWABin@V?8I*~tZ9nB3s#smZhw><0T^>Q-C(7S-mi>*_-1IQ@(7xQ`2s
z-Gmh($-%v+YR8iKQDgWtYZs7{l{wsy{Q<D&;iY_gqdxoQ4^bbA5m7*8@^m85$CM##
z2(cz0E0043a0LXx+ODGwHei(jzW+#E5oWi#x-dCTB#?`2k4fM(it&9x%ek!y&<)pB
zz?+?cM`9A-|ByO^A3k(%F8qOUJWi7kr_I$Si!E7m*sMJFwI+aeZo6aYnW{OC@SM7I
z@Xy`dZM5_K-!IX95TuhJOJVe(VoTH+K3Tvi2r}z3SIeLX5>U*P1rJb?7?1#0fod>@
z-k>g&+j`0Eq5xY0HlV6Q+LF>kb$0r*4{3e`tSXPSI2O2oHN9i)0vH4<yt8YE8onGK
zY{)!~?;zuuC!Y;vW9B$GSn(yqih!ul!2UaBkPaTv9&O~x2gNC`1V!WqQC8R*Z7}!u
zb*uXHRmJ77tPV>IW$a=_0FOY`*!GQ7kWfV!1$?AHQ=TtQd)cPr-LWt08j&4D0tLos
zi)^Y5Y{+mT0J(UZ>ZEx%4KjEiz$U{R$HT6&Lq(+lmEG);HlSr+Cju}4R-fCM`JvKz
zzO12H^@2>1k9D3<2UiAkRe}=%GVrjkW2InpR-P{dyy#uj3bIZ(GdZO8skm%*ZMJDJ
znFlpMNbqF<FhNCiLYc9+k23)_libXG*98Ht{*Q%O7X<hy%sL3-)CIrL;8+U9$^X6G
z@(OS!z~pzlrL9U8Rg7=#0syD~Kq&#|8CfRJyOQT}Ad0!12;dFTpJ&_EtitA}PKOvp
zr#-IV^!EnFf2BRb>|~qz?yXB+!#WYbyFzk<sc3#W&20_|A;CK<Kz9RL1wn#oNo>^t
zpr&S8c~|*+5uh6<Ns!NccZUEhTL{_9@tj<M2hfAzDhY899A*H3D+vr9pt<?_yuNT=
z1ehcW1Ct*zq5xU=Lr6gg1Ni#%wT5Fixd=W{(76uCGr*@dH-Ygz_sb*5n*a`o`Xsi6
zQc;m(8qX*AvAtHm4(BnM^~Xx`sH|)zkg1Mpjg`M3)91gb2!L@RNN6T_*c?m&ygFq_
z$Ws#M`KnhwxC`i@OhlCVdAv-X4<Y@^3CLRIM_;Km{D&#ow<ynt1Yd~@xaQ<CfAJX_
zysNFP_gW0J7-%ujVqm>6@E@B(uU*UOp;iC@01jnXNoGw=04e|g00;m8000000Mb*F
P00000NkvXXu0mjf%9`?P

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/VerbIcons/revivify.png b/Resources/Textures/Interface/VerbIcons/revivify.png
new file mode 100644
index 0000000000000000000000000000000000000000..087f40b4c98a073de7c2e0258f6128a1c3ff755b
GIT binary patch
literal 1977
zcmV;q2S)gbP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004QX+uL$X=7sm
z04R}lkvmHRK@^3*Bx=M5DHIVENfE`uKu{1%iC~&&kwh?RlWbl>9?Ncm1Y5zzB48of
z_$vGd+6uM`f}jW@me#%+k@Zd@BuJcP_I{k1bD22<_Fz`anJqrZ<%>or;CC-Ym)*`6
z+8CyfL3}aI)aS!<5&j*Yci2?D^{QU~?`t|b6G>A8Tf6X-rW-}!8R6i1QCGYz+^c0`
z3E@NGaYGI$e5Lewjh_{#Yy7U*h=gXru6nxD4IFP^Eo0<_$Amq(Y)Sh)kGe@$GQSv>
zIv{fhlMn&?xQSC@jVwjHQuC5obDyv3Tc98wP5wG%3~{8%h<9Anl5|Z<O^KeAFH2eF
z{x?rEH91l1-sOkZC(C*p0p|{US1jx6$g;kV!SM(e`MSR#IZc0vUa4!I18{A^*=1de
z@51>O^grk^BUY6hGVQ4pyq-dL6nbu;W2KhW?>Z;<5ZRC?x`w@d7?u65)gMjJXf8<g
z4H^Id010qNS#tmYE+YT{E+YYWr9XB600q}cL_t(|UhSHHXdFcp$DgqlwGpF%wrNC6
zBr&8OK^hh6uRmI?);1y4gto*AB2<xDMQHv|vC{sNnjo==1pg5m#B$QoY9neRh_?T<
zg6ElVw%CZ~N29$E^=h>h;(q6Rd$W6&-JQwJYU2(Zm%E+YdEd{xdGp?Eh@ut|hzLXk
zA_5VC|1E(_!cboK`hsblaZ*p6HE!QL9m7<91M#gbi&TDM_l?uUv}p)N0kHVh<tw!S
zP|IO54Z#=yS$u0{LJL5A)B<N1f{``m7JpsY4N3q;roPWDgV6@+Pg|a_e}YUbhoS?R
zt$0=*7K9R|shNYFBLH)7Qk5h{9-xG44t6${2Y9hcj32Ns55>l*K3O3?H&ir-jyO~R
zEWD$mGbgm4XzL5FiqAbepA8*^G60>zMizeS&1FL5O-o`~2o?Zt0I}!Ioy7giuV~2g
z2*2@FlO-hpI)#l}ye-_4cIh)!)Z6^7L*$kxx6tl4cGLN@=P8{@kPIP6QKect1O_mh
z!UisnnU}@SwAiQqx|$dQWpcd&7gUP1L!eYxx3Ec{OAxR3_WSN~XvXaCeW=&|4#MSD
zHt!ee?&_vY<~N5I_(jRMV(sAT0lK+8T)%DIT48VH!pjTV?H29sG=IT-f)@Z}kR1Z`
z11e9ID$+9%(iJZYNsbPRkKc|Z?H6CiEW2l&Kc6^}5^+GKan%V3STcwienHdM15^y~
z>MO5*z^JDx(Org6a$$tZE+b;ksJL-4jelo3fwc@wHKPDBS6)N+-?B{D-uLn6wg!#|
z5X>z#%n>gozB)emC8bYKn$m6G*C+rUW%Q>%sI#*}5@YQO+mh6}YX|L!Ws{%x4<2&N
zbZO~Tl=XnqbnT*YksAbw1FFP~6hkm}b^9h^OTKt=z*ty)yXePm4&iw5X9U7kEAFM2
zpMTs=kW@u_^)~{52aHuNb<KRv6gei;*4Bv&JnImRzcKr0bycOs)a<xd(E;%G_t>gC
z$i4TwRSa!ANShC=7eQ~s#`R*>PbN;%<U~3z@b!K0nGpy@2LLOpYVM?C-%N>ZFF9~D
z&u}D1xc2ZPo9%1x0zhC-fCsE?dQfDAuk`FSA|5w25(M{s_ztamV55LQR2V{R#qvB+
zfWVa@wnunI$%VmxykW5s2u1)*jQvPRfDi*10<0gib_28}uFQ~g0nP(hDZcO9pLKmK
zjf-LzfRVqRnWV3e9}y7H06`WnyFQDBc(^*}26)Gda{&|Lm6rf=?H~_1U~D3lJ@pyb
z7pFgeKS!^1_vE=SPJ?b6t|jWqZi6)qHKGqgK;TnNhgH{!@)D3ASa=PFI({T&<>XdA
zfTi&Cb6e@XJ-xyc_?_O$?f($pxO5pEJvB_rtFvh`W?v-@4r-fhw=w_~!hq1<_cq0(
zBd{-y9HzFGHH7z-)Mn2*#LLY+`#R!+*y?*8pnDd;gQJvXFL0*AMDl?s`m+~IPXA2D
zKK)AM189Yg#=OL-oC)~m0XSpBgGup#(mHI=X$XjD$O&*pfOm+;fyhhSx7#m7dbCqR
zKiF&Eq<D<w>j5lS=SU27If5qF28acm9pXf&x#Vt}XLbGcV(p_U{Al14$Ly<sSACKk
zI0gt$u>NBM&+CIU_Zc3%002-H<9rb30qtw<aoh^x;r<-?<=Ka@AWii#dSCz;+=k#|
ziTm`Hx5Z>*HaV)_)kN{87YmAq`_FU^2yuSR=&?9M@G`>h2<p-PO~UmXhn-O$GY|1x
z0nRjrsz5(rN*>^MGq3CL0&Iz0u}+cJx*LS^o{zq!wmtW_p#i|a5VqmW6XHFQ$UPrq
zqfDi{UK0~40NId#Lu?@szIniG-2P(tZ3MvdEQJ-!bajLh1OCep0;j?%glAho$z!P$
zHYzr9Un2l;^I||SEgp6n1K@_BGdrq<jm{WG0mu+^j8iRabjC0afFbA@SM0oB$A;)P
z5rK$6L?9v%5tzdS{swS&-m{i2%ijP101jnXNoGw=04e|g00;m8000000Mb*F00000
LNkvXXu0mjf^>dSO

literal 0
HcmV?d00001


From 80cf68b2575142f1c7618d099ffbc136c153be90 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 20 Sep 2024 14:24:11 -0400
Subject: [PATCH 02/13] Last Adjustments

---
 .../Abilities/HealOtherPowerSystem.cs         | 18 ++++++++++------
 .../PsionicHealOtherPowerActionEvent.cs       |  6 ++++++
 .../Locale/en-US/psionics/psionic-powers.ftl  | 21 +++++++++++++++++++
 Resources/Prototypes/Actions/psionics.yml     |  6 ++++++
 .../Prototypes/Nyanotrasen/psionicPowers.yml  |  2 ++
 Resources/Prototypes/Psionics/psionics.yml    |  3 +--
 6 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
index d565d46b1e5..b9195c458ba 100644
--- a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
+++ b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
@@ -78,8 +78,8 @@ private void AttemptDoAfter(EntityUid uid, PsionicComponent component, PsionicHe
         ev.DoRevive = args.DoRevive;
         var doAfterArgs = new DoAfterArgs(EntityManager, uid, args.UseDelay, ev, uid)
         {
-            BreakOnUserMove = true,
-            BreakOnTargetMove = false,
+            BreakOnUserMove = args.BreakOnUserMove,
+            BreakOnTargetMove = args.BreakOnTargetMove,
         };
 
         if (!_doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId))
@@ -108,12 +108,15 @@ private void OnDoAfter(EntityUid uid, PsionicComponent component, PsionicHealOth
             return; // The target can also cease existing mid-cast.
 
         _rotting.ReduceAccumulator(args.Target.Value, TimeSpan.FromSeconds(args.RotReduction * component.CurrentAmplification));
-        _damageable.TryChangeDamage(args.Target, args.HealingAmount * component.CurrentAmplification, true, origin: uid);
+
+        if (!TryComp<DamageableComponent>(args.Target.Value, out var damageableComponent))
+            return;
+
+        _damageable.TryChangeDamage(args.Target.Value, args.HealingAmount * component.CurrentAmplification, true, false, damageableComponent, uid);
 
         if (!args.DoRevive
             || !TryComp<MobStateComponent>(args.Target, out var mob)
             || !_mobThreshold.TryGetThresholdForState(args.Target.Value, MobState.Dead, out var threshold)
-            || !TryComp<DamageableComponent>(args.Target.Value, out var damageableComponent)
             || damageableComponent.TotalDamage > threshold)
             return;
 
@@ -127,12 +130,15 @@ private void ActivatePower(EntityUid uid, PsionicComponent component, PsionicHea
             return;
 
         _rotting.ReduceAccumulator(args.Target, TimeSpan.FromSeconds(args.RotReduction * component.CurrentAmplification));
-        _damageable.TryChangeDamage(args.Target, args.HealingAmount * component.CurrentAmplification, true, origin: uid);
+
+        if (!TryComp<DamageableComponent>(args.Target, out var damageableComponent))
+            return;
+
+        _damageable.TryChangeDamage(args.Target, args.HealingAmount * component.CurrentAmplification, true, false, damageableComponent, uid);
 
         if (!args.DoRevive
             || !TryComp<MobStateComponent>(args.Target, out var mob)
             || !_mobThreshold.TryGetThresholdForState(args.Target, MobState.Dead, out var threshold)
-            || !TryComp<DamageableComponent>(args.Target, out var damageableComponent)
             || damageableComponent.TotalDamage > threshold)
             return;
 
diff --git a/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs b/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
index 2449c1ad42c..518729d5448 100644
--- a/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
+++ b/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
@@ -26,6 +26,12 @@ public sealed partial class PsionicHealOtherPowerActionEvent : EntityTargetActio
     [DataField]
     public bool DoRevive;
 
+    [DataField]
+    public bool BreakOnUserMove = true;
+
+    [DataField]
+    public bool BreakOnTargetMove = false;
+
     [DataField]
     public float UseDelay = 8f;
 
diff --git a/Resources/Locale/en-US/psionics/psionic-powers.ftl b/Resources/Locale/en-US/psionics/psionic-powers.ftl
index ad6bbef02bd..2eace49ba6f 100644
--- a/Resources/Locale/en-US/psionics/psionic-powers.ftl
+++ b/Resources/Locale/en-US/psionics/psionic-powers.ftl
@@ -48,6 +48,27 @@ psionic-regeneration-power-initialization-feedback =
     I look within myself, finding a wellspring of life.
 psionic-regeneration-power-metapsionic-feedback = {CAPITALIZE($entity)} possesses an overwhelming will to live
 
+# Healing Word
+action-name-healing-word = Healing Word
+action-description-healing-word = Speak the Lesser Secret Of Life, and restore health to another.
+healing-word-power-description = Speak the Lesser Secret Of Life, and restore health to another.
+healing-word-power-initialization-feedback =
+    At the beginning of time, a word was spoken that brought life into the Spheres. Though it taxes my mind to know it,
+    this Secret is known to me now. I need only speak it.
+healing-word-power-metapsionic-feedback = {CAPITALIZE($entity)} bears the Lesser Secret Of Life.
+healing-word-begin = {CAPITALIZE($entity)} mutters a word that brings both joy and pain alike to those who hear it.
+
+# Revivify
+action-name-revivify = Breath Of Life
+action-description-revivify = Speak the Greater Secret of Life, and restore another to life.
+revivify-power-description = Speak the Greater Secret of Life, and restore another to life.
+revivify-power-initialization-feedback =
+    For a moment, my soul journeys across time and space to the beginning of it all, there I hear it.
+    The Secret of Life in its fullness. I feel my entire existence burning out from within, merely by knowing it.
+    Power flows through me as a mighty river, begging to be released with a simple spoken word.
+revivify-power-metapsionic-feedback = {CAPITALIZE($entity)} bears the Greater Secret Of Life.
+revivify-word-begin = {CAPITALIZE($entity)} enunciates a word of such divine power, that those who hear it weep from joy.
+
 # Telegnosis
 telegnosis-power-description = Create a telegnostic projection to remotely observe things.
 telegnosis-power-initialization-feedback =
diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
index 65e655ca2c2..ec97b086747 100644
--- a/Resources/Prototypes/Actions/psionics.yml
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -159,6 +159,9 @@
     range: 6
     itemIconStyle: BigAction
     canTargetSelf: true
+    whitelist:
+      components:
+        - Damageable
     blacklist:
       components:
         - PsionicInsulation
@@ -193,6 +196,9 @@
     range: 2
     itemIconStyle: BigAction
     canTargetSelf: false
+    whitelist:
+      components:
+        - Damageable
     blacklist:
       components:
         - PsionicInsulation
diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
index 0781122b8ec..af5770e262d 100644
--- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
+++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -11,3 +11,5 @@
 #    PsionicInvisibilityPower: 0.15
     MindSwapPower: 0.15
     TelepathyPower: 1
+    HealingWordPower: 0.85
+    Revivify: 0.1
diff --git a/Resources/Prototypes/Psionics/psionics.yml b/Resources/Prototypes/Psionics/psionics.yml
index e0174675868..32fa5607dc1 100644
--- a/Resources/Prototypes/Psionics/psionics.yml
+++ b/Resources/Prototypes/Psionics/psionics.yml
@@ -157,5 +157,4 @@
     - ActionRevivify
   initializationFeedback: revivify-power-initialization-feedback
   metapsionicFeedback: revivify-power-feedback
-  amplificationModifier: 0.5
-  dampeningModifier: 0.5
\ No newline at end of file
+  amplificationModifier: 2.5 # An extremely rare and dangerous power.
\ No newline at end of file

From bdf92e35e4071b31278958d1cd20d86b9a03e0fa Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 20 Sep 2024 14:26:01 -0400
Subject: [PATCH 03/13] Update ATTRIBUTION.txt

---
 Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
index 0b8ae856bd8..69aa4650b32 100644
--- a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
+++ b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
@@ -7,3 +7,6 @@ https://game-icons.net/1x1/lorc/padlock.html
 
 unlock.svg by Delapouite under CC BY 3.0
 https://game-icons.net/1x1/delapouite/padlock-open.html
+
+healing_word.png by LeonardoDaBepis under CC BY 3.0
+revivify.png by LeonardoDaBepis under CC BY 3.0
\ No newline at end of file

From 1d84829d92e4aa7c781eb962ea18d9e3e45ea5d1 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 20 Sep 2024 14:59:21 -0400
Subject: [PATCH 04/13] Last fixes, Tested ingame now to verify it works

---
 .../Abilities/HealOtherPowerSystem.cs         |  2 +-
 .../HealingWord/HealingWordPowerComponent.cs  | 28 -------------------
 Resources/Prototypes/Actions/psionics.yml     | 21 ++++++--------
 .../Prototypes/Nyanotrasen/psionicPowers.yml  |  2 +-
 4 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 Content.Shared/Psionics/Abilities/HealingWord/HealingWordPowerComponent.cs

diff --git a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
index b9195c458ba..5ac99ddb773 100644
--- a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
+++ b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
@@ -76,7 +76,7 @@ private void AttemptDoAfter(EntityUid uid, PsionicComponent component, PsionicHe
         ev.HealingAmount = args.HealingAmount;
         ev.RotReduction = args.RotReduction;
         ev.DoRevive = args.DoRevive;
-        var doAfterArgs = new DoAfterArgs(EntityManager, uid, args.UseDelay, ev, uid)
+        var doAfterArgs = new DoAfterArgs(EntityManager, uid, args.UseDelay, ev, uid, target: args.Target)
         {
             BreakOnUserMove = args.BreakOnUserMove,
             BreakOnTargetMove = args.BreakOnTargetMove,
diff --git a/Content.Shared/Psionics/Abilities/HealingWord/HealingWordPowerComponent.cs b/Content.Shared/Psionics/Abilities/HealingWord/HealingWordPowerComponent.cs
deleted file mode 100644
index dbad62b8a98..00000000000
--- a/Content.Shared/Psionics/Abilities/HealingWord/HealingWordPowerComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Robust.Shared.Audio;
-using Content.Shared.DoAfter;
-using Content.Shared.Damage;
-
-namespace Content.Shared.Abilities.Psionics
-{
-    [RegisterComponent]
-    public sealed partial class HealingWordPowerComponent : Component
-    {
-        [DataField]
-        public DoAfterId? DoAfter;
-
-        [DataField]
-        public DamageSpecifier HealingAmount = default!;
-
-        [DataField]
-        public float RotReduction;
-
-        [DataField]
-        public float UseDelay = 1f;
-
-        [DataField]
-        public AudioParams AudioParams = default!;
-
-        [DataField]
-        public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Psionics/heartbeat_fast.ogg");
-    }
-}
diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
index ec97b086747..a377427be41 100644
--- a/Resources/Prototypes/Actions/psionics.yml
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -159,9 +159,6 @@
     range: 6
     itemIconStyle: BigAction
     canTargetSelf: true
-    whitelist:
-      components:
-        - Damageable
     blacklist:
       components:
         - PsionicInsulation
@@ -170,10 +167,12 @@
             healingAmount:
               types:
                 Asphyxiation: -2.5
-                Brute: -2.5
-                Burn: -2.5
-                Cellular: -2.5
+              groups:
+                Brute: -7.5
+                Burn: -7.5
+                Poison: -7.5
             rotReduction: 10
+            useDelay: 1
             doRevive: true
             powerName: Healing Word
             popupText: healing-word-begin
@@ -196,9 +195,6 @@
     range: 2
     itemIconStyle: BigAction
     canTargetSelf: false
-    whitelist:
-      components:
-        - Damageable
     blacklist:
       components:
         - PsionicInsulation
@@ -207,9 +203,10 @@
             healingAmount:
               types:
                 Asphyxiation: -10
-                Brute: -10
-                Burn: -10
-                Cellular: -10
+              groups:
+                Brute: -30
+                Burn: -30
+                Poison: -30
             rotReduction: 60
             doRevive: true
             powerName: Revivify
diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
index af5770e262d..2aee2273a18 100644
--- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
+++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -12,4 +12,4 @@
     MindSwapPower: 0.15
     TelepathyPower: 1
     HealingWordPower: 0.85
-    Revivify: 0.1
+    RevivifyPower: 0.1

From 3f0d9c21b2736a173f9c1152881011b361328ea3 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 20 Sep 2024 15:00:22 -0400
Subject: [PATCH 05/13] Update psionic-powers.ftl

---
 Resources/Locale/en-US/psionics/psionic-powers.ftl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Locale/en-US/psionics/psionic-powers.ftl b/Resources/Locale/en-US/psionics/psionic-powers.ftl
index 2eace49ba6f..46b7792a13b 100644
--- a/Resources/Locale/en-US/psionics/psionic-powers.ftl
+++ b/Resources/Locale/en-US/psionics/psionic-powers.ftl
@@ -1,4 +1,5 @@
 generic-power-initialization-feedback = I Awaken.
+arleady-casting = I cannot channel more than one power at a time.
 
 # Dispel
 dispel-power-description = Dispel summoned entities such as familiars or forcewalls.

From 5551c1460038412df8b3a7678eb9b37d4b46f8dc Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 20 Sep 2024 15:02:06 -0400
Subject: [PATCH 06/13] Update psionics.yml

---
 Resources/Prototypes/Actions/psionics.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
index a377427be41..09514fe3def 100644
--- a/Resources/Prototypes/Actions/psionics.yml
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -202,11 +202,11 @@
     event: !type:PsionicHealOtherPowerActionEvent
             healingAmount:
               types:
-                Asphyxiation: -10
+                Asphyxiation: -40
               groups:
-                Brute: -30
-                Burn: -30
-                Poison: -30
+                Brute: -45
+                Burn: -45
+                Poison: -45
             rotReduction: 60
             doRevive: true
             powerName: Revivify

From 8f866c468e039bb818bcc51f3cc3af8d480a8b60 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 20 Sep 2024 15:08:41 -0400
Subject: [PATCH 07/13] Update chaplain.yml

---
 Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index c7395ff3e2d..d4385d0891a 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -5,8 +5,8 @@
   playTimeTracker: JobChaplain
   requirements:
     - !type:CharacterDepartmentTimeRequirement
-      department: Epistemics # DeltaV - Epistemics Department replacing Science
-      min: 14400 #DeltaV 4 hours
+      department: Epistemics # Chaplain is now one of the station's "Crew Aligned Wizards"
+      min: 14400 # 4 hours
     - !type:CharacterLogicOrRequirement
       requirements:
         - !type:CharacterSpeciesRequirement
@@ -21,7 +21,7 @@
   supervisors: job-supervisors-rd
   access:
   - Chapel
-  - Research # DeltaV - Move Chaplain into Epistemics
+  - Research
   - Maintenance
   special:
   - !type:AddComponentSpecial
@@ -32,6 +32,7 @@
     - type: InnatePsionicPowers
       powersToAdd:
         - TelepathyPower
+        - HealingWordPower
 
 - type: startingGear
   id: ChaplainGear
@@ -40,7 +41,7 @@
     back: ClothingBackpackChaplainFilled
     shoes: ClothingShoesColorBlack
     id: ChaplainPDA
-    ears: ClothingHeadsetScience # DeltaV - Move Chaplain into Epistemics
+    ears: ClothingHeadsetScience
   innerClothingSkirt: ClothingUniformJumpskirtChaplain
   satchel: ClothingBackpackSatchelChaplainFilled
   duffelbag: ClothingBackpackDuffelChaplainFilled

From 0c0b0f55df09ddd9295aa7e7f371a3fe563ca156 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Fri, 20 Sep 2024 15:22:06 -0400
Subject: [PATCH 08/13] Update psionics.yml

---
 Resources/Prototypes/Actions/psionics.yml | 27 +++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
index 09514fe3def..0ee38f37431 100644
--- a/Resources/Prototypes/Actions/psionics.yml
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -165,12 +165,12 @@
         - Mindbroken
     event: !type:PsionicHealOtherPowerActionEvent
             healingAmount:
-              types:
-                Asphyxiation: -2.5
-              groups:
+              groups: # These all get divided by the number of damage types in the group. So they're all -2.5.
+                Genetic: -2.5
+                Toxin: -5
+                Airloss: -5
                 Brute: -7.5
-                Burn: -7.5
-                Poison: -7.5
+                Burn: -10
             rotReduction: 10
             useDelay: 1
             doRevive: true
@@ -201,18 +201,21 @@
         - Mindbroken
     event: !type:PsionicHealOtherPowerActionEvent
             healingAmount:
-              types:
-                Asphyxiation: -40
-              groups:
+              groups: # These all get divided by the number of damage types in the group. So they're all -15.
+                      # Additionally, they're multiplied by the caster's Amplification.
+                      # Which assuming this is the only power they have,
+                      # The multiplier is between 2.9 and 3.9
+                Genetic: -15
+                Toxin: -30
+                Airloss: -60 #Except airloss, which heals 30 per type.
                 Brute: -45
-                Burn: -45
-                Poison: -45
+                Burn: -60
             rotReduction: 60
             doRevive: true
             powerName: Revivify
             popupText: revivify-begin
             playSound: true
-            minGlimmer: 10
-            maxGlimmer: 15
+            minGlimmer: 10 # These also get multiplied by caster stats. So,
+            maxGlimmer: 15 # keeping in mind the ~3.5x multiplier, this spikes glimmer by as much as 60 points.
             glimmerObviousSoundThreshold: 50
             glimmerObviousPopupThreshold: 100
\ No newline at end of file

From 9ad3f70a2ec5c325e076c93af0d3c5f4b50e6395 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sat, 21 Sep 2024 15:35:53 -0400
Subject: [PATCH 09/13] Apply suggestions from code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
---
 .../Psionics/Abilities/HealOtherPowerSystem.cs       |  9 +++++++--
 .../Events/PsionicHealOtherPowerActionEvent.cs       |  4 +---
 Content.Shared/Psionics/Events.cs                    |  2 +-
 Content.Shared/Psionics/PsionicComponent.cs          |  8 ++------
 Resources/Locale/en-US/psionics/psionic-powers.ftl   | 11 ++++++-----
 Resources/Prototypes/Actions/psionics.yml            | 12 ++++++------
 Resources/Prototypes/Psionics/psionics.yml           |  2 +-
 .../Prototypes/Roles/Jobs/Civilian/chaplain.yml      |  2 +-
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
index 5ac99ddb773..85bae78dc6b 100644
--- a/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
+++ b/Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
@@ -32,14 +32,17 @@ public sealed class RevivifyPowerSystem : EntitySystem
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly GlimmerSystem _glimmer = default!;
 
+
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<PsionicComponent, PsionicHealOtherPowerActionEvent>(OnPowerUsed);
         SubscribeLocalEvent<PsionicComponent, DispelledEvent>(OnDispelled);
         SubscribeLocalEvent<PsionicComponent, PsionicHealOtherDoAfterEvent>(OnDoAfter);
     }
 
+
     private void OnPowerUsed(EntityUid uid, PsionicComponent component, PsionicHealOtherPowerActionEvent args)
     {
         if (component.DoAfter is not null)
@@ -100,12 +103,14 @@ private void OnDispelled(EntityUid uid, PsionicComponent component, DispelledEve
 
     private void OnDoAfter(EntityUid uid, PsionicComponent component, PsionicHealOtherDoAfterEvent args)
     {
+        // It's entirely possible for the caster to stop being Psionic(due to mindbreaking) mid cast
         if (component is null)
-            return; // It's entirely possible for the caster to stop being Psionic(due to mindbreaking) mid cast.
+            return;
         component.DoAfter = null;
 
+        // The target can also cease existing mid-cast
         if (args.Target is null)
-            return; // The target can also cease existing mid-cast.
+            return;
 
         _rotting.ReduceAccumulator(args.Target.Value, TimeSpan.FromSeconds(args.RotReduction * component.CurrentAmplification));
 
diff --git a/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs b/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
index 518729d5448..8cf11b9e66d 100644
--- a/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
+++ b/Content.Shared/Actions/Events/PsionicHealOtherPowerActionEvent.cs
@@ -11,9 +11,7 @@ public sealed partial class PsionicHealOtherPowerActionEvent : EntityTargetActio
     [DataField]
     public string PowerName;
 
-    /// <summary>
-    ///     Controls whether or not a power fires immediately and with no DoAfter.
-    /// </summary>
+    /// Controls whether or not a power fires immediately and with no DoAfter
     [DataField]
     public bool Immediate;
 
diff --git a/Content.Shared/Psionics/Events.cs b/Content.Shared/Psionics/Events.cs
index 30e7ab332d1..f110c9c405f 100644
--- a/Content.Shared/Psionics/Events.cs
+++ b/Content.Shared/Psionics/Events.cs
@@ -56,4 +56,4 @@ public PsionicHealOtherDoAfterEvent(TimeSpan startedAt)
     }
 
     public override DoAfterEvent Clone() => this;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
index 7e60e7bcb3b..37d0a9a7ef4 100644
--- a/Content.Shared/Psionics/PsionicComponent.cs
+++ b/Content.Shared/Psionics/PsionicComponent.cs
@@ -169,15 +169,11 @@ private set
         [DataField]
         public List<string>? PsychognomicDescriptors = null;
 
-        /// <summary>
-        ///     Used for tracking what spell a Psion is actively casting.
-        /// </summary>
+        /// Used for tracking what spell a Psion is actively casting
         [DataField]
         public DoAfterId? DoAfter;
 
-        /// <summary>
-        ///     Popup to play if a Psion attempts to start casting a power while already casting one.
-        /// </summary>
+        /// Popup to play if a Psion attempts to start casting a power while already casting one
         [DataField]
         public string AlreadyCasting = "already-casting";
     }
diff --git a/Resources/Locale/en-US/psionics/psionic-powers.ftl b/Resources/Locale/en-US/psionics/psionic-powers.ftl
index 533972598cf..01b50cce326 100644
--- a/Resources/Locale/en-US/psionics/psionic-powers.ftl
+++ b/Resources/Locale/en-US/psionics/psionic-powers.ftl
@@ -54,20 +54,21 @@ action-name-healing-word = Healing Word
 action-description-healing-word = Speak the Lesser Secret Of Life, and restore health to another.
 healing-word-power-description = Speak the Lesser Secret Of Life, and restore health to another.
 healing-word-power-initialization-feedback =
-    At the beginning of time, a word was spoken that brought life into the Spheres. Though it taxes my mind to know it,
-    this Secret is known to me now. I need only speak it.
-healing-word-power-metapsionic-feedback = {CAPITALIZE($entity)} bears the Lesser Secret Of Life.
+    At the beginning of time, a word was spoken that brought life into the Spheres.
+    Though it taxes my mind to know it, this Secret is known to me now.
+    I need only speak it.
+healing-word-power-metapsionic-feedback = {CAPITALIZE($entity)} bears the Lesser Secret of Life.
 healing-word-begin = {CAPITALIZE($entity)} mutters a word that brings both joy and pain alike to those who hear it.
 
 # Revivify
-action-name-revivify = Breath Of Life
+action-name-revivify = Breath of Life
 action-description-revivify = Speak the Greater Secret of Life, and restore another to life.
 revivify-power-description = Speak the Greater Secret of Life, and restore another to life.
 revivify-power-initialization-feedback =
     For a moment, my soul journeys across time and space to the beginning of it all, there I hear it.
     The Secret of Life in its fullness. I feel my entire existence burning out from within, merely by knowing it.
     Power flows through me as a mighty river, begging to be released with a simple spoken word.
-revivify-power-metapsionic-feedback = {CAPITALIZE($entity)} bears the Greater Secret Of Life.
+revivify-power-metapsionic-feedback = {CAPITALIZE($entity)} bears the Greater Secret of Life.
 revivify-word-begin = {CAPITALIZE($entity)} enunciates a word of such divine power, that those who hear it weep from joy.
 
 # Telegnosis
diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
index 0ee38f37431..2f61c265b59 100644
--- a/Resources/Prototypes/Actions/psionics.yml
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -201,13 +201,13 @@
         - Mindbroken
     event: !type:PsionicHealOtherPowerActionEvent
             healingAmount:
-              groups: # These all get divided by the number of damage types in the group. So they're all -15.
-                      # Additionally, they're multiplied by the caster's Amplification.
-                      # Which assuming this is the only power they have,
-                      # The multiplier is between 2.9 and 3.9
+              # These all get divided by the number of damage types in the group. So they're all -15
+              # Additionally, they're multiplied by the caster's Amplification, which,
+              #   assuming this is the only power they have, the multiplier is between 2.9-3.9
+              groups:
                 Genetic: -15
                 Toxin: -30
-                Airloss: -60 #Except airloss, which heals 30 per type.
+                Airloss: -60 # Except airloss, which heals 30 per type
                 Brute: -45
                 Burn: -60
             rotReduction: 60
@@ -218,4 +218,4 @@
             minGlimmer: 10 # These also get multiplied by caster stats. So,
             maxGlimmer: 15 # keeping in mind the ~3.5x multiplier, this spikes glimmer by as much as 60 points.
             glimmerObviousSoundThreshold: 50
-            glimmerObviousPopupThreshold: 100
\ No newline at end of file
+            glimmerObviousPopupThreshold: 100
diff --git a/Resources/Prototypes/Psionics/psionics.yml b/Resources/Prototypes/Psionics/psionics.yml
index 9d37d3b5f76..b881f1f11fb 100644
--- a/Resources/Prototypes/Psionics/psionics.yml
+++ b/Resources/Prototypes/Psionics/psionics.yml
@@ -160,5 +160,5 @@
     - ActionRevivify
   initializationFeedback: revivify-power-initialization-feedback
   metapsionicFeedback: revivify-power-feedback
-  amplificationModifier: 2.5 # An extremely rare and dangerous power.
+  amplificationModifier: 2.5 # An extremely rare and dangerous power
   powerSlotCost: 2
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index d4385d0891a..d4f8bdb0671 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobChaplain
   requirements:
     - !type:CharacterDepartmentTimeRequirement
-      department: Epistemics # Chaplain is now one of the station's "Crew Aligned Wizards"
+      department: Epistemics # Chaplain is now one of the station's "Crew-Aligned Wizards"
       min: 14400 # 4 hours
     - !type:CharacterLogicOrRequirement
       requirements:

From f531f79854b9e337c4df4fa106415c21fecda07c Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sat, 21 Sep 2024 18:33:18 -0400
Subject: [PATCH 10/13] Move icons to an rsi folder

---
 Resources/Prototypes/Actions/psionics.yml      |   6 +++---
 .../psionics.rsi}/healing_word.png             | Bin
 .../Interface/Actions/psionics.rsi/meta.json   |  17 +++++++++++++++++
 .../psionics.rsi}/revivify.png                 | Bin
 4 files changed, 20 insertions(+), 3 deletions(-)
 rename Resources/Textures/Interface/{VerbIcons => Actions/psionics.rsi}/healing_word.png (100%)
 create mode 100644 Resources/Textures/Interface/Actions/psionics.rsi/meta.json
 rename Resources/Textures/Interface/{VerbIcons => Actions/psionics.rsi}/revivify.png (100%)

diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
index 2f61c265b59..398819dd83f 100644
--- a/Resources/Prototypes/Actions/psionics.yml
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -67,7 +67,7 @@
   description: action-description-noospheric-zap
   noSpawn: true
   components:
-  - type: EntityTargetAction
+  -
     icon: Interface/VerbIcons/noospheric_zap.png
     useDelay: 100
     range: 5
@@ -153,7 +153,7 @@
   noSpawn: true
   components:
   - type: EntityTargetAction
-    icon: Interface/VerbIcons/healing_word.png
+    icon: { sprite : Interface/Actions/psionics.rsi, state: healing_word }
     useDelay: 10
     checkCanAccess: false
     range: 6
@@ -189,7 +189,7 @@
   noSpawn: true
   components:
   - type: EntityTargetAction
-    icon: Interface/VerbIcons/revivify.png
+    icon: { sprite : Interface/Actions/psionics.rsi, state: revivify }
     useDelay: 120
     checkCanAccess: false
     range: 2
diff --git a/Resources/Textures/Interface/VerbIcons/healing_word.png b/Resources/Textures/Interface/Actions/psionics.rsi/healing_word.png
similarity index 100%
rename from Resources/Textures/Interface/VerbIcons/healing_word.png
rename to Resources/Textures/Interface/Actions/psionics.rsi/healing_word.png
diff --git a/Resources/Textures/Interface/Actions/psionics.rsi/meta.json b/Resources/Textures/Interface/Actions/psionics.rsi/meta.json
new file mode 100644
index 00000000000..c456f1caa1c
--- /dev/null
+++ b/Resources/Textures/Interface/Actions/psionics.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by leonardo_dabepis (discord)",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "healing_word"
+    },
+    {
+      "name": "icon-on"
+    }
+  ]
+}
diff --git a/Resources/Textures/Interface/VerbIcons/revivify.png b/Resources/Textures/Interface/Actions/psionics.rsi/revivify.png
similarity index 100%
rename from Resources/Textures/Interface/VerbIcons/revivify.png
rename to Resources/Textures/Interface/Actions/psionics.rsi/revivify.png

From 9a11cb98fd5d5c08d1d02bcc254113c121193e68 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sat, 21 Sep 2024 18:34:30 -0400
Subject: [PATCH 11/13] Update meta.json

---
 Resources/Textures/Interface/Actions/psionics.rsi/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Textures/Interface/Actions/psionics.rsi/meta.json b/Resources/Textures/Interface/Actions/psionics.rsi/meta.json
index c456f1caa1c..6562a924ed3 100644
--- a/Resources/Textures/Interface/Actions/psionics.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/psionics.rsi/meta.json
@@ -11,7 +11,7 @@
       "name": "healing_word"
     },
     {
-      "name": "icon-on"
+      "name": "revifify"
     }
   ]
 }

From fcd2313bbc0e486935874b7e7e95f6d71d0d7192 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sat, 21 Sep 2024 18:35:26 -0400
Subject: [PATCH 12/13] Update meta.json

---
 Resources/Textures/Interface/Actions/psionics.rsi/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Textures/Interface/Actions/psionics.rsi/meta.json b/Resources/Textures/Interface/Actions/psionics.rsi/meta.json
index 6562a924ed3..085cc412814 100644
--- a/Resources/Textures/Interface/Actions/psionics.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/psionics.rsi/meta.json
@@ -11,7 +11,7 @@
       "name": "healing_word"
     },
     {
-      "name": "revifify"
+      "name": "revivify"
     }
   ]
 }

From 86337314b4704038b2d85464ce61c065dcef2904 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Sat, 21 Sep 2024 18:39:58 -0400
Subject: [PATCH 13/13] Update psionics.yml

---
 Resources/Prototypes/Actions/psionics.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
index 398819dd83f..d38608a469b 100644
--- a/Resources/Prototypes/Actions/psionics.yml
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -67,7 +67,7 @@
   description: action-description-noospheric-zap
   noSpawn: true
   components:
-  -
+  - type: EntityTargetAction
     icon: Interface/VerbIcons/noospheric_zap.png
     useDelay: 100
     range: 5