Merge branch 'master' of https://github.com/Baystation12/Baystation12

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

code/game/machinery/computer/crew.dm

@@ -29,7 +29,7 @@
 /obj/machinery/computer/crew/update_icon()
 
 	if(stat & BROKEN)
-		icon_state = "broken"
+		icon_state = "crewb"
 	else
 		if(stat & NOPOWER)
 			src.icon_state = "c_unpowered"