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.

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 6 commits into
base: master
Choose a base branch
from

Conversation

Monotheonist
Copy link
Contributor

@Monotheonist Monotheonist commented Dec 23, 2024

About the PR

Adds two songs from the band Red Vox, Garbage Land and Atom Bomb respectively. Red Vox fans, rejoice.

Why / Balance

I really like this band and I decided to email their frontman (Vinny) about if I was allowed to use it, and he said "Sure, have fun!"
Garbage Land I can sort of see fitting in the game if it wasn't centered on New York, Atom Bomb seemed like a good candidate for a "let's blow up the station" song for the title and just the concept of the song, really.
This would not affect game balance in the slightest other than giving us banger tunes.

Technical details

  • Adds another section to attributions.yml for the jukebox to credit a new track, "Garbage Land."

  • Also adds a new DeltaV/StationEvents folder in the audio section, if we ever want to add more custom nuke-explosion songs. Only files in there are Atom Bomb and the new attributions.yml.

  • Edits one upstream file (NukeMusic.yml) to add the new song, "Atom Bomb."

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Makes the upstream merge a little more arduous if there's changes to nuke songs, and will cause merge conflicts. Sorry Deltanedas, let me know if I have to fix it.

Changelog

🆑

  • add: Added Garbage Land by Red Vox, to the jukebox.
  • add: Added new "exploding the station" song, Atom Bomb by Red Vox.

@Monotheonist Monotheonist requested review from a team as code owners December 23, 2024 00:40
@github-actions github-actions bot added size/XS Under 16 lines Changes: YML Changes any yml files Changes: Audio Changes any audio files S: Needs Review labels Dec 23, 2024
@Colin-Tel
Copy link
Contributor

In the changelog, you should specify that Garbage Land is added to the jukebox in particular, as opposed to the lobby or something.

@Monotheonist
Copy link
Contributor Author

Fuck, Colin, you're so fucking right.

@github-actions github-actions bot added size/S 16-63 lines and removed size/XS Under 16 lines labels Dec 23, 2024
@Monotheonist
Copy link
Contributor Author

Monotheonist commented Dec 23, 2024

@Lyndomen meow

@@ -41,6 +41,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

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.)

Resources/Prototypes/SoundCollections/NukeMusic.yml Outdated Show resolved Hide resolved
… the license was All Rights Reserved, which attributions yaml won't support AAAAAAAAAAAAaa
@ThataKat
Copy link
Contributor

Direction is reviewing, get back to you in about 24 hours

@ThataKat
Copy link
Contributor

Heya, we listened to both of these and think they're both pretty cool. Our consensus is that Atom Bomb wouldn't quite fit as a nuke countdown song due to it being highly lyrical (though we would be willing to consider an instrumental version if you'd like to PR that). We'd be happy to have both in the jukebox though. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any audio files Changes: YML Changes any yml files S: Needs Review size/S 16-63 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants