Secrets panel is now available to all admin-datum holders. Each subsection is restricted to specific permissions however.

Adminhelp now loops through all clients in var/list/admins rather than every client in the world. Both SERVER and FUN can toggle random events on/off. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5029 316c924e-a436-60f5-8080-3fe189b3f50e
2025-12-09 16:14:13 +00:00 · 2012-11-08 17:08:18 +00:00
parent 0b3ca8d0a6
commit 8a3e9ab885
4 changed files with 53 additions and 56 deletions
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -170,7 +170,7 @@ datum/controller/vote
 		var/trialmin = 0
 		if(C.holder)
 			admin = 1
-			if (C.holder.rights & R_ADMIN)
+			if(C.holder.rights & R_ADMIN)
 				trialmin = 1
 		voting |= C

--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -386,31 +386,33 @@ var/global/floorIsLava = 0
 /datum/admins/proc/Secrets()
 	if(!check_rights(0))	return

-	var/dat = {"
-		<B>Choose a secret, any secret at all.</B><HR>
-		<B>Admin Secrets</B><BR>
-		<BR>
-		<A href='?src=\ref[src];secretsadmin=clear_bombs'>Remove all bombs currently in existence</A><BR>
-		<A href='?src=\ref[src];secretsadmin=list_bombers'>Bombing List</A><BR>
-		<A href='?src=\ref[src];secretsadmin=check_antagonist'>Show current traitors and objectives</A><BR>
-		<A href='?src=\ref[src];secretsadmin=list_signalers'>Show last [length(lastsignalers)] signalers</A><BR>
-		<A href='?src=\ref[src];secretsadmin=list_lawchanges'>Show last [length(lawchanges)] law changes</A><BR>
-		<A href='?src=\ref[src];secretsadmin=showailaws'>Show AI Laws</A><BR>
-		<A href='?src=\ref[src];secretsadmin=showgm'>Show Game Mode</A><BR>
-		<A href='?src=\ref[src];secretsadmin=manifest'>Show Crew Manifest</A><BR>
-		<A href='?src=\ref[src];secretsadmin=DNA'>List DNA (Blood)</A><BR>
-		<A href='?src=\ref[src];secretsadmin=fingerprints'>List Fingerprints</A><BR><BR>
-		<BR>
-		"}
+	var/dat = "<B>The first rule of adminbuse is: you don't talk about the adminbuse.</B><HR>"
+
+	if(check_rights(R_ADMIN,0))
+		dat += {"
+			<B>Admin Secrets</B><BR>
+			<BR>
+			<A href='?src=\ref[src];secretsadmin=clear_bombs'>Remove all bombs currently in existence</A><BR>
+			<A href='?src=\ref[src];secretsadmin=list_bombers'>Bombing List</A><BR>
+			<A href='?src=\ref[src];secretsadmin=check_antagonist'>Show current traitors and objectives</A><BR>
+			<A href='?src=\ref[src];secretsadmin=list_signalers'>Show last [length(lastsignalers)] signalers</A><BR>
+			<A href='?src=\ref[src];secretsadmin=list_lawchanges'>Show last [length(lawchanges)] law changes</A><BR>
+			<A href='?src=\ref[src];secretsadmin=showailaws'>Show AI Laws</A><BR>
+			<A href='?src=\ref[src];secretsadmin=showgm'>Show Game Mode</A><BR>
+			<A href='?src=\ref[src];secretsadmin=manifest'>Show Crew Manifest</A><BR>
+			<A href='?src=\ref[src];secretsadmin=DNA'>List DNA (Blood)</A><BR>
+			<A href='?src=\ref[src];secretsadmin=fingerprints'>List Fingerprints</A><BR><BR>
+			<BR>
+			"}

 	if(check_rights(R_FUN,0))
 		dat += {"
 			<B>'Random' Events</B><BR>
 			<BR>
-			<A href='?src=\ref[src];secretsfun=wave'>Spawn a wave of meteors</A><BR>
-			<A href='?src=\ref[src];secretsfun=gravanomalies'>Spawn a gravitational anomaly (Untested)</A><BR>
-			<A href='?src=\ref[src];secretsfun=timeanomalies'>Spawn wormholes (Untested)</A><BR>
-			<A href='?src=\ref[src];secretsfun=goblob'>Spawn blob(Untested)</A><BR>
+			<A href='?src=\ref[src];secretsfun=wave'>Spawn a wave of meteors (aka lagocolyptic shower)</A><BR>
+			<A href='?src=\ref[src];secretsfun=gravanomalies'>Spawn a gravitational anomaly (aka lagitational anomolag)</A><BR>
+			<A href='?src=\ref[src];secretsfun=timeanomalies'>Spawn wormholes</A><BR>
+			<A href='?src=\ref[src];secretsfun=goblob'>Spawn blob</A><BR>
 			<A href='?src=\ref[src];secretsfun=aliens'>Trigger an Alien infestation</A><BR>
 			<A href='?src=\ref[src];secretsfun=spaceninja'>Send in a space ninja</A><BR>
 			<A href='?src=\ref[src];secretsfun=carp'>Trigger an Carp migration</A><BR>
@@ -449,7 +451,7 @@ var/global/floorIsLava = 0
 			<A href='?src=\ref[src];secretsfun=blackout'>Break all lights</A><BR>
 			<A href='?src=\ref[src];secretsfun=whiteout'>Fix all lights</A><BR>
 			<A href='?src=\ref[src];secretsfun=friendai'>Best Friend AI</A><BR>
-			<A href='?src=\ref[src];secretsfun=floorlava'>The floor is lava! (DANGEROUS)</A><BR>
+			<A href='?src=\ref[src];secretsfun=floorlava'>The floor is lava! (DANGEROUS: extremely lame)</A><BR>
 			"}

 	if(check_rights(R_SERVER,0))
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -14,7 +14,8 @@ var/list/admin_verbs_default = list(
 	/client/proc/toggleprayers,			/*toggles prayers on/off*/
 	/client/proc/toggle_hear_deadcast,	/*toggles whether we hear deadchat*/
 	/client/proc/toggle_hear_radio,		/*toggles whether we hear the radio*/
-	/client/proc/investigate_show		/*various admintools for investigation. Such as a singulo grief-log*/
+	/client/proc/investigate_show,		/*various admintools for investigation. Such as a singulo grief-log*/
+	/client/proc/secrets
 	)
 var/list/admin_verbs_admin = list(
 	/client/proc/game_panel,			/*game panel, allows to change game-mode etc*/
@@ -70,7 +71,6 @@ var/list/admin_verbs_fun = list(
 	/client/proc/drop_bomb,
 	/client/proc/toggle_gravity_on,
 	/client/proc/toggle_gravity_off,
-	/client/proc/secrets,
 	/client/proc/strike_team,
 	/client/proc/cinematic,
 	/client/proc/triple_ai,
@@ -84,8 +84,7 @@ var/list/admin_verbs_fun = list(
 	/client/proc/cmd_admin_add_random_ai_law,
 	/client/proc/cmd_admin_create_centcom_report,
 	/client/proc/make_sound,
-	/client/proc/toggle_random_events,
-	/client/proc/cmd_admin_add_random_ai_law
+	/client/proc/toggle_random_events
 	)
 var/list/admin_verbs_server = list(
 	/client/proc/Set_Holiday,
@@ -102,7 +101,8 @@ var/list/admin_verbs_server = list(
 	/datum/admins/proc/toggleoocdead,
 	/datum/admins/proc/adrev,
 	/datum/admins/proc/adspawn,
-	/datum/admins/proc/adjump
+	/datum/admins/proc/adjump,
+	/client/proc/toggle_random_events
 	)
 var/list/admin_verbs_debug = list(
 	/client/proc/restart_controller,
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -87,43 +87,38 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali
 			j++

 	msg = dd_list2text(msglist, " ")
-	var/admin_number = 0
 	var/admin_number_afk = 0

 	if(mob)
 		var/ref_mob = "\ref[src.mob]"
-		for (var/client/X)
-			if (X.holder)
-				admin_number++
-				if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
-					admin_number_afk++
-				if(X.holder.sound_adminhelp)
-					X << 'sound/effects/adminhelp.ogg'
-				var/check_laws_text = ""
-				if(ai_found)
-					check_laws_text = (" (<A HREF='?src=\ref[X.holder];adminchecklaws=[ref_mob]'>CL</A>)")
+		for(var/client/X in admins)
+			if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
+				admin_number_afk++
+			if(X.holder.sound_adminhelp)
+				X << 'sound/effects/adminhelp.ogg'
+			var/check_laws_text = ""
+			if(ai_found)
+				check_laws_text = (" (<A HREF='?src=\ref[X.holder];adminchecklaws=[ref_mob]'>CL</A>)")

-				var/msg_to_send = "\blue <b><font color=red>HELP: </font>[key_name(src, X)] (<A HREF='?src=\ref[X.holder];adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?src=\ref[X.holder];adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?src=\ref[X.holder];adminplayervars=[ref_mob]'>VV</A>) (<A HREF='?src=\ref[X.holder];adminplayersubtlemessage=[ref_mob]'>SM</A>) (<A HREF='?src=\ref[X.holder];adminplayerobservejump=[ref_mob]'>JMP</A>) (<A HREF='?src=\ref[X.holder];secretsadmin=check_antagonist'>CA</A>) [check_laws_text]:</b> [msg]"
-				msg_to_send = replacetext(msg_to_send, "HOLDERREF", "\ref[X.holder]")
-				msg_to_send = replacetext(msg_to_send, "ADMINREF", "\ref[X]")
-				X << msg_to_send
+			var/msg_to_send = "\blue <b><font color=red>HELP: </font>[key_name(src, X)] (<A HREF='?src=\ref[X.holder];adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?src=\ref[X.holder];adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?src=\ref[X.holder];adminplayervars=[ref_mob]'>VV</A>) (<A HREF='?src=\ref[X.holder];adminplayersubtlemessage=[ref_mob]'>SM</A>) (<A HREF='?src=\ref[X.holder];adminplayerobservejump=[ref_mob]'>JMP</A>) (<A HREF='?src=\ref[X.holder];secretsadmin=check_antagonist'>CA</A>) [check_laws_text]:</b> [msg]"
+			msg_to_send = replacetext(msg_to_send, "HOLDERREF", "\ref[X.holder]")
+			msg_to_send = replacetext(msg_to_send, "ADMINREF", "\ref[X]")
+			X << msg_to_send
 	else
 		var/ref_client = "\ref[src]"
-		for (var/client/X)
-			if (X.holder)
-				admin_number++
-				if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
-					admin_number_afk++
-				if(X.holder.sound_adminhelp)
-					X << 'sound/effects/adminhelp.ogg'
-				var/msg_to_send = "\blue <b><font color=red>HELP: </font>[key_name(src, X)] (<A HREF='?src=\ref[X.holder];adminplayervars=[ref_client]'>VV</A>) (<A HREF='?src=\ref[X.holder];secretsadmin=check_antagonist'>CA</A>):</b> [msg]"
-				msg_to_send = replacetext(msg_to_send, "HOLDERREF", "\ref[X.holder]")
-				msg_to_send = replacetext(msg_to_send, "ADMINREF", "\ref[X]")
-				X << msg_to_send
-
+		for(var/client/X in admins)
+			if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one.
+				admin_number_afk++
+			if(X.holder.sound_adminhelp)
+				X << 'sound/effects/adminhelp.ogg'
+			var/msg_to_send = "\blue <b><font color=red>HELP: </font>[key_name(src, X)] (<A HREF='?src=\ref[X.holder];adminplayervars=[ref_client]'>VV</A>) (<A HREF='?src=\ref[X.holder];secretsadmin=check_antagonist'>CA</A>):</b> [msg]"
+			msg_to_send = replacetext(msg_to_send, "HOLDERREF", "\ref[X.holder]")
+			msg_to_send = replacetext(msg_to_send, "ADMINREF", "\ref[X]")
+			X << msg_to_send
+	var/admin_number_present = admins.len - admin_number_afk
 	src << "<font color='blue'>PM to-<b>Admins</b>: [original_msg]</font>"
-	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number] non-AFK admins.")
-	if((admin_number - admin_number_afk) <= 0)
+	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
+	if(admin_number_present <= 0)
 		if(!admin_number_afk)
 			send2irc(ckey, "[original_msg] - No admins online")
 		else