]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
No more passive zombies (#21506)
authorVasilis <vasilis@pikachu.systems>
Wed, 8 Nov 2023 01:27:49 +0000 (02:27 +0100)
committerGitHub <noreply@github.com>
Wed, 8 Nov 2023 01:27:49 +0000 (18:27 -0700)
Content.Server/Zombies/ZombieSystem.Transform.cs

index 3014edd1b9ae44c81ed2118361993fd9718f33ab..18bbd7e7a8eee4e02f7d2daf0416d5f7a80aa736 100644 (file)
@@ -16,6 +16,7 @@ using Content.Server.Roles;
 using Content.Server.Speech.Components;
 using Content.Server.Temperature.Components;
 using Content.Shared.CombatMode;
+using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -106,6 +107,7 @@ namespace Content.Server.Zombies
             //This is needed for stupid entities that fuck up combat mode component
             //in an attempt to make an entity not attack. This is the easiest way to do it.
             var combat = EnsureComp<CombatModeComponent>(target);
+            RemComp<PacifiedComponent>(target);
             _combat.SetCanDisarm(target, false, combat);
             _combat.SetInCombatMode(target, true, combat);