Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
This commit is contained in:
PsiOmega
2015-06-14 10:35:29 +02:00
5 changed files with 16 additions and 29 deletions
+4
View File
@@ -174,6 +174,10 @@ var/list/admin_verbs_debug = list(
/client/proc/toggledebuglogs,
/client/proc/SDQL_query,
/client/proc/SDQL2_query,
/client/proc/Jump,
/client/proc/jumptomob,
/client/proc/jumptocoord,
/client/proc/dsay
)
var/list/admin_verbs_paranoid_debug = list(