diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index 15a4a52ae5..c6629c5e7c 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -40,6 +40,11 @@ namespace Content.Shared.Projectiles if (component.RemovalTime == null) return; + if (args.Handled || !TryComp(uid, out var physics) || physics.BodyType != BodyType.Static) + return; + + args.Handled = true; + _doAfter.TryStartDoAfter(new DoAfterArgs(args.User, component.RemovalTime.Value, new RemoveEmbeddedProjectileEvent(), eventTarget: uid, target: uid) {