Startup

Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs

@@ -34,6 +34,8 @@ private void OnPowerUsed(DarkSwapActionEvent args)
 
                 if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost / 2, args.CheckInsulation))
                 {
+                    SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates);
+                    SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(args.Performer).Coordinates);
                     RemComp(args.Performer, ethereal);
                     args.Handled = true;
                 }
@@ -50,7 +52,7 @@ private void OnPowerUsed(DarkSwapActionEvent args)
             }
 
             if (args.Handled)
-                _psionics.LogPowerUsed(args.Performer, "DarkSwap", 0, 0);
+                _psionics.LogPowerUsed(args.Performer, "DarkSwap");
         }
     }
 }

Content.Server/Shadowkin/EtherealStunItemSystem.cs

@@ -21,7 +21,8 @@ private void OnUseInHand(EntityUid uid, EtherealStunItemComponent component, Use
     {
         foreach (var ent in _lookup.GetEntitiesInRange(uid, component.Radius))
         {
-            if (!TryComp<EtherealComponent>(ent, out var ethereal))
+            if (!TryComp<EtherealComponent>(ent, out var ethereal)
+                || !ethereal.CanBeStunned)
                 continue;
 
             RemComp(ent, ethereal);

Content.Server/Shadowkin/EtherealSystem.cs

@@ -79,9 +79,6 @@ public override void OnShutdown(EntityUid uid, EtherealComponent component, Comp
         RemComp<RespiratorImmuneComponent>(uid);
         RemComp<MovementIgnoreGravityComponent>(uid);
 
-        SpawnAtPosition("ShadowkinShadow", Transform(uid).Coordinates);
-        SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(uid).Coordinates);
-
         foreach (var light in component.DarkenedLights.ToArray())
         {
             if (!TryComp<PointLightComponent>(light, out var pointLight)
@@ -181,7 +178,7 @@ public override void Update(float frameTime)
 
                 if (etherealLight.AttachedEntity == uid
                     && _random.Prob(0.03f))
-                        etherealLight.AttachedEntity = EntityUid.Invalid;
+                    etherealLight.AttachedEntity = EntityUid.Invalid;
 
                 if (!etherealLight.OldRadiusEdited)
                 {
@@ -213,4 +210,4 @@ public override void Update(float frameTime)
             }
         }
     }
-}
+}

Content.Server/Shadowkin/ShadowkinSystem.cs

@@ -30,26 +30,19 @@ public override void Initialize()
         SubscribeLocalEvent<ShadowkinComponent, ComponentStartup>(OnInit);
         SubscribeLocalEvent<ShadowkinComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<ShadowkinComponent, OnMindbreakEvent>(OnMindbreak);
-        SubscribeLocalEvent<ShadowkinComponent, OnAttemptPowerUseEvent>(OnAttemptPowerUse);
         SubscribeLocalEvent<ShadowkinComponent, OnManaUpdateEvent>(OnManaUpdate);
         SubscribeLocalEvent<ShadowkinComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<ShadowkinComponent, EyeColorInitEvent>(OnEyeColorChange);
     }
 
     private void OnInit(EntityUid uid, ShadowkinComponent component, ComponentStartup args)
     {
-        if (component.BlackeyeSpawn)
-            ApplyBlackEye(uid);
-
         _actionsSystem.AddAction(uid, ref component.ShadowkinSleepAction, ShadowkinSleepActionId, uid);
-
-        UpdateShadowkinAlert(uid, component);
     }
 
     private void OnEyeColorChange(EntityUid uid, ShadowkinComponent component, EyeColorInitEvent args)
     {
         if (!TryComp<HumanoidAppearanceComponent>(uid, out var humanoid)
-            || !component.BlackeyeSpawn
             || humanoid.EyeColor == component.OldEyeColor)
             return;
 
@@ -95,12 +88,6 @@ public void UpdateShadowkinAlert(EntityUid uid, ShadowkinComponent component)
             _alerts.ClearAlert(uid, AlertType.ShadowkinPower);
     }
 
