diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs index a7442680b2a..0521a057c32 100644 --- a/Content.Server/Zombies/ZombieSystem.cs +++ b/Content.Server/Zombies/ZombieSystem.cs @@ -13,6 +13,7 @@ using Content.Shared.Damage; using Content.Shared.Humanoid; using Content.Shared.Inventory; +using Content.Shared.Mech.Components; // Sunrise-Edit using Content.Shared.Mind; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; @@ -352,6 +353,13 @@ private void OnMeleeHit(EntityUid uid, ZombieComponent component, MeleeHitEvent if (args.User == entity) continue; + // Sunrise-Edit-Start + + if (HasComp(entity)) + continue; + + // Sunrise-Edit-End + if (!TryComp(entity, out var mobState)) continue;