- Added a new permission type called 'ADVDEBUG', which contains the debug verbs, which should really not be available to run-of-the-mill admins, but should be available to coders, who can use them properly. (debug-verbs and advanced proc call).

- Moved 'reload admins' into the SERVER permission. It already had a check for R_SERVER when it was run, so it being in the debug list was likely a typo. There should probably be an ADVANCEDADMIN permission type or something, that contains the admin-related tools that you don't want all admins to have access to. A 'game masters only' list of verbs, so to speak. - Edited admin_ranks.txt and the other dm files accordingly. - Standardized diagnostics.dm PS: I really love permission based admin verb assignment. So much easier to work with! git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5012 316c924e-a436-60f5-8080-3fe189b3f50e
2025-12-10 10:21:11 +00:00 · 2012-11-06 06:17:57 +00:00
parent 65154e531d
commit dfa45366b8
9 changed files with 161 additions and 155 deletions
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -262,4 +262,5 @@ proc/tg_list2text(list/list, glue=",")
 	if(rights & R_REJUVINATE)	. += "+REJUVINATE"
 	if(rights & R_VAREDIT)		. += "+VAREDIT"
 	if(rights & R_SOUNDS)		. += "+SOUND"
+	if(rights & R_ADVDEBUG)		. += "+ADVDEBUG"
 	return .
--- a/code/global.dm
+++ b/code/global.dm
@@ -221,7 +221,8 @@ var/fileaccess_timer = 1800 //Cannot access files by ftp until the game is finis
 #define R_REJUVINATE	512
 #define R_VAREDIT		1024
 #define R_SOUNDS		2048
+#define R_ADVDEBUG		4096

-#define R_MAXPERMISSION 2048 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
+#define R_MAXPERMISSION 4096 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.

 #define R_HOST			65535
--- a/code/modules/admin/admin_ranks.dm
+++ b/code/modules/admin/admin_ranks.dm
@@ -39,6 +39,7 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 				if("varedit")					rights |= R_VAREDIT
 				if("everything","host","all")	rights |= R_HOST
 				if("sound","sounds")			rights |= R_SOUNDS
