Large merge resultion. Used remote for map conflicts.

code/modules/admin/verbs/mapping.dm

@@ -125,7 +125,7 @@ var/intercom_range_display_status = 0
 	feedback_add_details("admin_verb","mIRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 var/list/debug_verbs = list (
-	/client/proc/do_not_use_these
+        /client/proc/do_not_use_these
         ,/client/proc/camera_view
         ,/client/proc/sec_camera_report
         ,/client/proc/intercom_view
@@ -158,9 +158,13 @@ var/list/debug_verbs = list (
         ,/client/proc/ZoneTick
         ,/client/proc/rebootAirMaster
         ,/client/proc/hide_debug_verbs
-	,/client/proc/testZAScolors
-	,/client/proc/testZAScolors_remove
-	,/client/proc/setup_supermatter_engine
+        ,/client/proc/testZAScolors
+        ,/client/proc/testZAScolors_remove
+        ,/client/proc/setup_supermatter_engine
+        ,/client/proc/view_power_update_stats_area
+        ,/client/proc/view_power_update_stats_machines
+        ,/client/proc/toggle_power_update_profiling
+		,/client/proc/atmos_toggle_debug
 	)
 
 

code/modules/admin/verbs/modifyvariables.dm

@@ -215,7 +215,7 @@ var/list/forbidden_varedit_object_types = list(
 	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)
 		choices += "marked datum ([holder.marked_datum.type])"
-	if(!isnull(default) && default != "num" && !isnull(L[variable]))
+	if(!isnull(default) && default != "num")
 		choices += "edit associated variable"
 	choices += "DELETE FROM LIST"