- Check antagonists is now a verb available to anyone who has access to the secrets panel. (Admin Candidate and up)

- set ticklag moved to debug verbs, enabled by calling 'debug verbs' as a game master. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3530 316c924e-a436-60f5-8080-3fe189b3f50e
2025-12-10 18:22:39 +00:00 · 2012-04-30 00:10:11 +00:00
parent 235cc0ff1d
commit d484c5adab
4 changed files with 133 additions and 118 deletions
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1998,121 +1998,7 @@ var/global/BSACooldown = 0
 							dat += "job: [job.title], current_positions: [job.current_positions], total_positions: [job.total_positions] <BR>"
 						usr << browse(dat, "window=jobdebug;size=600x500")
 				if("check_antagonist")
-					if (ticker && ticker.current_state >= GAME_STATE_PLAYING)
-						var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>"
-						dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>"
-						dat += "Round Duration: <B>[round(world.time / 36000)]:[add_zero(world.time / 600 % 60, 2)]:[world.time / 100 % 6][world.time / 100 % 10]</B><BR>"
-						dat += "<B>Emergency shuttle</B><BR>"
-						if (!emergency_shuttle.online)
-							dat += "<a href='?src=\ref[src];call_shuttle=1'>Call Shuttle</a><br>"
-						else
-							var/timeleft = emergency_shuttle.timeleft()
-							switch(emergency_shuttle.location)
-								if(0)
-									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];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>"
-
-						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)
-								var/mob/M = N.current
-								if(M)
-									dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
-									dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
-								else
-									dat += "<tr><td><i>Nuclear Operative not found!</i></td></tr>"
-							dat += "</table><br><table><tr><td><B>Nuclear Disk(s)</B></td></tr>"
-							for(var/obj/item/weapon/disk/nuclear/N in world)
-								dat += "<tr><td>[N.name], "
-								var/atom/disk_loc = N.loc
-								while(!istype(disk_loc, /turf))
-									if(istype(disk_loc, /mob))
-										var/mob/M = disk_loc
-										dat += "carried by <a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a> "
-									if(istype(disk_loc, /obj))
-										var/obj/O = disk_loc
-										dat += "in \a [O.name] "
-									disk_loc = disk_loc.loc
-								dat += "in [disk_loc.loc] at ([disk_loc.x], [disk_loc.y], [disk_loc.z])</td></tr>"
-							dat += "</table>"
-
-						if(ticker.mode.head_revolutionaries.len || ticker.mode.revolutionaries.len)
-							dat += "<br><table cellspacing=5><tr><td><B>Revolutionaries</B></td><td></td></tr>"
-							for(var/datum/mind/N in ticker.mode.head_revolutionaries)
-								var/mob/M = N.current
-								if(!M)
-									dat += "<tr><td><i>Head Revolutionary not found!</i></td></tr>"
-								else
-									dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a> <b>(Leader)</b>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
-									dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
-							for(var/datum/mind/N in ticker.mode.revolutionaries)
-								var/mob/M = N.current
-								if(M)
-									dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
-									dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
-							dat += "</table><table cellspacing=5><tr><td><B>Target(s)</B></td><td></td><td><B>Location</B></td></tr>"
-							for(var/datum/mind/N in ticker.mode.get_living_heads())
-								var/mob/M = N.current
-								if(M)
-									dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
-									dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
-									var/turf/mob_loc = get_turf_loc(M)
-									dat += "<td>[mob_loc.loc]</td></tr>"
-								else
-									dat += "<tr><td><i>Head not found!</i></td></tr>"
-							dat += "</table>"
-
-						if(ticker.mode.changelings.len > 0)
-							dat += "<br><table cellspacing=5><tr><td><B>Changelings</B></td><td></td><td></td></tr>"
-							for(var/datum/mind/changeling in ticker.mode.changelings)
-								var/mob/M = changeling.current
-								if(M)
-									dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
-									dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
-									dat += "<td><A HREF='?src=\ref[src];traitor=\ref[M]'>Show Objective</A></td></tr>"
-								else
-									dat += "<tr><td><i>Changeling not found!</i></td></tr>"
-							dat += "</table>"
-
-						if(ticker.mode.wizards.len > 0)
-							dat += "<br><table cellspacing=5><tr><td><B>Wizards</B></td><td></td><td></td></tr>"
-							for(var/datum/mind/wizard in ticker.mode.wizards)
-								var/mob/M = wizard.current
-								if(M)
-									dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
-									dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
-									dat += "<td><A HREF='?src=\ref[src];traitor=\ref[M]'>Show Objective</A></td></tr>"
-								else
-									dat += "<tr><td><i>Wizard not found!</i></td></tr>"
-							dat += "</table>"
-
-						if(ticker.mode.cult.len)
-							dat += "<br><table cellspacing=5><tr><td><B>Cultists</B></td><td></td></tr>"
-							for(var/datum/mind/N in ticker.mode.cult)
-								var/mob/M = N.current
-								if(M)
-									dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
-									dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
-							dat += "</table>"
-
-						if(ticker.mode.traitors.len > 0)
-							dat += "<br><table cellspacing=5><tr><td><B>Traitors</B></td><td></td><td></td></tr>"
-							for(var/datum/mind/traitor in ticker.mode.traitors)
-								var/mob/M = traitor.current
-								if(M)
-									dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
-									dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
-									dat += "<td><A HREF='?src=\ref[src];traitor=\ref[M]'>Show Objective</A></td></tr>"
-								else
-									dat += "<tr><td><i>Traitor not found!</i></td></tr>"
-							dat += "</table>"
-
-						dat += "</body></html>"
-						usr << browse(dat, "window=roundstatus;size=400x500")
-					else
-						alert("The game hasn't started yet!")
+					check_antagonists()
 				if("showailaws")
 					for(var/mob/living/silicon/ai/ai in world)
 						usr << "[key_name(ai, usr)]'s Laws:"
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -161,6 +161,7 @@
 		if (holder.level >= 2)
 			verbs += /client/proc/cmd_admin_add_random_ai_law
 			verbs += /client/proc/secrets
