- Ion storms now ask you if you want to send a report to the crew or not

- Added JMP and CA actions to adminhelps and prayers.
- - JMP is an "observe and jump to mob" command
- - CA is a shortcut to the "check antagonists" page, only appears with adminhelps, not prayers.
Screenshot: http://www.kamletos.si/adminhelps%20and%20prayers.PNG
- Jump to mob will no longer teleport you into the abyss if the mob's been destroyed between the link being sent and you clicking it.



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

code/game/gamemodes/events.dm

@@ -485,7 +485,4 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 
 	world << "Ion Storm Main Done"
 
-	*/
+	*/
-
-//	command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
-//	world << sound('ionstorm.ogg')

code/modules/admin/admin.dm

@@ -773,6 +773,22 @@
 					var/client/cl = MO.client
 					cl.cmd_admin_subtle_message(M)
 
+	if (href_list["adminplayerobservejump"])
+		var/mob/M = locate(href_list["adminplayerobservejump"])
+		if(src && src.owner)
+			if(istype(src.owner,/client))
+				var/client/cl = src.owner
+				cl.admin_observe()
+				sleep(2)
+				cl.jumptomob(M)
+			else if(ismob(src.owner))
+				var/mob/MO = src.owner
+				if(MO.client)
+					var/client/cl = MO.client
+					cl.admin_observe()
+					sleep(2)
+					cl.jumptomob(M)
+
 
 	if (href_list["jumpto"])
 		if(rank in list("Badmin", "Game Admin", "Game Master"))
@@ -1367,6 +1383,10 @@
 					if (src.rank in list("Badmin","Game Admin", "Game Master"))
 						IonStorm()
 						message_admins("[key_name_admin(usr)] triggered an ion storm")
+						var/show_log = alert(usr, "Show ion message?", "Message", "Yes", "No")
+						if(show_log == "Yes")
+							command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
+							world << sound('ionstorm.ogg')
 					else
 						alert("You cannot perform this action. You must be of a higher administrative rank!")
 						return

code/modules/admin/verbs/adminhelp.dm

@@ -15,7 +15,7 @@
 
 	for (var/mob/M in world)
 		if (M.client && M.client.holder)
-			M << "\blue <b><font color=red>HELP: </font>[key_name(src, M)] (<A HREF='?src=\ref[M.client.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[M.client.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[M.client.holder];adminplayersubtlemessage=\ref[src]'>SM</A>):</b> [msg]"
+			M << "\blue <b><font color=red>HELP: </font>[key_name(src, M)] (<A HREF='?src=\ref[M.client.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[M.client.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[M.client.holder];adminplayersubtlemessage=\ref[src]'>SM</A>) (<A HREF='?src=\ref[M.client.holder];adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?src=\ref[M.client.holder];secretsadmin=check_antagonist'>CA</A>):</b>[msg]"
 
 	usr << "Your message has been broadcast to administrators."
 	log_admin("HELP: [key_name(src)]: [msg]")

code/modules/admin/verbs/adminjump.dm

@@ -39,7 +39,13 @@
 	if(config.allow_admin_jump)
 		log_admin("[key_name(usr)] jumped to [key_name(M)]")
 		message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1)
-		usr.loc = get_turf(M)
+		if(src.mob)
+			var/mob/A = src.mob
+			var/turf/T = get_turf(M)
+			if(T && isturf(T))
+				A.loc = T
+			else
+				A << "This mob is not located in the game world."
 	else
 		alert("Admin jumping disabled")
 

code/modules/admin/verbs/pray.dm

@@ -13,9 +13,11 @@
 	if (usr.muted)
 		return
 
+	var/icon/cross = icon('storage.dmi',"bible")
+
 	for (var/mob/M in world)
 		if (M.client && M.client.holder && M.client.seeprayers)
-			M << "\blue <b><font color=purple>PRAY: </font>[key_name(src, M)] (<A HREF='?src=\ref[M.client.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[M.client.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[M.client.holder];adminplayersubtlemessage=\ref[src]'>SM</A>):</b> [msg]"
+			M << "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, M)] (<A HREF='?src=\ref[M.client.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[M.client.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[M.client.holder];adminplayersubtlemessage=\ref[src]'>SM</A>)(<A HREF='?src=\ref[M.client.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[M.client.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[M.client.holder];adminplayersubtlemessage=\ref[src]'>SM</A>):</b> [msg]"
 
 	usr << "Your prayers have been received by the gods."
 	//log_admin("HELP: [key_name(src)]: [msg]")

code/modules/admin/verbs/randomverbs.dm

@@ -159,6 +159,11 @@
 	log_admin("[key_name(src)] has added a random AI law.")
 	message_admins("[key_name_admin(src)] has added a random AI law.", 1)
 
+	var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
+	if(show_log == "Yes")
+		command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
+		world << sound('ionstorm.ogg')
+
 	IonStorm(0)
 
  /*
@@ -468,8 +473,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	log_admin("Admin [key_name(usr)] has added a new AI law - [input]")
 	message_admins("Admin [key_name_admin(usr)] has added a new AI law - [input]", 1)
-//	command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
+
-//	world << sound('ionstorm.ogg')
+	var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
+	if(show_log == "Yes")
+		command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
+		world << sound('ionstorm.ogg')
 
 /client/proc/cmd_admin_rejuvenate(mob/living/M as mob in world)
 	set category = "Special Verbs"
@@ -759,6 +767,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		src << "Only administrators may use this command."
 		return
 
+	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
+	if(confirm != "Yes") return
+
 	if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "confliction")
 		var/choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel")
 		if(choice == "Confirm")
@@ -783,6 +794,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		src << "Only administrators may use this command."
 		return
 
+	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
+	if(confirm != "Yes") return
+
 	emergency_shuttle.recall()
 
 	return