Merge remote-tracking branch 'upstream/dev' into APC. Updates map with new SMES variable names.

This commit is contained in:
PsiOmega
2014-10-30 08:02:56 +01:00
25 changed files with 931 additions and 1005 deletions

View File

@@ -161,9 +161,6 @@ var/list/debug_verbs = list (
,/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
)