diff --git a/.gitignore b/.gitignore index 0686354bc83..97a5911fdbc 100644 --- a/.gitignore +++ b/.gitignore @@ -301,3 +301,4 @@ Resources/MapImages /Content.Docfx/api/ /Content.Docfx/*site +*.bak diff --git a/Content.Server/Nuke/NukeComponent.cs b/Content.Server/Nuke/NukeComponent.cs index 2d91af1f6ed..728998af5ef 100644 --- a/Content.Server/Nuke/NukeComponent.cs +++ b/Content.Server/Nuke/NukeComponent.cs @@ -79,7 +79,7 @@ public sealed class NukeComponent : SharedNukeComponent public SoundSpecifier DisarmSound = new SoundPathSpecifier("/Audio/Misc/notice2.ogg"); [DataField("armMusic")] - public SoundSpecifier ArmMusic = new SoundPathSpecifier("/Audio/StationEvents/countdown.ogg"); + public SoundSpecifier ArmMusic = new SoundCollectionSpecifier("NukeMusic"); // These datafields here are duplicates of those in explosive component. But I'm hesitant to use explosive // component, just in case at some point, somehow, when grenade crafting added in someone manages to wire up a diff --git a/Resources/Audio/StationEvents/attributions.yml b/Resources/Audio/StationEvents/attributions.yml new file mode 100644 index 00000000000..1972bc1287c --- /dev/null +++ b/Resources/Audio/StationEvents/attributions.yml @@ -0,0 +1,4 @@ +- files: ["running_out.ogg"] + license: "CC-BY-3.0" + copyright: "Created by Bolgarich" + source: "https://www.youtube.com/watch?v=SzEp2nv6oZ4" diff --git a/Resources/Audio/StationEvents/running_out.ogg b/Resources/Audio/StationEvents/running_out.ogg new file mode 100644 index 00000000000..3b64a230542 Binary files /dev/null and b/Resources/Audio/StationEvents/running_out.ogg differ diff --git a/Resources/Prototypes/SoundCollections/NukeMusic.yml b/Resources/Prototypes/SoundCollections/NukeMusic.yml new file mode 100644 index 00000000000..3d33fadc128 --- /dev/null +++ b/Resources/Prototypes/SoundCollections/NukeMusic.yml @@ -0,0 +1,5 @@ +- type: soundCollection + id: NukeMusic + files: + - /Audio/StationEvents/running_out.ogg + - /Audio/StationEvents/countdown.ogg