Zombie virus delayed from 20-30 minutes from rule start. (#16346)

2023-05-16 17:59:39 +12:00
parent 10348fe11d
commit d3b6bb62c0
8 changed files with 120 additions and 19 deletions
--- a/Content.Server/Zombies/ZombifyOnDeathSystem.cs
+++ b/Content.Server/Zombies/ZombifyOnDeathSystem.cs
@@ -232,7 +232,8 @@ namespace Content.Server.Zombies
            }
            RemComp<HandsComponent>(target);
            // No longer waiting to become a zombie:
-            RemComp<PendingZombieComponent>(target);
+            // Requires deferral because this is (probably) the event which called ZombifyEntity in the first place.
+            RemCompDeferred<PendingZombieComponent>(target);

            //zombie gamemode stuff
            RaiseLocalEvent(new EntityZombifiedEvent(target));