diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index c8481e53a24..32eda4be3de 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -37,10 +37,9 @@ var/global/datum/controller/gameticker/ticker var/triai = 0//Global holder for Triumvirate /datum/controller/gameticker/proc/pregame() - login_music = pick('sound/ambience/title1.ogg','sound/ambience/title2.ogg') // choose title music! - for(var/mob/new_player/M in mob_list) - if(M.client) M.client.playtitlemusic() - + login_music = pick('sound/ambience/title1.ogg','sound/ambience/title2.ogg','sound/ambience/b12_combined_start.ogg') // choose title music! +/* for(var/mob/new_player/M in mob_list) + if(M.client) M.client.playtitlemusic()*/ do pregame_timeleft = 180 world << "Welcome to the pre-game lobby!" diff --git a/code/modules/mining/mine_areas.dm b/code/modules/mining/mine_areas.dm index 8e02f5a19b5..0a8b01bb194 100644 --- a/code/modules/mining/mine_areas.dm +++ b/code/modules/mining/mine_areas.dm @@ -2,16 +2,15 @@ /area/mine icon_state = "mining" + music = 'sound/ambience/song_game.ogg' /area/mine/explored name = "Mine" icon_state = "explored" - music = null /area/mine/unexplored name = "Mine" icon_state = "unexplored" - music = null /area/mine/lobby name = "Mining station" diff --git a/sound/ambience/b12_combined_start.ogg b/sound/ambience/b12_combined_start.ogg new file mode 100644 index 00000000000..d3898aa4d08 Binary files /dev/null and b/sound/ambience/b12_combined_start.ogg differ diff --git a/sound/ambience/song_game.ogg b/sound/ambience/song_game.ogg new file mode 100644 index 00000000000..16b85f662f1 Binary files /dev/null and b/sound/ambience/song_game.ogg differ