-
Notifications
You must be signed in to change notification settings - Fork 335
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.
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
Monotheonist
wants to merge
5
commits into
DeltaV-Station:master
Choose a base branch
from
Monotheonist:I-feel-like-an-atom-bomb
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+16
−0
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
29e3003
The entire rigamarole
Monotheonist c4059d9
A small oopsie
Monotheonist 0483486
This should fix every error in the fucking world ever :3
Monotheonist 04cdc8f
Send Electronic M
Monotheonist 967839f
Fixes the space, clarifies the copyright to make it more evident that…
Monotheonist File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
- files: ["Red_Vox_-_Atom_Bomb.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." | ||
source: "https://vine.bandcamp.com/track/atom-bomb" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Garbage Land
Space Asshole
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.)