cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Aurorastation/development'

Browse Source 
# Conflicts:
#	code/modules/admin/admin_verbs.dm
This commit is contained in:
skull132
2016-02-06 02:08:11 +02:00
parent 481cbf423d c302fcf210
commit 26a449b861
20 changed files with 877 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+3 -2
View File
@@ -98,6 +98,7 @@ var/list/admin_verbs_admin = list(
/client/proc/cmd_cciaa_say,
/client/proc/cmd_dev_say,
/client/proc/view_duty_log
/client/proc/cmd_dev_bst
)
var/list/admin_verbs_ban = list(
/client/proc/unban_panel,
@@ -299,7 +300,6 @@ var/list/admin_verbs_mod = list(
var/list/admin_verbs_dev = list( //will need to be altered - Ryan784
///datum/admins/proc/restart,
/datum/admins/proc/spawn_atom, //allows us to spawn instances,
/datum/admins/proc/delay,
/client/proc/Jump,
/client/proc/jumptokey, /*allows us to jump to the location of a mob with a certain ckey*/
/client/proc/jumptomob, /*allows us to jump to a specific mob*/
@@ -330,7 +330,8 @@ var/list/admin_verbs_dev = list( //will need to be altered - Ryan784
/client/proc/restart_controller,
/client/proc/togglebuildmodeself,
/client/proc/toggledebuglogs,
/client/proc/ZASSettings
/client/proc/ZASSettings,
/client/proc/cmd_dev_bst
)
var/list/admin_verbs_cciaa = list(
/client/proc/cmd_admin_pm_panel, /*admin-pm list*/