- add: Defib fun. (#567)

Content.Server/Medical/DefibrillatorSystem.cs

@@ -7,8 +7,12 @@ using Content.Server.Ghost;
 using Content.Server.Popups;
 using Content.Server.PowerCell;
 using Content.Server.Traits.Assorted;
+using Content.Shared._White.Item.DelayedKnockdown;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Events;
 using Content.Shared.DoAfter;
+using Content.Shared.Emag.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
@@ -20,6 +24,8 @@ using Content.Shared.Mobs.Systems;
 using Content.Shared.PowerCell;
 using Content.Shared.Timing;
 using Content.Shared.Toggleable;
+using Content.Shared.Weapons.Melee;
+using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
@@ -54,8 +60,25 @@ public sealed class DefibrillatorSystem : EntitySystem
         SubscribeLocalEvent<DefibrillatorComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
         SubscribeLocalEvent<DefibrillatorComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<DefibrillatorComponent, DefibrillatorZapDoAfterEvent>(OnDoAfter);
+
+        SubscribeLocalEvent<DefibrillatorComponent, StaminaDamageOnHitAttemptEvent>(OnStaminaHitAttempt); // WD
     }
 
+    // WD START
+    private void OnStaminaHitAttempt(Entity<DefibrillatorComponent> ent, ref StaminaDamageOnHitAttemptEvent args)
+    {
+        var (uid, comp) = ent;
+        if (comp.Enabled && _powerCell.TryUseActivatableCharge(uid))
+        {
+            if (!_powerCell.HasActivatableCharge(uid))
+                TryDisable(uid, comp);
+            return;
+        }
+
+        args.Cancelled = true;
+    }
+    // WD END
+
     private void OnUseInHand(EntityUid uid, DefibrillatorComponent component, UseInHandEvent args)
     {
         if (args.Handled || !TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay)))
@@ -159,8 +182,8 @@ public sealed class DefibrillatorSystem : EntitySystem
         if (!_powerCell.HasActivatableCharge(uid, user: user))
             return false;
 
-        if (_mobState.IsAlive(target, mobState))
+        // if (_mobState.IsAlive(target, mobState))
-            return false;
+        //    return false;
 
         return true;
     }
@@ -177,6 +200,7 @@ public sealed class DefibrillatorSystem : EntitySystem
         return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
             uid, target, uid)
             {
+                BreakOnMove = user == target, // WD EDIT
                 BlockDuplicate = true,
                 BreakOnHandChange = true,
                 NeedHand = true
@@ -206,7 +230,13 @@ public sealed class DefibrillatorSystem : EntitySystem
         ICommonSession? session = null;
 
         var dead = true;
-        if (_rotting.IsRotten(target))
+        // WD EDIT START
+        var alive = false;
+        if (_mobState.IsAlive(target))
+        {
+            alive = true;
+        }
+        else if (_rotting.IsRotten(target)) // WD EDIT END
         {
             _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-rotten"),
                 InGameICChatType.Speak, true);
@@ -246,7 +276,7 @@ public sealed class DefibrillatorSystem : EntitySystem
             }
         }
 
-        var sound = dead || session == null
+        var sound = !alive && (dead || session == null) // WD EDIT
             ? component.FailureSound
             : component.SuccessSound;
         _audio.PlayPvs(sound, uid);

Content.Shared/Medical/DefibrillatorComponent.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -86,6 +87,10 @@ public sealed partial class DefibrillatorComponent : Component
 
     [ViewVariables(VVAccess.ReadWrite), DataField("readySound")]
     public SoundSpecifier? ReadySound = new SoundPathSpecifier("/Audio/Items/Defib/defib_ready.ogg");
+
+    // WD EDIT
+    [DataField]
+    public EntityWhitelist? EmaggedAttackWhitelist;
 }
 
 [Serializable, NetSerializable]

Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

@@ -27,6 +27,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
+    [AutoNetworkedField] // WD EDIT
     public bool Hidden;
 
     /// <summary>
