Skip to content

Commit

Permalink
add new music for nuke (#15035)
Browse files Browse the repository at this point in the history
  • Loading branch information
pofitlo authored Apr 29, 2023
1 parent 53c59f6 commit 447f08b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -301,3 +301,4 @@ Resources/MapImages
/Content.Docfx/api/
/Content.Docfx/*site

*.bak
2 changes: 1 addition & 1 deletion Content.Server/Nuke/NukeComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Resources/Audio/StationEvents/attributions.yml
Original file line number Diff line number Diff line change
@@ -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"
Binary file added Resources/Audio/StationEvents/running_out.ogg
Binary file not shown.
5 changes: 5 additions & 0 deletions Resources/Prototypes/SoundCollections/NukeMusic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: soundCollection
id: NukeMusic
files:
- /Audio/StationEvents/running_out.ogg
- /Audio/StationEvents/countdown.ogg

0 comments on commit 447f08b

Please sign in to comment.