Fixed issue 411. (Thanks Yvarov- http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8651)

Added Invisty's new field generator sprites.

Added a button to check antagonists that stops the world from automatically restarting at round end.
It's toggleable, but once the round ends with it on, you'll need to reboot the world manually. (It's under check antagonists because that's where the shuttle stuff is, let me know if I should move it.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3565 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/gamemodes/gameticker.dm

@@ -29,6 +29,7 @@ var/global/datum/controller/gameticker/ticker
 
 	var/pregame_timeleft = 0
 
+	var/delay_end = 0	//if set to nonzero, the round will not restart on it's own
 
 /datum/controller/gameticker/proc/pregame()
 	login_music = pick('title2.ogg') // choose title music!
@@ -277,17 +278,22 @@ var/global/datum/controller/gameticker/ticker
 			spawn(50)
 				if (mode.station_was_nuked)
 					feedback_set_details("end_proper","nuke")
-					world << "\blue <B>Rebooting due to destruction of station in [restart_timeout/10] seconds</B>"
+					if(!delay_end)
+						world << "\blue <B>Rebooting due to destruction of station in [restart_timeout/10] seconds</B>"
 				else
 					feedback_set_details("end_proper","proper completion")
-					world << "\blue <B>Restarting in [restart_timeout/10] seconds</B>"
+					if(!delay_end)
+						world << "\blue <B>Restarting in [restart_timeout/10] seconds</B>"
 
 
 				if(blackbox)
 					blackbox.save_all_data_to_sql()
 
-				sleep(restart_timeout)
-				world.Reboot()
+				if(!delay_end)
+					sleep(restart_timeout)
+					world.Reboot()
+				else
+					world << "\blue <B>An admin has delayed the round end</B>"
 
 		return 1
 
@@ -304,7 +310,7 @@ var/global/datum/controller/gameticker/ticker
 		if (aiPlayer.connected_robots.len)
 			var/robolist = "<b>The AI's loyal minions were:</b> "
 			for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
-				robolist += "[robo.name][robo.stat?" (Deactivated)  (Played by: [robo.key]), ":",  (Played by: [robo.key])"]"
+				robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]"
 			world << "[robolist]"
 
 	for (var/mob/living/silicon/robot/robo in world)

code/modules/admin/admin.dm

@@ -65,6 +65,12 @@ var/global/BSACooldown = 0
 			alert("You cannot perform this action. You must be of a higher administrative rank!")
 			return
 
+	if(href_list["delay_round_end"])
+		if (src.rank in list("Badmin", "Game Admin", "Game Master"))
+			ticker.delay_end = !ticker.delay_end
+			log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
+			message_admins("\blue [key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
+			href_list["secretsadmin"] = "check_antagonist"
 
 	if(href_list["simplemake"])
 

code/modules/admin/player_panel.dm

@@ -392,7 +392,7 @@
 					dat += "<a href='?src=\ref[src];call_shuttle=2'>Send Back</a><br>"
 				if(1)
 					dat += "ETA: <a href='?src=\ref[src];edit_shuttle_time=1'>[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]</a><BR>"
-
+		dat += "<a href='?src=\ref[src];delay_round_end=1'>[ticker.delay_end ? "End Round Normally" : "Delay Round End"]</a><br>"
 		if(ticker.mode.syndicates.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Syndicates</B></td><td></td></tr>"
 			for(var/datum/mind/N in ticker.mode.syndicates)

code/modules/mob/living/silicon/robot/login.dm

@@ -13,9 +13,10 @@
 		src.real_name += " "
 		src.real_name += "-[ident]"
 		src.name = src.real_name
-	if(!src.connected_ai)
+	/*if(!src.connected_ai)
 		for(var/mob/living/silicon/ai/A in world)
 			src.connected_ai = A
 			A.connected_robots += src
 			break
+	*/
 	return