-    private void OnAttemptPowerUse(EntityUid uid, ShadowkinComponent component, OnAttemptPowerUseEvent args)
-    {
-        if (HasComp<ShadowkinCuffComponent>(uid))
-            args.Cancel();
-    }
-
     private void OnManaUpdate(EntityUid uid, ShadowkinComponent component, ref OnManaUpdateEvent args)
     {
         if (!TryComp<PsionicComponent>(uid, out var magic))
@@ -112,26 +99,10 @@ private void OnManaUpdate(EntityUid uid, ShadowkinComponent component, ref OnMan
         else
             magic.ManaGainMultiplier = 1;
 
-        if (magic.Mana <= component.BlackEyeMana)
-            ApplyBlackEye(uid);
-
         Dirty(magic); // Update Shadowkin Overlay.
         UpdateShadowkinAlert(uid, component);
     }
 
-    /// <summary>
-    /// Blackeye the Shadowkin, its just a function to mindbreak the shadowkin but making sure "Removable" is checked true during it.
-    /// </summary>
-    /// <param name="uid"></param>
-    public void ApplyBlackEye(EntityUid uid)
-    {
-        if (!TryComp<PsionicComponent>(uid, out var magic))
-            return;
-
-        magic.Removable = true;
-        _psionicAbilitiesSystem.MindBreak(uid);
-    }
-
     private void OnMindbreak(EntityUid uid, ShadowkinComponent component, ref OnMindbreakEvent args)
     {
         if (TryComp<MindbrokenComponent>(uid, out var mindbreak))
@@ -144,17 +115,13 @@ private void OnMindbreak(EntityUid uid, ShadowkinComponent component, ref OnMind
             Dirty(humanoid);
         }
 
-        if (component.BlackeyeSpawn)
-            return;
-
         if (TryComp<StaminaComponent>(uid, out var stamina))
             _stamina.TakeStaminaDamage(uid, stamina.CritThreshold, stamina, uid);
     }
 
     private void OnRejuvenate(EntityUid uid, ShadowkinComponent component, RejuvenateEvent args)
     {
-        if (component.BlackeyeSpawn
-            || !HasComp<MindbrokenComponent>(uid))
+        if (!HasComp<MindbrokenComponent>(uid))
             return;
 
         RemComp<MindbrokenComponent>(uid);
@@ -166,12 +133,11 @@ private void OnRejuvenate(EntityUid uid, ShadowkinComponent component, Rejuvenat
         }
 
         EnsureComp<PsionicComponent>(uid, out var magic);
-        magic.Mana = 250;
-        magic.MaxMana = 250;
+        magic.Mana = 200;
+        magic.MaxMana = 200;
         magic.ManaGain = 0.25f;
-        magic.BypassManaCheck = true;
-        magic.Removable = false;
         magic.MindbreakingFeedback = "shadowkin-blackeye";
+        magic.NoMana = "shadowkin-tired";
 
         if (_prototypeManager.TryIndex<PsionicPowerPrototype>("ShadowkinPowers", out var shadowkinPowers))
             _psionicAbilitiesSystem.InitializePsionicPower(uid, shadowkinPowers);

Content.Shared/Psionics/PsionicComponent.cs

@@ -12,7 +12,7 @@ public sealed partial class PsionicComponent : Component
         ///     Current Mana.
         /// </summary>
         [DataField, AutoNetworkedField]
-        public float Mana;
+        public float Mana = 50;
 
         /// <summary>
         ///     Max Mana Possible.

Content.Shared/Shadowkin/EtherealComponent.cs

@@ -23,6 +23,9 @@ public sealed partial class EtherealComponent : Component
     [DataField]
     public float DarkenRate = 0.084f;
 
+    [DataField]
+    public bool CanBeStunned = true;
+
     public List<EntityUid> DarkenedLights = new();
 
     public float DarkenAccumulator;
@@ -33,4 +36,4 @@ public sealed partial class EtherealComponent : Component
 
     public List<string> SuppressedFactions = new();
     public bool HasDoorBumpTag;
-}
+}

Content.Shared/Shadowkin/ShadowkinComponent.cs

@@ -17,18 +17,6 @@ public sealed partial class ShadowkinComponent : Component
     [DataField]
     public float SleepManaRegenMultiplier = 4;
 
-    /// <summary>
-    ///     On MapInitEvent, will Blackeye the Shadowkin.
-    /// </summary>
-    [DataField]
-    public bool BlackeyeSpawn;
-
-    /// <summary>
-    ///     If mana is equal or lower then this value, blackeye the shadowkin.
-    /// </summary>
-    [DataField]
-    public float BlackEyeMana;
-
     /// <summary>
     ///     Set the Black-Eye Color.
     /// </summary>
@@ -39,4 +27,4 @@ public sealed partial class ShadowkinComponent : Component
 
     [DataField]
     public EntityUid? ShadowkinSleepAction;
-}
+}

Resources/Prototypes/Actions/psionics.yml

@@ -291,40 +291,6 @@
           maxThrowStrength: 5
           spaceRange: 3
 
-- type: entity
-  id: ActionShadowkinShadeskip
-  name: action-name-shadeskip
-  description: action-description-shadowkin-shadeskip
-  noSpawn: true
-  components:
-    - type: InstantAction
-      icon: { sprite: Interface/Actions/shadowkin_icons.rsi, state: shadeskip }
-      useDelay: 10
-      checkCanInteract: false
-      event: !type:AnomalyPowerActionEvent
-        settings:
-          powerName: "Shadowkin-Shadeskip"
-          manaCost: 25
-          checkInsulation: false
-          minGlimmer: 0
-          maxGlimmer: 0
-          doSupercritical: false
-        entitySpawnEntries:
-          - settings:
-              spawnOnPulse: true
-              minAmount: 5
-              maxAmount: 10
-              maxRange: 2.5
-            spawns:
-              - ShadowkinShadow
-          - settings:
-              spawnOnPulse: true
-              minAmount: 1
-              maxAmount: 1
-              maxRange: 0.5
-            spawns:
-              - EffectFlashShadowkinShadeskip
-
 - type: entity
   id: ActionDarkSwap
   name: action-name-darkswap

Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml

@@ -224,10 +224,9 @@
     - type: Psionic
       mindbreakingFeedback: shadowkin-blackeye
       manaGain: 0.25
-      mana: 150
-      maxMana: 250
-      bypassManaCheck: true
-      removable: false
+      mana: 100
+      maxMana: 200
+      noMana: shadowkin-tired
     - type: InnatePsionicPowers
       powersToAdd:
         - ShadowkinPowers

Resources/Prototypes/Psionics/psionics.yml

@@ -224,7 +224,7 @@
   name: Shadowkin Powers
   description: shadowkin-powers-description
   actions:
-    - ActionShadowkinShadeskip
+    - ActionShadeskip
     - ActionDarkSwap
   powerSlotCost: 1
 

Resources/Prototypes/Species/shadowkin.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Shadowkin
   name: species-name-shadowkin
-  roundStart: false
+  roundStart: true
   prototype: MobShadowkin
   sprites: MobShadowkinSprites
   defaultSkinTone: "#FFFFFF"