From 7f1e7ca95449f8e215a1c691b49229485db44aa6 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Mon, 7 Jan 2013 20:41:45 +0400 Subject: [PATCH] Moved most admin verbs from admin_verbs_default to admin_verbs_admin. Reason is to make moderators possible without Game Masters losing basic admin verbs. Now default admin verbs only have bare bone functionality, and each next permission adds more. --- code/modules/admin/admin_verbs.dm | 36 +++++++++++++------------------ config/admin_ranks.txt | 4 ++-- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 3919e4df073..8f1d8692658 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1,25 +1,12 @@ //admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless var/list/admin_verbs_default = list( /datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags*/ - /client/proc/game_panel, /*game panel, allows to change game-mode etc*/ - /datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/ - /datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/ /client/proc/toggleadminhelpsound, /*toggles whether we hear a sound when adminhelps/PMs are used*/ /client/proc/deadmin_self, /*destroys our own admin datum so we can play as a regular player*/ - /client/proc/cmd_admin_say, /*admin-only ooc chat*/ /client/proc/hide_verbs, /*hides all our adminverbs*/ /client/proc/hide_most_verbs, /*hides all our hideable adminverbs*/ /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/ - /client/proc/check_ai_laws, /*shows AI and borg laws*/ /client/proc/check_antagonists, /*shows all antags*/ - /client/proc/admin_memo, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/ - /client/proc/deadchat, /*toggles deadchat on/off*/ - /client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/ - /client/proc/toggleprayers, /*toggles prayers on/off*/ - /client/proc/toggle_hear_deadcast, /*toggles whether we hear deadchat*/ - /client/proc/toggle_hear_radio, /*toggles whether we hear the radio*/ - /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ - /client/proc/secrets ) var/list/admin_verbs_admin = list( /client/proc/player_panel, /*shows an interface for all players, with links to various panels (old style)*/ @@ -55,7 +42,20 @@ var/list/admin_verbs_admin = list( /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ /client/proc/cmd_admin_create_centcom_report, - /client/proc/check_words /*displays cult-words*/ + /client/proc/check_words, /*displays cult-words*/ + /client/proc/check_ai_laws, /*shows AI and borg laws*/ + /client/proc/admin_memo, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/ + /client/proc/deadchat, /*toggles deadchat on/off*/ + /client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/ + /client/proc/toggleprayers, /*toggles prayers on/off*/ + /client/proc/toggle_hear_deadcast, /*toggles whether we hear deadchat*/ + /client/proc/toggle_hear_radio, /*toggles whether we hear the radio*/ + /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ + /client/proc/secrets, + /datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/ + /datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/ + /client/proc/game_panel, /*game panel, allows to change game-mode etc*/ + /client/proc/cmd_admin_say /*admin-only ooc chat*/ ) var/list/admin_verbs_ban = list( /client/proc/unban_panel, @@ -209,20 +209,14 @@ var/list/admin_verbs_hideable = list( /proc/release ) var/list/admin_verbs_mod = list( - /client/proc/check_antagonists, /*shows all antags*/ /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game.*/ /client/proc/playernotes, /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ - /client/proc/toggleadminhelpsound, /*toggles whether we hear a sound when adminhelps/PMs are used*/ - /client/proc/hide_verbs, /*hides all our adminverbs*/ - /client/proc/hide_verbs, /client/proc/mod_panel, /client/proc/cmd_mod_say, /datum/admins/proc/show_player_info - //client/proc/Report, - //client/proc/display_admin_reports ) /client/proc/add_admin_verbs() if(holder) @@ -239,7 +233,7 @@ var/list/admin_verbs_mod = list( if(holder.rights & R_REJUVINATE) verbs += admin_verbs_rejuv if(holder.rights & R_SOUNDS) verbs += admin_verbs_sounds if(holder.rights & R_SPAWN) verbs += admin_verbs_spawn - if(holder.rights & R_MOD) verbs -= admin_verbs_default; verbs += admin_verbs_mod + if(holder.rights & R_MOD) verbs += admin_verbs_mod /client/proc/remove_admin_verbs() verbs.Remove( diff --git a/config/admin_ranks.txt b/config/admin_ranks.txt index 2a33adb3b80..1b377e9fd12 100644 --- a/config/admin_ranks.txt +++ b/config/admin_ranks.txt @@ -28,8 +28,8 @@ # +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag Admin Observer -Moderator +ADMIN -Admin Candidate +@ +Moderator +MOD +Admin Candidate +ADMIN Trial Admin +@ +SPAWN +REJUV +VAREDIT +BAN Badmin +@ +POSSESS +BUILDMODE +SERVER +FUN Game Admin +@ +STEALTH +SOUNDS +DEBUG