Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649)

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/mob/new_player/new_player.dm

@@ -173,6 +173,9 @@
 				return 1
 
 		if(href_list["late_join"])
+			if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
+				usr << "/red The round is either not ready, or has already finished..."
+				return
 			LateChoices()
 
 		if(href_list["manifest"])