[MIRROR] Adds verb to VV global variables

code/modules/admin/admin_verb_lists.dm

@@ -108,9 +108,16 @@ var/list/admin_verbs_admin = list(
 	/datum/admins/proc/quick_nif, //VOREStation Add,
 	/datum/admins/proc/sendFax,
 	/client/proc/despawn_player,
+<<<<<<< HEAD
 	/datum/admins/proc/view_feedback,
 	/client/proc/admin_teleport,	//CHOMPEdit
 	/client/proc/setckey //YW add - readds SetCkey proc
+||||||| parent of 5c2c83cd81... Merge pull request #10273 from VOREStation/upstream-merge-8046
+	/datum/admins/proc/view_feedback
+=======
+	/datum/admins/proc/view_feedback,
+	/client/proc/debug_global_variables
+>>>>>>> 5c2c83cd81... Merge pull request #10273 from VOREStation/upstream-merge-8046
 	)
 
 var/list/admin_verbs_ban = list(
@@ -188,7 +195,8 @@ var/list/admin_verbs_server = list(
 	/client/proc/recipe_dump,
 	/client/proc/panicbunker,
 	/client/proc/paranoia_logging,
-	/client/proc/ip_reputation
+	/client/proc/ip_reputation,
+	/client/proc/debug_global_variables
 	)
 
 var/list/admin_verbs_debug = list(
@@ -236,7 +244,8 @@ var/list/admin_verbs_debug = list(
 	/datum/admins/proc/change_time,
 	/client/proc/admin_give_modifier,
 	/client/proc/simple_DPS,
-	/datum/admins/proc/view_feedback
+	/datum/admins/proc/view_feedback,
+	/client/proc/debug_global_variables
 	)
 
 var/list/admin_verbs_paranoid_debug = list(
@@ -330,7 +339,8 @@ var/list/admin_verbs_hideable = list(
 	/client/proc/roll_dices,
 	/proc/possess,
 	/proc/release,
-	/datum/admins/proc/set_tcrystals
+	/datum/admins/proc/set_tcrystals,
+	/client/proc/debug_global_variables
 	)
 var/list/admin_verbs_mod = list(
 	/client/proc/cmd_admin_pm_context,	//right-click adminPM interface,
@@ -494,8 +504,8 @@ var/list/admin_verbs_event_manager = list(
 	/client/proc/cmd_admin_delete,		//delete an instance/object/mob/etc,
 	/client/proc/cmd_debug_del_all,
 	/client/proc/toggle_random_events,
-	/client/proc/modify_server_news
-
+	/client/proc/modify_server_news,
+	/client/proc/debug_global_variables
 )
 
 /client/proc/add_admin_verbs()

code/modules/admin/view_variables/helpers.dm

@@ -0,0 +1,191 @@
+
+// Keep these two together, they *must* be defined on both
+// If /client ever becomes /datum/client or similar, they can be merged
+/datum/proc/get_view_variables_header()
+	return "<b>[src]</b>"
+
+/atom/get_view_variables_header()
+	return {"
+		<a href='?_src_=vars;datumedit=\ref[src];varnameedit=name'><b>[src]</b></a>
+		<br><font size='1'>
+		<a href='?_src_=vars;rotatedatum=\ref[src];rotatedir=left'><<</a>
+		<a href='?_src_=vars;datumedit=\ref[src];varnameedit=dir'>[dir2text(dir)]</a>
+		<a href='?_src_=vars;rotatedatum=\ref[src];rotatedir=right'>>></a>
+		</font>
+		"}
+
+/mob/living/get_view_variables_header()
+	return {"
+		<a href='?_src_=vars;rename=\ref[src]'><b>[src]</b></a><font size='1'>
+		<br><a href='?_src_=vars;rotatedatum=\ref[src];rotatedir=left'><<</a> <a href='?_src_=vars;datumedit=\ref[src];varnameedit=dir'>[dir2text(dir)]</a> <a href='?_src_=vars;rotatedatum=\ref[src];rotatedir=right'>>></a>
+		<br><a href='?_src_=vars;datumedit=\ref[src];varnameedit=ckey'>[ckey ? ckey : "No ckey"]</a> / <a href='?_src_=vars;datumedit=\ref[src];varnameedit=real_name'>[real_name ? real_name : "No real name"]</a>
+		<br>
+		BRUTE:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=brute'>[getBruteLoss()]</a>
+		FIRE:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=fire'>[getFireLoss()]</a>
+		TOXIN:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=toxin'>[getToxLoss()]</a>
+		OXY:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=oxygen'>[getOxyLoss()]</a>
+		CLONE:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=clone'>[getCloneLoss()]</a>
+		BRAIN:<a href='?_src_=vars;mobToDamage=\ref[src];adjustDamage=brain'>[getBrainLoss()]</a>
+		</font>
+		"}
+
+//This entire file needs to be removed eventually
+/datum/proc/get_view_variables_options()
+	return ""
+
+/mob/get_view_variables_options()
+	return ..() + {"
+		<option value='?_src_=vars;mob_player_panel=\ref[src]'>Show player panel</option>
+		<option>---</option>
+		<option value='?_src_=vars;give_modifier=\ref[src]'>Give Modifier</option>
+		<option value='?_src_=vars;give_spell=\ref[src]'>Give Spell</option>
+		<option value='?_src_=vars;give_disease2=\ref[src]'>Give Disease</option>
+		<option value='?_src_=vars;give_disease=\ref[src]'>Give TG-style Disease</option>
+		<option value='?_src_=vars;godmode=\ref[src]'>Toggle Godmode</option>
+		<option value='?_src_=vars;build_mode=\ref[src]'>Toggle Build Mode</option>
+
+		<option value='?_src_=vars;ninja=\ref[src]'>Make Space Ninja</option>
+		<option value='?_src_=vars;make_skeleton=\ref[src]'>Make 2spooky</option>
+
+		<option value='?_src_=vars;direct_control=\ref[src]'>Assume Direct Control</option>
+		<option value='?_src_=vars;drop_everything=\ref[src]'>Drop Everything</option>
+
+		<option value='?_src_=vars;regenerateicons=\ref[src]'>Regenerate Icons</option>
+		<option value='?_src_=vars;addlanguage=\ref[src]'>Add Language</option>
+		<option value='?_src_=vars;remlanguage=\ref[src]'>Remove Language</option>
+		<option value='?_src_=vars;addorgan=\ref[src]'>Add Organ</option>
+		<option value='?_src_=vars;remorgan=\ref[src]'>Remove Organ</option>
+
+		<option value='?_src_=vars;fix_nano=\ref[src]'>Fix NanoUI</option>
+
+		<option value='?_src_=vars;addverb=\ref[src]'>Add Verb</option>
+		<option value='?_src_=vars;remverb=\ref[src]'>Remove Verb</option>
+		<option>---</option>
+		<option value='?_src_=vars;gib=\ref[src]'>Gib</option>
+		"}
+
+/mob/living/carbon/human/get_view_variables_options()
+	return ..() + {"
+		<option value='?_src_=vars;setspecies=\ref[src]'>Set Species</option>
+		<option value='?_src_=vars;makeai=\ref[src]'>Make AI</option>
+		<option value='?_src_=vars;makerobot=\ref[src]'>Make cyborg</option>
+		<option value='?_src_=vars;makemonkey=\ref[src]'>Make monkey</option>
+		<option value='?_src_=vars;makealien=\ref[src]'>Make alien</option>
+		"}
+
+/obj/get_view_variables_options()
+	return ..() + {"
+		<option value='?_src_=vars;delall=\ref[src]'>Delete all of type</option>
+		"}
+
+/turf/get_view_variables_options()
+	return ..() + {"
+		<option value='?_src_=vars;explode=\ref[src]'>Trigger explosion</option>
+		<option value='?_src_=vars;emp=\ref[src]'>Trigger EM pulse</option>
+		"}
+
+/datum/proc/get_variables()
+	. = vars - VV_hidden()
+	if(!usr || !check_rights(R_ADMIN|R_DEBUG, FALSE))
+		. -= VV_secluded()
+
+/datum/proc/get_variable_value(varname)
+	return vars[varname]
+
+/datum/proc/set_variable_value(varname, value)
+	vars[varname] = value
+
+/datum/proc/get_initial_variable_value(varname)
+	return initial(vars[varname])
+
+/datum/proc/make_view_variables_variable_entry(var/varname, var/value, var/hide_watch = 0)
+	return {"
+			(<a href='?_src_=vars;datumedit=\ref[src];varnameedit=[varname]'>E</a>)
+			(<a href='?_src_=vars;datumchange=\ref[src];varnamechange=[varname]'>C</a>)
+			(<a href='?_src_=vars;datummass=\ref[src];varnamemass=[varname]'>M</a>)
+			[hide_watch ? "" : "(<a href='?_src_=vars;datumwatch=\ref[src];varnamewatch=[varname]'>W</a>)"]
+			"}
+
+// No mass editing of clients
+/client/make_view_variables_variable_entry(var/varname, var/value, var/hide_watch = 0)
+	return {"
+			(<a href='?_src_=vars;datumedit=\ref[src];varnameedit=[varname]'>E</a>)
+			(<a href='?_src_=vars;datumchange=\ref[src];varnamechange=[varname]'>C</a>)
+			[hide_watch ? "" : "(<a href='?_src_=vars;datumwatch=\ref[src];varnamewatch=[varname]'>W</a>)"]
+			"}
+
+// These methods are all procs and don't use stored lists to avoid VV exploits
+
+// The following vars cannot be viewed by anyone
+/datum/proc/VV_hidden()
+	return list()
+
+// The following vars can only be viewed by R_ADMIN|R_DEBUG
+/datum/proc/VV_secluded()
+	return list()
+
+/datum/configuration/VV_secluded()
+	return vars
+
+// The following vars cannot be edited by anyone
+/datum/proc/VV_static()
+	return list("parent_type")
+
+/atom/VV_static()
+	return ..() + list("bound_x", "bound_y", "bound_height", "bound_width", "bounds", "step_x", "step_y", "step_size")
+
+/client/VV_static()
+	return ..() + list("holder", "prefs")
+
+/datum/admins/VV_static()
+	return vars
+
+// The following vars require R_DEBUG to edit
+/datum/proc/VV_locked()
+	return list("vars", "cuffed")
+
+/client/VV_locked()
+	return list("vars", "mob")
+
+/mob/VV_locked()
+	return ..() + list("client")
+
+// The following vars require R_FUN|R_DEBUG to edit
+/datum/proc/VV_icon_edit_lock()
+	return list()
+
+/atom/VV_icon_edit_lock()
+	return ..() + list("icon", "icon_state", "overlays", "underlays")
+
+// The following vars require R_SPAWN|R_DEBUG to edit
+/datum/proc/VV_ckey_edit()
+	return list()
+
+/mob/VV_ckey_edit()
+	return list("key", "ckey")
+
+/client/VV_ckey_edit()
+	return list("key", "ckey")
+
+/datum/proc/may_edit_var(var/user, var/var_to_edit)
+	if(!user)
+		return FALSE
+	if(!(var_to_edit in vars))
+		to_chat(user, "<span class='warning'>\The [src] does not have a var '[var_to_edit]'</span>")
+		return FALSE
+	if(var_to_edit in VV_static())
+		return FALSE
+	if((var_to_edit in VV_secluded()) && !check_rights(R_ADMIN|R_DEBUG, FALSE, C = user))
+		return FALSE
+	if((var_to_edit in VV_locked()) && !check_rights(R_DEBUG, C = user))
+		return FALSE
+	if((var_to_edit in VV_ckey_edit()) && !check_rights(R_SPAWN|R_DEBUG, C = user))
+		return FALSE
+	if((var_to_edit in VV_icon_edit_lock()) && !check_rights(R_FUN|R_DEBUG, C = user))
+		return FALSE
+	return TRUE
+
+/proc/forbidden_varedit_object_types()
+ 	return list(
+		/datum/admins						//Admins editing their own admin-power object? Yup, sounds like a good idea.
+	)

code/modules/admin/view_variables/helpers_deprecated.dm

@@ -1,48 +0,0 @@
-//This entire file needs to be removed eventually
-/datum/proc/get_view_variables_options()
-	return ""
-
-/mob/get_view_variables_options()
-	return ..() + {"
-		<option value='?_src_=vars;mob_player_panel=\ref[src]'>Show player panel</option>
-		<option>---</option>
-		<option value='?_src_=vars;give_modifier=\ref[src]'>Give Modifier</option>
-		<option value='?_src_=vars;give_spell=\ref[src]'>Give Spell</option>
-		<option value='?_src_=vars;give_disease2=\ref[src]'>Give Disease</option>
-		<option value='?_src_=vars;give_disease=\ref[src]'>Give TG-style Disease</option>
-		<option value='?_src_=vars;godmode=\ref[src]'>Toggle Godmode</option>
-		<option value='?_src_=vars;build_mode=\ref[src]'>Toggle Build Mode</option>
-
-		<option value='?_src_=vars;ninja=\ref[src]'>Make Space Ninja</option>
-		<option value='?_src_=vars;make_skeleton=\ref[src]'>Make 2spooky</option>
-
-		<option value='?_src_=vars;direct_control=\ref[src]'>Assume Direct Control</option>
-		<option value='?_src_=vars;drop_everything=\ref[src]'>Drop Everything</option>
-
-		<option value='?_src_=vars;regenerateicons=\ref[src]'>Regenerate Icons</option>
-		<option value='?_src_=vars;addlanguage=\ref[src]'>Add Language</option>
-		<option value='?_src_=vars;remlanguage=\ref[src]'>Remove Language</option>
-		<option value='?_src_=vars;addorgan=\ref[src]'>Add Organ</option>
-		<option value='?_src_=vars;remorgan=\ref[src]'>Remove Organ</option>
-
-		<option value='?_src_=vars;fix_nano=\ref[src]'>Fix NanoUI</option>
-
-		<option value='?_src_=vars;addverb=\ref[src]'>Add Verb</option>
-		<option value='?_src_=vars;remverb=\ref[src]'>Remove Verb</option>
-		<option>---</option>
-		<option value='?_src_=vars;gib=\ref[src]'>Gib</option>
-		"}
-
-/mob/living/carbon/human/get_view_variables_options()
-	return ..() + {"
-		<option value='?_src_=vars;setspecies=\ref[src]'>Set Species</option>
-		<option value='?_src_=vars;makeai=\ref[src]'>Make AI</option>
-		<option value='?_src_=vars;makerobot=\ref[src]'>Make cyborg</option>
-		<option value='?_src_=vars;makemonkey=\ref[src]'>Make monkey</option>
-		<option value='?_src_=vars;makealien=\ref[src]'>Make alien</option>
-		"}
-
-/obj/get_view_variables_options()
-	return ..() + {"
-		<option value='?_src_=vars;delall=\ref[src]'>Delete all of type</option>
-		"}

code/modules/admin/view_variables/view_variables.dm

@@ -78,8 +78,7 @@
 
 	var/list/names = list()
 	if (!islist)
-		for (var/V in D.vars)
-			names += V
+		names = D.get_variables()
 	sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects.
 
 	var/list/variable_html = list()

code/modules/admin/view_variables/view_variables_global.dm

@@ -0,0 +1,91 @@
+/proc/readglobal(which)
+	. = global.vars[which]
+		
+/proc/writeglobal(which, newval)
+	global.vars[which] = newval
+
+/proc/getallglobals()
+	. = list()
+	for(var/some_global in global.vars)
+		. += some_global
+
+/var/decl/global_vars/global_vars_
+
+/decl/global_vars
+	var/name = "<b>Global Variables</b>"
+
+/decl/global_vars/get_view_variables_options()
+	return "" // Ensuring changes to the base proc never affect us
+
+/decl/global_vars/get_variables()
+	. = getallglobals() - VV_hidden()
+	if(!usr || !check_rights(R_ADMIN|R_DEBUG, FALSE))
+		. -= VV_secluded()
+
+/decl/global_vars/get_variable_value(varname)
+	return readglobal(varname)
+
+/decl/global_vars/set_variable_value(varname, value)
+	writeglobal(varname, value)
+
+/decl/global_vars/make_view_variables_variable_entry(varname, value)
+	return "(<a href='?_src_=vars;datumedit=\ref[src];varnameedit=[varname]'>E</a>) "
+
+/decl/global_vars/VV_locked()
+	return vars
+
+/decl/global_vars/VV_hidden()
+	return list(
+		"forumsqladdress",
+		"forumsqldb",
+		"forumsqllogin",
+		"forumsqlpass",
+		"forumsqlport",
+		"sqladdress",
+		"sqldb",
+		"sqllogin",
+		"sqlpass",
+		"sqlport",
+		"comms_password",
+		"ban_comms_password",
+		"login_export_addr",
+		"admin_verbs_default",
+		"admin_verbs_admin",
+		"admin_verbs_ban",
+		"admin_verbs_sounds",
+		"admin_verbs_fun",
+		"admin_verbs_spawn",
+		"admin_verbs_server",
+		"admin_verbs_debug",
+		"admin_verbs_paranoid_debug",
+		"admin_verbs_possess",
+		"admin_verbs_permissions",
+		"admin_verbs_rejuv",
+		"admin_verbs_hideable",
+		"admin_verbs_mod",
+		"admin_verbs_event_manager",
+		"adminProcCallCount",
+		"adminProcCaller",
+		"AdminProcCallSpamPrevention",
+		"admins",
+		"admin_datums",
+		"admin_log",
+		"admin_ranks",
+		"admin_state",
+		"alien_whitelist",
+		"alldirs",
+		"ahelp_tickets",
+		"adminfaxes",
+		"adminlogs",
+		"cardinal",
+		"cardinalz",
+		"IClog"
+	)
+
+/client/proc/debug_global_variables()
+	set category = "Debug"
+	set name = "View Global Variables"
+
+	if(!global_vars_)
+		global_vars_ = new()
+	debug_variables(global_vars_)