Ambient music fixes (#17685)

Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs

@@ -1,9 +1,8 @@
-using Content.Shared.Random;
 using Content.Shared.Salvage;
+using Content.Shared.Salvage.Expeditions;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Server.Salvage.Expeditions;
@@ -12,7 +11,7 @@ namespace Content.Server.Salvage.Expeditions;
 /// Designates this entity as holding a salvage expedition.
 /// </summary>
 [RegisterComponent]
-public sealed class SalvageExpeditionComponent : Component
+public sealed class SalvageExpeditionComponent : SharedSalvageExpeditionComponent
 {
     public SalvageMissionParams MissionParams = default!;
 
@@ -36,9 +35,6 @@ public sealed class SalvageExpeditionComponent : Component
 
     [ViewVariables] public bool Completed = false;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("stage")]
-    public ExpeditionStage Stage = ExpeditionStage.Added;
-
     /// <summary>
     /// Countdown audio stream.
     /// </summary>
@@ -50,7 +46,7 @@ public sealed class SalvageExpeditionComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("sound")]
     public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Misc/tension_session.ogg")
     {
-        Params = AudioParams.Default.WithVolume(-15),
+        Params = AudioParams.Default.WithVolume(-5),
     };
 
     /// <summary>
@@ -65,12 +61,3 @@ public sealed class SalvageExpeditionComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("rewards", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
     public List<string> Rewards = default!;
 }
-
-public enum ExpeditionStage : byte
-{
-    Added,
-    Running,
-    Countdown,
-    MusicCountdown,
-    FinalCountdown,
-}