Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds two songs to different areas in the game entirely. #2514

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+21 −0
Open

Adds two songs to different areas in the game entirely. #2514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29e3003
The entire rigamarole
Monotheonist Dec 23, 2024
c4059d9
A small oopsie
Monotheonist Dec 23, 2024
0483486
This should fix every error in the fucking world ever :3
Monotheonist Dec 23, 2024
04cdc8f
Send Electronic M
Monotheonist Dec 23, 2024
967839f
Fixes the space, clarifies the copyright to make it more evident that…
Monotheonist Dec 23, 2024
0e0992e
The grand shuffle of this to the jukebox
Monotheonist Dec 24, 2024
917b592
So the linter stops shitting itself
Monotheonist Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Resources/Audio/DeltaV/Jukebox/Red_Vox_-_Atom_Bomb-MONO.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/DeltaV/Jukebox/Red_Vox_-_Garbage_Land_MONO.ogg
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Resources/Audio/DeltaV/Jukebox/attributions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
copyright: "MEL -Aggravated Assault by melcom, converted to mono"
source: "https://modarchive.org/index.php?request=view_by_moduleid&query=176234"

- files: ["Red_Vox_-_Atom_Bomb-MONO.ogg"]
license: "Custom"
copyright: "Atom Bomb by Red Vox is used with special permission from the author, and may be used non-commercially in the Delta-V fork of SS14. Converted to mono for the sake of it sounding good in the jukebox."
source: "https://vine.bandcamp.com/track/atom-bomb"

- files: ["autumnal_equinox.xm-MONO.ogg"]
license: "CC-BY-NC-4.0"
copyright: "Autumnal Equinox by lemonade, converted to mono"
Expand Down Expand Up @@ -41,6 +46,11 @@
copyright: "every light blinking at once by Sunbeamstress, converted to mono"
source: "https://soundcloud.com/sunbeamstress/every-light-is-blinking-at-once"

- files: ["Red_Vox_-_Garbage Land_MONO.ogg"]
license: "Custom"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

get a concrete license from them like CC-BY-NC-SA-3.0 (attribution, non commercial, share alike) which is similar to the loose terms given

Copy link
Contributor Author

@Monotheonist Monotheonist Dec 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
Garbage Land
image
Space Asshole
image
DOS=HIGH, UMB
On the bandcamp pages for this song, Space Asshole, and DOS=HIGH, UMB, they're all already under an "all rights reserved" license, which is a concrete license, and all of them are put under Custom because they are all used in the game with permission from the artist.
I'll change the file to clarify such if needed for both, though I did get Red Vox to agree to using it non commercially with credit here, and I had to edit the song for the sake of it sounding decent in the jukebox.
That being said, please keep in mind that these two songs are All Rights Reserved and they NEED to be licensed under "Custom" because to my knowledge, attributions YAML shits itself if you aren't using a very specific CC license (hell, another good example is if you're using public domain CC 0, like Leisurely Voice, it won't work.)

copyright: "Garbage Land by Red Vox is used with special permission from the author, and may be used non-commercially in the Delta-V fork of SS14. Converted to mono for the sake of it sounding good in the jukebox."
source: "https://vine.bandcamp.com/track/garbage-land"

- files: ["hackers-MONO.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Hackers by Karl Casey @ White Bat Audio, converted to mono"
Expand Down
Binary file added Resources/Audio/DeltaV/StationEvents/Red_Vox_-_Atom_Bomb_INSTRUMENTAL.ogg
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions Resources/Audio/DeltaV/StationEvents/attributions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["Red_Vox_-_Atom_Bomb_INSTRUMENTAL.ogg"]
license: "Custom"
copyright: "Atom Bomb by Red Vox is used with special permission from the author, and may be used non-commercially in the Delta-V fork of SS14. Instrumentals were isolated by Pixelrino."
source: "https://vine.bandcamp.com/track/atom-bomb"
6 changes: 6 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Jukebox/Standard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@
path:
path: /Audio/DeltaV/Jukebox/every_light_is_blinking_at_onceMONO.ogg

- type: jukebox
id: GarbageLandRV
name: Red Vox - Garbage Land
path:
path: /Audio/DeltaV/Jukebox/Red_Vox_-_Garbage_Land_MONO.ogg

- type: jukebox
id: KCHaxors
name: Karl Casey @ White Bat Audio - Hackers
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/SoundCollections/NukeMusic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
- /Audio/StationEvents/countdown.ogg
- /Audio/StationEvents/sound_station_14.ogg
- /Audio/StationEvents/nukemass.ogg
- /Audio/DeltaV/StationEvents/Red_Vox_-_Atom_Bomb_INSTRUMENTAL.ogg # DeltaV - We gained permission to use this one from the artist.
Loading