From 52aa3bcc191930b34b41c7221b73a87382821f72 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Fri, 10 Feb 2012 20:36:58 +0000 Subject: [PATCH] - 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. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3080 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/admin/admin_verbs.dm | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index bfabbc85b39..cfe5d5dc973 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -141,6 +141,7 @@ 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/deadmin_self if (holder.level >= 5)//Game Admin******************************************************************** verbs += /obj/admins/proc/view_txt_log @@ -174,6 +175,7 @@ verbs += /client/proc/toggle_gravity_on verbs += /client/proc/toggle_gravity_off verbs += /client/proc/toggle_random_events + verbs += /client/proc/deadmin_self if (holder.level >= 4)//Badmin******************************************************************** verbs += /obj/admins/proc/adrev //toggle admin revives @@ -202,6 +204,7 @@ verbs += /client/proc/hide_most_verbs verbs += /client/proc/tension_report verbs += /client/proc/jumptocoord + verbs += /client/proc/deadmin_self if (holder.level >= 3)//Trial Admin******************************************************************** verbs += /obj/admins/proc/toggleaban //abandon mob @@ -215,6 +218,7 @@ verbs += /proc/possess verbs += /proc/release verbs += /client/proc/toggleprayers + verbs += /client/proc/deadmin_self if (holder.level >= 2)//Admin Candidate******************************************************************** @@ -222,6 +226,7 @@ verbs += /client/proc/secrets verbs += /client/proc/play_sound verbs += /client/proc/stealth + verbs += /client/proc/deadmin_self if (holder.level >= 1)//Temp Admin******************************************************************** @@ -233,6 +238,7 @@ 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 if (holder.level >= 0)//Mod******************************************************************** @@ -267,11 +273,13 @@ verbs += /client/proc/hide_verbs verbs += /client/proc/general_report verbs += /client/proc/air_report + verbs += /client/proc/deadmin_self if (holder.level >= -1)//Admin Observer verbs += /client/proc/cmd_admin_say verbs += /client/proc/cmd_admin_gib_self + verbs += /client/proc/deadmin_self /client/proc/clear_admin_verbs() @@ -405,6 +413,10 @@ 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_switch_radio return @@ -662,7 +674,7 @@ 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" /client/proc/toggle_hear_radio() set name = "Toggle Hear Radio" @@ -670,7 +682,21 @@ 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" + +/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." /client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs set name = "Toggle most admin verb visibility"