+			verbs += /client/proc/check_antagonists
 			verbs += /client/proc/play_sound
 			verbs += /client/proc/stealth
 			verbs += /client/proc/deadmin_self
@@ -230,7 +231,6 @@
 			verbs += /client/proc/cmd_admin_world_narrate
 			verbs += /client/proc/cmd_debug_del_all
 			verbs += /client/proc/cmd_debug_tog_aliens
-			verbs += /client/proc/ticklag
 			verbs += /client/proc/mapload
 			verbs += /client/proc/check_words
 			verbs += /client/proc/drop_bomb
@@ -323,7 +323,6 @@
 	verbs -= /client/proc/Cell
 	verbs -= /client/proc/cmd_debug_del_all
 	verbs -= /client/proc/cmd_debug_tog_aliens
-	verbs -= /client/proc/ticklag
 	verbs -= /client/proc/mapload
 	verbs -= /client/proc/check_words
 	verbs -= /client/proc/drop_bomb
@@ -356,6 +355,7 @@
 	verbs -= /client/proc/spawn_xeno
 	verbs -= /client/proc/cmd_admin_add_random_ai_law
 	verbs -= /client/proc/secrets
+	verbs -= /client/proc/check_antagonists
 	verbs -= /client/proc/play_sound
 	verbs -= /client/proc/stealth
 	verbs -= /client/proc/cmd_admin_check_contents
@@ -482,13 +482,21 @@
 	return

 /client/proc/player_panel_new()
