From 0171c3bd9334fc77cddc38720218fdea8b360364 Mon Sep 17 00:00:00 2001 From: Hugal31 Date: Thu, 28 May 2020 13:02:06 +0200 Subject: [PATCH] Fix rifles making sound on spawn (#1021) --- .../Ranged/Projectile/BallisticMagazineWeaponComponent.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs index 6ebdcdd3b4..83f3a85609 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs @@ -103,7 +103,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { return false; } - if (_magInSound != null) + if (_magInSound != null && playSound) { Owner.GetComponent().Play(_magInSound); } @@ -132,7 +132,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile if (_magazineSlot.Remove(entity)) { entity.Transform.GridPosition = Owner.Transform.GridPosition; - if (_magOutSound != null) + if (_magOutSound != null && playSound) { Owner.GetComponent().Play(_magOutSound, AudioParams.Default.WithVolume(20)); }