diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index a331dab556..b4ff1ed7ca 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -48,7 +48,7 @@
 	message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.")
 	return
 
-/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply","Shuttles","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller"))
+/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply","Shuttles","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller", "Gas Data"))
 	set category = "Debug"
 	set name = "Debug Controller"
 	set desc = "Debug the various periodic loop controllers for the game (be careful!)"
@@ -100,5 +100,8 @@
 		if("Transfer Controller")
 			debug_variables(transfer_controller)
 			feedback_add_details("admin_verb","DAutovoter")
+		if("Gas Data")
+			debug_variables(gas_data)
+			feedback_add_details("admin_verv","DGasdata")
 	message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
 	return
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 49ded54e4c..e5b1555b0d 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -212,12 +212,14 @@ var/list/forbidden_varedit_object_types = list(
 			usr << "If a direction, direction is: [dir]"
 
 	var/class = "text"
+	var/list/choices = list("text","num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default")
 	if(src.holder && src.holder.marked_datum)
-		class = input("What kind of variable?","Variable Type",default) as null|anything in list("text",
-			"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default","marked datum ([holder.marked_datum.type])", "DELETE FROM LIST")
-	else
-		class = input("What kind of variable?","Variable Type",default) as null|anything in list("text",
-			"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default", "DELETE FROM LIST")
+		choices += "marked datum ([holder.marked_datum.type])"
+	if(!isnull(default) && default != "num" && !isnull(L[variable]))
+		choices += "edit associated variable"
+	choices += "DELETE FROM LIST"
+
+	class = input("What kind of variable?","Variable Type",default) as null|anything in choices
 
 	if(!class)
 		return
@@ -264,6 +266,11 @@ var/list/forbidden_varedit_object_types = list(
 		if("marked datum")
 			L[L.Find(variable)] = holder.marked_datum
 
+		if("edit associated variable")
+			var/temp_var = mod_list_add_ass()
+			if(temp_var)
+				L[variable] = temp_var
+
 
 /client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
 	if(!check_rights(R_VAREDIT))	return