Merge branch 'master' into upstream-merge-29747

code/game/gamemodes/nuclear/nuclear.dm

@@ -288,7 +288,7 @@
 		text += "<br>"
 		text += "(Syndicates used [TC_uses] TC) [purchases]"
 		if(TC_uses == 0 && station_was_nuked && !are_operatives_dead())
-			text += "<BIG>[bicon(icon('icons/badass.dmi', "badass"))]</BIG>"
+			text += "<BIG>[icon2html('icons/badass.dmi', world, "badass")]</BIG>"
 		to_chat(world, text)
 	return 1
 

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -420,8 +420,7 @@
 	yes_code = FALSE
 	safety = TRUE
 	update_icon()
-	for(var/mob/M in GLOB.player_list)
-		M << 'sound/machines/alarm.ogg'
+	sound_to_playing_players('sound/machines/alarm.ogg')
 	if(SSticker && SSticker.mode)
 		SSticker.mode.explosion_in_progress = 1
 	sleep(100)