From 3a7fda10df6788d682d2bfe1d25a4fa2a7e24123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20M=C4=99drek?= Date: Mon, 1 Jan 2024 23:31:36 +0000 Subject: [PATCH] Fix reptilians pulling after being zombiefied (#23066) * Fix reptilians pulling after being zombiefied Now being zombefied removes ability to pull objects, regardless of if the entity could pull without using their hands. Fix #23043 * Apply changes from review --- Content.Server/Zombies/ZombieSystem.Transform.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs index cac516407b..40946b6d7f 100644 --- a/Content.Server/Zombies/ZombieSystem.Transform.cs +++ b/Content.Server/Zombies/ZombieSystem.Transform.cs @@ -29,6 +29,7 @@ using Content.Shared.Nutrition.AnimalHusbandry; using Content.Shared.Nutrition.Components; using Content.Shared.Popups; using Content.Shared.Roles; +using Content.Shared.Pulling.Components; using Content.Shared.Tools.Components; using Content.Shared.Weapons.Melee; using Content.Shared.Zombies; @@ -262,6 +263,8 @@ namespace Content.Server.Zombies RemComp(target, handsComp); } + RemComp(target); + // No longer waiting to become a zombie: // Requires deferral because this is (probably) the event which called ZombifyEntity in the first place. RemCompDeferred(target);