]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
add new music for nuke (#15035)
authorpofitlo <107665898+pofitlo@users.noreply.github.com>
Sat, 29 Apr 2023 08:57:59 +0000 (12:57 +0400)
committerGitHub <noreply@github.com>
Sat, 29 Apr 2023 08:57:59 +0000 (18:57 +1000)
.gitignore
Content.Server/Nuke/NukeComponent.cs
Resources/Audio/StationEvents/attributions.yml [new file with mode: 0644]
Resources/Audio/StationEvents/running_out.ogg [new file with mode: 0644]
Resources/Prototypes/SoundCollections/NukeMusic.yml [new file with mode: 0644]

index 0686354bc83f26b09414ed17f19c20af0450f017..97a5911fdbcae1ae057a8c15d899f8d89bfaf7fc 100644 (file)
@@ -301,3 +301,4 @@ Resources/MapImages
 /Content.Docfx/api/
 /Content.Docfx/*site
 
+*.bak
index 2d91af1f6ed0a5f02906d0b20b0839b53a27d750..728998af5efd7f31e9a1bdc86cb45f568bb6a511 100644 (file)
@@ -79,7 +79,7 @@ namespace Content.Server.Nuke
         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 (file)
index 0000000..1972bc1
--- /dev/null
@@ -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 (file)
index 0000000..3b64a23
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 (file)
index 0000000..3d33fad
--- /dev/null
@@ -0,0 +1,5 @@
+- type: soundCollection
+  id: NukeMusic
+  files:
+    - /Audio/StationEvents/running_out.ogg
+    - /Audio/StationEvents/countdown.ogg