Merge remote-tracking branch 'upstream/pr/5689' into dev

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/crew.dm
This commit is contained in:
Mloc-Hibernia
2014-07-26 14:25:24 +00:00
31 changed files with 3055 additions and 47 deletions
+2 -1
View File
@@ -127,7 +127,8 @@ var/list/admin_verbs_server = list(
/datum/admins/proc/toggle_aliens,
/datum/admins/proc/toggle_space_ninja,
/client/proc/toggle_random_events,
/client/proc/check_customitem_activity
/client/proc/check_customitem_activity,
/client/proc/nanomapgen_DumpImage
)
var/list/admin_verbs_debug = list(
/client/proc/getruntimelog, /*allows us to access runtime logs to somebody*/