+				if("advdebug")					rights |= R_ADVDEBUG

 		admin_ranks[rank] = rights
 		previous_rights = rights
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -102,23 +102,24 @@ 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/reload_admins
 	)
 var/list/admin_verbs_debug = list(
 	/client/proc/restart_controller,
 	/client/proc/cmd_admin_list_open_jobs,
-	/client/proc/callproc,
 	/client/proc/Debug2,
-	/client/proc/reload_admins,
 	/client/proc/kill_air,
 	/client/proc/cmd_debug_make_powernets,
 	/client/proc/kill_airgroup,
 	/client/proc/debug_controller,
-	/client/proc/startSinglo,
 	/client/proc/cmd_debug_mob_lists,
 	/client/proc/cmd_debug_del_all,
 	/client/proc/cmd_debug_tog_aliens,
 	/client/proc/air_report,
+	)
+var/list/admin_verbs_advdebug = list(
+	/client/proc/restart_controller,
 	/client/proc/enable_debug_verbs
 	)
 var/list/admin_verbs_possess = list(
@@ -228,6 +229,7 @@ var/list/admin_verbs_hideable = list(
 		if(rights & R_STEALTH)		verbs += /client/proc/stealth
 		if(rights & R_REJUVINATE)	verbs += admin_verbs_rejuv
 		if(rights & R_SOUNDS)		verbs += admin_verbs_sounds
+		if(rights & R_ADVDEBUG)		verbs += admin_verbs_advdebug

 /client/proc/remove_admin_verbs()
 	if(holder)
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -29,9 +29,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	set category = "Debug"
 	set name = "Advanced ProcCall"

-	if(!holder)
-		src << "Only administrators may use this command."
-		return
+	if(!check_rights(R_ADVDEBUG)) return

 	spawn(0)
 		var/target = null
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -1,27 +1,26 @@
-/client/proc
-	air_report()
-		set category = "Debug"
-		set name = "Show Air Report"
+/client/proc/air_report()
+	set category = "Debug"
+	set name = "Show Air Report"

-		if(!master_controller || !air_master)
-			alert(usr,"Master_controller or air_master not found.","Air Report")
-			return 0
+	if(!master_controller || !air_master)
+		alert(usr,"Master_controller or air_master not found.","Air Report")
+		return 0

-		var/active_groups = 0
-		var/inactive_groups = 0
-		var/active_tiles = 0
-		for(var/datum/air_group/group in air_master.air_groups)
-			if(group.group_processing)
-				active_groups++
-			else
-				inactive_groups++
-				active_tiles += group.members.len
+	var/active_groups = 0
+	var/inactive_groups = 0
+	var/active_tiles = 0
+	for(var/datum/air_group/group in air_master.air_groups)
+		if(group.group_processing)
+			active_groups++
+		else
+			inactive_groups++
+			active_tiles += group.members.len

-		var/hotspots = 0
-		for(var/obj/effect/hotspot/hotspot in world)
-			hotspots++
+	var/hotspots = 0
+	for(var/obj/effect/hotspot/hotspot in world)
+		hotspots++

-		var/output = {"<B>AIR SYSTEMS REPORT</B><HR>
+	var/output = {"<B>AIR SYSTEMS REPORT</B><HR>
 <B>General Processing Data</B><BR>
 <B># of Groups:</B> [air_master.air_groups.len]<BR>
 ---- <I>Active:</I> [active_groups]<BR>
@@ -39,143 +38,143 @@
 <B>Tile Update:</B> [air_master.tiles_to_update.len]<BR>
 "}

-		usr << browse(output,"window=airreport")
-		feedback_add_details("admin_verb","SAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	usr << browse(output,"window=airreport")
+	feedback_add_details("admin_verb","SAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

-	air_status(turf/target as turf)
-		set category = "Debug"
-		set name = "Display Air Status"
+/client/proc/air_status(turf/target as turf)
+	set category = "Debug"
+	set name = "Display Air Status"

-		if(!isturf(target))
-			return
-
-		var/datum/gas_mixture/GM = target.return_air()
-		var/burning = 0
-		if(istype(target, /turf/simulated))
-			var/turf/simulated/T = target
-			if(T.active_hotspot)
-				burning = 1
-
-		usr << "\blue @[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]"
-		for(var/datum/gas/trace_gas in GM.trace_gases)
-			usr << "[trace_gas.type]: [trace_gas.moles]"
-		feedback_add_details("admin_verb","DAST") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-	fix_next_move()
-		set category = "Debug"
-		set name = "Unfreeze Everyone"
-		var/largest_move_time = 0
-		var/largest_click_time = 0
-		var/mob/largest_move_mob = null
-		var/mob/largest_click_mob = null
-		for(var/mob/M in world)
-			if(!M.client)
-				continue
-			if(M.next_move >= largest_move_time)
-				largest_move_mob = M
-				if(M.next_move > world.time)
-					largest_move_time = M.next_move - world.time
-				else
-					largest_move_time = 1
-			if(M.lastDblClick >= largest_click_time)
-				largest_click_mob = M
-				if(M.lastDblClick > world.time)
-					largest_click_time = M.lastDblClick - world.time
-				else
-					largest_click_time = 0
-			log_admin("DEBUG: [key_name(M)]  next_move = [M.next_move]  lastDblClick = [M.lastDblClick]  world.time = [world.time]")
-			M.next_move = 1
-			M.lastDblClick = 0
-		message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [largest_move_time/10] seconds!", 1)
-		message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [largest_click_time/10] seconds!", 1)
-		message_admins("world.time = [world.time]", 1)
-		feedback_add_details("admin_verb","UFE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	if(!isturf(target))
 		return

-	radio_report()
-		set category = "Debug"
-		set name = "Radio report"
+	var/datum/gas_mixture/GM = target.return_air()
+	var/burning = 0
+	if(istype(target, /turf/simulated))
+		var/turf/simulated/T = target
+		if(T.active_hotspot)
+			burning = 1

-		var/filters = list(
-			"1" = "RADIO_TO_AIRALARM",
-			"2" = "RADIO_FROM_AIRALARM",
-			"3" = "RADIO_CHAT",
-			"4" = "RADIO_ATMOSIA",
-			"5" = "RADIO_NAVBEACONS",
-			"6" = "RADIO_AIRLOCK",
-			"7" = "RADIO_SECBOT",
-			"8" = "RADIO_MULEBOT",
-			"_default" = "NO_FILTER"
-			)
-		var/output = "<b>Radio Report</b><hr>"
-		for (var/fq in radio_controller.frequencies)
-			output += "<b>Freq: [fq]</b><br>"
-			var/list/datum/radio_frequency/fqs = radio_controller.frequencies[fq]
-			if (!fqs)
-				output += "&nbsp;&nbsp;<b>ERROR</b><br>"
+	usr << "\blue @[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]"
+	for(var/datum/gas/trace_gas in GM.trace_gases)
+		usr << "[trace_gas.type]: [trace_gas.moles]"
+	feedback_add_details("admin_verb","DAST") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/fix_next_move()
+	set category = "Debug"
+	set name = "Unfreeze Everyone"
+	var/largest_move_time = 0
+	var/largest_click_time = 0
+	var/mob/largest_move_mob = null
+	var/mob/largest_click_mob = null
+	for(var/mob/M in world)
+		if(!M.client)
+			continue
+		if(M.next_move >= largest_move_time)
+			largest_move_mob = M
+			if(M.next_move > world.time)
+				largest_move_time = M.next_move - world.time
+			else
+				largest_move_time = 1
+		if(M.lastDblClick >= largest_click_time)
+			largest_click_mob = M
+			if(M.lastDblClick > world.time)
+				largest_click_time = M.lastDblClick - world.time
+			else
+				largest_click_time = 0
+		log_admin("DEBUG: [key_name(M)]  next_move = [M.next_move]  lastDblClick = [M.lastDblClick]  world.time = [world.time]")
+		M.next_move = 1
+		M.lastDblClick = 0
+	message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [largest_move_time/10] seconds!", 1)
+	message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [largest_click_time/10] seconds!", 1)
+	message_admins("world.time = [world.time]", 1)
+	feedback_add_details("admin_verb","UFE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	return
+
+/client/proc/radio_report()
+	set category = "Debug"
+	set name = "Radio report"
+
+	var/filters = list(
+		"1" = "RADIO_TO_AIRALARM",
+		"2" = "RADIO_FROM_AIRALARM",
+		"3" = "RADIO_CHAT",
+		"4" = "RADIO_ATMOSIA",
+		"5" = "RADIO_NAVBEACONS",
+		"6" = "RADIO_AIRLOCK",
+		"7" = "RADIO_SECBOT",
+		"8" = "RADIO_MULEBOT",
+		"_default" = "NO_FILTER"
+		)
+	var/output = "<b>Radio Report</b><hr>"
+	for (var/fq in radio_controller.frequencies)
+		output += "<b>Freq: [fq]</b><br>"
+		var/list/datum/radio_frequency/fqs = radio_controller.frequencies[fq]
+		if (!fqs)
+			output += "&nbsp;&nbsp;<b>ERROR</b><br>"
+			continue
+		for (var/filter in fqs.devices)
+			var/list/f = fqs.devices[filter]
+			if (!f)
+				output += "&nbsp;&nbsp;[filters[filter]]: ERROR<br>"
 				continue
-			for (var/filter in fqs.devices)
-				var/list/f = fqs.devices[filter]
-				if (!f)
-					output += "&nbsp;&nbsp;[filters[filter]]: ERROR<br>"
-					continue
-				output += "&nbsp;&nbsp;[filters[filter]]: [f.len]<br>"
-				for (var/device in f)
-					if (isobj(device))
-						output += "&nbsp;&nbsp;&nbsp;&nbsp;[device] ([device:x],[device:y],[device:z] in area [get_area(device:loc)])<br>"
-					else
-						output += "&nbsp;&nbsp;&nbsp;&nbsp;[device]<br>"
+			output += "&nbsp;&nbsp;[filters[filter]]: [f.len]<br>"
+			for (var/device in f)
+				if (isobj(device))
+					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device] ([device:x],[device:y],[device:z] in area [get_area(device:loc)])<br>"
+				else
+					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device]<br>"

-		usr << browse(output,"window=radioreport")
-		feedback_add_details("admin_verb","RR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	usr << browse(output,"window=radioreport")
+	feedback_add_details("admin_verb","RR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

-	reload_admins()
-		set name = "Reload Admins"
-		set category = "Debug"
+/client/proc/reload_admins()
+	set name = "Reload Admins"
+	set category = "Debug"

-		if(!check_rights(R_SERVER))	return
+	if(!check_rights(R_SERVER))	return

-		message_admins("[usr] manually reloaded admins.txt")
-		load_admins()
-		feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	message_admins("[usr] manually reloaded admins.txt")
+	load_admins()
+	feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!


-	jump_to_dead_group()
-		set name = "Jump to dead group"
-		set category = "Debug"
-		if(!holder)
-			src << "Only administrators may use this command."
-			return
-
-		if(!air_master)
-			usr << "Cannot find air_system"
-			return
-		var/datum/air_group/dead_groups = list()
-		for(var/datum/air_group/group in air_master.air_groups)
-			if (!group.group_processing)
-				dead_groups += group
-		var/datum/air_group/dest_group = pick(dead_groups)
-		usr.loc = pick(dest_group.members)
-		feedback_add_details("admin_verb","JDAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/jump_to_dead_group()
+	set name = "Jump to dead group"
+	set category = "Debug"
+	if(!holder)
+		src << "Only administrators may use this command."
 		return

-	kill_airgroup()
-		set name = "Kill Local Airgroup"
-		set desc = "Use this to allow manual manupliation of atmospherics."
-		set category = "Debug"
-		if(!holder)
-			src << "Only administrators may use this command."
-			return
+	if(!air_master)
+		usr << "Cannot find air_system"
+		return
+	var/datum/air_group/dead_groups = list()
+	for(var/datum/air_group/group in air_master.air_groups)
+		if (!group.group_processing)
+			dead_groups += group
+	var/datum/air_group/dest_group = pick(dead_groups)
+	usr.loc = pick(dest_group.members)
+	feedback_add_details("admin_verb","JDAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	return

-		if(!air_master)
-			usr << "Cannot find air_system"
-			return
+/client/proc/kill_airgroup()
+	set name = "Kill Local Airgroup"
+	set desc = "Use this to allow manual manupliation of atmospherics."
+	set category = "Debug"
+	if(!holder)
+		src << "Only administrators may use this command."
+		return

-		var/turf/T = get_turf(usr)
-		if(istype(T, /turf/simulated))
-			var/datum/air_group/AG = T:parent
-			AG.next_check = 30
-			AG.group_processing = 0
-		else
-			usr << "Local airgroup is unsimulated!"
-		feedback_add_details("admin_verb","KLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	if(!air_master)
+		usr << "Cannot find air_system"
+		return
+
+	var/turf/T = get_turf(usr)
+	if(istype(T, /turf/simulated))
+		var/datum/air_group/AG = T:parent
+		AG.next_check = 30
+		AG.group_processing = 0
+	else
+		usr << "Local airgroup is unsimulated!"
+	feedback_add_details("admin_verb","KLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -127,6 +127,9 @@ var/intercom_range_display_status = 0
 /client/proc/enable_debug_verbs()
 	set category = "Debug"
 	set name = "Debug verbs"
+
+	if(!check_rights(R_ADVDEBUG)) return
+
 	src.verbs += /client/proc/do_not_use_these 			//-errorage
 	src.verbs += /client/proc/camera_view 				//-errorage
 	src.verbs += /client/proc/sec_camera_report 		//-errorage
--- a/code/modules/admin/verbs/ticklag.dm
+++ b/code/modules/admin/verbs/ticklag.dm
@@ -5,7 +5,7 @@
 	set name = "Set Ticklag"
 	set desc = "Sets a new tick lag. Recommend you don't mess with this too much! Stable, time-tested ticklag value is 0.9"

-	if(!check_rights(R_DEBUG))	return
+	if(!check_rights(R_ADVDEBUG))	return

 	var/newtick = input("Sets a new tick lag. Please don't mess with this too much! The stable, time-tested ticklag value is 0.9","Lag of Tick", world.tick_lag) as num|null
 	//I've used ticks of 2 before to help with serious singulo lags
--- a/config/admin_ranks.txt
+++ b/config/admin_ranks.txt
@@ -20,7 +20,8 @@
 # +REJUV (or +REJUVINATE) = the ability to heal, respawn, modify damage and use godmode
 # +BUILD (or +BUILDMODE) = the ability to use buildmode
 # +SERVER = higher-risk admin verbs and abilities, such as those which affect the server configuration.
-# +DEBUG = debug tools used for diagnosing and fixing problems. It's useful to give this to coders so they can investigate problems on a live server
+# +DEBUG = debug tools used for diagnosing and fixing problems. The use of these requires some technical know-how, but can generally be used by trusted admins.
+# +ADVDEBUG = advanced debug tools, which can destroy the game if used improperly. Only suitable for coders.
 # +VAREDIT = everyone may view viewvars/debugvars/whatever you call it. This keyword allows you to actually EDIT those variables.
 # +RIGHTS (or +PERMISSIONS) = allows you to promote and/or demote people.
 # +SOUND (or +SOUNDS) = allows you to upload and play sounds
@@ -36,4 +37,4 @@ Game Master		+EVERYTHING

 Host			+EVERYTHING

-Coder			+DEBUG +VAREDIT +SERVER
+Coder			+DEBUG +VAREDIT +SERVER +ADVDEBUG