diff --git a/Content.Server/Supermatter/Components/SupermatterComponent.cs b/Content.Server/Supermatter/Components/SupermatterComponent.cs index f356abe6f67..5e699e9a496 100644 --- a/Content.Server/Supermatter/Components/SupermatterComponent.cs +++ b/Content.Server/Supermatter/Components/SupermatterComponent.cs @@ -49,7 +49,7 @@ public sealed partial class SupermatterComponent : Component public readonly string SliverPrototype = "SupermatterSliver"; [DataField("zapSound")] - public static SoundSpecifier SupermatterZapSound = new SoundPathSpecifier("/Audio/Weapons/emitter2.ogg"); + public SoundSpecifier SupermatterZapSound = new SoundPathSpecifier("/Audio/Weapons/emitter2.ogg"); [DataField("calmAmbienceSound")] public SoundSpecifier CalmAmbienceSound = new SoundPathSpecifier("/Audio/Ambience/Objects/supermatter_calm.ogg"); @@ -60,9 +60,6 @@ public sealed partial class SupermatterComponent : Component [ViewVariables] public SoundSpecifier CurrentAmbience = new SoundPathSpecifier("/Audio/Ambience/Objects/supermatter_calm.ogg"); - [DataField("vaporizeSound")] - public static SoundSpecifier VaporizeSound = new SoundPathSpecifier("/Audio/Effects/Grenades/Supermatter/supermatter_start.ogg"); - [DataField("teslaSpawnPrototype")] public string TeslaPrototype = "TeslaEnergyBall"; diff --git a/Content.Server/Supermatter/EntitySystems/SupermatterSystem.cs b/Content.Server/Supermatter/EntitySystems/SupermatterSystem.cs index 78ebe7f50b3..9cf96ba5c73 100644 --- a/Content.Server/Supermatter/EntitySystems/SupermatterSystem.cs +++ b/Content.Server/Supermatter/EntitySystems/SupermatterSystem.cs @@ -28,6 +28,7 @@ using Content.Server.Kitchen.Components; using Content.Shared.Singularity.Components; using System; +using Robust.Shared.Audio; namespace Content.Server.Supermatter.EntitySystems; @@ -49,6 +50,9 @@ public sealed class SupermatterSystem : EntitySystem [Dependency] private readonly DoAfterSystem _doAfter = default!; [Dependency] private readonly ExplosionSystem _explosion = default!; + public static SoundSpecifier VaporizeSound = + new SoundPathSpecifier("/Audio/Effects/Grenades/Supermatter/supermatter_start.ogg"); + public override void Initialize() { base.Initialize(); @@ -310,7 +314,7 @@ private void Vaporize(EntityUid uid, EntityUid smUid) if (TryComp(smUid, out var sm)) sm.AVExternalDamage += 1f; - _sound.PlayPvs(SupermatterComponent.VaporizeSound, smUid); + _sound.PlayPvs(VaporizeSound, smUid); EntityManager.QueueDeleteEntity(uid); // getting discombobulated by the SM is the same as permanent round removal so why not log that