Merge branch 'master' into replace-sounds-with-sound-specifier

2021-08-10 15:05:49 -07:00
parent aa7606cf42 9f64592a40
commit a1db43ab34
183 changed files with 5472 additions and 2022 deletions
--- a/Content.Server/Explosion/TriggerSystem.cs
+++ b/Content.Server/Explosion/TriggerSystem.cs
@@ -112,6 +112,7 @@ namespace Content.Server.Explosion

            Timer.Spawn(delay, () =>
            {
+                if (triggered.Deleted) return;
                Trigger(triggered, user);
            });
        }