From 464cfd49f7bf182019615ecf82278a15913e1971 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Sun, 22 Apr 2012 18:39:36 +0100 Subject: [PATCH] TG: - toggle-hear-radio and toggle-hear-deadcast now properly say whether you will or won't hear the two communication types when toggling them. - added a de-admin-self verb for admins. This exists so admins can play games without having to deal with 2nd accounts and such. It removes all the verbs and deletes the 'holder' object, so admins lose all their verbs, asay, adminhelp/prayer hearing, everything. They are exactly the same as normal players. To return to being an admin someone has to promote you back. The effects of de-admin-self are only for the current round. Coders, when adding new admin verbs, don't forget to also add their removal into /client/proc/clear_admin_verbs() Added jumptocoord, everyone_random and cmd_switch_radio to the proc, so hiding admin verbs works more properly. Revision: r3080 Author: baloh.matevz --- code/modules/admin/admin_verbs.dm | 516 +++++++++++++++++------------- 1 file changed, 290 insertions(+), 226 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 5d9aa9f5d9f..f5092a41e88 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -8,8 +8,7 @@ // verbs += /client/proc/radio_report //for radio debugging dont think its been used in a very long time // verbs += /client/proc/fix_next_move //has not been an issue in a very very long time - - // Mapping helpers added via enable_mapping_debug verb + // Mapping helpers added via enable_debug_verbs verb // verbs += /client/proc/do_not_use_these // verbs += /client/proc/camera_view // verbs += /client/proc/sec_camera_report @@ -44,34 +43,27 @@ seeprayers = 1 holder.level = 6 - if ("Game Admin") deadchat = 1 seeprayers = 1 holder.level = 5 - if ("Badmin") deadchat = 1 seeprayers = 1 holder.level = 4 - if ("Trial Admin") deadchat = 1 seeprayers = 1 holder.level = 3 - if(holder.state == 2) // if observing // Debug verbs += /client/proc/debug_variables - //verbs += /client/proc/cmd_modify_object_variables --Merged with view variables verbs += /client/proc/cmd_modify_ticker_variables verbs += /client/proc/toggleadminhelpsound - // Admin helpers verbs += /client/proc/toggle_view_range - // Admin game intrusion verbs += /client/proc/Getmob verbs += /client/proc/Getkey @@ -84,36 +76,32 @@ verbs += /client/proc/cmd_admin_add_freeform_ai_law verbs += /client/proc/cmd_admin_rejuvenate verbs += /client/proc/cmd_admin_drop_everything - + //verbs += /client/proc/cmd_modify_object_variables --Merged with view variables if ("Admin Candidate") holder.level = 2 if(holder.state == 2) // if observing deadchat = 1 // Settings - verbs += /obj/admins/proc/toggleaban //abandon mob - verbs += /client/proc/deadchat //toggles deadchat + verbs += /obj/admins/proc/toggleaban //abandon mob + verbs += /client/proc/deadchat //toggles deadchat // Admin helpers - //verbs += /client/proc/cmd_admin_attack_log //Use view variables verbs += /client/proc/cmd_admin_check_contents // Admin game intrusion verbs += /client/proc/Jump verbs += /client/proc/jumptokey verbs += /client/proc/jumptomob - + //verbs += /client/proc/cmd_admin_attack_log --Merged with view variables if ("Temporary Admin") holder.level = 1 - if ("Moderator") holder.level = 0 - if ("Admin Observer") holder.level = -1 - if ("Banned") holder.level = -2 del(src) @@ -126,139 +114,33 @@ del(holder) return - if (holder)//Slightly easier to edit way of granting powers + if (holder) //THE BELOW handles granting powers. The above is for special cases only! holder.owner = src - if (holder.level >= 6)//Game Master******************************************************************** - verbs += /client/proc/callproc - verbs += /obj/admins/proc/adjump - verbs += /client/proc/get_admin_state - verbs += /client/proc/reload_admins - verbs += /client/proc/kill_air - verbs += /client/proc/cmd_debug_make_powernets - verbs += /client/proc/enable_mapping_debug - verbs += /client/proc/everyone_random - verbs += /client/proc/only_one // Fateweaver suggested I do this - Doohl - verbs += /client/proc/callprocgen - verbs += /client/proc/callprocobj - verbs += /client/proc/rnd_check_designs - verbs += /client/proc/CarbonCopy - verbs += /client/proc/getruntimelog //used by coders to retrieve runtime logs - if (holder.level >= 5)//Game Admin******************************************************************** - verbs += /obj/admins/proc/view_txt_log - verbs += /obj/admins/proc/view_atk_log - //verbs += /client/proc/cmd_mass_modify_object_variables --Merged with view variables - verbs += /client/proc/cmd_admin_list_open_jobs - verbs += /client/proc/cmd_admin_direct_narrate - verbs += /client/proc/cmd_admin_world_narrate - verbs += /client/proc/cmd_debug_del_all - verbs += /client/proc/cmd_debug_tog_aliens - verbs += /client/proc/ticklag - verbs += /client/proc/mapload - verbs += /obj/admins/proc/spawn_atom - verbs += /client/proc/check_words - verbs += /client/proc/drop_bomb - //verbs += /client/proc/give_spell --moved to view variables - //verbs += /client/proc/cmd_admin_ninjafy --now in view vars - verbs += /client/proc/cmd_admin_grantfullaccess - //verbs += /client/proc/cmd_admin_explosion --now in view vars - //verbs += /client/proc/cmd_admin_emp --now in view vars - verbs += /client/proc/jump_to_dead_group - verbs += /client/proc/cmd_admin_drop_everything - verbs += /client/proc/make_sound - verbs += /client/proc/play_local_sound - verbs += /client/proc/send_space_ninja - verbs += /client/proc/restartcontroller //Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri - verbs += /client/proc/Blobize//I need to remember to move/remove this later - verbs += /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested) - verbs += /client/proc/toggle_gravity_on - verbs += /client/proc/toggle_gravity_off - verbs += /client/proc/toggle_random_events - // Moved over from tg's Game Master: - verbs += /client/proc/colorooc - verbs += /obj/admins/proc/toggle_aliens //toggle aliens - verbs += /obj/admins/proc/toggle_space_ninja //toggle ninjas - verbs += /client/proc/triple_ai - verbs += /client/proc/object_talk - verbs += /client/proc/strike_team - verbs += /client/proc/admin_invis - verbs += /client/proc/cmd_admin_godmode - verbs += /client/proc/delbook - verbs += /client/proc/Force_Event_admin - verbs += /client/proc/radioalert - verbs += /client/proc/make_tajaran - verbs += /client/proc/CarbonCopy + //Retired Admin, skips banned + if (holder.level == -3) + verbs += /client/proc/cmd_admin_say + else return - if (holder.level >= 4)//Badmin******************************************************************** - verbs += /obj/admins/proc/adrev //toggle admin revives - verbs += /obj/admins/proc/adspawn //toggle admin item spawning - verbs += /client/proc/debug_variables - //verbs += /client/proc/cmd_modify_object_variables --Merged with view variables - verbs += /client/proc/cmd_modify_ticker_variables - verbs += /client/proc/Debug2 //debug toggle switch - verbs += /client/proc/toggle_view_range - verbs += /client/proc/Getmob - verbs += /client/proc/Getkey - verbs += /client/proc/sendmob - verbs += /client/proc/Jump - verbs += /client/proc/jumptokey - verbs += /client/proc/jumptomob - verbs += /client/proc/jumptoturf - verbs += /client/proc/cmd_admin_add_freeform_ai_law - verbs += /client/proc/cmd_admin_add_random_ai_law - //verbs += /client/proc/cmd_admin_godmode --now in view variables - verbs += /client/proc/cmd_admin_rejuvenate - //verbs += /client/proc/cmd_admin_gib --View vars menu - verbs += /client/proc/cmd_admin_delete - //verbs += /proc/togglebuildmode --now in view vars - verbs += /client/proc/toggleadminhelpsound - verbs += /client/proc/togglebuildmodeself - verbs += /client/proc/hide_most_verbs - verbs += /client/proc/tension_report - verbs += /client/proc/jumptocoord + //Admin Observer + if (holder.level >= -1) + verbs += /client/proc/cmd_admin_say + verbs += /client/proc/cmd_admin_gib_self + verbs += /client/proc/deadmin_self + else return - if (holder.level >= 3)//Trial Admin******************************************************************** - verbs += /obj/admins/proc/toggleaban //abandon mob - verbs += /client/proc/cmd_admin_remove_plasma - verbs += /client/proc/admin_call_shuttle - verbs += /client/proc/admin_cancel_shuttle - verbs += /client/proc/admin_deny_shuttle - verbs += /obj/admins/proc/show_traitor_panel - verbs += /client/proc/cmd_admin_dress - verbs += /client/proc/cmd_admin_christmas - verbs += /client/proc/respawn_character - verbs += /client/proc/spawn_xeno - verbs += /proc/possess - verbs += /proc/release - verbs += /client/proc/toggleprayers - verbs += /client/proc/editappear - - if (holder.level >= 2)//Admin Candidate******************************************************************** - verbs += /client/proc/cmd_admin_add_random_ai_law - verbs += /client/proc/secrets - verbs += /client/proc/play_sound - verbs += /client/proc/stealth - - - if (holder.level >= 1)//Temp Admin******************************************************************** - //verbs += /client/proc/cmd_admin_attack_log //use view variables - verbs += /client/proc/cmd_admin_check_contents - verbs += /obj/admins/proc/delay //game start delay - verbs += /obj/admins/proc/immreboot //immediate reboot - verbs += /obj/admins/proc/restart //restart - verbs += /client/proc/cmd_admin_create_centcom_report - verbs += /client/proc/toggle_hear_deadcast - verbs += /client/proc/toggle_hear_radio - verbs += /client/proc/cmd_admin_change_custom_event - - if (holder.level >= 0)//Mod******************************************************************** - verbs += /obj/admins/proc/toggleAI //Toggle the AI - verbs += /obj/admins/proc/toggleenter //Toggle enterting -// verbs += /obj/admins/proc/toggleguests //Toggle guests entering - verbs += /obj/admins/proc/toggleooc //toggle ooc - verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc - verbs += /obj/admins/proc/voteres //toggle votes - verbs += /client/proc/deadchat //toggles deadchat + //Moderator + if (holder.level >= 0) + verbs += /obj/admins/proc/toggleAI //Toggle the AI + verbs += /obj/admins/proc/toggleenter //Toggle enterting +// verbs += /obj/admins/proc/toggleguests //Toggle guests entering + verbs += /obj/admins/proc/toggleooc //toggle ooc + verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc + verbs += /obj/admins/proc/voteres //toggle votes + verbs += /obj/admins/proc/vmode + verbs += /obj/admins/proc/votekill + verbs += /obj/admins/proc/show_player_panel + verbs += /client/proc/deadchat //toggles deadchat verbs += /client/proc/cmd_admin_mute verbs += /client/proc/cmd_admin_pm verbs += /client/proc/cmd_admin_subtle_message @@ -274,36 +156,189 @@ verbs += /client/proc/unban_panel verbs += /client/proc/jobbans verbs += /client/proc/playernotes - verbs += /obj/admins/proc/show_skills - verbs += /obj/admins/proc/vmode - verbs += /obj/admins/proc/votekill verbs += /client/proc/voting - verbs += /obj/admins/proc/show_player_panel - //verbs += /client/proc/cmd_admin_prison --in player panel - //verbs += /obj/admins/proc/unprison --in player panel verbs += /client/proc/hide_verbs verbs += /client/proc/general_report verbs += /client/proc/air_report + verbs += /client/proc/deadmin_self + //verbs += /client/proc/cmd_admin_prison --Merged with player panel + //verbs += /obj/admins/proc/unprison --Merged with player panel + verbs += /obj/admins/proc/show_skills + else return + //Temporary Admin + if (holder.level >= 1) + verbs += /obj/admins/proc/delay //game start delay + verbs += /obj/admins/proc/immreboot //immediate reboot + verbs += /obj/admins/proc/restart //restart + verbs += /client/proc/cmd_admin_check_contents + verbs += /client/proc/cmd_admin_create_centcom_report + verbs += /client/proc/toggle_hear_deadcast + verbs += /client/proc/toggle_hear_radio + verbs += /client/proc/deadmin_self + //verbs += /client/proc/cmd_admin_attack_log --Merged with view variables + verbs += /client/proc/cmd_admin_change_custom_event + else return - if (holder.level >= -1)//Admin Observer - verbs += /client/proc/cmd_admin_say - verbs += /client/proc/cmd_admin_gib_self + //Admin Candidate + if (holder.level >= 2) + verbs += /client/proc/cmd_admin_add_random_ai_law + verbs += /client/proc/secrets + verbs += /client/proc/play_sound + verbs += /client/proc/stealth + verbs += /client/proc/deadmin_self + else return - if (holder.level == -3)//Retired Admin, skips banned - verbs += /client/proc/cmd_admin_say + //Trial Admin + if (holder.level >= 3) + verbs += /obj/admins/proc/toggleaban //abandon mob + verbs += /obj/admins/proc/show_traitor_panel + verbs += /client/proc/cmd_admin_remove_plasma + verbs += /client/proc/admin_call_shuttle + verbs += /client/proc/admin_cancel_shuttle + verbs += /client/proc/cmd_admin_dress + verbs += /client/proc/respawn_character + verbs += /client/proc/spawn_xeno + verbs += /client/proc/toggleprayers + verbs += /client/proc/deadmin_self + verbs += /proc/possess + verbs += /proc/release + verbs += /client/proc/admin_deny_shuttle + verbs += /client/proc/cmd_admin_christmas + verbs += /client/proc/editappear + else return + + //Badmin + if (holder.level >= 4) + verbs += /obj/admins/proc/adrev //toggle admin revives + verbs += /obj/admins/proc/adspawn //toggle admin item spawning + verbs += /client/proc/debug_variables + verbs += /client/proc/cmd_modify_ticker_variables + verbs += /client/proc/Debug2 //debug toggle switch + verbs += /client/proc/toggle_view_range + verbs += /client/proc/Getmob + verbs += /client/proc/Getkey + verbs += /client/proc/sendmob + verbs += /client/proc/Jump + verbs += /client/proc/jumptokey + verbs += /client/proc/jumptomob + verbs += /client/proc/jumptoturf + verbs += /client/proc/cmd_admin_delete + verbs += /client/proc/cmd_admin_add_freeform_ai_law + verbs += /client/proc/cmd_admin_add_random_ai_law + verbs += /client/proc/cmd_admin_rejuvenate + verbs += /client/proc/hide_most_verbs + verbs += /client/proc/jumptocoord + verbs += /client/proc/deadmin_self + //verbs += /client/proc/cmd_admin_godmode --Merged with view variables + //verbs += /client/proc/cmd_admin_gib --Merged with view variables + //verbs += /proc/togglebuildmode --Merged with view variables + //verbs += /client/proc/cmd_modify_object_variables --Merged with view variables + verbs += /client/proc/togglebuildmodeself + verbs += /client/proc/tension_report + verbs += /client/proc/toggleadminhelpsound + else return + + //Game Admin + if (holder.level >= 5) + verbs += /obj/admins/proc/spawn_atom + verbs += /obj/admins/proc/view_txt_log + verbs += /obj/admins/proc/view_atk_log + verbs += /client/proc/cmd_admin_list_open_jobs + verbs += /client/proc/cmd_admin_direct_narrate + verbs += /client/proc/colorooc + verbs += /client/proc/cmd_admin_world_narrate + verbs += /client/proc/cmd_debug_del_all + verbs += /client/proc/cmd_debug_tog_aliens + verbs += /client/proc/ticklag + verbs += /client/proc/mapload + verbs += /client/proc/check_words + verbs += /client/proc/drop_bomb + verbs += /client/proc/cmd_admin_grantfullaccess + verbs += /client/proc/cmd_admin_drop_everything + verbs += /client/proc/make_sound + verbs += /client/proc/play_local_sound + verbs += /client/proc/send_space_ninja + verbs += /client/proc/restartcontroller //Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri + verbs += /client/proc/Blobize //I need to remember to move/remove this later + verbs += /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the new clickproc is being tested) + verbs += /client/proc/toggle_gravity_on + verbs += /client/proc/toggle_gravity_off + verbs += /client/proc/toggle_random_events + verbs += /client/proc/deadmin_self + //verbs += /client/proc/cmd_mass_modify_object_variables --Merged with view variables + //verbs += /client/proc/cmd_admin_explosion --Merged with view variables + //verbs += /client/proc/cmd_admin_emp --Merged with view variables + //verbs += /client/proc/give_spell --Merged with view variables + //verbs += /client/proc/cmd_admin_ninjafy --Merged with view variables + // Moved over from tg's Game Master: + verbs += /obj/admins/proc/toggle_aliens //toggle aliens + verbs += /obj/admins/proc/toggle_space_ninja //toggle ninjas + verbs += /client/proc/triple_ai + verbs += /client/proc/object_talk + verbs += /client/proc/strike_team + verbs += /client/proc/admin_invis + verbs += /client/proc/cmd_admin_godmode + verbs += /client/proc/delbook + verbs += /client/proc/Force_Event_admin + verbs += /client/proc/radioalert + verbs += /client/proc/make_tajaran + verbs += /client/proc/CarbonCopy + verbs += /client/proc/jump_to_dead_group + else return + + //Game Master + if (holder.level >= 6) + verbs += /obj/admins/proc/adjump + verbs += /client/proc/callproc + verbs += /client/proc/get_admin_state + verbs += /client/proc/reload_admins + verbs += /client/proc/cmd_debug_make_powernets + verbs += /client/proc/everyone_random + verbs += /client/proc/only_one + verbs += /client/proc/deadmin_self + verbs += /client/proc/getruntimelog //used by coders to retrieve runtime logs + verbs += /client/proc/enable_mapping_debug + verbs += /client/proc/kill_air + verbs += /client/proc/callprocgen + verbs += /client/proc/callprocobj + verbs += /client/proc/rnd_check_designs + verbs += /client/proc/CarbonCopy + else return + return /client/proc/clear_admin_verbs() deadchat = 0 + verbs -= /obj/admins/proc/vmode + verbs -= /obj/admins/proc/votekill + verbs -= /obj/admins/proc/announce + verbs -= /obj/admins/proc/startnow + verbs -= /obj/admins/proc/toggleAI //Toggle the AI + verbs -= /obj/admins/proc/toggleenter //Toggle enterting +// verbs -= /obj/admins/proc/toggleguests //Toggle guests entering + verbs -= /obj/admins/proc/toggleooc //toggle ooc + verbs -= /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc + verbs -= /obj/admins/proc/voteres //toggle votes + verbs -= /obj/admins/proc/delay //game start delay + verbs -= /obj/admins/proc/immreboot //immediate reboot + verbs -= /obj/admins/proc/restart //restart + verbs -= /obj/admins/proc/show_traitor_panel + verbs -= /obj/admins/proc/show_player_panel + verbs -= /obj/admins/proc/toggle_aliens //toggle aliens + verbs -= /obj/admins/proc/toggle_space_ninja //toggle ninjas + verbs -= /obj/admins/proc/adjump + verbs -= /obj/admins/proc/view_txt_log + verbs -= /obj/admins/proc/view_atk_log + verbs -= /obj/admins/proc/spawn_atom + verbs -= /obj/admins/proc/adrev //toggle admin revives + verbs -= /obj/admins/proc/adspawn //toggle admin item spawning + verbs -= /obj/admins/proc/toggleaban //abandon mob verbs -= /client/proc/hide_verbs verbs -= /client/proc/hide_most_verbs verbs -= /client/proc/show_verbs verbs -= /client/proc/colorooc - verbs -= /obj/admins/proc/toggle_aliens //toggle aliens - verbs -= /obj/admins/proc/toggle_space_ninja //toggle ninjas - verbs -= /obj/admins/proc/adjump verbs -= /client/proc/triple_ai verbs -= /client/proc/get_admin_state verbs -= /client/proc/reload_admins @@ -311,8 +346,6 @@ verbs -= /client/proc/cmd_debug_make_powernets verbs -= /client/proc/object_talk verbs -= /client/proc/strike_team - verbs -= /obj/admins/proc/view_txt_log - //verbs -= /client/proc/cmd_mass_modify_object_variables --Merged with view variables verbs -= /client/proc/cmd_admin_list_open_jobs verbs -= /client/proc/cmd_admin_direct_narrate verbs -= /client/proc/cmd_admin_world_narrate @@ -322,25 +355,16 @@ verbs -= /client/proc/cmd_debug_tog_aliens verbs -= /client/proc/ticklag verbs -= /client/proc/mapload - verbs -= /obj/admins/proc/spawn_atom verbs -= /client/proc/check_words verbs -= /client/proc/drop_bomb - //verbs -= /client/proc/give_spell --moved to view variables - //verbs -= /client/proc/cmd_admin_ninjafy --now in view vars verbs -= /client/proc/cmd_admin_grantfullaccess - //verbs -= /client/proc/cmd_admin_explosion --now in view vars - //verbs -= /client/proc/cmd_admin_emp --now in view vars verbs -= /client/proc/cmd_admin_drop_everything verbs -= /client/proc/make_sound verbs -= /client/proc/only_one verbs -= /client/proc/send_space_ninja - verbs -= /obj/admins/proc/adrev //toggle admin revives - verbs -= /obj/admins/proc/adspawn //toggle admin item spawning - verbs -= /obj/admins/proc/toggleaban //abandon mob verbs -= /client/proc/debug_variables - //verbs -= /client/proc/cmd_modify_object_variables --merged with view variables verbs -= /client/proc/cmd_modify_ticker_variables - verbs -= /client/proc/Debug2 //debug toggle switch + verbs -= /client/proc/Debug2 //debug toggle switch verbs -= /client/proc/toggle_view_range verbs -= /client/proc/Getmob verbs -= /client/proc/Getkey @@ -351,64 +375,35 @@ verbs -= /client/proc/jumptoturf verbs -= /client/proc/cmd_admin_add_freeform_ai_law verbs -= /client/proc/cmd_admin_add_random_ai_law - //verbs -= /client/proc/cmd_admin_godmode --now in view variables verbs -= /client/proc/cmd_admin_rejuvenate - //verbs -= /client/proc/cmd_admin_gib --view vars menu verbs -= /client/proc/cmd_admin_delete - //verbs -= /proc/togglebuildmode --now in view vars verbs -= /client/proc/toggleadminhelpsound - verbs -= /client/proc/togglebuildmodeself verbs -= /client/proc/cmd_admin_remove_plasma verbs -= /client/proc/admin_call_shuttle verbs -= /client/proc/admin_cancel_shuttle - verbs -= /client/proc/admin_deny_shuttle - verbs -= /obj/admins/proc/show_traitor_panel verbs -= /client/proc/cmd_admin_dress - verbs -= /client/proc/cmd_admin_christmas verbs -= /client/proc/respawn_character verbs -= /client/proc/spawn_xeno - verbs -= /proc/possess - verbs -= /proc/release verbs -= /client/proc/cmd_admin_add_random_ai_law verbs -= /client/proc/secrets verbs -= /client/proc/play_sound verbs -= /client/proc/stealth - //verbs -= /client/proc/cmd_admin_attack_log //use view variables verbs -= /client/proc/cmd_admin_check_contents - verbs -= /obj/admins/proc/delay //game start delay - verbs -= /obj/admins/proc/immreboot //immediate reboot - verbs -= /obj/admins/proc/restart //restart verbs -= /client/proc/cmd_admin_create_centcom_report - verbs -= /obj/admins/proc/toggleAI //Toggle the AI - verbs -= /obj/admins/proc/toggleenter //Toggle enterting -// verbs -= /obj/admins/proc/toggleguests //Toggle guests entering - verbs -= /obj/admins/proc/toggleooc //toggle ooc - verbs -= /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc - verbs -= /obj/admins/proc/voteres //toggle votes - verbs -= /client/proc/deadchat //toggles deadchat + verbs -= /client/proc/deadchat //toggles deadchat verbs -= /client/proc/cmd_admin_mute verbs -= /client/proc/cmd_admin_pm verbs -= /client/proc/cmd_admin_say verbs -= /client/proc/cmd_admin_subtle_message verbs -= /client/proc/warn - verbs -= /obj/admins/proc/announce - verbs -= /obj/admins/proc/startnow verbs -= /client/proc/dsay verbs -= /client/proc/admin_play verbs -= /client/proc/admin_observe verbs -= /client/proc/game_panel // verbs -= /client/proc/player_panel - verbs -= /client/proc/player_panel_new verbs -= /client/proc/unban_panel verbs -= /client/proc/jobbans - verbs -= /client/proc/playernotes - verbs -= /obj/admins/proc/show_skills - verbs -= /obj/admins/proc/vmode - verbs -= /obj/admins/proc/votekill verbs -= /client/proc/voting - verbs -= /obj/admins/proc/show_player_panel - //verbs -= /client/proc/cmd_admin_prison --in player panel - //verbs -= /obj/admins/proc/unprison --in player panel verbs -= /client/proc/hide_verbs verbs -= /client/proc/general_report verbs -= /client/proc/air_report @@ -416,18 +411,19 @@ verbs -= /client/proc/cmd_admin_gib_self verbs -= /client/proc/restartcontroller verbs -= /client/proc/play_local_sound - verbs -= /client/proc/enable_mapping_debug verbs -= /client/proc/toggleprayers - verbs -= /client/proc/editappear - verbs -= /client/proc/jump_to_dead_group verbs -= /client/proc/Blobize - verbs -= /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested) + verbs -= /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested) verbs -= /client/proc/toggle_hear_deadcast verbs -= /client/proc/toggle_hear_radio verbs -= /client/proc/tension_report + verbs -= /client/proc/player_panel_new verbs -= /client/proc/toggle_gravity_on verbs -= /client/proc/toggle_gravity_off verbs -= /client/proc/toggle_random_events + verbs -= /client/proc/deadmin_self + verbs -= /client/proc/jumptocoord + verbs -= /client/proc/everyone_random verbs -= /client/proc/cmd_admin_change_custom_event verbs -= /client/proc/admin_invis verbs -= /client/proc/callprocgen @@ -440,6 +436,29 @@ verbs -= /client/proc/make_tajaran verbs -= /client/proc/CarbonCopy verbs -= /client/proc/getruntimelog //used by coders to retrieve runtime logs + verbs -= /proc/possess + verbs -= /proc/release + //verbs -= /client/proc/give_spell --Merged with view variables + //verbs -= /client/proc/cmd_admin_ninjafy --Merged with view variables + //verbs -= /client/proc/cmd_modify_object_variables --Merged with view variables + //verbs -= /client/proc/cmd_admin_explosion --Merged with view variables + //verbs -= /client/proc/cmd_admin_emp --Merged with view variables + //verbs -= /client/proc/cmd_admin_godmode --Merged with view variables + //verbs -= /client/proc/cmd_admin_gib --Merged with view variables + //verbs -= /client/proc/cmd_mass_modify_object_variables --Merged with view variables + //verbs -= /client/proc/cmd_admin_attack_log --Merged with view variables + //verbs -= /proc/togglebuildmode --Merged with view variables + //verbs -= /client/proc/cmd_admin_prison --Merged with player panel + //verbs -= /obj/admins/proc/unprison --Merged with player panel + //verbs -= /client/proc/cmd_switch_radio --removed because tcommsat is staying + verbs -= /client/proc/togglebuildmodeself + verbs -= /client/proc/admin_deny_shuttle + verbs -= /client/proc/cmd_admin_christmas + verbs -= /client/proc/editappear + verbs -= /client/proc/jump_to_dead_group + verbs -= /client/proc/playernotes + verbs -= /obj/admins/proc/show_skills + verbs -= /client/proc/enable_mapping_debug return @@ -461,6 +480,7 @@ mob.admin_observing = 1 mob.adminghostize(1) src << "\blue You are now observing" +// feedback_add_details("admin_verb","O") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/admin_play() set category = "Admin" @@ -478,6 +498,7 @@ if(istype(mob, /mob/dead/observer)) mob:reenter_corpse() src << "\blue You are now playing" +// feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/get_admin_state() set name = "Get Admin State" @@ -490,20 +511,24 @@ src << "[M.key] is observing - [M.client.holder.state]" else src << "[M.key] is undefined - [M.client.holder.state]" +// feedback_add_details("admin_verb","GAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -///client/proc/player_panel() -// set name = "Player Panel-Old" -// set category = "Admin" -// if(holder) -// holder.player_panel_old() -// return - +/* +/client/proc/player_panel() + set name = "Player Panel-Old" + set category = "Admin" + if(holder) + holder.player_panel_old() +// feedback_add_details("admin_verb","PP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + return +*/ /client/proc/player_panel_new() set name = "Player Panel" set category = "Admin" if(holder) holder.player_panel_new() +// feedback_add_details("admin_verb","PPN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/jobbans() @@ -511,27 +536,23 @@ set category = "Admin" if(holder) holder.Jobbans() - return - -/client/proc/playernotes() - set name = "Show Player Info" - set category = "Admin" - if(holder) - holder.PlayerNotes() +// feedback_add_details("admin_verb","VJB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/unban_panel() set name = "Unban Panel" set category = "Admin" - if (holder) + if(holder) holder.unbanpanel() +// feedback_add_details("admin_verb","UBP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/game_panel() set name = "Game Panel" set category = "Admin" - if (holder) + if(holder) holder.Game() +// feedback_add_details("admin_verb","GP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/secrets() @@ -539,6 +560,7 @@ set category = "Admin" if (holder) holder.Secrets() +// feedback_add_details("admin_verb","S") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/voting() @@ -546,11 +568,13 @@ set category = "Admin" if (holder) holder.Voting() +// feedback_add_details("admin_verb","VO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/colorooc() set category = "Fun" set name = "OOC Text Color" ooccolor = input(src, "Please select your OOC colour.", "OOC colour") as color +// feedback_add_details("admin_verb","OC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/stealth() @@ -573,6 +597,14 @@ fakekey = null log_admin("[key_name(usr)] has turned stealth mode [stealth ? "ON" : "OFF"]") message_admins("[key_name_admin(usr)] has turned stealth mode [stealth ? "ON" : "OFF"]", 1) +// feedback_add_details("admin_verb","SM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +/client/proc/playernotes() + set name = "Show Player Info" + set category = "Admin" + if(holder) + holder.PlayerNotes() + return #define AUTOBANTIME 10 /client/proc/warn(var/mob/M in world) @@ -600,6 +632,7 @@ feedback_inc("ban_warn",1) del(M.client) +// feedback_add_details("admin_verb","WARN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/drop_bomb() // Some admin dickery that can probably be done better -- TLE @@ -626,6 +659,7 @@ var/flash_range = input("Flash range (in tiles):") as num explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range) message_admins("\blue [ckey] creating an admin explosion at [epicenter.loc].") +// feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/give_spell(mob/T as mob in world) // -- Urist set category = "Fun" @@ -634,6 +668,7 @@ var/obj/effect/proc_holder/spell/S = input("Choose the spell to give to that guy", "ABRAKADABRA") as null|anything in spells if(!S) return T.spell_list += new S +// feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/make_sound(var/obj/O in world) // -- TLE set category = "Special Verbs" @@ -645,12 +680,16 @@ return for (var/mob/V in hearers(O)) V.show_message(message, 2) +// feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + /client/proc/togglebuildmodeself() set name = "Toggle Build Mode Self" set category = "Special Verbs" if(src.mob) togglebuildmode(src.mob) +// feedback_add_details("admin_verb","TBMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + /client/proc/toggleadminhelpsound() set name = "Toggle Adminhelp Sound" @@ -660,6 +699,7 @@ usr << "You will now hear a sound when adminhelps arrive" else usr << "You will no longer hear a sound when adminhelps arrive" +// feedback_add_details("admin_verb","AHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/object_talk(var/msg as text) // -- TLE set category = "Special Verbs" @@ -670,6 +710,7 @@ return for (var/mob/V in hearers(mob.control_object)) V.show_message("[mob.control_object.name] says: \"" + msg + "\"", 2) +// feedback_add_details("admin_verb","OT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/kill_air() // -- TLE set category = "Debug" @@ -681,6 +722,7 @@ else kill_air = 1 usr << "Disabled air processing." +// feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/show_verbs() set name = "Toggle admin verb visibility" @@ -691,14 +733,16 @@ clear_admin_verbs() update_admins(holder.rank) deadchat = temp +// feedback_add_details("admin_verb","TAVVS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_clickproc() //TODO ERRORAGE (This is a temporary verb here while I test the new clicking proc) set name = "Toggle NewClickProc" - set category = "Admin" + set category = "Debug" if(!holder) return using_new_click_proc = !using_new_click_proc world << "Testing of new click proc [using_new_click_proc ? "enabled" : "disabled"]" +// feedback_add_details("admin_verb","TNCP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_hear_deadcast() set name = "Toggle Hear Deadcast" @@ -706,7 +750,8 @@ if(!holder) return STFU_ghosts = !STFU_ghosts - usr << "You will now [STFU_ghosts ? "hear" : "not hear"] ghosts" + usr << "You will now [STFU_ghosts ? "not hear" : "hear"] ghosts" +// feedback_add_details("admin_verb","THDC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_hear_radio() set name = "Toggle Hear Radio" @@ -714,7 +759,24 @@ if(!holder) return STFU_radio = !STFU_radio - usr << "You will now [STFU_radio ? "hear" : "not hear"] radio chatter from nearby radios or speakers" + usr << "You will now [STFU_radio ? "not hear" : "hear"] radio chatter from nearby radios or speakers" +// feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +/client/proc/deadmin_self() + set name = "De-admin self" + set category = "Admin" + + if(src.holder) + if(alert("Confirm self-deadmin for the round? You can't re-admin yourself without someont promoting you.",,"Yes","No") == "Yes") + del(holder) + log_admin("[src] deadmined themself.") + message_admins("[src] deadmined themself.", 1) + src.clear_admin_verbs() + src.update_admins(null) + admins.Remove(src.ckey) + usr << "You are now a normal player." +// feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + /client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs set name = "Toggle most admin verb visibility" @@ -728,7 +790,7 @@ verbs -= /client/proc/hide_most_verbs verbs += /client/proc/show_verbs - if(holder.level >= 6)//Game Master******************************************************************** + if(holder.level >= 5)//Game Admin******************************************************************** verbs += /client/proc/colorooc if(holder.level >= 4)//Badmin******************************************************************** @@ -752,6 +814,7 @@ verbs += /obj/admins/proc/toggleooc //toggle ooc verbs += /client/proc/cmd_admin_say//asay verbs += /client/proc/toggleadminhelpsound +// feedback_add_details("admin_verb","HMV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -770,6 +833,7 @@ verbs += /client/proc/deadchat //toggles deadchat verbs += /obj/admins/proc/toggleooc //toggle ooc verbs += /client/proc/cmd_admin_say//asay +// feedback_add_details("admin_verb","TAVVH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return /client/proc/admin_invis()