mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-31 00:49:06 +01:00
(Re)Adding Soul: Title3 (#20811)
This PR (re?)adds Title3 as possible server music and to the jukebox (not the audiconsoles). This song is as old as the game. Personally I like it a lot and think we can have it for the approx. 3 people who have the lobby music not muted. I used an improved, remixed version of the classic Title3 (originally "Tintin On The Moon", composed by Jeroen Tel), that is better quality and not grating on your ears. Some of you may know this version from SS14. Tested and working locally. All appropiate attributions have been made. It is all marked under (YouTube's) CC BY (reuse allowed) license. ### Asset Licenses The following assets that **have not** been created by myself are included in this PR: | Path | Original Author | License | | sound/music/lobby/title3mk2 | Jeroen Tel (original)/PinkBlossom6 (remix) | CC0 (free reuse) |
This commit is contained in:
@@ -56,6 +56,7 @@ var/datum/controller/subsystem/ticker/SSticker
|
||||
'sound/music/lobby/space.ogg',
|
||||
'sound/music/lobby/traitor.ogg',
|
||||
'sound/music/lobby/title2.ogg',
|
||||
'sound/music/lobby/title3mk2.ogg',
|
||||
'sound/music/lobby/clouds.s3m'
|
||||
)
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
new/datum/track("Beyond", 'sound/music/ambispace.ogg'),
|
||||
new/datum/track("Clouds of Fire", 'sound/music/lobby/clouds.s3m'),
|
||||
new/datum/track("D`Bert", 'sound/music/lobby/title2.ogg'),
|
||||
new/datum/track("Uplift", 'sound/music/lobby/title3mk2.ogg'),
|
||||
new/datum/track("D`Fort", 'sound/music/song_game.ogg'),
|
||||
new/datum/track("Floating", 'sound/music/main.ogg'),
|
||||
new/datum/track("Endless Space", 'sound/music/lobby/space.ogg'),
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# - (fixes bugs)
|
||||
# wip
|
||||
# - (work in progress)
|
||||
# qol
|
||||
# - (quality of life)
|
||||
# soundadd
|
||||
# - (adds a sound)
|
||||
# sounddel
|
||||
# - (removes a sound)
|
||||
# rscadd
|
||||
# - (adds a feature)
|
||||
# rscdel
|
||||
# - (removes a feature)
|
||||
# imageadd
|
||||
# - (adds an image or sprite)
|
||||
# imagedel
|
||||
# - (removes an image or sprite)
|
||||
# spellcheck
|
||||
# - (fixes spelling or grammar)
|
||||
# experiment
|
||||
# - (experimental change)
|
||||
# balance
|
||||
# - (balance changes)
|
||||
# code_imp
|
||||
# - (misc internal code change)
|
||||
# refactor
|
||||
# - (refactors code)
|
||||
# config
|
||||
# - (makes a change to the config files)
|
||||
# admin
|
||||
# - (makes changes to administrator tools)
|
||||
# server
|
||||
# - (miscellaneous changes to server)
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: KingOfThePing, PinkBlossom6
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
|
||||
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- soundadd: "Added the Mk II version of SS13's classic song 'Title3' to the lobby and the jukebox."
|
||||
@@ -68,6 +68,12 @@ Author: Eric Schumaker AKA CBoyardee
|
||||
License: N/A
|
||||
Link: N/A
|
||||
----------
|
||||
File Name: title3mk2.ogg
|
||||
Original Title: Tintin On The Moon
|
||||
Author: Jeroen Tel (original), PinkBlossom6 (Mk. II)
|
||||
License: Creative Commons Attribution License (reuse allowed)
|
||||
Link: Mk I: https://www.youtube.com/watch?v=YKVmXn-Gv0M, Mk II: https://www.youtube.com/watch?v=d7hc_GrZP4Y
|
||||
----------
|
||||
File Name: traitor.ogg
|
||||
Original Title: Absconditus
|
||||
Author: Joseph Toscano AKA Zhaytee
|
||||
|
||||
Binary file not shown.
@@ -9,5 +9,6 @@ sound/music/space.ogg
|
||||
sound/music/thunderdome.ogg
|
||||
sound/music/title1.ogg
|
||||
sound/music/title2.ogg
|
||||
sound/music/title3mk2.ogg
|
||||
sound/music/lobby/traitor.ogg
|
||||
sound/music/velvet_rose.ogg
|
||||
|
||||
Reference in New Issue
Block a user