@@ -75,10 +76,10 @@ public sealed partial class MeleeWeaponComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public bool CanMiss;
 
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? AttackWhitelist;
 
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? AttackBlacklist;
 
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]

Content.Shared/_White/Item/DefibEmagSystem.cs

@@ -0,0 +1,50 @@
+using Content.Shared._White.Item.DelayedKnockdown;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
+using Content.Shared.Emag.Systems;
+using Content.Shared.Medical;
+using Content.Shared.Weapons.Melee;
+using Robust.Shared.Audio;
+
+namespace Content.Shared._White.Item;
+
+public sealed class DefibEmagSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DefibrillatorComponent, GotEmaggedEvent>(OnEmag);
+    }
+
+    private void OnEmag(Entity<DefibrillatorComponent> ent, ref GotEmaggedEvent args)
+    {
+        var (uid, comp) = ent;
+        comp.ZapDamage = 55;
+        comp.ZapDelay = TimeSpan.FromSeconds(1);
+        comp.WritheDuration = TimeSpan.FromSeconds(6);
+        var meleeWeapon = new MeleeWeaponComponent
+        {
+            Hidden = true,
+            AttackRate = 0.2f,
+            CanHeavyAttack = false,
+            AttackWhitelist = comp.EmaggedAttackWhitelist,
+            EquipCooldown = 1f,
+            Damage = new DamageSpecifier()
+        };
+        var delayedKnockdown = new DelayedKnockdownOnHitComponent
+        {
+            Delay = TimeSpan.Zero,
+            KnockdownTime = TimeSpan.FromSeconds(1.5)
+        };
+        var staminaDamage = new StaminaDamageOnHitComponent
+        {
+            Damage = 60f,
+            Sound = new SoundCollectionSpecifier("sparks")
+        };
+        AddComp(uid, meleeWeapon, true);
+        AddComp(uid, delayedKnockdown, true);
+        AddComp(uid, staminaDamage, true);
+        args.Handled = true;
+    }
+}

Content.Shared/_White/Item/DelayedKnockdown/DelayedKnockdownOnHitSystem.cs

@@ -26,6 +26,8 @@ public sealed class DelayedKnockdownOnHitSystem : EntitySystem
     {
         var jitterTime = ent.Comp.JitterTime;
         var stutterTime = ent.Comp.StutterTime;
+        var delay = ent.Comp.Delay;
+        var knockdownTime = ent.Comp.KnockdownTime;
         foreach (var (uid, _) in args.HitList)
         {
             if (!TryComp(uid, out StatusEffectsComponent? statusEffects))
@@ -38,12 +40,17 @@ public sealed class DelayedKnockdownOnHitSystem : EntitySystem
                 _jitter.DoJitter(uid, jitterTime, true, status: statusEffects);
             if (stutterTime > TimeSpan.Zero)
                 _stutter.DoStutter(uid, stutterTime, true, statusEffects);
+            if (delay <= TimeSpan.Zero)
+            {
+                _stun.TryKnockdown(uid, knockdownTime, true, statusEffects);
+                continue;
+            }
             if (HasComp<KnockedDownComponent>(uid))
                 continue;
             var delayedKnockdown = EnsureComp<DelayedKnockdownComponent>(uid);
-            delayedKnockdown.KnockdownTime = TimeSpan.FromSeconds(Math.Max(ent.Comp.KnockdownTime.TotalSeconds,
+            delayedKnockdown.KnockdownTime = TimeSpan.FromSeconds(Math.Max(knockdownTime.TotalSeconds,
                 delayedKnockdown.KnockdownTime.TotalSeconds));
-            var knockdownMoment = _timing.CurTime + ent.Comp.Delay;
+            var knockdownMoment = _timing.CurTime + delay;
             if (knockdownMoment < delayedKnockdown.KnockdownMoment)
                 delayedKnockdown.KnockdownMoment = knockdownMoment;
         }

Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml

@@ -35,6 +35,9 @@
       zapHeal:
         types:
           Asphyxiation: -40
+      emaggedAttackWhitelist:
+        components:
+        - Stamina
     - type: DoAfter
     - type: UseDelay
     - type: StaticPrice