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

This commit is contained in:
GinjaNinja32
2015-12-25 03:51:40 +00:00
7 changed files with 31 additions and 44 deletions
+4 -2
View File
@@ -91,7 +91,8 @@ var/list/admin_verbs_admin = list(
/client/proc/change_human_appearance_self, // Allows the human-based mob itself change its basic appearance ,
/client/proc/change_security_level,
/client/proc/view_chemical_reaction_logs,
/client/proc/makePAI
/client/proc/makePAI,
/datum/admins/proc/paralyze_mob
)
var/list/admin_verbs_ban = list(
/client/proc/unban_panel,
@@ -294,7 +295,8 @@ var/list/admin_verbs_mod = list(
/datum/admins/proc/show_player_panel,
/client/proc/check_antagonists,
/client/proc/jobbans,
/client/proc/cmd_admin_subtle_message // send an message to somebody as a 'voice in their head',
/client/proc/cmd_admin_subtle_message, // send an message to somebody as a 'voice in their head',
/datum/admins/proc/paralyze_mob
)
var/list/admin_verbs_mentor = list(