Merge branch 'master' into vg-parallax

code/controllers/configuration.dm

@@ -177,6 +177,8 @@
 	var/disable_lobby_music = 0 // Disables the lobby music
 	var/disable_cid_warn_popup = 0 //disables the annoying "You have already logged in this round, disconnect or be banned" popup, because it annoys the shit out of me when testing.
 
+	var/max_loadout_points = 5 // How many points can be spent on extra items in character setup
+
 /datum/configuration/New()
 	var/list/L = subtypesof(/datum/game_mode)
 	for (var/T in L)
@@ -552,6 +554,9 @@
 				if("disable_cid_warn_popup")
 					config.disable_cid_warn_popup = 1
 
+				if("max_loadout_points")
+					config.max_loadout_points = text2num(value)
+
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 

code/controllers/voting.dm

@@ -229,11 +229,11 @@ datum/controller/vote
 			to_chat(world, "<font color='purple'><b>[text]</b>\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote.</font>")
 			switch(vote_type)
 				if("crew_transfer")
-					to_chat(world, sound('sound/ambience/alarm4.ogg'))
+					world << sound('sound/ambience/alarm4.ogg')
 				if("gamemode")
-					to_chat(world, sound('sound/ambience/alarm4.ogg'))
+					world << sound('sound/ambience/alarm4.ogg')
 				if("custom")
-					to_chat(world, sound('sound/ambience/alarm4.ogg'))
+					world << sound('sound/ambience/alarm4.ogg')
 			if(mode == "gamemode" && going)
 				going = 0
 				to_chat(world, "<font color='red'><b>Round start has been delayed.</b></font>")