From 60c1614393e72a2f0fb8543260586a38abd8d673 Mon Sep 17 00:00:00 2001 From: Kara Date: Mon, 2 May 2022 19:53:03 -0700 Subject: [PATCH] Fix pneumatic cannon (#7902) --- Content.Server/PneumaticCannon/PneumaticCannonSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs index dc490334c0..9cf4808c14 100644 --- a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs +++ b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs @@ -225,7 +225,7 @@ namespace Content.Server.PneumaticCannon if (storage.StoredEntities.Count == 0) return; // click sound? var ent = _random.Pick(storage.StoredEntities); - storage.Remove(ent); + _storageSystem.RemoveAndDrop(comp.Owner, ent, storage); SoundSystem.Play(Filter.Pvs(data.User), comp.FireSound.GetSound(), ((IComponent) comp).Owner, AudioParams.Default); if (EntityManager.HasComponent(data.User)) @@ -333,7 +333,7 @@ namespace Content.Server.PneumaticCannon if (storage.StoredEntities == null) return; foreach (var entity in storage.StoredEntities.ToArray()) { - storage.Remove(entity); + _storageSystem.RemoveAndDrop(component.Owner, entity, storage); } user.PopupMessage(Loc.GetString("pneumatic-cannon-component-ejected-all",