diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 305687656be..f5091564527 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -39,7 +39,8 @@ var/global/datum/controller/gameticker/ticker
 /datum/controller/gameticker/proc/pregame()
 	login_music = pick(\
 	'sound/music/space.ogg',\
-	'sound/music/traitor.ogg')
+	'sound/music/traitor.ogg',\
+	'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on?
 	do
 		pregame_timeleft = 180
 		world << "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>"
diff --git a/code/world.dm b/code/world.dm
index 1a85ada9ba6..d72ec0c02a8 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -155,9 +155,9 @@
 
 
 /world/Reboot(var/reason)
-	spawn(0)
+	/*spawn(0)
 		world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')) // random end sounds!! - LastyBatsy
-
+		*/
 	for(var/client/C in clients)
 		if(config.server)	//if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
 			C << link("byond://[config.server]")
diff --git a/sound/music/THUNDERDOME.ogg b/sound/music/THUNDERDOME.ogg
deleted file mode 100644
index 0a36b251b79..00000000000
Binary files a/sound/music/THUNDERDOME.ogg and /dev/null differ
diff --git a/sound/music/space_oddity.ogg b/sound/music/space_oddity.ogg
new file mode 100644
index 00000000000..8baa94c0432
Binary files /dev/null and b/sound/music/space_oddity.ogg differ