From 140af001dd7f27a66cb1d55d26b7fca420ac3917 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Wed, 23 Sep 2015 10:58:03 -0700 Subject: [PATCH 1/2] Pretty-up the admins secret menu --- code/modules/admin/secrets.dm | 136 +++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 61 deletions(-) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 8c57bb0c45b..c89421a55ba 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -17,99 +17,113 @@ if (0) // Debug if(check_rights(R_ADMIN,0)) dat += {" - Admin Secrets
-
- Remove all bombs currently in existence
- Bombing List
- Show current traitors and objectives
- Show last [length(lastsignalers)] signalers
- Show last [length(lawchanges)] law changes
- Show AI Laws
- Show Game Mode
- Show Crew Manifest
- List DNA (Blood)
- List Fingerprints

- Break all lights
- Fix all lights
- Make all areas powered
- Make all areas unpowered
- Power all SMES
- Toggle Prison Shuttle Status(Use with S/R)
- Send Prison Shuttle
- Return Prison Shuttle
-
- Launch a shuttle
- Force launch a shuttle
- Jump a shuttle
- Move a shuttle
-
+

Admin Secrets

 + Game
+ Show AI Laws   + Show Game Mode   + Show Crew Manifest
+ Show current traitors and objectives
+ Bombs
+ Bombing List   + Remove all bombs currently in existence + [check_rights(R_SERVER, 0) ? "  Toggle bomb cap
" : "
"] + Lists
+ Show last [length(lastsignalers)] signalers   + Show last [length(lawchanges)] law changes
+ List DNA (Blood)   + List Fingerprints
+ Power
+ Break all lights   + Fix all lights
+ Make all areas powered   + Make all areas unpowered   + Power all SMES
+
+ Shuttle options
+ Toggle Prison Shuttle Status(Use with S/R)   + Send Prison Shuttle   + Return Prison Shuttle
+ Launch a shuttle   + Force launch a shuttle
+ Jump a shuttle   + Move a shuttle
+
"} - if(check_rights(R_SERVER,0)) - dat += "Toggle bomb cap
" + else if(check_rights(R_SERVER,0)) //only add this if admin secrets are unavailiable; otherwise, it's added inline + dat += "
Bomb cap: Toggle bomb cap
" dat += "
" if(check_rights(R_DEBUG,0)) dat += {" +
Security Level Elevated

Change all maintenance doors to engie/brig access only
Change all maintenance doors to brig access only
- Remove cap on security officers
- Change Security Level
+ Remove cap on security officers  
Coder Secrets

- Show Job Debug
+ Show Job Debug   Admin Log

+
"} if (1) if(check_rights((R_EVENT|R_SERVER),0)) dat += {" - IC Events
-
- Send in a strike team
- Send in a syndicate strike team
+
+

IC Events

+ Teams
+ Send in a strike team   + Send in a syndicate strike team   Send in a HONKsquad
+ Change Security Level
+ Security Level - Green   + Security Level - Blue   + Security Level - Red
+ Security Level - Gamma   + Security Level - Epsilon   + Security Level - Delta

- Change Security Level To Green
- Change Security Level To Blue
- Change Security Level To Red
- Change Security Level To Gamma
- Change Security Level To Epsilon
- Change Security Level To Delta
-
"} +
"} if (2) if(check_rights((R_SERVER|R_EVENT),0)) dat += {" - OOC Events
-
- The floor is lava! (DANGEROUS: extremely lame)
- Start a Thunderdome match
- Reset Thunderdome to default state
- Remove 'internal' clothing
+
+

OOC Events

+ Thunderdome
+ Start a Thunderdome match   + Reset Thunderdome to default state

+ Clothing
+ Remove 'internal' clothing   Remove ALL clothing
- Turn all humans into monkeys
- Remove firesuits, grilles, and pods
- Warp all Players to Prison
- Triple AI mode (needs to be used in the lobby)
- Everyone is the traitor
- There can only be one!
+ TDM
+ Everyone is the traitor   + There can only be one!   Dodgeball (TDM)!
- Ghost Mode
- Make all players retarded
+ Round-enders
+ The floor is lava! (DANGEROUS: extremely lame)
+ Turn all humans into monkeys
Make all items look like guns
- Japanese Animes Mode
+ Warp all Players to Prison
+ Make all players retarded
+ Misc
+ Remove firesuits, grilles, and pods   + Triple AI mode (needs to be used in the lobby)
+ Ghost Mode   + Japanese Animes Mode   Egalitarian Station Mode
- Summon Guns
- Summon Magic
+ Summon Guns   + Summon Magic
Roll the Dice
-
"} +
+
"} dat += "" - var/datum/browser/popup = new(usr, "secrets", "
Admin Secrets
", 610, 650) + var/datum/browser/popup = new(usr, "secrets", "
Admin Secrets
", 630, 670) popup.set_content(dat) popup.open(0) From b86c77b6a99fb5fb9cc5708f2606770445e3659e Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Wed, 23 Sep 2015 11:05:44 -0700 Subject: [PATCH 2/2] remove unused code and buttons --- code/modules/admin/secrets.dm | 3 --- code/modules/admin/topic.dm | 44 +++++++---------------------------- 2 files changed, 8 insertions(+), 39 deletions(-) diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index c89421a55ba..a064788ebba 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -40,9 +40,6 @@ Power all SMES

Shuttle options
- Toggle Prison Shuttle Status(Use with S/R)   - Send Prison Shuttle   - Return Prison Shuttle
Launch a shuttle   Force launch a shuttle
Jump a shuttle   diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index c48041774bd..2e738dda4da 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -9,7 +9,7 @@ if(ticker.mode && ticker.mode.check_antagonists_topic(href, href_list)) check_antagonists() return - + if(href_list["rejectadminhelp"]) if(!check_rights(R_MOD)) return @@ -905,7 +905,7 @@ feedback_add_details("ban_job","- [job]") jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") if(!msg) msg = job - else msg += ", [job]" + else msg += ", [job]" add_note(M.ckey, "Banned from [msg] - [reason]", null, usr, 0) message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1) M << "\redYou have been jobbanned by [usr.client.ckey] from: [msg]." @@ -1000,7 +1000,7 @@ if(query_noteedits.NextRow()) var/edit_log = query_noteedits.item[1] usr << browse(edit_log,"window=noteedits") - + else if(href_list["removejobban"]) if(!check_rights(R_BAN)) return @@ -1085,7 +1085,7 @@ else if(href_list["watchremove"]) var/target_ckey = href_list["watchremove"] var/confirm = alert("Are you sure you want to remove [target_ckey] from the watchlist?", "Confirm Watchlist Removal", "Yes", "No") - if(confirm == "Yes") + if(confirm == "Yes") usr.client.watchlist_remove(target_ckey) else if(href_list["watchedit"]) @@ -1119,8 +1119,8 @@ return if(query_watchedits.NextRow()) var/edit_log = query_watchedits.item[1] - usr << browse(edit_log,"window=watchedits") - + usr << browse(edit_log,"window=watchedits") + else if(href_list["mute"]) if(!check_rights(R_MOD)) return @@ -1541,7 +1541,7 @@ if(!isobserver(usr)) C.admin_ghost() sleep(2) C.jumptomob(M) - + else if(href_list["adminplayerobservefollow"]) if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN)) return @@ -2140,7 +2140,7 @@ message_admins("[key_name_admin(usr)] created [number]ea [english_list(paths)]") break return - + else if(href_list["kick_all_from_lobby"]) if(!check_rights(R_ADMIN)) return @@ -2256,34 +2256,6 @@ log_admin("[key_name(usr)] made all SMESs powered", 1) message_admins("\blue [key_name_admin(usr)] made all SMESs powered", 1) power_restore_quick() - if("activateprison") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","AP") - world << "\blue Transit signature detected." - world << "\blue Incoming shuttle." - /* - var/A = locate(/area/shuttle_prison) - for(var/atom/movable/AM as mob|obj in A) - AM.z = 1 - AM.Move() - */ - message_admins("\blue [key_name_admin(usr)] sent the prison shuttle to the station.", 1) - if("deactivateprison") - /* - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","DP") - var/A = locate(/area/shuttle_prison) - for(var/atom/movable/AM as mob|obj in A) - AM.z = 2 - AM.Move() - */ - message_admins("\blue [key_name_admin(usr)] sent the prison shuttle back.", 1) - if("toggleprisonstatus") - feedback_inc("admin_secrets_fun_used",1) - feedback_add_details("admin_secrets_fun_used","TPS") - for(var/obj/machinery/computer/prison_shuttle/PS in world) - PS.allowedtocall = !(PS.allowedtocall) - message_admins("\blue [key_name_admin(usr)] toggled status of prison shuttle to [PS.allowedtocall].", 1) if("prisonwarp") if(!ticker) alert("The game hasn't started yet!", null, null, null, null, null)