Merge pull request #98 from FrisKisDr/cool

Sound
AdventureTimeSS14 · Nov 6, 2023 · 3f66a28 · 3f66a28
2 parents d4f1fcd + 288941f
commit 3f66a28
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 3 deletions.
diff --git a/.github/rsi-schema.json b/.github/rsi-schema.json
@@ -1,7 +1,7 @@
 {
    "$schema":"http://json-schema.org/draft-07/schema",
    "default":{
-      
+
    },
    "description":"JSON Schema for SS14 RSI validation.",
    "examples":[
@@ -104,7 +104,7 @@
       "size":{
          "$id":"#/properties/size",
          "default":{
-            
+
          },
          "description":"The dimensions of the sprites inside the RSI.  This is not the size of the PNG files that store the sprite sheet.",
          "examples":[
@@ -145,7 +145,7 @@
          "title":"Icon States",
          "description":"Metadata for icon states. Includes name, directions, delays, etc.",
          "default":[
-            
+
          ],
          "examples":[
             [

diff --git a/Resources/Audio/ADT/Friskis/blast.ogg b/Resources/Audio/ADT/Friskis/blast.ogg
diff --git a/Resources/Audio/ADT/Friskis/pomehi.ogg b/Resources/Audio/ADT/Friskis/pomehi.ogg
diff --git a/Resources/Audio/ADT/Friskis/trevoga.ogg b/Resources/Audio/ADT/Friskis/trevoga.ogg
diff --git a/Resources/Audio/ADT/Friskis/trevoga2.ogg b/Resources/Audio/ADT/Friskis/trevoga2.ogg
diff --git a/Resources/Audio/Lobby/The_Wrong_Party.ogg b/Resources/Audio/Lobby/The_Wrong_Party.ogg
diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml
@@ -83,3 +83,8 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "The Wrong Party by Leon Riskin."
   source: "https://gamemusicandsoundeffects.com/product/the-wrong-party/"
+
+- files: ["friday_night.ogg"]
+  license: "Custom"
+  copyright: "Friday Night by Leon Riskin. Royalty-free music. Purchased for the Space Station 14: Adventure Time project."
+  source: "https://gamemusicandsoundeffects.com/product/friday-night/"
diff --git a/Resources/Audio/Lobby/friday_night.ogg b/Resources/Audio/Lobby/friday_night.ogg
diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -1,6 +1,7 @@
 - type: soundCollection
   id: LobbyMusic
   files:
+    - /Audio/Lobby/friday_night.ogg
     - /Audio/Lobby/The_Wrong_Party.ogg
     - /Audio/Lobby/thunderdome.ogg
     - /Audio/Lobby/absconditus.ogg