cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved "there can only be one" to the secrets panel (fun)

Browse Source 
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
This commit is contained in:
elly1989@rocketmail.com
2012-11-17 23:28:54 +00:00
parent 9894568500
commit 97e95e4ab0
4 changed files with 12 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/admin/admin.dm
View File

@@ -36,10 +36,7 @@ var/global/floorIsLava = 0
body += "<body>Options panel for <b>[M]</b>" body += "<body>Options panel for <b>[M]</b>"
if(M.client) if(M.client)
body += " played by <b>[M.client]</b> " body += " played by <b>[M.client]</b> "
if(M.client.holder) body += "\[<A href='?src=\ref[src];editrights=show'>[M.client.holder ? M.client.holder.rank : "Player"]</A>\]"
body += "\[<A href='?src=\ref[src];prom_demot=\ref[M.client]'>[M.client.holder.rank]</A>\]"
else
body += "\[<A href='?src=\ref[src];prom_demot=\ref[M.client]'>Player</A>\]"
if(istype(M, /mob/new_player)) if(istype(M, /mob/new_player))
body += " <B>Hasn't Entered Game</B> " body += " <B>Hasn't Entered Game</B> "
@@ -442,6 +439,7 @@ var/global/floorIsLava = 0
<A href='?src=\ref[src];secretsfun=prisonwarp'>Warp all Players to Prison</A><BR> <A href='?src=\ref[src];secretsfun=prisonwarp'>Warp all Players to Prison</A><BR>
<A href='?src=\ref[src];secretsfun=tripleAI'>Triple AI mode (needs to be used in the lobby)</A><BR> <A href='?src=\ref[src];secretsfun=tripleAI'>Triple AI mode (needs to be used in the lobby)</A><BR>
<A href='?src=\ref[src];secretsfun=traitor_all'>Everyone is the traitor</A><BR> <A href='?src=\ref[src];secretsfun=traitor_all'>Everyone is the traitor</A><BR>
<A href='?src=\ref[src];secretsfun=onlyone'>There can only be one!</A><BR>
<A href='?src=\ref[src];secretsfun=flicklights'>Ghost Mode</A><BR> <A href='?src=\ref[src];secretsfun=flicklights'>Ghost Mode</A><BR>
<A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR> <A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR>
<A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns</A><BR> <A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns</A><BR>

8
code/modules/admin/admin_verbs.dm
View File

@@ -33,7 +33,7 @@ var/list/admin_verbs_admin = list(
/client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/
/client/proc/toggle_view_range, /*changes how far we can see*/ /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_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_context, /*right-click adminPM interface*/
/client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /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'*/ /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, /client/proc/one_click_antag,
/datum/admins/proc/toggle_aliens, /datum/admins/proc/toggle_aliens,
/datum/admins/proc/toggle_space_ninja, /datum/admins/proc/toggle_space_ninja,
/client/proc/only_one,
/client/proc/send_space_ninja, /client/proc/send_space_ninja,
/client/proc/cmd_admin_add_freeform_ai_law, /client/proc/cmd_admin_add_freeform_ai_law,
/client/proc/cmd_admin_add_random_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/adrev,
/datum/admins/proc/adspawn, /datum/admins/proc/adspawn,
/datum/admins/proc/adjump, /datum/admins/proc/adjump,
/datum/admins/proc/toggle_aliens,
/datum/admins/proc/toggle_space_ninja,
/client/proc/toggle_random_events /client/proc/toggle_random_events
) )
var/list/admin_verbs_debug = list( var/list/admin_verbs_debug = list(
@@ -149,7 +150,7 @@ var/list/admin_verbs_hideable = list(
/client/proc/admin_ghost, /client/proc/admin_ghost,
/client/proc/toggle_view_range, /client/proc/toggle_view_range,
/datum/admins/proc/view_txt_log, /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_subtle_message,
/client/proc/cmd_admin_check_contents, /client/proc/cmd_admin_check_contents,
/datum/admins/proc/access_news_network, /datum/admins/proc/access_news_network,
@@ -169,7 +170,6 @@ var/list/admin_verbs_hideable = list(
/client/proc/cinematic, /client/proc/cinematic,
/datum/admins/proc/toggle_aliens, /datum/admins/proc/toggle_aliens,
/datum/admins/proc/toggle_space_ninja, /datum/admins/proc/toggle_space_ninja,
/client/proc/only_one,
/client/proc/send_space_ninja, /client/proc/send_space_ninja,
/client/proc/cmd_admin_add_freeform_ai_law, /client/proc/cmd_admin_add_freeform_ai_law,
/client/proc/cmd_admin_add_random_ai_law, /client/proc/cmd_admin_add_random_ai_law,

30
code/modules/admin/topic.dm
View File

@@ -117,7 +117,7 @@
return return
adm_ckey = new_ckey adm_ckey = new_ckey
task = "rank" task = "rank"
else else if(task != "show")
adm_ckey = ckey(href_list["ckey"]) adm_ckey = ckey(href_list["ckey"])
if(!adm_ckey) if(!adm_ckey)
usr << "<font color='red'>Error: Topic 'editrights': No valid ckey</font>" usr << "<font color='red'>Error: Topic 'editrights': No valid ckey</font>"
@@ -1444,29 +1444,6 @@
if(!check_rights(R_SPAWN)) return if(!check_rights(R_SPAWN)) return
return create_mob(usr) 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 += "<br><br>Change [C]'s rank?<br>"
for(var/rank in admin_ranks)
dat += "<A href='?src=\ref[src];chgadlvl=[rank];client4ad=\ref[C]'>[rank]</A><br>"
dat += "<A href='?src=\ref[src];chgadlvl=Remove;client4ad=\ref[C]'>Deadmin</A>"
dat += "<br>NOTE: this screen currently does nothing<br>"
usr << browse(dat, "window=prom_demot;size=480x300")
else if(href_list["object_list"]) //this is the laggiest thing ever else if(href_list["object_list"]) //this is the laggiest thing ever
if(!check_rights(R_SPAWN)) return if(!check_rights(R_SPAWN)) return
@@ -2122,6 +2099,11 @@
feedback_add_details("admin_secrets_fun_used","K") feedback_add_details("admin_secrets_fun_used","K")
spacevine_infestation() spacevine_infestation()
message_admins("[key_name_admin(usr)] has spawned spacevines", 1) 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) if(usr)
log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]") log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]")
if (ok) if (ok)

6
code/modules/admin/verbs/onlyone.dm
View File

@@ -1,14 +1,8 @@
/client/proc/only_one() /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) if(!ticker)
alert("The game hasn't started yet!") alert("The game hasn't started yet!")
return 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) for(var/mob/living/carbon/human/H in player_list)
if(H.stat == 2 || !(H.client)) continue if(H.stat == 2 || !(H.client)) continue
if(is_special_character(H)) continue if(is_special_character(H)) continue