-	set name = "Player Panel-New"
+	set name = "Player Panel New"
 	set category = "Admin"
 	if(holder)
 		holder.player_panel_new()
 	feedback_add_details("admin_verb","PPN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return

+/client/proc/check_antagonists()
+	set name = "Check Antagonists"
+	set category = "Admin"
+	if(holder)
+		holder.check_antagonists()
+	feedback_add_details("admin_verb","CHA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	return
+
 /client/proc/jobbans()
 	set name = "Display Job bans"
 	set category = "Admin"
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -373,3 +373,122 @@
 	dat += "</table></body></html>"

 	usr << browse(dat, "window=players;size=640x480")
+
+
+
+/obj/admins/proc/check_antagonists()
+	if (ticker && ticker.current_state >= GAME_STATE_PLAYING)
+		var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>"
+		dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>"
+		dat += "Round Duration: <B>[round(world.time / 36000)]:[add_zero(world.time / 600 % 60, 2)]:[world.time / 100 % 6][world.time / 100 % 10]</B><BR>"
+		dat += "<B>Emergency shuttle</B><BR>"
+		if (!emergency_shuttle.online)
+			dat += "<a href='?src=\ref[src];call_shuttle=1'>Call Shuttle</a><br>"
+		else
+			var/timeleft = emergency_shuttle.timeleft()
+			switch(emergency_shuttle.location)
+				if(0)
+					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];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>"
+
+		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)
+				var/mob/M = N.current
+				if(M)
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
+				else
+					dat += "<tr><td><i>Nuclear Operative not found!</i></td></tr>"
+			dat += "</table><br><table><tr><td><B>Nuclear Disk(s)</B></td></tr>"
+			for(var/obj/item/weapon/disk/nuclear/N in world)
+				dat += "<tr><td>[N.name], "
+				var/atom/disk_loc = N.loc
+				while(!istype(disk_loc, /turf))
+					if(istype(disk_loc, /mob))
+						var/mob/M = disk_loc
+						dat += "carried by <a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a> "
+					if(istype(disk_loc, /obj))
+						var/obj/O = disk_loc
+						dat += "in \a [O.name] "
+					disk_loc = disk_loc.loc
+				dat += "in [disk_loc.loc] at ([disk_loc.x], [disk_loc.y], [disk_loc.z])</td></tr>"
+			dat += "</table>"
+
+		if(ticker.mode.head_revolutionaries.len || ticker.mode.revolutionaries.len)
+			dat += "<br><table cellspacing=5><tr><td><B>Revolutionaries</B></td><td></td></tr>"
+			for(var/datum/mind/N in ticker.mode.head_revolutionaries)
+				var/mob/M = N.current
+				if(!M)
+					dat += "<tr><td><i>Head Revolutionary not found!</i></td></tr>"
+				else
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a> <b>(Leader)</b>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
+			for(var/datum/mind/N in ticker.mode.revolutionaries)
+				var/mob/M = N.current
+				if(M)
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
+			dat += "</table><table cellspacing=5><tr><td><B>Target(s)</B></td><td></td><td><B>Location</B></td></tr>"
+			for(var/datum/mind/N in ticker.mode.get_living_heads())
+				var/mob/M = N.current
+				if(M)
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
+					var/turf/mob_loc = get_turf_loc(M)
+					dat += "<td>[mob_loc.loc]</td></tr>"
+				else
+					dat += "<tr><td><i>Head not found!</i></td></tr>"
+			dat += "</table>"
+
+		if(ticker.mode.changelings.len > 0)
+			dat += "<br><table cellspacing=5><tr><td><B>Changelings</B></td><td></td><td></td></tr>"
+			for(var/datum/mind/changeling in ticker.mode.changelings)
+				var/mob/M = changeling.current
+				if(M)
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
+					dat += "<td><A HREF='?src=\ref[src];traitor=\ref[M]'>Show Objective</A></td></tr>"
+				else
+					dat += "<tr><td><i>Changeling not found!</i></td></tr>"
+			dat += "</table>"
+
+		if(ticker.mode.wizards.len > 0)
+			dat += "<br><table cellspacing=5><tr><td><B>Wizards</B></td><td></td><td></td></tr>"
+			for(var/datum/mind/wizard in ticker.mode.wizards)
+				var/mob/M = wizard.current
+				if(M)
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
+					dat += "<td><A HREF='?src=\ref[src];traitor=\ref[M]'>Show Objective</A></td></tr>"
+				else
+					dat += "<tr><td><i>Wizard not found!</i></td></tr>"
+			dat += "</table>"
+
+		if(ticker.mode.cult.len)
+			dat += "<br><table cellspacing=5><tr><td><B>Cultists</B></td><td></td></tr>"
+			for(var/datum/mind/N in ticker.mode.cult)
+				var/mob/M = N.current
+				if(M)
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td></tr>"
+			dat += "</table>"
+
+		if(ticker.mode.traitors.len > 0)
+			dat += "<br><table cellspacing=5><tr><td><B>Traitors</B></td><td></td><td></td></tr>"
+			for(var/datum/mind/traitor in ticker.mode.traitors)
+				var/mob/M = traitor.current
+				if(M)
+					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>"
+					dat += "<td><A HREF='?src=\ref[src];traitor=\ref[M]'>Show Objective</A></td></tr>"
+				else
+					dat += "<tr><td><i>Traitor not found!</i></td></tr>"
+			dat += "</table>"
+
+		dat += "</body></html>"
+		usr << browse(dat, "window=roundstatus;size=400x500")
+	else
+		alert("The game hasn't started yet!")
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -139,6 +139,8 @@ var/intercom_range_display_status = 0
 		src.verbs += /client/proc/cmd_assume_direct_control	//-errorage
 		src.verbs += /client/proc/jump_to_dead_group
 		src.verbs += /client/proc/startSinglo
+		src.verbs += /client/proc/ticklag	//allows you to set the ticklag.
+
 		feedback_add_details("admin_verb","mDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

 	count_objects_on_z_level()