- tweak: Magic tweaks.

Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Numerics;
-using Content.Server._White.Cult;
 using Content.Server._White.IncorporealSystem;
+using Content.Server._White.Other.FastAndFuriousSystem;
 using Content.Server._White.Wizard.Charging;
 using Content.Server._White.Wizard.Magic.Amaterasu;
 using Content.Server._White.Wizard.Magic.Other;
@@ -48,6 +48,7 @@ using Content.Shared.Physics;
 using Content.Shared.Popups;
 using Content.Shared.Revolutionary.Components;
 using Content.Shared.StatusEffect;
+using Content.Shared.Stunnable;
 using Content.Shared.Throwing;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
@@ -88,6 +89,7 @@ public sealed class WizardSpellsSystem : EntitySystem
     [Dependency] private readonly MindSystem _mindSystem = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
     [Dependency] private readonly ChargingSystem _charging = default!;
+    [Dependency] private readonly SharedStunSystem _stun = default!;
 
     #endregion
 
@@ -191,6 +193,7 @@ public sealed class WizardSpellsSystem : EntitySystem
         SwapComponent<RevolutionaryComponent>(uid, target);
         SwapComponent<HeadRevolutionaryComponent>(uid, target);
         SwapComponent<GlobalAntagonistComponent>(uid, target);
+        SwapComponent<FastAndFuriousComponent>(uid, target);
 
         _mindSystem.TransferTo(mindId, target, mind: mind);
 
@@ -738,8 +741,8 @@ public sealed class WizardSpellsSystem : EntitySystem
             return false;
         }
 
+        _stun.TryKnockdown(msg.TargetUid, TimeSpan.FromSeconds(4), true);
         _throwingSystem.TryThrow(msg.TargetUid, Transform(msg.Performer).Coordinates, 5f);
-        _standing.TryLieDown(msg.TargetUid);
 
         return true;
     }

Resources/Prototypes/Magic/white.yml

@@ -29,7 +29,7 @@
         prototype: ProjectileTeslaBall
         posData: !type:TargetCasterPos
     - type: VariableUseDelay
-      useDelay: 5
+      useDelay: 10
       altUseDelay: 5
       chargeUseDelay: 30
 
@@ -63,7 +63,7 @@
         speech: "EL DRITCH!"
     - type: VariableUseDelay
       useDelay: 6
-      altUseDelay: 2
+      altUseDelay: 3
       chargeUseDelay: 30
 
 - type: entity
@@ -72,7 +72,7 @@
   noSpawn: true
   components:
     - type: Magic
-      requiresClothes: true
+      requiresClothes: false
     - type: WorldTargetAction
       itemIconStyle: BigAction
       useDelay: 60
@@ -128,7 +128,7 @@
         posData: !type:TargetCasterPos
         speech: "SHIZO NERO!"
     - type: VariableUseDelay
-      useDelay: 4
+      useDelay: 5
       altUseDelay: 1
       chargeUseDelay: 30
 

Resources/Prototypes/_White/Wizard/magic_items.yml

@@ -8,7 +8,7 @@
     sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
   - type: MeleeWeapon
     autoAttack: true
-    attackRate: 4
+    attackRate: 5
     damage:
       types:
         Slash: 10
@@ -39,7 +39,7 @@
     wideAnimationRotation: 135
     damage:
       types:
-        Slash: 30
+        Slash: 35
   - type: Clothing
     quickEquip: false
     sprite: White/Objects/Weapons/Chaplain/spellblade.rsi