Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb

Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

code/modules/admin/secrets.dm

@@ -534,7 +534,9 @@
 			for(var/obj/machinery/capture_the_flag/CTF in machines)
 				ctf_enabled = !CTF.ctf_enabled
 				CTF.ctf_enabled = !CTF.ctf_enabled
+				CTF.TellGhost()
 			message_admins("[key_name_admin(usr)] has [ctf_enabled? "enabled" : "disabled"] CTF!")
+			notify_ghosts("CTF has been [ctf_enabled? "enabled" : "disabled"]!",'sound/effects/ghost2.ogg')
 
 	if(E)
 		E.processing = 0

code/modules/admin/verbs/playsound.dm

@@ -26,8 +26,6 @@ var/sound/admin_sound
 		
 	for(var/mob/M in player_list)
 		if(M.client.prefs.toggles & SOUND_MIDI)
-			var/vol = M.client.prefs.adminmusicvolume
-			admin_sound.volume = vol
 			M << admin_sound
 			
 	feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!