diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index a6b249a7dde..4c9d2758d33 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -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' ) diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 6a2ae28ff48..509e4df92bf 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -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'), diff --git a/html/changelogs/KingOfThePing - 20811.yml b/html/changelogs/KingOfThePing - 20811.yml new file mode 100644 index 00000000000..5b641dc198d --- /dev/null +++ b/html/changelogs/KingOfThePing - 20811.yml @@ -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." diff --git a/sound/music/licensing_information.txt b/sound/music/licensing_information.txt index 6b20a91842f..64811652a11 100644 --- a/sound/music/licensing_information.txt +++ b/sound/music/licensing_information.txt @@ -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 diff --git a/sound/music/lobby/title3mk2.ogg b/sound/music/lobby/title3mk2.ogg new file mode 100644 index 00000000000..26556c6c30e Binary files /dev/null and b/sound/music/lobby/title3mk2.ogg differ diff --git a/sound/serversound_list.txt b/sound/serversound_list.txt index 134f6cdf63e..7ae5a94a0a9 100644 --- a/sound/serversound_list.txt +++ b/sound/serversound_list.txt @@ -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