cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 15:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Browse Source 
Conflicts:
	code/game/gamemodes/gameticker.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-01-08 23:06:45 +10:00
parent 2ad36df02a 8d1f1d8c00
commit 6aa245f716
6 changed files with 6 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/gamemodes/gameticker.dm
View File

@@ -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 << "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>"

3
code/modules/mining/mine_areas.dm
View File

@@ -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"