From 97e95e4ab0b78b5f15d77a48581139772e8a9754 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Sat, 17 Nov 2012 23:28:54 +0000 Subject: [PATCH] Moved "there can only be one" to the secrets panel (fun) Removed the last of the old promotion/demotion code. Permissions panel accessible via player panel. Uncommented the attack log verb. I mistakenly thought it wasn't used. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5102 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/admin/admin.dm | 6 ++---- code/modules/admin/admin_verbs.dm | 8 ++++---- code/modules/admin/topic.dm | 30 ++++++----------------------- code/modules/admin/verbs/onlyone.dm | 6 ------ 4 files changed, 12 insertions(+), 38 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 500ccc4d04d..a95e1d9e08c 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -36,10 +36,7 @@ var/global/floorIsLava = 0 body += "Options panel for [M]" if(M.client) body += " played by [M.client] " - if(M.client.holder) - body += "\[[M.client.holder.rank]\]" - else - body += "\[Player\]" + body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]" if(istype(M, /mob/new_player)) body += " Hasn't Entered Game " @@ -442,6 +439,7 @@ var/global/floorIsLava = 0 Warp all Players to Prison
Triple AI mode (needs to be used in the lobby)
Everyone is the traitor
+ There can only be one!
Ghost Mode
Make all players retarded
Make all items look like guns
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 532bb28d2d3..a6721af627f 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -33,7 +33,7 @@ var/list/admin_verbs_admin = list( /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ /client/proc/toggle_view_range, /*changes how far we can see*/ /datum/admins/proc/view_txt_log, /*shows the server log (diary) for today*/ -// /datum/admins/proc/view_atk_log, /*shows the server combat-log, doesn't do anything presently*/ + /datum/admins/proc/view_atk_log, /*shows the server combat-log, doesn't do anything presently*/ /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/ @@ -76,7 +76,6 @@ var/list/admin_verbs_fun = list( /client/proc/one_click_antag, /datum/admins/proc/toggle_aliens, /datum/admins/proc/toggle_space_ninja, - /client/proc/only_one, /client/proc/send_space_ninja, /client/proc/cmd_admin_add_freeform_ai_law, /client/proc/cmd_admin_add_random_ai_law, @@ -103,6 +102,8 @@ var/list/admin_verbs_server = list( /datum/admins/proc/adrev, /datum/admins/proc/adspawn, /datum/admins/proc/adjump, + /datum/admins/proc/toggle_aliens, + /datum/admins/proc/toggle_space_ninja, /client/proc/toggle_random_events ) var/list/admin_verbs_debug = list( @@ -149,7 +150,7 @@ var/list/admin_verbs_hideable = list( /client/proc/admin_ghost, /client/proc/toggle_view_range, /datum/admins/proc/view_txt_log, -// /datum/admins/proc/view_atk_log, + /datum/admins/proc/view_atk_log, /client/proc/cmd_admin_subtle_message, /client/proc/cmd_admin_check_contents, /datum/admins/proc/access_news_network, @@ -169,7 +170,6 @@ var/list/admin_verbs_hideable = list( /client/proc/cinematic, /datum/admins/proc/toggle_aliens, /datum/admins/proc/toggle_space_ninja, - /client/proc/only_one, /client/proc/send_space_ninja, /client/proc/cmd_admin_add_freeform_ai_law, /client/proc/cmd_admin_add_random_ai_law, diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index c9cc4f89af0..bb5b3b9489b 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -117,7 +117,7 @@ return adm_ckey = new_ckey task = "rank" - else + else if(task != "show") adm_ckey = ckey(href_list["ckey"]) if(!adm_ckey) usr << "Error: Topic 'editrights': No valid ckey" @@ -1444,29 +1444,6 @@ if(!check_rights(R_SPAWN)) return return create_mob(usr) - //Promote or Demote a client. - else if(href_list["prom_demot"]) - if(!check_rights(R_PERMISSIONS)) return - - var/client/C = locate(href_list["prom_demot"]) - if(!istype(C)) - usr << "This can only be used on instances of type /client" - return - - var/dat = "[C] is a " - if(C.holder) - dat += "[C.holder.rank]" - else - dat += "non-admin" - dat += "

Change [C]'s rank?
" - - for(var/rank in admin_ranks) - dat += "[rank]
" - dat += "Deadmin" - - dat += "
NOTE: this screen currently does nothing
" - usr << browse(dat, "window=prom_demot;size=480x300") - else if(href_list["object_list"]) //this is the laggiest thing ever if(!check_rights(R_SPAWN)) return @@ -2122,6 +2099,11 @@ feedback_add_details("admin_secrets_fun_used","K") spacevine_infestation() message_admins("[key_name_admin(usr)] has spawned spacevines", 1) + if("onlyone") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","OO") + usr.client.only_one() +// message_admins("[key_name_admin(usr)] has triggered a battle to the death (only one)") if(usr) log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]") if (ok) diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 75e0a5f2873..06cb9f64564 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -1,14 +1,8 @@ /client/proc/only_one() - set category = "Fun" - set name = "THERE CAN BE ONLY ONE" - set desc = "Makes everyone into a traitor and has them fight for the nuke auth. disk." if(!ticker) alert("The game hasn't started yet!") return - if(alert("BEGIN THE TOURNAMENT?",,"Yes","No")=="No") - return - feedback_add_details("admin_verb","TCBOO") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! for(var/mob/living/carbon/human/H in player_list) if(H.stat == 2 || !(H.client)) continue if(is_special_character(H)) continue