tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix reptilians pulling after being zombiefied (#23066)

Browse Source 
* 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
This commit is contained in:
Łukasz Mędrek
2024-01-01 23:31:36 +00:00
committed by GitHub
parent 7ac7258b56
commit 3a7fda10df
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Zombies/ZombieSystem.Transform.cs
View File

@@ -29,6 +29,7 @@ using Content.Shared.Nutrition.AnimalHusbandry;
using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.Components;
using Content.Shared.Popups; using Content.Shared.Popups;
using Content.Shared.Roles; using Content.Shared.Roles;
using Content.Shared.Pulling.Components;
using Content.Shared.Tools.Components; using Content.Shared.Tools.Components;
using Content.Shared.Weapons.Melee; using Content.Shared.Weapons.Melee;
using Content.Shared.Zombies; using Content.Shared.Zombies;
@@ -262,6 +263,8 @@ namespace Content.Server.Zombies
RemComp(target, handsComp); RemComp(target, handsComp);
} }
RemComp<SharedPullerComponent>(target);
// No longer waiting to become a zombie: // No longer waiting to become a zombie:
// Requires deferral because this is (probably) the event which called ZombifyEntity in the first place. // Requires deferral because this is (probably) the event which called ZombifyEntity in the first place.
RemCompDeferred<PendingZombieComponent>(target); RemCompDeferred<PendingZombieComponent>(target);