From f8da06db13b287cd34a1083ccd18422fd0bceba8 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Mon, 24 Sep 2012 11:40:41 +0000 Subject: [PATCH] Re-added the default-vote config option for voting. For every client connected more than the total votes, it will add 1 to the default vote option (No restart or the current game-mode). /obj/admins is now /datum/admins because that's what datums are for you silly people Moved var/datum/marked_datum from /obj/ to /datum/admins admin datums are persistent throughout the round. They are stored in the var/list/admins rather than the ranks. This is so admin preferences may be moved into the datum to have them persist even after Login/Logout/Disconnects. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4749 316c924e-a436-60f5-8080-3fe189b3f50e --- code/controllers/voting.dm | 15 + code/game/objects/objs.dm | 1 - code/modules/admin/DB ban/functions.dm | 6 +- code/modules/admin/NewBan.dm | 2 +- code/modules/admin/admin.dm | 68 +- code/modules/admin/admin_verbs.dm | 111 +- code/modules/admin/create_mob.dm | 2 +- code/modules/admin/create_object.dm | 4 +- code/modules/admin/create_turf.dm | 2 +- code/modules/admin/holder2.dm | 2587 +++++++++++++++++++ code/modules/admin/newbanjob.dm | 6 +- code/modules/admin/player_notes.dm | 4 +- code/modules/admin/player_panel.dm | 6 +- code/modules/admin/verbs/getlogs.dm | 4 +- code/modules/admin/verbs/modifyvariables.dm | 2 +- code/modules/admin/verbs/one_click_antag.dm | 26 +- code/modules/client/client defines.dm | 2 +- code/modules/client/client procs.dm | 17 +- code/world.dm | 2 +- tgstation.dme | 2 +- 20 files changed, 2735 insertions(+), 134 deletions(-) create mode 100644 code/modules/admin/holder2.dm diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index bb1219d784..f2596cd5f2 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -53,10 +53,25 @@ datum/controller/vote proc/get_result() //get the highest number of votes var/greatest_votes = 0 + var/total_votes = 0 for(var/option in choices) var/votes = choices[option] + total_votes += votes if(votes > greatest_votes) greatest_votes = votes + //default-vote for everyone who didn't vote + if(!config.vote_no_default && choices.len) + var/non_voters = (client_list.len - total_votes) + if(non_voters > 0) + if(mode == "restart") + choices["Continue Playing"] += non_voters + if(choices["Continue Playing"] >= greatest_votes) + greatest_votes = choices["Continue Playing"] + else if(mode == "gamemode") + if(master_mode in choices) + choices[master_mode] += non_voters + if(choices[master_mode] >= greatest_votes) + greatest_votes = choices[master_mode] //get all options with that many votes and return them in a list . = list() if(greatest_votes) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 9d782959bd..d19a39a846 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -7,7 +7,6 @@ var/reliability = 100 //Used by SOME devices to determine how reliable they are. var/crit_fail = 0 var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj. - var/datum/marked_datum animate_movement = 2 var/throwforce = 1 var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]" diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index e4106a6435..2d2b0ec3a2 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -1,5 +1,5 @@ -obj/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0) +datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0) var/user = sqlfdbklogin var/pass = sqlfdbkpass var/db = sqlfdbkdb @@ -79,7 +79,7 @@ obj/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1 -obj/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") +datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") var/user = sqlfdbklogin var/pass = sqlfdbkpass var/db = sqlfdbkdb @@ -149,7 +149,7 @@ obj/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") DB_ban_unban_by_id(ban_id) -obj/admins/proc/DB_ban_unban_by_id(var/id) +datum/admins/proc/DB_ban_unban_by_id(var/id) var/user = sqlfdbklogin var/pass = sqlfdbkpass var/db = sqlfdbkdb diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index d9014fad01..883e05a68a 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -163,7 +163,7 @@ var/savefile/Banlist timeleftstring = "[exp] Minutes" return timeleftstring -/obj/admins/proc/unbanpanel() +/datum/admins/proc/unbanpanel() var/count = 0 var/dat //var/dat = "
Unban Player: \blue(U) = Unban , (E) = Edit Ban\green (Total
" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 8ef1a75def..c19b2e8dc6 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -19,7 +19,7 @@ var/global/floorIsLava = 0 ///////////////////////////////////////////////////////////////////////////////////////////////Panels -/obj/admins/proc/show_player_panel(var/mob/M in mob_list) +/datum/admins/proc/show_player_panel(var/mob/M in mob_list) set category = "Admin" set name = "Show Player Panel" set desc="Edit player (respawn, ban, heal, etc)" @@ -27,9 +27,9 @@ var/global/floorIsLava = 0 if(!M) usr << "You seem to be selecting a mob that doesn't exist anymore." return - if (!istype(src,/obj/admins)) + if (!istype(src,/datum/admins)) src = usr.client.holder - if (!istype(src,/obj/admins)) + if (!istype(src,/datum/admins)) usr << "Error: you are not an admin!" return @@ -157,14 +157,14 @@ var/global/floorIsLava = 0 feedback_add_details("admin_verb","SPP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/access_news_network() //MARKER +/datum/admins/proc/access_news_network() //MARKER set category = "Fun" set name = "Access Newscaster Network" set desc = "Allows you to view, add and edit news feeds." - if (!istype(src,/obj/admins)) + if (!istype(src,/datum/admins)) src = usr.client.holder - if (!istype(src,/obj/admins)) + if (!istype(src,/datum/admins)) usr << "Error: you are not an admin!" return var/dat @@ -350,7 +350,7 @@ var/global/floorIsLava = 0 -/obj/admins/proc/Jobbans() +/datum/admins/proc/Jobbans() if ((src.rank in list( "Game Admin", "Game Master" ))) var/dat = "Job Bans!
" @@ -362,7 +362,7 @@ var/global/floorIsLava = 0 dat += "
" usr << browse(dat, "window=ban;size=400x400") -/obj/admins/proc/Game() +/datum/admins/proc/Game() var/dat var/lvl = 0 @@ -404,21 +404,21 @@ var/global/floorIsLava = 0 usr << browse(dat, "window=admin2;size=210x180") return /* -/obj/admins/proc/goons() +/datum/admins/proc/goons() var/dat = "
GOOOOOOONS
" for(var/t in goon_keylist) dat += text("") dat += "
KeySA Username
[t][goon_keylist[ckey(t)]]
" usr << browse(dat, "window=ban;size=300x400") -/obj/admins/proc/beta_testers() +/datum/admins/proc/beta_testers() var/dat = "
Beta testers
" for(var/t in beta_tester_keylist) dat += text("") dat += "
Key
[t]
" usr << browse(dat, "window=ban;size=300x400") */ -/obj/admins/proc/Secrets() +/datum/admins/proc/Secrets() if (!usr.client.holder) return @@ -533,7 +533,7 @@ var/global/floorIsLava = 0 //i.e. buttons/verbs -/obj/admins/proc/restart() +/datum/admins/proc/restart() set category = "Server" set name = "Restart" set desc="Restarts the world" @@ -556,7 +556,7 @@ var/global/floorIsLava = 0 world.Reboot() -/obj/admins/proc/announce() +/datum/admins/proc/announce() set category = "Special Verbs" set name = "Announce" set desc="Announce your desires to the world" @@ -568,7 +568,7 @@ var/global/floorIsLava = 0 log_admin("Announce: [key_name(usr)] : [message]") feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/toggleooc() +/datum/admins/proc/toggleooc() set category = "Server" set desc="Toggle dis bitch" set name="Toggle OOC" @@ -581,7 +581,7 @@ var/global/floorIsLava = 0 message_admins("[key_name_admin(usr)] toggled OOC.", 1) feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/toggleoocdead() +/datum/admins/proc/toggleoocdead() set category = "Server" set desc="Toggle dis bitch" set name="Toggle Dead OOC" @@ -591,7 +591,7 @@ var/global/floorIsLava = 0 message_admins("[key_name_admin(usr)] toggled Dead OOC.", 1) feedback_add_details("admin_verb","TDOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/toggletraitorscaling() +/datum/admins/proc/toggletraitorscaling() set category = "Server" set desc="Toggle traitor scaling" set name="Toggle Traitor Scaling" @@ -600,7 +600,7 @@ var/global/floorIsLava = 0 message_admins("[key_name_admin(usr)] toggled Traitor Scaling [traitor_scaling ? "on" : "off"].", 1) feedback_add_details("admin_verb","TTS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/startnow() +/datum/admins/proc/startnow() set category = "Server" set desc="Start the round RIGHT NOW" set name="Start Now" @@ -617,7 +617,7 @@ var/global/floorIsLava = 0 usr << "Error: Start Now: Game has already started." return 0 -/obj/admins/proc/toggleenter() +/datum/admins/proc/toggleenter() set category = "Server" set desc="People can't enter" set name="Toggle Entering" @@ -631,7 +631,7 @@ var/global/floorIsLava = 0 world.update_status() feedback_add_details("admin_verb","TE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/toggleAI() +/datum/admins/proc/toggleAI() set category = "Server" set desc="People can't be AI" set name="Toggle AI" @@ -644,7 +644,7 @@ var/global/floorIsLava = 0 world.update_status() feedback_add_details("admin_verb","TAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/toggleaban() +/datum/admins/proc/toggleaban() set category = "Server" set desc="Respawn basically" set name="Toggle Respawn" @@ -658,7 +658,7 @@ var/global/floorIsLava = 0 world.update_status() feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/toggle_aliens() +/datum/admins/proc/toggle_aliens() set category = "Server" set desc="Toggle alien mobs" set name="Toggle Aliens" @@ -667,7 +667,7 @@ var/global/floorIsLava = 0 message_admins("[key_name_admin(usr)] toggled Aliens [aliens_allowed ? "on" : "off"].", 1) feedback_add_details("admin_verb","TA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/toggle_space_ninja() +/datum/admins/proc/toggle_space_ninja() set category = "Server" set desc="Toggle space ninjas spawning." set name="Toggle Space Ninjas" @@ -676,7 +676,7 @@ var/global/floorIsLava = 0 message_admins("[key_name_admin(usr)] toggled Space Ninjas [toggle_space_ninja ? "on" : "off"].", 1) feedback_add_details("admin_verb","TSN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/delay() +/datum/admins/proc/delay() set category = "Server" set desc="Delay the game start" set name="Delay" @@ -691,7 +691,7 @@ var/global/floorIsLava = 0 log_admin("[key_name(usr)] removed the delay.") feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/adjump() +/datum/admins/proc/adjump() set category = "Server" set desc="Toggle admin jumping" set name="Toggle Jump" @@ -699,7 +699,7 @@ var/global/floorIsLava = 0 message_admins("\blue Toggled admin jumping to [config.allow_admin_jump].") feedback_add_details("admin_verb","TJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/adspawn() +/datum/admins/proc/adspawn() set category = "Server" set desc="Toggle admin spawning" set name="Toggle Spawn" @@ -707,7 +707,7 @@ var/global/floorIsLava = 0 message_admins("\blue Toggled admin item spawning to [config.allow_admin_spawning].") feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/adrev() +/datum/admins/proc/adrev() set category = "Server" set desc="Toggle admin revives" set name="Toggle Revive" @@ -715,7 +715,7 @@ var/global/floorIsLava = 0 message_admins("\blue Toggled reviving to [config.allow_admin_rev].") feedback_add_details("admin_verb","TAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/immreboot() +/datum/admins/proc/immreboot() set category = "Server" set desc="Reboots the server post haste" set name="Immediate Reboot" @@ -756,7 +756,7 @@ var/global/floorIsLava = 0 usr << "Prayer visibility turned off" feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/unprison(var/mob/M in mob_list) +/datum/admins/proc/unprison(var/mob/M in mob_list) set category = "Admin" set name = "Unprison" if (M.z == 2) @@ -817,7 +817,7 @@ var/global/floorIsLava = 0 return 0 /* -/obj/admins/proc/get_sab_desc(var/target) +/datum/admins/proc/get_sab_desc(var/target) switch(target) if(1) return "Destroy at least 70% of the plasma canisters on the station" @@ -834,7 +834,7 @@ var/global/floorIsLava = 0 else return "Error: Invalid sabotage target: [target]" */ -/obj/admins/proc/spawn_atom(var/object as text) +/datum/admins/proc/spawn_atom(var/object as text) set category = "Debug" set desc= "(atom path) Spawn an atom" set name= "Spawn" @@ -869,7 +869,7 @@ var/global/floorIsLava = 0 feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/show_traitor_panel(var/mob/M in sortmobs()) +/datum/admins/proc/show_traitor_panel(var/mob/M in sortmobs()) set category = "Admin" set desc = "Edit mobs's memory and role" set name = "Show Traitor Panel" @@ -881,7 +881,7 @@ var/global/floorIsLava = 0 feedback_add_details("admin_verb","STP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/toggletintedweldhelmets() +/datum/admins/proc/toggletintedweldhelmets() set category = "Debug" set desc="Reduces view range when wearing welding helmets" set name="Toggle tinted welding helmes" @@ -894,7 +894,7 @@ var/global/floorIsLava = 0 message_admins("[key_name_admin(usr)] toggled tinted_weldhelh.", 1) feedback_add_details("admin_verb","TTWH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/obj/admins/proc/toggleguests() +/datum/admins/proc/toggleguests() set category = "Server" set desc="Guests can't enter" set name="Toggle guests" @@ -915,7 +915,7 @@ var/global/floorIsLava = 0 feedback_add_details("admin_verb","UJBP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return -/obj/admins/proc/output_ai_laws() +/datum/admins/proc/output_ai_laws() var/ai_number = 0 for(var/mob/living/silicon/S in mob_list) ai_number++ diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 9827a5cfa3..68ac53ac52 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -18,7 +18,9 @@ /client/proc/update_admins(var/rank) if(!holder) - holder = new /obj/admins(src) + holder = new /datum/admins(rank) + admin_list |= src + admins[ckey] = holder var/need_update = 0 //check if our rank has changed @@ -73,7 +75,7 @@ holder.level = 2 if(holder.state == 2) // if observing deadchat = 1 - verbs += /obj/admins/proc/toggleaban //abandon mob + verbs += /datum/admins/proc/toggleaban //abandon mob verbs += /client/proc/deadchat //toggles deadchat verbs += /client/proc/cmd_admin_check_contents verbs += /client/proc/Jump @@ -112,14 +114,14 @@ //Moderator if (holder.level >= 0) - 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/show_player_panel + verbs += /datum/admins/proc/announce + verbs += /datum/admins/proc/startnow + verbs += /datum/admins/proc/toggleAI //Toggle the AI + verbs += /datum/admins/proc/toggleenter //Toggle enterting + verbs += /datum/admins/proc/toggleguests //Toggle guests entering + verbs += /datum/admins/proc/toggleooc //toggle ooc + verbs += /datum/admins/proc/toggleoocdead //toggle ooc for dead/unc + verbs += /datum/admins/proc/show_player_panel verbs += /client/proc/deadchat //toggles deadchat //verbs += /client/proc/cmd_admin_mute --was never used (according to stats trackind) - use show player panel --erro verbs += /client/proc/cmd_admin_pm_context @@ -140,14 +142,14 @@ verbs += /client/proc/deadmin_self verbs += /client/proc/check_ai_laws //verbs += /client/proc/cmd_admin_prison --Merged with player panel - //verbs += /obj/admins/proc/unprison --Merged with player panel + //verbs += /datum/admins/proc/unprison --Merged with player panel 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 += /datum/admins/proc/delay //game start delay + verbs += /datum/admins/proc/immreboot //immediate reboot + verbs += /datum/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 @@ -172,10 +174,10 @@ seeprayers = 1 verbs += /client/proc/invisimin - verbs += /obj/admins/proc/view_txt_log - verbs += /obj/admins/proc/view_atk_log - verbs += /obj/admins/proc/toggleaban //abandon mob - verbs += /obj/admins/proc/show_traitor_panel + verbs += /datum/admins/proc/view_txt_log + verbs += /datum/admins/proc/view_atk_log + verbs += /datum/admins/proc/toggleaban //abandon mob + verbs += /datum/admins/proc/show_traitor_panel verbs += /client/proc/getserverlog //fetch an old serverlog to look at //verbs += /client/proc/cmd_admin_remove_plasma --This proc is outdated, does not do anything verbs += /client/proc/admin_call_shuttle @@ -195,10 +197,10 @@ //Badmin if (holder.level >= 4) - verbs += /obj/admins/proc/adrev //toggle admin revives - verbs += /obj/admins/proc/adspawn //toggle admin item spawning + verbs += /datum/admins/proc/adrev //toggle admin revives + verbs += /datum/admins/proc/adspawn //toggle admin item spawning verbs += /client/proc/debug_variables - verbs += /obj/admins/proc/access_news_network //Admin access to the newscaster network + verbs += /datum/admins/proc/access_news_network //Admin access to the newscaster network verbs += /client/proc/cmd_modify_ticker_variables verbs += /client/proc/Debug2 //debug toggle switch verbs += /client/proc/toggle_view_range @@ -226,7 +228,7 @@ //Game Admin if (holder.level >= 5) - verbs += /obj/admins/proc/spawn_atom + verbs += /datum/admins/proc/spawn_atom verbs += /client/proc/cmd_admin_list_open_jobs verbs += /client/proc/cmd_admin_direct_narrate verbs += /client/proc/colorooc @@ -264,9 +266,9 @@ //Game Master if (holder.level >= 6) - verbs += /obj/admins/proc/toggle_aliens //toggle aliens - verbs += /obj/admins/proc/toggle_space_ninja //toggle ninjas - verbs += /obj/admins/proc/adjump + verbs += /datum/admins/proc/toggle_aliens //toggle aliens + verbs += /datum/admins/proc/toggle_space_ninja //toggle ninjas + verbs += /datum/admins/proc/adjump verbs += /client/proc/callproc verbs += /client/proc/triple_ai verbs += /client/proc/get_admin_state @@ -289,27 +291,27 @@ /client/proc/clear_admin_verbs() deadchat = 0 verbs.Remove( - /obj/admins/proc/announce, - /obj/admins/proc/startnow, - /obj/admins/proc/toggleAI, /*Toggle the AI*/ - /obj/admins/proc/toggleenter, /*Toggle enterting*/ - /obj/admins/proc/toggleguests, /*Toggle guests entering*/ - /obj/admins/proc/toggleooc, /*toggle ooc*/ - /obj/admins/proc/toggleoocdead, /*toggle ooc for dead/unc*/ - /obj/admins/proc/delay, /*game start delay*/ - /obj/admins/proc/immreboot, /*immediate reboot*/ - /obj/admins/proc/restart, /*restart*/ - /obj/admins/proc/show_traitor_panel, - /obj/admins/proc/show_player_panel, - /obj/admins/proc/toggle_aliens, /*toggle aliens*/ - /obj/admins/proc/toggle_space_ninja,/*toggle ninjas*/ - /obj/admins/proc/adjump, - /obj/admins/proc/view_txt_log, - /obj/admins/proc/view_atk_log, - /obj/admins/proc/spawn_atom, - /obj/admins/proc/adrev, /*toggle admin revives*/ - /obj/admins/proc/adspawn, /*toggle admin item spawning*/ - /obj/admins/proc/toggleaban, /*abandon mob*/ + /datum/admins/proc/announce, + /datum/admins/proc/startnow, + /datum/admins/proc/toggleAI, /*Toggle the AI*/ + /datum/admins/proc/toggleenter, /*Toggle enterting*/ + /datum/admins/proc/toggleguests, /*Toggle guests entering*/ + /datum/admins/proc/toggleooc, /*toggle ooc*/ + /datum/admins/proc/toggleoocdead, /*toggle ooc for dead/unc*/ + /datum/admins/proc/delay, /*game start delay*/ + /datum/admins/proc/immreboot, /*immediate reboot*/ + /datum/admins/proc/restart, /*restart*/ + /datum/admins/proc/show_traitor_panel, + /datum/admins/proc/show_player_panel, + /datum/admins/proc/toggle_aliens, /*toggle aliens*/ + /datum/admins/proc/toggle_space_ninja,/*toggle ninjas*/ + /datum/admins/proc/adjump, + /datum/admins/proc/view_txt_log, + /datum/admins/proc/view_atk_log, + /datum/admins/proc/spawn_atom, + /datum/admins/proc/adrev, /*toggle admin revives*/ + /datum/admins/proc/adspawn, /*toggle admin item spawning*/ + /datum/admins/proc/toggleaban, /*abandon mob*/ /client/proc/hide_verbs, /client/proc/hide_most_verbs, /client/proc/show_verbs, @@ -408,7 +410,7 @@ /client/proc/startSinglo, /client/proc/check_ai_laws, /client/proc/cmd_debug_mob_lists, - /obj/admins/proc/access_news_network, + /datum/admins/proc/access_news_network, /client/proc/one_click_antag, /client/proc/invisimin ) @@ -425,7 +427,7 @@ //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 -= /datum/admins/proc/unprison --Merged with player panel //verbs -= /client/proc/cmd_switch_radio --removed because tcommsat is staying // verbs -= /client/proc/Blobize // verbs -= /client/proc/Blobcount @@ -444,7 +446,9 @@ ghost.can_reenter_corpse = 1 //just in-case. ghost.reenter_corpse() feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - else if(!istype(mob,/mob/new_player)) + else if(istype(mob,/mob/new_player)) + src << "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first." + else //ghostize var/mob/body = mob body.ghostize(1) @@ -731,12 +735,9 @@ 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() - admins.Remove(src.ckey) - admin_list -= src + deadmin() 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! @@ -773,7 +774,7 @@ verbs += /client/proc/cmd_admin_gib_self verbs += /client/proc/deadchat //toggles deadchat - verbs += /obj/admins/proc/toggleooc //toggle ooc + verbs += /datum/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! @@ -793,7 +794,7 @@ verbs += /client/proc/show_verbs verbs += /client/proc/deadchat //toggles deadchat - verbs += /obj/admins/proc/toggleooc //toggle ooc + verbs += /datum/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 diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index b815eb5923..bdebd8c454 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -1,5 +1,5 @@ /var/create_mob_html = null -/obj/admins/proc/create_mob(var/mob/user) +/datum/admins/proc/create_mob(var/mob/user) if (!create_mob_html) var/mobjs = null mobjs = dd_list2text(typesof(/mob), ";") diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 008dc38256..9fa8de0462 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -1,6 +1,6 @@ /var/create_object_html = null -/obj/admins/proc/create_object(var/mob/user) +/datum/admins/proc/create_object(var/mob/user) if (!create_object_html) var/objectjs = null objectjs = dd_list2text(typesof(/obj), ";") @@ -10,7 +10,7 @@ user << browse(dd_replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=425x475") -/obj/admins/proc/quick_create_object(var/mob/user) +/datum/admins/proc/quick_create_object(var/mob/user) var/quick_create_object_html = null var/pathtext = null diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index 953f0c78a5..ca92f6dd36 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -1,5 +1,5 @@ /var/create_turf_html = null -/obj/admins/proc/create_turf(var/mob/user) +/datum/admins/proc/create_turf(var/mob/user) if (!create_turf_html) var/turfjs = null turfjs = dd_list2text(typesof(/turf), ";") diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm new file mode 100644 index 0000000000..85c250a29a --- /dev/null +++ b/code/modules/admin/holder2.dm @@ -0,0 +1,2587 @@ +/client/proc/deadmin() + admins.Remove(ckey) + if(holder) del(holder) + src.clear_admin_verbs() + admin_list -= src + return 1 + +var/list/admin_datums = list() + +/datum/admins + var/rank = null + var/client/owner = null + var/state = null //state = 1 for playing //state = 2 for observing + var/level = null + +// var/permissions = 0 + + var/datum/marked_datum + + var/admincaster_screen = 0 //See newscaster.dm under machinery for a full description + var/datum/feed_message/admincaster_feed_message = new /datum/feed_message //These two will act as holders. + var/datum/feed_channel/admincaster_feed_channel = new /datum/feed_channel + var/admincaster_signature //What you'll sign the newsfeeds as + +/datum/admins/New(initial_rank) +// if(!istype(C)) +// world.log << "## WARNING: [type] created with no client/C argument" +// del(src) +// return +// C.holder = src + admincaster_signature = "Nanotrasen Officer #[rand(0,9)][rand(0,9)][rand(0,9)]" + rank = initial_rank +// admin_list |= C + ..() + +/datum/admins/Del() + ..() + +/datum/admins/Topic(href, href_list) + ..() + if (usr.client != src.owner) + world << "\blue [usr.key] has attempted to override the admin panel!" + log_admin("[key_name(usr)] tried to use the admin panel without authorization.") + return + + if(href_list["makeAntag"]) + switch(href_list["makeAntag"]) + if("1") + log_admin("[key_name(usr)] has spawned a traitor.") + if(!src.makeTratiors()) + usr << "\red Unfortunatly there were no candidates available" + if("2") + log_admin("[key_name(usr)] has spawned a changeling.") + if(!src.makeChanglings()) + usr << "\red Unfortunatly there were no candidates available" + if("3") + log_admin("[key_name(usr)] has spawned revolutionaries.") + if(!src.makeRevs()) + usr << "\red Unfortunatly there were no candidates available" + if("4") + log_admin("[key_name(usr)] has spawned a cultists.") + if(!src.makeCult()) + usr << "\red Unfortunatly there were no candidates available" + if("5") + log_admin("[key_name(usr)] has spawned a malf AI.") + if(!src.makeMalfAImode()) + usr << "\red Unfortunatly there were no candidates available" + if("6") + log_admin("[key_name(usr)] has spawned a wizard.") + if(!src.makeWizard()) + usr << "\red Unfortunatly there were no candidates available" + if("7") + log_admin("[key_name(usr)] has spawned a nuke team.") + if(!src.makeNukeTeam()) + usr << "\red Unfortunatly there were no candidates available" + if("8") + log_admin("[key_name(usr)] has spawned a ninja.") + src.makeSpaceNinja() + if("9") + log_admin("[key_name(usr)] has spawned aliens.") + src.makeAliens() + if("10") + log_admin("[key_name(usr)] has spawned a death squad.") + if(!src.makeDeathsquad()) + usr << "\red Unfortunatly there were no candidates available" + return + + if(href_list["call_shuttle"]) + if (src.rank in list("Trial Admin", "Badmin", "Game Admin", "Game Master")) + if( ticker.mode.name == "blob" ) + alert("You can't call the shuttle during blob!") + return + switch(href_list["call_shuttle"]) + if("1") + if ((!( ticker ) || emergency_shuttle.location)) + return + emergency_shuttle.incall() + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") + log_admin("[key_name(usr)] called the Emergency Shuttle") + message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1) + + if("2") + if ((!( ticker ) || emergency_shuttle.location || emergency_shuttle.direction == 0)) + return + switch(emergency_shuttle.direction) + if(-1) + emergency_shuttle.incall() + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") + log_admin("[key_name(usr)] called the Emergency Shuttle") + message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1) + if(1) + emergency_shuttle.recall() + log_admin("[key_name(usr)] sent the Emergency Shuttle back") + message_admins("\blue [key_name_admin(usr)] sent the Emergency Shuttle back", 1) + + href_list["secretsadmin"] = "check_antagonist" + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + + if(href_list["edit_shuttle_time"]) + if (src.rank in list("Badmin", "Game Admin", "Game Master")) + emergency_shuttle.settimeleft( input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", emergency_shuttle.timeleft() ) as num ) + log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]") + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") + message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]", 1) + href_list["secretsadmin"] = "check_antagonist" + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + + if(href_list["delay_round_end"]) + if (src.rank in list("Badmin", "Game Admin", "Game Master")) + ticker.delay_end = !ticker.delay_end + log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].") + message_admins("\blue [key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) + href_list["secretsadmin"] = "check_antagonist" + + if(href_list["simplemake"]) + + if(!href_list["mob"]) + usr << "Invalid mob" + return + + var/mob/M = locate(href_list["mob"]) + + if(!M || !ismob(M)) + usr << "Cannot find mob" + return + + var/delmob = 0 + var/option = alert("Delete old mob?","Message","Yes","No","Cancel") + if(option == "Cancel") + return + if(option == "Yes") + delmob = 1 + + log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]") + message_admins("\blue [key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]", 1) + + switch(href_list["simplemake"]) + if("observer") + M.change_mob_type( /mob/dead/observer , null, null, delmob) + if("drone") + M.change_mob_type( /mob/living/carbon/alien/humanoid/drone , null, null, delmob) + if("hunter") + M.change_mob_type( /mob/living/carbon/alien/humanoid/hunter , null, null, delmob) + if("queen") + M.change_mob_type( /mob/living/carbon/alien/humanoid/queen , null, null, delmob) + if("sentinel") + M.change_mob_type( /mob/living/carbon/alien/humanoid/sentinel , null, null, delmob) + if("larva") + M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob) + if("human") + M.change_mob_type( /mob/living/carbon/human , null, null, delmob) + if("metroid") + M.change_mob_type( /mob/living/carbon/metroid , null, null, delmob) + if("adultmetroid") + M.change_mob_type( /mob/living/carbon/metroid/adult , null, null, delmob) + if("monkey") + M.change_mob_type( /mob/living/carbon/monkey , null, null, delmob) + if("robot") + M.change_mob_type( /mob/living/silicon/robot , null, null, delmob) + if("cat") + M.change_mob_type( /mob/living/simple_animal/cat , null, null, delmob) + if("runtime") + M.change_mob_type( /mob/living/simple_animal/cat/Runtime , null, null, delmob) + if("corgi") + M.change_mob_type( /mob/living/simple_animal/corgi , null, null, delmob) + if("ian") + M.change_mob_type( /mob/living/simple_animal/corgi/Ian , null, null, delmob) + if("crab") + M.change_mob_type( /mob/living/simple_animal/crab , null, null, delmob) + if("coffee") + M.change_mob_type( /mob/living/simple_animal/crab/Coffee , null, null, delmob) + if("parrot") + M.change_mob_type( /mob/living/simple_animal/parrot , null, null, delmob) + if("polyparrot") + M.change_mob_type( /mob/living/simple_animal/parrot/Poly , null, null, delmob) + if("constructarmoured") + M.change_mob_type( /mob/living/simple_animal/constructarmoured , null, null, delmob) + if("constructbuilder") + M.change_mob_type( /mob/living/simple_animal/constructbuilder , null, null, delmob) + if("constructwraith") + M.change_mob_type( /mob/living/simple_animal/constructwraith , null, null, delmob) + if("shade") + M.change_mob_type( /mob/living/simple_animal/shade , null, null, delmob) + + + /////////////////////////////////////new ban stuff + if(href_list["unbanf"]) + var/banfolder = href_list["unbanf"] + Banlist.cd = "/base/[banfolder]" + var/key = Banlist["key"] + if(alert(usr, "Are you sure you want to unban [key]?", "Confirmation", "Yes", "No") == "Yes") + if (RemoveBan(banfolder)) + unbanpanel() + else + alert(usr,"This ban has already been lifted / does not exist.","Error","Ok") + unbanpanel() + + if(href_list["unbane"]) + UpdateTime() + var/reason + + var/banfolder = href_list["unbane"] + Banlist.cd = "/base/[banfolder]" + var/reason2 = Banlist["reason"] + var/temp = Banlist["temp"] + + var/minutes = Banlist["minutes"] + + var/banned_key = Banlist["key"] + Banlist.cd = "/base" + + var/duration + + switch(alert("Temporary Ban?",,"Yes","No")) + if("Yes") + temp = 1 + var/mins = 0 + if(minutes > CMinutes) + mins = minutes - CMinutes + mins = input(usr,"How long (in minutes)? (Default: 1440)","Ban time",mins ? mins : 1440) as num|null + if(!mins) return + mins = min(525599,mins) + minutes = CMinutes + mins + duration = GetExp(minutes) + reason = input(usr,"Reason?","reason",reason2) as text|null + if(!reason) return + if("No") + temp = 0 + duration = "Perma" + reason = input(usr,"Reason?","reason",reason2) as text|null + if(!reason) return + + log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") + ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") + message_admins("\blue [key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1) + Banlist.cd = "/base/[banfolder]" + Banlist["reason"] << reason + Banlist["temp"] << temp + Banlist["minutes"] << minutes + Banlist["bannedby"] << usr.ckey + Banlist.cd = "/base" + feedback_inc("ban_edit",1) + unbanpanel() + + /////////////////////////////////////new ban stuff + + if(href_list["jobban2"]) + var/mob/M = locate(href_list["jobban2"]) + if(!M) //sanity + alert("Mob no longer exists!") + return + if(!M.ckey) //sanity + alert("Mob has no ckey") + return + if(!job_master) + usr << "Job Master has not been setup!" + return + var/dat = "" + var/header = "Job-Ban Panel: [M.name]" + var/body + var/jobs = "" + + /***********************************WARNING!************************************ + The jobban stuff looks mangled and disgusting + But it looks beautiful in-game + -Nodrak + ************************************WARNING!***********************************/ + var/counter = 0 +//Regular jobs + //Command (Blue) + jobs += "" + jobs += "" + for(var/jobPos in command_positions) + if(!jobPos) continue + var/datum/job/job = job_master.GetJob(jobPos) + if(!job) continue + + if(jobban_isbanned(M, job.title)) + jobs += "" + counter++ + else + jobs += "" + counter++ + + if(counter >= 6) //So things dont get squiiiiished! + jobs += "" + counter = 0 + jobs += "
Command Positions
[dd_replacetext(job.title, " ", " ")][dd_replacetext(job.title, " ", " ")]
" + + //Security (Red) + counter = 0 + jobs += "" + jobs += "" + for(var/jobPos in security_positions) + if(!jobPos) continue + var/datum/job/job = job_master.GetJob(jobPos) + if(!job) continue + + if(jobban_isbanned(M, job.title)) + jobs += "" + counter++ + else + jobs += "" + counter++ + + if(counter >= 5) //So things dont get squiiiiished! + jobs += "" + counter = 0 + jobs += "
Security Positions
[dd_replacetext(job.title, " ", " ")][dd_replacetext(job.title, " ", " ")]
" + + //Engineering (Yellow) + counter = 0 + jobs += "" + jobs += "" + for(var/jobPos in engineering_positions) + if(!jobPos) continue + var/datum/job/job = job_master.GetJob(jobPos) + if(!job) continue + + if(jobban_isbanned(M, job.title)) + jobs += "" + counter++ + else + jobs += "" + counter++ + + if(counter >= 5) //So things dont get squiiiiished! + jobs += "" + counter = 0 + jobs += "
Engineering Positions
[dd_replacetext(job.title, " ", " ")][dd_replacetext(job.title, " ", " ")]
" + + //Medical (White) + counter = 0 + jobs += "" + jobs += "" + for(var/jobPos in medical_positions) + if(!jobPos) continue + var/datum/job/job = job_master.GetJob(jobPos) + if(!job) continue + + if(jobban_isbanned(M, job.title)) + jobs += "" + counter++ + else + jobs += "" + counter++ + + if(counter >= 5) //So things dont get squiiiiished! + jobs += "" + counter = 0 + jobs += "
Medical Positions
[dd_replacetext(job.title, " ", " ")][dd_replacetext(job.title, " ", " ")]
" + + //Science (Purple) + counter = 0 + jobs += "" + jobs += "" + for(var/jobPos in science_positions) + if(!jobPos) continue + var/datum/job/job = job_master.GetJob(jobPos) + if(!job) continue + + if(jobban_isbanned(M, job.title)) + jobs += "" + counter++ + else + jobs += "" + counter++ + + if(counter >= 5) //So things dont get squiiiiished! + jobs += "" + counter = 0 + jobs += "
Science Positions
[dd_replacetext(job.title, " ", " ")][dd_replacetext(job.title, " ", " ")]
" + + //Civilian (Grey) + counter = 0 + jobs += "" + jobs += "" + for(var/jobPos in civilian_positions) + if(!jobPos) continue + var/datum/job/job = job_master.GetJob(jobPos) + if(!job) continue + + if(jobban_isbanned(M, job.title)) + jobs += "" + counter++ + else + jobs += "" + counter++ + + if(counter >= 5) //So things dont get squiiiiished! + jobs += "" + counter = 0 + jobs += "
Civilian Positions
[dd_replacetext(job.title, " ", " ")][dd_replacetext(job.title, " ", " ")]
" + + //Non-Human (Green) + counter = 0 + jobs += "" + jobs += "" + for(var/jobPos in nonhuman_positions) + if(!jobPos) continue + var/datum/job/job = job_master.GetJob(jobPos) + if(!job) continue + + if(jobban_isbanned(M, job.title)) + jobs += "" + counter++ + else + jobs += "" + counter++ + + if(counter >= 5) //So things dont get squiiiiished! + jobs += "" + counter = 0 + + //pAI isn't technically a job, but it goes in here. + if(jobban_isbanned(M, "pAI")) + jobs += "" + else + jobs += "" + + jobs += "
Non-human Positions
[dd_replacetext(job.title, " ", " ")][dd_replacetext(job.title, " ", " ")]
pAIpAI
" + + //Antagonist (Orange) + var/isbanned_dept = jobban_isbanned(M, "Syndicate") + jobs += "" + jobs += "" + + //Traitor + if(jobban_isbanned(M, "traitor") || isbanned_dept) + jobs += "" + else + jobs += "" + + //Changeling + if(jobban_isbanned(M, "changeling") || isbanned_dept) + jobs += "" + else + jobs += "" + + //Nuke Operative + if(jobban_isbanned(M, "operative") || isbanned_dept) + jobs += "" + else + jobs += "" + + //Revolutionary + if(jobban_isbanned(M, "revolutionary") || isbanned_dept) + jobs += "" + else + jobs += "" + + jobs += "" //Breaking it up so it fits nicer on the screen every 5 entries + + //Cultist + if(jobban_isbanned(M, "cultist") || isbanned_dept) + jobs += "" + else + jobs += "" + + //Wizard + if(jobban_isbanned(M, "wizard") || isbanned_dept) + jobs += "" + else + jobs += "" + +/* //Malfunctioning AI //Removed Malf-bans because they're a pain to impliment + if(jobban_isbanned(M, "malf AI") || isbanned_dept) + jobs += "" + else + jobs += "" + + //Alien + if(jobban_isbanned(M, "alien candidate") || isbanned_dept) + jobs += "" + else + jobs += "" + + //Infested Monkey + if(jobban_isbanned(M, "infested monkey") || isbanned_dept) + jobs += "" + else + jobs += "" +*/ + jobs += "
Antagonist Positions
[dd_replacetext("Traitor", " ", " ")][dd_replacetext("Traitor", " ", " ")][dd_replacetext("Changeling", " ", " ")][dd_replacetext("Changeling", " ", " ")][dd_replacetext("Nuke Operative", " ", " ")][dd_replacetext("Nuke Operative", " ", " ")][dd_replacetext("Revolutionary", " ", " ")][dd_replacetext("Revolutionary", " ", " ")]
[dd_replacetext("Cultist", " ", " ")][dd_replacetext("Cultist", " ", " ")][dd_replacetext("Wizard", " ", " ")][dd_replacetext("Wizard", " ", " ")][dd_replacetext("Malf AI", " ", " ")][dd_replacetext("Malf AI", " ", " ")][dd_replacetext("Alien", " ", " ")][dd_replacetext("Alien", " ", " ")][dd_replacetext("Infested Monkey", " ", " ")][dd_replacetext("Infested Monkey", " ", " ")]
" + + body = "[jobs]" + dat = "[header][body]" + usr << browse(dat, "window=jobban2;size=800x450") + return + + //JOBBAN'S INNARDS + if(href_list["jobban3"]) + if (src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" )) + var/mob/M = locate(href_list["jobban4"]) + if(!M) + alert("Mob no longer exists!") + return + if ((M.client && M.client.holder && (M.client.holder.level > src.level))) + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + if(!job_master) + usr << "Job Master has not been setup!" + return + + //get jobs for department if specified, otherwise just returnt he one job in a list. + var/list/joblist = list() + switch(href_list["jobban3"]) + if("commanddept") + for(var/jobPos in command_positions) + if(!jobPos) continue + var/datum/job/temp = job_master.GetJob(jobPos) + if(!temp) continue + joblist += temp.title + if("securitydept") + for(var/jobPos in security_positions) + if(!jobPos) continue + var/datum/job/temp = job_master.GetJob(jobPos) + if(!temp) continue + joblist += temp.title + if("engineeringdept") + for(var/jobPos in engineering_positions) + if(!jobPos) continue + var/datum/job/temp = job_master.GetJob(jobPos) + if(!temp) continue + joblist += temp.title + if("medicaldept") + for(var/jobPos in medical_positions) + if(!jobPos) continue + var/datum/job/temp = job_master.GetJob(jobPos) + if(!temp) continue + joblist += temp.title + if("sciencedept") + for(var/jobPos in science_positions) + if(!jobPos) continue + var/datum/job/temp = job_master.GetJob(jobPos) + if(!temp) continue + joblist += temp.title + if("civiliandept") + for(var/jobPos in civilian_positions) + if(!jobPos) continue + var/datum/job/temp = job_master.GetJob(jobPos) + if(!temp) continue + joblist += temp.title + if("nonhumandept") + joblist += "pAI" + for(var/jobPos in nonhuman_positions) + if(!jobPos) continue + var/datum/job/temp = job_master.GetJob(jobPos) + if(!temp) continue + joblist += temp.title + else + joblist += href_list["jobban3"] + + //Create a list of unbanned jobs within joblist + var/list/notbannedlist = list() + for(var/job in joblist) + if(!jobban_isbanned(M, job)) + notbannedlist += job + + //Banning comes first + if(notbannedlist.len) //at least 1 unbanned job exists in joblist so we have stuff to ban. + var/reason = input(usr,"Reason?","Please State Reason","") as text|null + if(reason) + var/msg + for(var/job in notbannedlist) + ban_unban_log_save("[key_name(usr)] jobbanned [key_name(M)] from [job]. reason: [reason]") + log_admin("[key_name(usr)] banned [key_name(M)] from [job]") + feedback_inc("ban_job",1) + DB_ban_record(BANTYPE_JOB_PERMA, M, -1, reason, job) + 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]" + notes_add(M.ckey, "Banned from [msg] - [reason]") + 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]." + M << "\red The reason is: [reason]" + M << "\red Jobban can be lifted only upon request." + href_list["jobban2"] = 1 // lets it fall through and refresh + return 1 + + //Unbanning joblist + //all jobs in joblist are banned already OR we didn't give a reason (implying they shouldn't be banned) + if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban. + var/msg + for(var/job in joblist) + var/reason = jobban_isbanned(M, job) + if(!reason) continue //skip if it isn't jobbanned anyway + switch(alert("Job: '[job]' Reason: '[reason]' Un-jobban?","Please Confirm","Yes","No")) + if("Yes") + ban_unban_log_save("[key_name(usr)] unjobbanned [key_name(M)] from [job]") + log_admin("[key_name(usr)] unbanned [key_name(M)] from [job]") + DB_ban_unban(M.ckey, BANTYPE_JOB_PERMA, job) + feedback_inc("ban_job_unban",1) + feedback_add_details("ban_job_unban","- [job]") + jobban_unban(M, job) + if(!msg) msg = job + else msg += ", [job]" + else + continue + if(msg) + message_admins("\blue [key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1) + M << "\redYou have been un-jobbanned by [usr.client.ckey] from [msg]." + href_list["jobban2"] = 1 // lets it fall through and refresh + return 1 + return 0 //we didn't do anything! + + if (href_list["boot2"]) + if ((src.rank in list( "Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/mob/M = locate(href_list["boot2"]) + if (ismob(M)) + if ((M.client && M.client.holder && (M.client.holder.level >= src.level))) + alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null) + return + M << "\red You have been kicked from the server" + log_admin("[key_name(usr)] booted [key_name(M)].") + message_admins("\blue [key_name_admin(usr)] booted [key_name_admin(M)].", 1) + //M.client = null + del(M.client) + + //Player Notes + if(href_list["notes"]) + var/ckey = href_list["ckey"] + if(!ckey) + var/mob/M = locate(href_list["mob"]) + if(ismob(M)) + ckey = M.ckey + + switch(href_list["notes"]) + if("show") + notes_show(ckey) + if("add") + notes_add(ckey,href_list["text"]) + notes_show(ckey) + if("remove") + notes_remove(ckey,text2num(href_list["from"]),text2num(href_list["to"])) + notes_show(ckey) + return + + + if (href_list["removejobban"]) + if ((src.rank in list("Game Admin", "Game Master" ))) + var/t = href_list["removejobban"] + if(t) + if((alert("Do you want to unjobban [t]?","Unjobban confirmation", "Yes", "No") == "Yes") && t) //No more misclicks! Unless you do it twice. + log_admin("[key_name(usr)] removed [t]") + message_admins("\blue [key_name_admin(usr)] removed [t]", 1) + jobban_remove(t) + href_list["ban"] = 1 // lets it fall through and refresh + var/t_split = dd_text2list(t, " - ") + var/key = t_split[1] + var/job = t_split[2] + DB_ban_unban(ckey(key), BANTYPE_JOB_PERMA, job) + + if (href_list["newban"]) + if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/mob/M = locate(href_list["newban"]) + if(!ismob(M)) return + if ((M.client && M.client.holder && (M.client.holder.level >= src.level))) + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + switch(alert("Temporary Ban?",,"Yes","No", "Cancel")) + if("Yes") + var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null + if(!mins) + return + if(mins >= 525600) mins = 525599 + var/reason = input(usr,"Reason?","reason","Griefer") as text|null + if(!reason) + return + AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins) + ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.") + M << "\redYou have been banned by [usr.client.ckey].\nReason: [reason]." + M << "\red This is a temporary ban, it will be removed in [mins] minutes." + feedback_inc("ban_tmp",1) + DB_ban_record(BANTYPE_TEMP, M, mins, reason) + feedback_inc("ban_tmp_mins",mins) + if(config.banappeals) + M << "\red To try to resolve this matter head to [config.banappeals]" + else + M << "\red No ban appeals URL has been set." + log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") + message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") + + del(M.client) + //del(M) // See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends. + if("No") + var/reason = input(usr,"Reason?","reason","Griefer") as text|null + if(!reason) + return + switch(alert(usr,"IP ban?",,"Yes","No","Cancel")) + if("Cancel") return + if("Yes") + AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0, M.lastKnownIP) + if("No") + AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0) + M << "\redYou have been banned by [usr.client.ckey].\nReason: [reason]." + M << "\red This is a permanent ban." + if(config.banappeals) + M << "\red To try to resolve this matter head to [config.banappeals]" + else + M << "\red No ban appeals URL has been set." + ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.") + log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") + message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") + feedback_inc("ban_perma",1) + DB_ban_record(BANTYPE_PERMA, M, -1, reason) + + del(M.client) + //del(M) + if("Cancel") + return + if(href_list["unjobbanf"]) + var/banfolder = href_list["unjobbanf"] + Banlist.cd = "/base/[banfolder]" + var/key = Banlist["key"] + if(alert(usr, "Are you sure you want to unban [key]?", "Confirmation", "Yes", "No") == "Yes") + if (RemoveBanjob(banfolder)) + unjobbanpanel() + else + alert(usr,"This ban has already been lifted / does not exist.","Error","Ok") + unjobbanpanel() + + if(href_list["unjobbane"]) + return +/* + if (href_list["remove"]) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/t = href_list["remove"] + if(t && isgoon(t)) + log_admin("[key_name(usr)] removed [t] from the goonlist.") + message_admins("\blue [key_name_admin(usr)] removed [t] from the goonlist.") + remove_goon(t) +*/ + if (href_list["mute"]) + if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/mob/M = locate(href_list["mute"]) + var/mute_type = href_list["mute_type"] + if(istext(mute_type)) + mute_type = text2num(mute_type) + if(!isnum(mute_type)) + return + if (ismob(M)) + if(!M.client) + src << "This mob doesn't have a client tied to it." + return + if ((M.client && M.client.holder && (M.client.holder.level >= src.level))) + alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null) + return + + cmd_admin_mute(M, mute_type) + + if (href_list["c_mode"]) + if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + if (ticker && ticker.mode) + return alert(usr, "The game has already started.", null, null, null, null) + var/dat = {"What mode do you wish to play?
"} + for (var/mode in config.modes) + dat += {"[config.mode_names[mode]]
"} + dat += {"Secret
"} + dat += {"Random
"} + dat += {"Now: [master_mode]"} + usr << browse(dat, "window=c_mode") + + if (href_list["f_secret"]) + if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + if (ticker && ticker.mode) + return alert(usr, "The game has already started.", null, null, null, null) + if (master_mode != "secret") + return alert(usr, "The game mode has to be secret!", null, null, null, null) + var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
"} + for (var/mode in config.modes) + dat += {"[config.mode_names[mode]]
"} + dat += {"Random (default)
"} + dat += {"Now: [secret_force_mode]"} + usr << browse(dat, "window=f_secret") + + if (href_list["c_mode2"]) + if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + if (ticker && ticker.mode) + return alert(usr, "The game has already started.", null, null, null, null) + master_mode = href_list["c_mode2"] + log_admin("[key_name(usr)] set the mode as [master_mode].") + message_admins("\blue [key_name_admin(usr)] set the mode as [master_mode].", 1) + world << "\blue The mode is now: [master_mode]" + Game() // updates the main game menu + world.save_mode(master_mode) + .(href, list("c_mode"=1)) + + if (href_list["f_secret2"]) + if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + if (ticker && ticker.mode) + return alert(usr, "The game has already started.", null, null, null, null) + if (master_mode != "secret") + return alert(usr, "The game mode has to be secret!", null, null, null, null) + secret_force_mode = href_list["f_secret2"] + log_admin("[key_name(usr)] set the forced secret mode as [secret_force_mode].") + message_admins("\blue [key_name_admin(usr)] set the forced secret mode as [secret_force_mode].", 1) + Game() // updates the main game menu + .(href, list("f_secret"=1)) + + if (href_list["monkeyone"]) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/mob/M = locate(href_list["monkeyone"]) + if(!ismob(M)) + return + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/N = M + log_admin("[key_name(usr)] attempting to monkeyize [key_name(M)]") + message_admins("\blue [key_name_admin(usr)] attempting to monkeyize [key_name_admin(M)]", 1) + N.monkeyize() + if(istype(M, /mob/living/silicon)) + alert("The AI can't be monkeyized!", null, null, null, null, null) + return + + if (href_list["corgione"]) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/mob/M = locate(href_list["corgione"]) + if(!ismob(M)) + return + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/N = M + log_admin("[key_name(usr)] attempting to corgize [key_name(M)]") + message_admins("\blue [key_name_admin(usr)] attempting to corgize [key_name_admin(M)]", 1) + N.corgize() + if(istype(M, /mob/living/silicon)) + alert("The AI can't be corgized!", null, null, null, null, null) + return + + if (href_list["forcespeech"]) + if ((src.rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/mob/M = locate(href_list["forcespeech"]) + if (ismob(M)) + var/speech = input("What will [key_name(M)] say?.", "Force speech", "")// Don't need to sanitize, since it does that in say(), we also trust our admins. + if(!speech) + return + M.say(speech) + speech = sanitize(speech) // Nah, we don't trust them + log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]") + message_admins("\blue [key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]") + else + alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null) + return + + if (href_list["sendtoprison"]) + if ((src.rank in list( "Moderator", "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + + var/confirm = alert(usr, "Send to admin prison for the round?", "Message", "Yes", "No") + if(confirm != "Yes") + return + + var/mob/M = locate(href_list["sendtoprison"]) + if (ismob(M)) + if(istype(M, /mob/living/silicon/ai)) + alert("The AI can't be sent to prison you jerk!", null, null, null, null, null) + return + //strip their stuff before they teleport into a cell :downs: + for(var/obj/item/weapon/W in M) + if(istype(W, /datum/organ/external)) + continue + //don't strip organs + M.u_equip(W) + if (M.client) + M.client.screen -= W + if (W) + W.loc = M.loc + W.dropped(M) + W.layer = initial(W.layer) + //teleport person to cell + M.Paralyse(5) + sleep(5) //so they black out before warping + M.loc = pick(prisonwarp) + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/prisoner = M + prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform) + prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) + spawn(50) + M << "\red You have been sent to the prison station!" + log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") + message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) + else + alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null) + return + +/* + if (href_list["sendtomaze"]) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/mob/M = locate(href_list["sendtomaze"]) + if (ismob(M)) + if(istype(M, /mob/living/silicon/ai)) + alert("The AI can't be sent to the maze you jerk!", null, null, null, null, null) + return + //strip their stuff before they teleport into a cell :downs: + for(var/obj/item/weapon/W in M) + if(istype(W, /datum/organ/external)) + continue + //don't strip organs + M.u_equip(W) + if (M.client) + M.client.screen -= W + if (W) + W.loc = M.loc + W.dropped(M) + W.layer = initial(W.layer) + //teleport person to cell + M.paralysis += 5 + sleep(5) + //so they black out before warping + M.loc = pick(mazewarp) + spawn(50) + M << "\red You have been sent to the maze! Try and get out alive. In the maze everyone is free game. Kill or be killed." + log_admin("[key_name(usr)] sent [key_name(M)] to the maze.") + message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the maze.", 1) + else + alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null) + return +*/ + + if (href_list["tdome1"]) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + + var/confirm = alert(usr, "Confirm?", "Message", "Yes", "No") + if(confirm != "Yes") + return + + var/mob/M = locate(href_list["tdome1"]) + if (ismob(M)) + if(istype(M, /mob/living/silicon/ai)) + alert("The AI can't be sent to the thunderdome you jerk!", null, null, null, null, null) + return + for(var/obj/item/W in M) + if (istype(W,/obj/item)) + if(istype(W, /datum/organ/external)) + continue + M.u_equip(W) + if (M.client) + M.client.screen -= W + if (W) + W.loc = M.loc + W.dropped(M) + W.layer = initial(W.layer) + M.Paralyse(5) + sleep(5) + M.loc = pick(tdome1) + spawn(50) + M << "\blue You have been sent to the Thunderdome." + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)") + message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1) + + if (href_list["tdome2"]) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + + var/confirm = alert(usr, "Confirm?", "Message", "Yes", "No") + if(confirm != "Yes") + return + + var/mob/M = locate(href_list["tdome2"]) + if (ismob(M)) + if(istype(M, /mob/living/silicon/ai)) + alert("The AI can't be sent to the thunderdome you jerk!", null, null, null, null, null) + return + for(var/obj/item/W in M) + if (istype(W,/obj/item)) + if(istype(W, /datum/organ/external)) + continue + M.u_equip(W) + if (M.client) + M.client.screen -= W + if (W) + W.loc = M.loc + W.dropped(M) + W.layer = initial(W.layer) + M.Paralyse(5) + sleep(5) + M.loc = pick(tdome2) + spawn(50) + M << "\blue You have been sent to the Thunderdome." + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)") + message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1) + + if (href_list["tdomeadmin"]) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + + var/confirm = alert(usr, "Confirm?", "Message", "Yes", "No") + if(confirm != "Yes") + return + + var/mob/M = locate(href_list["tdomeadmin"]) + if (ismob(M)) + if(istype(M, /mob/living/silicon/ai)) + alert("The AI can't be sent to the thunderdome you jerk!", null, null, null, null, null) + return + M.Paralyse(5) + sleep(5) + M.loc = pick(tdomeadmin) + spawn(50) + M << "\blue You have been sent to the Thunderdome." + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)") + message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1) + + if (href_list["tdomeobserve"]) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + + var/confirm = alert(usr, "Confirm?", "Message", "Yes", "No") + if(confirm != "Yes") + return + + var/mob/M = locate(href_list["tdomeobserve"]) + if (ismob(M)) + if(istype(M, /mob/living/silicon/ai)) + alert("The AI can't be sent to the thunderdome you jerk!", null, null, null, null, null) + return + for(var/obj/item/W in M) + if (istype(W,/obj/item)) + if(istype(W, /datum/organ/external)) + continue + M.u_equip(W) + if (M.client) + M.client.screen -= W + if (W) + W.loc = M.loc + W.dropped(M) + W.layer = initial(W.layer) + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/observer = M + observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), slot_w_uniform) + observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), slot_shoes) + M.Paralyse(5) + sleep(5) + M.loc = pick(tdomeobserve) + spawn(50) + M << "\blue You have been sent to the Thunderdome." + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)") + message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1) + +// if (href_list["adminauth"]) +// if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) +// var/mob/M = locate(href_list["adminauth"]) +// if (ismob(M) && !M.client.authenticated && !M.client.authenticating) +// M.client.verbs -= /client/proc/authorize +// M.client.authenticated = text("admin/[]", usr.client.authenticated) +// log_admin("[key_name(usr)] authorized [key_name(M)]") +// message_admins("\blue [key_name_admin(usr)] authorized [key_name_admin(M)]", 1) +// M.client << text("You have been authorized by []", usr.key) + + if (href_list["revive"]) + if ((src.rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/mob/living/M = locate(href_list["revive"]) + if (isliving(M)) + if(config.allow_admin_rev) + M.revive() + message_admins("\red Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!", 1) + log_admin("[key_name(usr)] healed / Rrvived [key_name(M)]") + return + else + alert("Admin revive disabled") + else + alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null) + return + + if (href_list["makeai"]) //Yes, im fucking lazy, so what? it works ... hopefully + if (src.level>=3) + var/mob/M = locate(href_list["makeai"]) + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + message_admins("\red Admin [key_name_admin(usr)] AIized [key_name_admin(M)]!", 1) +// if (ticker.mode.name == "AI malfunction") +// var/obj/O = locate("landmark*ai") +// M << "\blue You have been teleported to your new starting location!" +// M.loc = O.loc +// M.buckled = null +// else +// var/obj/S = locate(text("start*AI")) +// if ((istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf))) +// M << "\blue You have been teleported to your new starting location!" +// M.loc = S.loc +// M.buckled = null + // world << "[M.real_name] is the AI!" + log_admin("[key_name(usr)] AIized [key_name(M)]") + H.AIize() + else + alert("I cannot allow this.") + return + else + alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null) + return + + if (href_list["makealien"]) + if (src.level>=3) + var/mob/M = locate(href_list["makealien"]) + if(istype(M, /mob/living/carbon/human)) + usr.client.cmd_admin_alienize(M) + else + alert("Wrong mob. Must be human.") + return + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + + if (href_list["makemetroid"]) + if (src.level>=3) + var/mob/M = locate(href_list["makemetroid"]) + if(istype(M, /mob/living/carbon/human)) + usr.client.cmd_admin_metroidize(M) + else + alert("Wrong mob. Must be human.") + return + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + + if (href_list["makerobot"]) + if (src.level>=3) + var/mob/M = locate(href_list["makerobot"]) + if(istype(M, /mob/living/carbon/human)) + usr.client.cmd_admin_robotize(M) + else + alert("Wrong mob. Must be human.") + return + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + if (href_list["makeanimal"]) + if(src.level>=3) + var/mob/M = locate(href_list["makeanimal"]) + if(!istype(M, /mob/new_player)) + usr.client.cmd_admin_animalize(M) + else + alert("The mob must not be a new_player.") + return + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return +/***************** BEFORE************** + + if (href_list["l_players"]) + var/dat = "Name/Real Name/Key/IP:
" + for(var/mob/M in world) + var/foo = "" + if (ismob(M) && M.client) + if(!M.client.authenticated && !M.client.authenticating) + foo += text("\[ Authorize | ", src, M) + else + foo += text("\[ Authorized | ") + if(M.start) + if(!istype(M, /mob/living/carbon/monkey)) + foo += text("Monkeyize | ", src, M) + else + foo += text("Monkeyized | ") + if(istype(M, /mob/living/silicon/ai)) + foo += text("Is an AI | ") + else + foo += text("Make AI | ", src, M) + if(M.z != 2) + foo += text("Prison | ", src, M) + foo += text("Maze | ", src, M) + else + foo += text("On Z = 2 | ") + else + foo += text("Hasn't Entered Game | ") + foo += text("Heal/Revive | ", src, M) + + foo += text("Say \]", src, M) + dat += text("N: [] R: [] (K: []) (IP: []) []
", M.name, M.real_name, (M.client ? M.client : "No client"), M.lastKnownIP, foo) + + usr << browse(dat, "window=players;size=900x480") + +*****************AFTER******************/ + +// Now isn't that much better? IT IS NOW A PROC, i.e. kinda like a big panel like unstable + + if (href_list["adminplayeropts"]) + var/mob/M = locate(href_list["adminplayeropts"]) + show_player_panel(M) + + if (href_list["adminplayervars"]) + var/mob/M = locate(href_list["adminplayervars"]) + if(src && src.owner) + if(istype(src.owner,/client)) + var/client/cl = src.owner + cl.debug_variables(M) + else if(ismob(src.owner)) + var/mob/MO = src.owner + if(MO.client) + var/client/cl = MO.client + cl.debug_variables(M) + + if (href_list["adminplayersubtlemessage"]) + var/mob/M = locate(href_list["adminplayersubtlemessage"]) + if(src && src.owner) + if(istype(src.owner,/client)) + var/client/cl = src.owner + cl.cmd_admin_subtle_message(M) + else if(ismob(src.owner)) + var/mob/MO = src.owner + if(MO.client) + var/client/cl = MO.client + cl.cmd_admin_subtle_message(M) + + if (href_list["adminplayerobservejump"]) + var/mob/M = locate(href_list["adminplayerobservejump"]) + if(src && src.owner) + var/client/C + if(istype(src.owner,/client)) + C = src.owner + else if(ismob(src.owner)) + var/mob/MO = src.owner + C = MO.client + if(C) + if(state == 1) + C.admin_ghost() + sleep(2) + C.jumptomob(M) + + if (href_list["adminplayerobservecoodjump"]) + + var/x = text2num(href_list["X"]) + var/y = text2num(href_list["Y"]) + var/z = text2num(href_list["Z"]) + + if(src && src.owner) + var/client/C + if(istype(src.owner,/client)) + C = src.owner + else if(ismob(src.owner)) + var/mob/MO = src.owner + C = MO.client + if(C) + if(state == 1) + C.admin_ghost() + sleep(2) + C.jumptocoord(x, y, z) + + if (href_list["adminchecklaws"]) + if(src && src.owner) + output_ai_laws() + + if (href_list["adminmoreinfo"]) + var/mob/M = locate(href_list["adminmoreinfo"]) + if(!M) + usr << "\blue The mob no longer exists." + return + + if(src && src.owner) +// //world <<"Passed the owner-check. Owner is [src.owner]. The mob is [M]." + var/location_description = "" + var/special_role_description = "" + var/health_description = "" + var/gender_description = "" + var/turf/T = get_turf(M) + + //Location + if(T && isturf(T)) +// //world <<"Has a location." + if(T.loc && isarea(T.loc)) + location_description = "([M.loc == T ? "at coordinates " : "in [M.loc] at coordinates "] [T.x], [T.y], [T.z] in area [T.loc])" + else + location_description = "([M.loc == T ? "at coordinates " : "in [M.loc] at coordinates "] [T.x], [T.y], [T.z])" + + //Job + antagonist + if(M.mind) + special_role_description = "Role: [M.mind.assigned_role]; Antagonist: [M.mind.special_role]; Has been rev: [(M.mind.has_been_rev)?"Yes":"No"]" + else + special_role_description = "Role: Mind datum missing Antagonist: Mind datum missing; Has been rev: Mind datum missing;" + + //Health + if(isliving(M)) + var/mob/living/L = M + var/status + switch (M.stat) + if (0) status = "Alive" + if (1) status = "Unconscious" + if (2) status = "Dead" + health_description = "Status = [status]" + health_description += "
Oxy: [L.getOxyLoss()] - Tox: [L.getToxLoss()] - Fire: [L.getFireLoss()] - Brute: [L.getBruteLoss()] - Clone: [L.getCloneLoss()] - Brain: [L.getBrainLoss()]" + else +// world <<"Has no health." + health_description = "This mob type has no health to speak of." + + //Gener + if(M.gender in list(MALE,FEMALE)) + gender_description = "[M.gender]" + else + gender_description = "[M.gender]" + +// world <<"Displaying info about the mob..." + src.owner << "Info about [M.name]: " + src.owner << "Mob type = [M.type]; Gender = [gender_description] Damage = [health_description]" + src.owner << "Name = [M.name]; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = [M.key];" + src.owner << "Location = [location_description];" + src.owner << "[special_role_description]" + src.owner << "(PM) (PP) (VV) (SM) (JMP) (CA)" + + if (href_list["adminspawncookie"]) + var/mob/M = locate(href_list["adminspawncookie"]) + if(M && ishuman(M)) + var/mob/living/carbon/human/H = M + H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand ) + if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) + H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_r_hand ) + if(!(istype(H.r_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) + log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") + message_admins("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") + return + else + H.update_inv_r_hand()//To ensure the icon appears in the HUD + else + H.update_inv_l_hand() + log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") + message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") + feedback_inc("admin_cookies_spawned",1) + H << "\blue Your prayers have been answered!! You received the best cookie!" + else + src << "\blue The person who prayed is not a human. Cookies cannot be spawned." + + + if (href_list["traitor_panel_pp"]) + var/mob/M = locate(href_list["traitor_panel_pp"]) + if(isnull(M)) + usr << "Mob doesn't seem to exist." + return + if(!ismob(M)) + usr << "This doen't seem to be a mob." + return + show_traitor_panel(M) + + if (href_list["BlueSpaceArtillery"]) + var/mob/target = locate(href_list["BlueSpaceArtillery"]) + if(!target) + return + + if(!isliving(target)) + src.owner << "That is not a valid target." + return + + var/mob/living/M = target + + var/choice = alert(src.owner, "Are you sure you wish to hit [key_name(M)] with Blue Space Artillery?", "Confirm Firing?" , "Yes" , "No") + if (choice == "No") + return + + if(BSACooldown) + src.owner << "Standby! Reload cycle in progress! Gunnary crews ready in five seconds!" + return + + BSACooldown = 1 + spawn(50) + BSACooldown = 0 + + + M << "You've been hit by bluespace artillery!" + log_admin("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]") + message_admins("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]") + var/obj/effect/stop/S + S = new /obj/effect/stop + S.victim = M + S.loc = M.loc + spawn(20) + del(S) + + var/turf/T = get_turf(M) + if(T && (istype(T,/turf/simulated/floor/))) + if(prob(80)) + T:break_tile_to_plating() + else + T:break_tile() + + if(M.health == 1) + M.gib() + else + M.adjustBruteLoss( min( 99 , (M.health - 1) ) ) + M.Stun(20) + M.Weaken(20) + M.stuttering = 20 + + if (href_list["CentcommReply"]) + var/mob/M = locate(href_list["CentcommReply"]) + if(!M) + return + if(!ishuman(M)) + alert("Centcomm cannot transmit to non-humans.") + return + var/mob/living/carbon/human/H = M + if(!istype(H.ears, /obj/item/device/radio/headset)) + alert("The person you're trying to reply to doesn't have a headset! Centcomm cannot transmit directly to them.") + return + var/input = input(src.owner, "Please enter a message to reply to [key_name(M)] via their headset.","Outgoing message from Centcomm", "") + if(!input) + return + + src.owner << "You sent [input] to [M] via a secure channel." + + log_admin("[src.owner] replied to [key_name(M)]'s Centcomm message with the message [input].") + message_admins("[src.owner] replied to [key_name(M)]'s Centcom message with: \"[input]\"") + M << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. [input]. Message ends.\"" + + return + + if (href_list["SyndicateReply"]) + var/mob/M = locate(href_list["SyndicateReply"]) + if(!M) + return + if(!istype(M, /mob/living/carbon/human)) + alert("The Syndicate cannot transmit to non-humans.") + return + if(!istype(M:ears, /obj/item/device/radio/headset)) + alert("The person you're trying to reply to doesn't have a headset! The Syndicate cannot transmit directly to them.") + return + var/input = input(src.owner, "Please enter a message to reply to [key_name(M)] via their headset.","Outgoing message from The Syndicate", "") + if(!input) + return + + src.owner << "You sent [input] to [M] via a secure channel." + log_admin("[src.owner] replied to [key_name(M)]'s Syndicate message with the message [input].") + M << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. [input]. Message ends.\"" + + return + + if (href_list["jumpto"]) + if(rank in list("Badmin", "Game Admin", "Game Master")) + var/mob/M = locate(href_list["jumpto"]) + usr.client.jumptomob(M) + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + + if (href_list["getmob"]) + if(rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master")) + + var/confirm = alert(usr, "Confirm?", "Message", "Yes", "No") + if(confirm != "Yes") + return + + var/mob/M = locate(href_list["getmob"]) + usr.client.Getmob(M) + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + + if (href_list["sendmob"]) + if(rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master")) + var/mob/M = locate(href_list["sendmob"]) + usr.client.sendmob(M) + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + + if (href_list["narrateto"]) + var/mob/M = locate(href_list["narrateto"]) + usr.client.cmd_admin_direct_narrate(M) + + if (href_list["subtlemessage"]) + var/mob/M = locate(href_list["subtlemessage"]) + usr.client.cmd_admin_subtle_message(M) + + if (href_list["traitor"]) + if(!ticker || !ticker.mode) + alert("The game hasn't started yet!") + return + var/mob/M = locate(href_list["traitor"]) + if (!istype(M)) + player_panel_new() + return + if(isalien(M)) + alert("Is an [M.mind ? M.mind.special_role : "Alien"]!", "[M.key]") + return + if (M:mind) + M:mind.edit_memory() + return + alert("Cannot make this mob a traitor! It has no mind!") + + if (href_list["create_object"]) + if (src.rank in list("Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master")) + return create_object(usr) + else + alert("You are not a high enough administrator! Sorry!!!!") + + if (href_list["quick_create_object"]) + if (src.rank in list("Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master")) + return quick_create_object(usr) + else + alert("You are not a high enough administrator! Sorry!!!!") + + + if (href_list["create_turf"]) + if (src.rank in list("Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master")) + return create_turf(usr) + else + alert("You are not a high enough administrator! Sorry!!!!") + + if (href_list["create_mob"]) + if (src.rank in list("Badmin", "Game Admin", "Game Master")) + return create_mob(usr) + else + alert("You are not a high enough administrator! Sorry!!!!") + + if (href_list["prom_demot"]) + if ((src.rank in list("Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/client/C = locate(href_list["prom_demot"]) + if(C.holder && (C.holder.level >= src.level)) + alert("This cannot be done as [C] is a [C.holder.rank]") + return + var/dat = "[C] is a [C.holder ? "[C.holder.rank]" : "non-admin"]

Change [C]'s rank?
" + if(src.level == 6) + //host + dat += {" + Game Admin //coder
+ Badmin // Shit Guy
+ Trial Admin // Primary Administrator
+ Admin Candidate // // Administrator
+ Temporary Admin // Secondary Admin
+ Moderator // Moderator
+ Admin Observer // Filthy Xeno
+ Remove Admin
"} + else if(src.level == 5) + //coder + dat += {" + Badmin // Shit Guy
+ Trial Admin // Primary Administrator
+ Admin Candidate // // Administrator
+ Temporary Admin // Secondary Admin
+ Moderator // Moderator
+ Admin Observer // Filthy Xeno
+ Remove Admin
"} + else + alert("Not a high enough level admin, sorry.") + return + usr << browse(dat, "window=prom_demot;size=480x300") + + if (href_list["chgadlvl"]) + //change admin level + var/rank = href_list["chgadlvl"] + var/client/C = locate(href_list["client4ad"]) + if(!istype(C)) return + if(rank == "Remove") + log_admin("[key_name(usr)] has removed [C]'s adminship") + message_admins("[key_name_admin(usr)] has removed [C]'s adminship", 1) + C.deadmin() + else + if(C == owner) //no promoting/demoting yourself + message_admins("[C] tried to change their own admin-rank >:(") + return + C.update_admins(rank) + log_admin("[key_name(usr)] has made [C] a [rank]") + message_admins("[key_name_admin(usr)] has made [C] a [rank]", 1) +// admins[C.ckey] = rank +// admin_list |= C + + + if (href_list["object_list"]) + if (src.rank in list("Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master")) + if (config.allow_admin_spawning && ((src.state == 2) || (src.rank in list("Badmin", "Game Admin", "Game Master")))) + var/atom/loc = usr.loc + + var/dirty_paths + if (istext(href_list["object_list"])) + dirty_paths = list(href_list["object_list"]) + else if (istype(href_list["object_list"], /list)) + dirty_paths = href_list["object_list"] + + var/paths = list() + var/removed_paths = list() + for (var/dirty_path in dirty_paths) + var/path = text2path(dirty_path) + if (!path) + removed_paths += dirty_path + else if (!ispath(path, /obj) && !ispath(path, /turf) && !ispath(path, /mob)) + removed_paths += dirty_path + else if (ispath(path, /obj/item/weapon/gun/energy/pulse_rifle) && !(src.rank in list("Game Admin", "Game Master"))) + removed_paths += dirty_path + else if (ispath(path, /obj/item/weapon/melee/energy/blade))//Not an item one should be able to spawn./N + removed_paths += dirty_path + else if (ispath(path, /obj/effect/bhole) && !(src.rank in list("Game Admin", "Game Master"))) + removed_paths += dirty_path + else if (ispath(path, /mob) && !(src.rank in list("Badmin", "Game Admin", "Game Master"))) + removed_paths += dirty_path + + else + paths += path + + if (!paths) + return + else if (length(paths) > 5) + alert("Select fewer object types, (max 5)") + return + else if (length(removed_paths)) + alert("Removed:\n" + dd_list2text(removed_paths, "\n")) + + var/list/offset = dd_text2list(href_list["offset"],",") + var/number = dd_range(1, 100, text2num(href_list["object_count"])) + var/X = offset.len > 0 ? text2num(offset[1]) : 0 + var/Y = offset.len > 1 ? text2num(offset[2]) : 0 + var/Z = offset.len > 2 ? text2num(offset[3]) : 0 + var/tmp_dir = href_list["object_dir"] + var/obj_dir = tmp_dir ? text2num(tmp_dir) : 2 + if(!obj_dir || !(obj_dir in list(1,2,4,8,5,6,9,10))) + obj_dir = 2 + var/obj_name = sanitize(href_list["object_name"]) + var/where = href_list["object_where"] + if (!( where in list("onfloor","inhand","inmarked") )) + where = "onfloor" + + //TODO ERRORAGE + if( where == "inhand" ) + usr << "Support for inhand not available yet. Will spawn on floor." + where = "onfloor" + //END TODO ERRORAGE + + if ( where == "inhand" ) //Can only give when human or monkey + if ( !( ishuman(usr) || ismonkey(usr) ) ) + usr << "Can only spawn in hand when you're a human or a monkey." + where = "onfloor" + else if ( usr.get_active_hand() ) + usr << "Your active hand is full. Spawning on floor." + where = "onfloor" + if ( where == "inmarked" ) + if ( !marked_datum ) + usr << "You don't have any object marked. Abandoning spawn." + return + else + if ( !istype(marked_datum,/atom) ) + usr << "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn." + return + + var/atom/target //Where the object will be spawned + switch ( where ) + if ( "onfloor" ) + switch (href_list["offset_type"]) + if ("absolute") + target = locate(0 + X,0 + Y,0 + Z) + if ("relative") + target = locate(loc.x + X,loc.y + Y,loc.z + Z) + if ( "inmarked" ) + target = marked_datum + + + //TODO ERRORAGE - Give support for "inhand" + + if(target) + for (var/path in paths) + for (var/i = 0; i < number; i++) + var/atom/O = new path(target) + if(O) + O.dir = obj_dir + if(obj_name) + O.name = obj_name + if(istype(O,/mob)) + var/mob/M = O + M.real_name = obj_name + + if (number == 1) + log_admin("[key_name(usr)] created a [english_list(paths)]") + for(var/path in paths) + if(ispath(path, /mob)) + message_admins("[key_name_admin(usr)] created a [english_list(paths)]", 1) + break + else + log_admin("[key_name(usr)] created [number]ea [english_list(paths)]") + for(var/path in paths) + if(ispath(path, /mob)) + message_admins("[key_name_admin(usr)] created [number]ea [english_list(paths)]", 1) + break + return + else + alert("You cannot spawn items right now.") + return + + if (href_list["secretsfun"]) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/ok = 0 + switch(href_list["secretsfun"]) + if("sec_clothes") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","SC") + for(var/obj/item/clothing/under/O in world) + del(O) + ok = 1 + if("sec_all_clothes") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","SAC") + for(var/obj/item/clothing/O in world) + del(O) + ok = 1 + if("sec_classic1") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","SC1") + for(var/obj/item/clothing/suit/fire/O in world) + del(O) + for(var/obj/structure/grille/O in world) + del(O) +/* for(var/obj/machinery/vehicle/pod/O in world) + for(var/mob/M in src) + M.loc = src.loc + if (M.client) + M.client.perspective = MOB_PERSPECTIVE + M.client.eye = M + del(O) + ok = 1*/ + if("toxic") + /* + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","T") + for(var/obj/machinery/atmoalter/siphs/fullairsiphon/O in world) + O.t_status = 3 + for(var/obj/machinery/atmoalter/siphs/scrubbers/O in world) + O.t_status = 1 + O.t_per = 1000000.0 + for(var/obj/machinery/atmoalter/canister/O in world) + if (!( istype(O, /obj/machinery/atmoalter/canister/oxygencanister) )) + O.t_status = 1 + O.t_per = 1000000.0 + else + O.t_status = 3 + */ + usr << "HEH" + if("monkey") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","M") + for(var/mob/living/carbon/human/H in mob_list) + spawn(0) + H.monkeyize() + ok = 1 + if("corgi") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","M") + for(var/mob/living/carbon/human/H in mob_list) + spawn(0) + H.corgize() + ok = 1 + if("power") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","P") + log_admin("[key_name(usr)] made all areas powered", 1) + message_admins("\blue [key_name_admin(usr)] made all areas powered", 1) + power_restore() + if("unpower") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","UP") + log_admin("[key_name(usr)] made all areas unpowered", 1) + message_admins("\blue [key_name_admin(usr)] made all areas unpowered", 1) + power_failure() + if("quickpower") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","QP") + 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) + return + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","PW") + message_admins("\blue [key_name_admin(usr)] teleported all players to the prison station.", 1) + for(var/mob/living/carbon/human/H in mob_list) + var/turf/loc = find_loc(H) + var/security = 0 + if(loc.z > 1 || prisonwarped.Find(H)) + //don't warp them if they aren't ready or are already there + continue + H.Paralyse(5) + if(H.wear_id) + var/obj/item/weapon/card/id/id = H.get_idcard() + for(var/A in id.access) + if(A == access_security) + security++ + if(!security) + //strip their stuff before they teleport into a cell :downs: + for(var/obj/item/weapon/W in H) + if(istype(W, /datum/organ/external)) + continue + //don't strip organs + H.u_equip(W) + if (H.client) + H.client.screen -= W + if (W) + W.loc = H.loc + W.dropped(H) + W.layer = initial(W.layer) + //teleport person to cell + H.loc = pick(prisonwarp) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes) + else + //teleport security person + H.loc = pick(prisonsecuritywarp) + prisonwarped += H + if("traitor_all") + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + if(!ticker) + alert("The game hasn't started yet!") + return + var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN) + if(!objective) + return + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","TA([objective])") + for(var/mob/living/carbon/human/H in player_list) + if(H.stat == 2 || !H.client || !H.mind) continue + if(is_special_character(H)) continue + //traitorize(H, objective, 0) + ticker.mode.traitors += H.mind + H.mind.special_role = "traitor" + var/datum/objective/new_objective = new + new_objective.owner = H + new_objective.explanation_text = objective + H.mind.objectives += new_objective + ticker.mode.greet_traitor(H.mind) + //ticker.mode.forge_traitor_objectives(H.mind) + ticker.mode.finalize_traitor(H.mind) + for(var/mob/living/silicon/A in player_list) + ticker.mode.traitors += A.mind + A.mind.special_role = "traitor" + var/datum/objective/new_objective = new + new_objective.owner = A + new_objective.explanation_text = objective + A.mind.objectives += new_objective + ticker.mode.greet_traitor(A.mind) + ticker.mode.finalize_traitor(A.mind) + message_admins("\blue [key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]", 1) + log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]") + else + alert("You're not of a high enough rank to do this") + if("moveminingshuttle") + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + if(mining_shuttle_moving) + return + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","ShM") + move_mining_shuttle() + message_admins("\blue [key_name_admin(usr)] moved mining shuttle", 1) + log_admin("[key_name(usr)] moved the mining shuttle") + else + alert("You're not of a high enough rank to do this") + if("moveadminshuttle") + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","ShA") + move_admin_shuttle() + message_admins("\blue [key_name_admin(usr)] moved the centcom administration shuttle", 1) + log_admin("[key_name(usr)] moved the centcom administration shuttle") + else + alert("You're not of a high enough rank to do this") + if("moveferry") + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","ShF") + move_ferry() + message_admins("\blue [key_name_admin(usr)] moved the centcom ferry", 1) + log_admin("[key_name(usr)] moved the centcom ferry") + else + alert("You're not of a high enough rank to do this") + if("movealienship") + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","ShX") + move_alien_ship() + message_admins("\blue [key_name_admin(usr)] moved the alien dinghy", 1) + log_admin("[key_name(usr)] moved the alien dinghy") + else + alert("You're not of a high enough rank to do this") + if("togglebombcap") + if (src.rank in list( "Game Admin", "Game Master" )) + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","BC") + switch(MAX_EXPLOSION_RANGE) + if(14) + MAX_EXPLOSION_RANGE = 16 + if(16) + MAX_EXPLOSION_RANGE = 20 + if(20) + MAX_EXPLOSION_RANGE = 28 + if(28) + MAX_EXPLOSION_RANGE = 56 + if(56) + MAX_EXPLOSION_RANGE = 128 + if(128) + MAX_EXPLOSION_RANGE = 14 + var/range_dev = MAX_EXPLOSION_RANGE *0.25 + var/range_high = MAX_EXPLOSION_RANGE *0.5 + var/range_low = MAX_EXPLOSION_RANGE + message_admins("\red [key_name_admin(usr)] changed the bomb cap to [range_dev], [range_high], [range_low]", 1) + log_admin("[key_name_admin(usr)] changed the bomb cap to [MAX_EXPLOSION_RANGE]") + else + alert("No way. You're not of a high enough rank to do this.") + + if("flicklights") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","FL") + while(!usr.stat) + //knock yourself out to stop the ghosts + for(var/mob/M in player_list) + if(M.stat != 2 && prob(25)) + var/area/AffectedArea = get_area(M) + if(AffectedArea.name != "Space" && AffectedArea.name != "Engine Walls" && AffectedArea.name != "Chemical Lab Test Chamber" && AffectedArea.name != "Escape Shuttle" && AffectedArea.name != "Arrival Area" && AffectedArea.name != "Arrival Shuttle" && AffectedArea.name != "start area" && AffectedArea.name != "Engine Combustion Chamber") + AffectedArea.power_light = 0 + AffectedArea.power_change() + spawn(rand(55,185)) + AffectedArea.power_light = 1 + AffectedArea.power_change() + var/Message = rand(1,4) + switch(Message) + if(1) + M.show_message(text("\blue You shudder as if cold..."), 1) + if(2) + M.show_message(text("\blue You feel something gliding across your back..."), 1) + if(3) + M.show_message(text("\blue Your eyes twitch, you feel like something you can't see is here..."), 1) + if(4) + M.show_message(text("\blue You notice something moving out of the corner of your eye, but nothing is there..."), 1) + for(var/obj/W in orange(5,M)) + if(prob(25) && !W.anchored) + step_rand(W) + sleep(rand(100,1000)) + for(var/mob/M in player_list) + if(M.stat != 2) + M.show_message(text("\blue The chilling wind suddenly stops..."), 1) + /* if("shockwave") + ok = 1 + world << "\red ALERT: STATION STRESS CRITICAL" + sleep(60) + world << "\red ALERT: STATION STRESS CRITICAL. TOLERABLE LEVELS EXCEEDED!" + sleep(80) + world << "\red ALERT: STATION STRUCTURAL STRESS CRITICAL. SAFETY MECHANISMS FAILED!" + sleep(40) + for(var/mob/M in world) + shake_camera(M, 400, 1) + for(var/obj/structure/window/W in world) + spawn(0) + sleep(rand(10,400)) + W.ex_act(rand(2,1)) + for(var/obj/structure/grille/G in world) + spawn(0) + sleep(rand(20,400)) + G.ex_act(rand(2,1)) + for(var/obj/machinery/door/D in world) + spawn(0) + sleep(rand(20,400)) + D.ex_act(rand(2,1)) + for(var/turf/station/floor/Floor in world) + spawn(0) + sleep(rand(30,400)) + Floor.ex_act(rand(2,1)) + for(var/obj/structure/cable/Cable in world) + spawn(0) + sleep(rand(30,400)) + Cable.ex_act(rand(2,1)) + for(var/obj/structure/closet/Closet in world) + spawn(0) + sleep(rand(30,400)) + Closet.ex_act(rand(2,1)) + for(var/obj/machinery/Machinery in world) + spawn(0) + sleep(rand(30,400)) + Machinery.ex_act(rand(1,3)) + for(var/turf/station/wall/Wall in world) + spawn(0) + sleep(rand(30,400)) + Wall.ex_act(rand(2,1)) */ + if("wave") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","MW") + if ((src.rank in list("Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + meteor_wave() + message_admins("[key_name_admin(usr)] has spawned meteors", 1) + command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert") + world << sound('sound/AI/meteors.ogg') + else + alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null) + return + if("gravanomalies") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","GA") + command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert") + world << sound('sound/AI/granomalies.ogg') + var/turf/T = pick(blobstart) + var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 ) + spawn(rand(100, 600)) + del(bh) + + if("timeanomalies") //dear god this code was awful :P Still needs further optimisation + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","STA") + //moved to its own dm so I could split it up and prevent the spawns copying variables over and over + //can be found in code\game\game_modes\events\wormholes.dm + wormhole_event() + + if("goblob") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","BL") + mini_blob_event() + message_admins("[key_name_admin(usr)] has spawned blob", 1) + if("aliens") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","AL") + if(aliens_allowed) + alien_infestation() + message_admins("[key_name_admin(usr)] has spawned aliens", 1) + if("comms_blackout") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","CB") + var/answer = alert(usr, "Would you like to alert the crew?", "Alert", "Yes", "No") + if(answer == "Yes") + communications_blackout(0) + else + communications_blackout(1) + message_admins("[key_name_admin(usr)] triggered a communications blackout.", 1) + if("spaceninja") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","SN") + if(toggle_space_ninja) + if(space_ninja_arrival())//If the ninja is actually spawned. They may not be depending on a few factors. + message_admins("[key_name_admin(usr)] has sent in a space ninja", 1) + if("carp") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","C") + var/choice = input("You sure you want to spawn carp?") in list("Badmin", "Cancel") + if(choice == "Badmin") + message_admins("[key_name_admin(usr)] has spawned carp.", 1) + carp_migration() + if("radiation") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","R") + message_admins("[key_name_admin(usr)] has has irradiated the station", 1) + high_radiation_event() + if("immovable") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","IR") + message_admins("[key_name_admin(usr)] has sent an immovable rod to the station", 1) + immovablerod() + if("prison_break") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","PB") + message_admins("[key_name_admin(usr)] has allowed a prison break", 1) + prison_break() + if("lightout") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","LO") + message_admins("[key_name_admin(usr)] has broke a lot of lights", 1) + lightsout(1,2) + if("blackout") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","BO") + message_admins("[key_name_admin(usr)] broke all lights", 1) + lightsout(0,0) + if("whiteout") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","WO") + for(var/obj/machinery/light/L in world) + L.fix() + message_admins("[key_name_admin(usr)] fixed all lights", 1) + if("friendai") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","FA") + for(var/mob/aiEye/aE in mob_list) + aE.icon_state = "ai_friend" + for(var/obj/machinery/M in machines) + if(istype(M, /obj/machinery/ai_status_display)) + var/obj/machinery/ai_status_display/A = M + A.emotion = "Friend Computer" + else if(istype(M, /obj/machinery/status_display)) + var/obj/machinery/status_display/A = M + A.friendc = 1 + message_admins("[key_name_admin(usr)] turned all AIs into best friends.", 1) + if("floorlava") + if(floorIsLava) + usr << "The floor is lava already." + return + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","LF") + + //Options + var/length = input(usr, "How long will the lava last? (in seconds)", "Length", 180) as num + length = min(abs(length), 1200) + + var/damage = input(usr, "How deadly will the lava be?", "Damage", 2) as num + damage = min(abs(damage), 100) + + var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "YES!", "Nah") + if(sure == "Nah") + return + floorIsLava = 1 + + message_admins("[key_name_admin(usr)] made the floor LAVA! It'll last [length] seconds and it will deal [damage] damage to everyone.", 1) + + for(var/turf/simulated/floor/F in world) + if(F.z == 1) + F.name = "lava" + F.desc = "The floor is LAVA!" + F.overlays += "lava" + F.lava = 1 + + spawn(0) + for(var/i = i, i < length, i++) // 180 = 3 minutes + if(damage) + for(var/mob/living/carbon/L in living_mob_list) + if(istype(L.loc, /turf/simulated/floor)) // Are they on LAVA?! + var/turf/simulated/floor/F = L.loc + if(F.lava) + var/safe = 0 + for(var/obj/structure/O in F.contents) + if(O.level > F.level && !istype(O, /obj/structure/window)) // Something to stand on and it isn't under the floor! + safe = 1 + break + if(!safe) + L.adjustFireLoss(damage) + + + sleep(10) + + for(var/turf/simulated/floor/F in world) // Reset everything. + if(F.z == 1) + F.name = initial(F.name) + F.desc = initial(F.desc) + F.overlays = null + F.lava = 0 + F.update_icon() + floorIsLava = 0 + return + if("virus") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","V") + var/answer = alert("Do you want this to be a random disease or do you have something in mind?",,"Virus2","Random","Choose") + if(answer=="Random") + viral_outbreak() + message_admins("[key_name_admin(usr)] has triggered a virus outbreak", 1) + else if(answer == "Choose") + var/list/viruses = list("fake gbs","gbs","magnitis","wizarditis",/*"beesease",*/"brain rot","cold","retrovirus","flu","pierrot's throat","rhumba beat") + var/V = input("Choose the virus to spread", "BIOHAZARD") in viruses + viral_outbreak(V) + message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1) + else + usr << "Nope" + /* + var/lesser = (alert("Do you want to infect the mob with a major or minor disease?",,"Major","Minor") == "Minor") + var/mob/living/carbon/victim = input("Select a mob to infect", "Virus2") as null|mob in world + if(!istype(victim)) return + if(lesser) + infect_mob_random_lesser(victim) + else + infect_mob_random_greater(victim) + message_admins("[key_name_admin(usr)] has infected [victim] with a [lesser ? "minor" : "major"] virus2.", 1) + */ + if("retardify") + if (src.rank in list("Badmin", "Game Admin", "Game Master")) + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","RET") + for(var/mob/living/carbon/human/H in player_list) + H << "\red You suddenly feel stupid." + H.setBrainLoss(60) + message_admins("[key_name_admin(usr)] made everybody retarded") + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + if("fakeguns") + if (src.rank in list("Badmin", "Game Admin", "Game Master")) + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","FG") + for(var/obj/item/W in world) + if(istype(W, /obj/item/clothing) || istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/weapon/disk) || istype(W, /obj/item/weapon/tank)) + continue + W.icon = 'icons/obj/gun.dmi' + W.icon_state = "revolver" + W.item_state = "gun" + message_admins("[key_name_admin(usr)] made every item look like a gun") + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + if("schoolgirl") + if (src.rank in list("Badmin", "Game Admin", "Game Master")) + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","SG") + for(var/obj/item/clothing/under/W in world) + W.icon_state = "schoolgirl" + W.item_state = "w_suit" + W.color = "schoolgirl" + message_admins("[key_name_admin(usr)] activated Japanese Animes mode") + world << sound('sound/AI/animes.ogg') + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + if("dorf") + if (src.rank in list("Badmin","Game Admin", "Game Master")) + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","DF") + for(var/mob/living/carbon/human/B in mob_list) + B.f_style = "Dward Beard" + B.update_hair() + message_admins("[key_name_admin(usr)] activated dorf mode") + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + if("ionstorm") + if (src.rank in list("Badmin","Game Admin", "Game Master")) + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","I") + IonStorm() + message_admins("[key_name_admin(usr)] triggered an ion storm") + var/show_log = alert(usr, "Show ion message?", "Message", "Yes", "No") + if(show_log == "Yes") + command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert") + world << sound('sound/AI/ionstorm.ogg') + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + if("spacevines") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","K") + spacevine_infestation() + message_admins("[key_name_admin(usr)] has spawned spacevines", 1) + if (usr) + log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]") + if (ok) + world << text("A secret has been activated by []!", usr.key) + return + + if (href_list["secretsadmin"]) + if ((src.rank in list( "Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" ))) + var/ok = 0 + switch(href_list["secretsadmin"]) + if("clear_bombs") + //I do nothing + if("list_bombers") + var/dat = "Bombing List
" + for(var/l in bombers) + dat += text("[l]
") + usr << browse(dat, "window=bombers") + if("list_signalers") + var/dat = "Showing last [length(lastsignalers)] signalers.
" + for(var/sig in lastsignalers) + dat += "[sig]
" + usr << browse(dat, "window=lastsignalers;size=800x500") + if("list_lawchanges") + var/dat = "Showing last [length(lawchanges)] law changes.
" + for(var/sig in lawchanges) + dat += "[sig]
" + usr << browse(dat, "window=lawchanges;size=800x500") + if("list_job_debug") + var/dat = "Job Debug info.
" + if(job_master) + for(var/line in job_master.job_debug) + dat += "[line]
" + dat+= "*******

" + for(var/datum/job/job in job_master.occupations) + if(!job) continue + dat += "job: [job.title], current_positions: [job.current_positions], total_positions: [job.total_positions]
" + usr << browse(dat, "window=jobdebug;size=600x500") + if("check_antagonist") + check_antagonists() + if("showailaws") + output_ai_laws() + if("showgm") + if(!ticker) + alert("The game hasn't started yet!") + else if (ticker.mode) + alert("The game mode is [ticker.mode.name]") + else alert("For some reason there's a ticker, but not a game mode") + if("manifest") + var/dat = "Showing Crew Manifest.
" + dat += "" + for(var/mob/living/carbon/human/H in mob_list) + if(H.ckey) + dat += text("", H.name, H.get_assignment()) + dat += "
NamePosition
[][]
" + usr << browse(dat, "window=manifest;size=440x410") + if("DNA") + var/dat = "Showing DNA from blood.
" + dat += "" + for(var/mob/living/carbon/human/H in mob_list) + if(H.dna && H.ckey) + dat += "" + dat += "
NameDNABlood Type
[H][H.dna.unique_enzymes][H.b_type]
" + usr << browse(dat, "window=DNA;size=440x410") + if("fingerprints") + var/dat = "Showing Fingerprints.
" + dat += "" + for(var/mob/living/carbon/human/H in mob_list) + if(H.ckey) + if(H.dna && H.dna.uni_identity) + dat += "" + else if(H.dna && !H.dna.uni_identity) + dat += "" + else if(!H.dna) + dat += "" + dat += "
NameFingerprints
[H][md5(H.dna.uni_identity)]
[H]H.dna.uni_identity = null
[H]H.dna = null
" + usr << browse(dat, "window=fingerprints;size=440x410") + else + if (usr) + log_admin("[key_name(usr)] used secret [href_list["secretsadmin"]]") + if (ok) + world << text("A secret has been activated by []!", usr.key) + return + if (href_list["secretscoder"]) + if ((src.rank in list( "Badmin", "Game Admin", "Game Master" ))) + switch(href_list["secretscoder"]) + if("spawn_objects") + var/dat = "Admin Log
" + for(var/l in admin_log) + dat += "
  • [l]
    • " + if(!admin_log.len) + dat += "No-one has done anything this round!" + usr << browse(dat, "window=admin_log") + if("maint_access_brig") + for(var/obj/machinery/door/airlock/maintenance/M in world) + if (access_maint_tunnels in M.req_access) + M.req_access = list(access_brig) + message_admins("[key_name_admin(usr)] made all maint doors brig access-only.") + if("maint_access_engiebrig") + for(var/obj/machinery/door/airlock/maintenance/M in world) + if (access_maint_tunnels in M.req_access) + M.req_access = list() + M.req_one_access = list(access_brig,access_engine) + message_admins("[key_name_admin(usr)] made all maint doors engineering and brig access-only.") + if("infinite_sec") + var/datum/job/J = job_master.GetJob("Security Officer") + if(!J) return + J.total_positions = -1 + J.spawn_positions = -1 + message_admins("[key_name_admin(usr)] has removed the cap on security officers.") + return + //hahaha + + + if(href_list["ac_view_wanted"]) //Admin newscaster Topic() stuff be here + src.admincaster_screen = 18 //The ac_ prefix before the hrefs stands for AdminCaster. + src.access_news_network() + if(href_list["ac_set_channel_name"]) + src.admincaster_feed_channel.channel_name = strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")) + while (findtext(src.admincaster_feed_channel.channel_name," ") == 1) + src.admincaster_feed_channel.channel_name = copytext(src.admincaster_feed_channel.channel_name,2,lentext(src.admincaster_feed_channel.channel_name)+1) + src.access_news_network() + + if(href_list["ac_set_channel_lock"]) + src.admincaster_feed_channel.locked = !src.admincaster_feed_channel.locked + src.access_news_network() + + if(href_list["ac_submit_new_channel"]) + var/check = 0 + for(var/datum/feed_channel/FC in news_network.network_channels) + if(FC.channel_name == src.admincaster_feed_channel.channel_name) + check = 1 + break + if(src.admincaster_feed_channel.channel_name == "" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]" || check ) + src.admincaster_screen=7 + else + var/choice = alert("Please confirm Feed channel creation","Network Channel Handler","Confirm","Cancel") + if(choice=="Confirm") + var/datum/feed_channel/newChannel = new /datum/feed_channel + newChannel.channel_name = src.admincaster_feed_channel.channel_name + newChannel.author = src.admincaster_signature + newChannel.locked = src.admincaster_feed_channel.locked + newChannel.is_admin_channel = 1 + feedback_inc("newscaster_channels",1) + news_network.network_channels += newChannel //Adding channel to the global network + log_admin("[key_name_admin(usr)] created command feed channel: [src.admincaster_feed_channel.channel_name]!") + src.admincaster_screen=5 + src.access_news_network() + + if(href_list["ac_set_channel_receiving"]) + var/list/available_channels = list() + for(var/datum/feed_channel/F in news_network.network_channels) + available_channels += F.channel_name + src.admincaster_feed_channel.channel_name = adminscrub(input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels ) + src.access_news_network() + + if(href_list["ac_set_new_message"]) + src.admincaster_feed_message.body = adminscrub(input(usr, "Write your Feed story", "Network Channel Handler", "")) + while (findtext(src.admincaster_feed_message.body," ") == 1) + src.admincaster_feed_message.body = copytext(src.admincaster_feed_message.body,2,lentext(src.admincaster_feed_message.body)+1) + src.access_news_network() + + if(href_list["ac_submit_new_message"]) + if(src.admincaster_feed_message.body =="" || src.admincaster_feed_message.body =="\[REDACTED\]" || src.admincaster_feed_channel.channel_name == "" ) + src.admincaster_screen = 6 + else + var/datum/feed_message/newMsg = new /datum/feed_message + newMsg.author = src.admincaster_signature + newMsg.body = src.admincaster_feed_message.body + newMsg.is_admin_message = 1 + feedback_inc("newscaster_stories",1) + for(var/datum/feed_channel/FC in news_network.network_channels) + if(FC.channel_name == src.admincaster_feed_channel.channel_name) + FC.messages += newMsg //Adding message to the network's appropriate feed_channel + break + src.admincaster_screen=4 + + for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) + NEWSCASTER.newsAlert(src.admincaster_feed_channel.channel_name) + + log_admin("[key_name_admin(usr)] submitted a feed story to channel: [src.admincaster_feed_channel.channel_name]!") + src.access_news_network() + + if(href_list["ac_create_channel"]) + src.admincaster_screen=2 + src.access_news_network() + + if(href_list["ac_create_feed_story"]) + src.admincaster_screen=3 + src.access_news_network() + + if(href_list["ac_menu_censor_story"]) + src.admincaster_screen=10 + src.access_news_network() + + if(href_list["ac_menu_censor_channel"]) + src.admincaster_screen=11 + src.access_news_network() + + if(href_list["ac_menu_wanted"]) + var/already_wanted = 0 + if(news_network.wanted_issue) + already_wanted = 1 + + if(already_wanted) + src.admincaster_feed_message.author = news_network.wanted_issue.author + src.admincaster_feed_message.body = news_network.wanted_issue.body + src.admincaster_screen = 14 + src.access_news_network() + + if(href_list["ac_set_wanted_name"]) + src.admincaster_feed_message.author = adminscrub(input(usr, "Provide the name of the Wanted person", "Network Security Handler", "")) + while (findtext(src.admincaster_feed_message.author," ") == 1) + src.admincaster_feed_message.author = copytext(admincaster_feed_message.author,2,lentext(admincaster_feed_message.author)+1) + src.access_news_network() + + if(href_list["ac_set_wanted_desc"]) + src.admincaster_feed_message.body = adminscrub(input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler", "")) + while (findtext(src.admincaster_feed_message.body," ") == 1) + src.admincaster_feed_message.body = copytext(src.admincaster_feed_message.body,2,lentext(src.admincaster_feed_message.body)+1) + src.access_news_network() + + if(href_list["ac_submit_wanted"]) + var/input_param = text2num(href_list["ac_submit_wanted"]) + if(src.admincaster_feed_message.author == "" || src.admincaster_feed_message.body == "") + src.admincaster_screen = 16 + else + var/choice = alert("Please confirm Wanted Issue [(input_param==1) ? ("creation.") : ("edit.")]","Network Security Handler","Confirm","Cancel") + if(choice=="Confirm") + if(input_param==1) //If input_param == 1 we're submitting a new wanted issue. At 2 we're just editing an existing one. See the else below + var/datum/feed_message/WANTED = new /datum/feed_message + WANTED.author = src.admincaster_feed_message.author //Wanted name + WANTED.body = src.admincaster_feed_message.body //Wanted desc + WANTED.backup_author = src.admincaster_signature //Submitted by + WANTED.is_admin_message = 1 + news_network.wanted_issue = WANTED + for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) + NEWSCASTER.newsAlert() + NEWSCASTER.update_icon() + src.admincaster_screen = 15 + else + news_network.wanted_issue.author = src.admincaster_feed_message.author + news_network.wanted_issue.body = src.admincaster_feed_message.body + news_network.wanted_issue.backup_author = src.admincaster_feed_message.backup_author + src.admincaster_screen = 19 + log_admin("[key_name_admin(usr)] issued a Station-wide Wanted Notification for [src.admincaster_feed_message.author]!") + src.access_news_network() + + if(href_list["ac_cancel_wanted"]) + var/choice = alert("Please confirm Wanted Issue removal","Network Security Handler","Confirm","Cancel") + if(choice=="Confirm") + news_network.wanted_issue = null + for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) + NEWSCASTER.update_icon() + src.admincaster_screen=17 + src.access_news_network() + + if(href_list["ac_censor_channel_author"]) + var/datum/feed_channel/FC = locate(href_list["ac_censor_channel_author"]) + if(FC.author != "\[REDACTED\]") + FC.backup_author = FC.author + FC.author = "\[REDACTED\]" + else + FC.author = FC.backup_author + src.access_news_network() + + if(href_list["ac_censor_channel_story_author"]) + var/datum/feed_message/MSG = locate(href_list["ac_censor_channel_story_author"]) + if(MSG.author != "\[REDACTED\]") + MSG.backup_author = MSG.author + MSG.author = "\[REDACTED\]" + else + MSG.author = MSG.backup_author + src.access_news_network() + + if(href_list["ac_censor_channel_story_body"]) + var/datum/feed_message/MSG = locate(href_list["ac_censor_channel_story_body"]) + if(MSG.body != "\[REDACTED\]") + MSG.backup_body = MSG.body + MSG.body = "\[REDACTED\]" + else + MSG.body = MSG.backup_body + src.access_news_network() + + if(href_list["ac_pick_d_notice"]) + var/datum/feed_channel/FC = locate(href_list["ac_pick_d_notice"]) + src.admincaster_feed_channel = FC + src.admincaster_screen=13 + src.access_news_network() + + if(href_list["ac_toggle_d_notice"]) + var/datum/feed_channel/FC = locate(href_list["ac_toggle_d_notice"]) + FC.censored = !FC.censored + src.access_news_network() + + if(href_list["ac_view"]) + src.admincaster_screen=1 + src.access_news_network() + + if(href_list["ac_setScreen"]) //Brings us to the main menu and resets all fields~ + src.admincaster_screen = text2num(href_list["ac_setScreen"]) + if (src.admincaster_screen == 0) + if(src.admincaster_feed_channel) + src.admincaster_feed_channel = new /datum/feed_channel + if(src.admincaster_feed_message) + src.admincaster_feed_message = new /datum/feed_message + src.access_news_network() + + if(href_list["ac_show_channel"]) + var/datum/feed_channel/FC = locate(href_list["ac_show_channel"]) + src.admincaster_feed_channel = FC + src.admincaster_screen = 9 + src.access_news_network() + + if(href_list["ac_pick_censor_channel"]) + var/datum/feed_channel/FC = locate(href_list["ac_pick_censor_channel"]) + src.admincaster_feed_channel = FC + src.admincaster_screen = 12 + src.access_news_network() + + if(href_list["ac_refresh"]) + src.access_news_network() + + if(href_list["ac_set_signature"]) + src.admincaster_signature = adminscrub(input(usr, "Provide your desired signature", "Network Identity Handler", "")) + src.access_news_network() \ No newline at end of file diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index ec545d6830..3ba12599ba 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -205,7 +205,7 @@ var/savefile/Banlistjob timeleftstring = "[exp] Minutes" return timeleftstring -/obj/admins/proc/unjobbanpanel() +/datum/admins/proc/unjobbanpanel() var/count = 0 var/dat //var/dat = "
    Unban Player: \blue(U) = Unban , (E) = Edit Ban\green (Total
    " @@ -219,7 +219,7 @@ var/savefile/Banlistjob dat = "
    Bans:(U) = Unban , - ([count] Bans)
    [dat]" usr << browse(dat, "window=unbanp;size=875x400") -/*/obj/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank) +/*/datum/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank) if(AddBanjob(ckey, computerid, reason, usr.ckey, 0, 0, job)) M << "\redYou have been banned from [job] by [usr.client.ckey].\nReason: [reason]." M << "\red This is a permanent ban." @@ -229,7 +229,7 @@ var/savefile/Banlistjob M << "\red No ban appeals URL has been set." log_admin("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") -/obj/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank) +/datum/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank) if(AddBanjob(ckey, computerid, reason, usr.ckey, 1, mins, job)) M << "\redYou have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason]." M << "\red This is a temporary ban, it will be removed in [mins] minutes." diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm index 9f494297f9..70de3b1c12 100644 --- a/code/modules/admin/player_notes.dm +++ b/code/modules/admin/player_notes.dm @@ -4,11 +4,11 @@ #define NOTESFILE "data/player_notes.sav" //where the player notes are saved -obj/admins/proc/notes_show(var/ckey) +datum/admins/proc/notes_show(var/ckey) usr << browse("Player Notes[notes_gethtml(ckey)]","window=player_notes;size=700x400") -obj/admins/proc/notes_gethtml(var/ckey) +datum/admins/proc/notes_gethtml(var/ckey) var/savefile/notesfile = new(NOTESFILE) if(!notesfile) return "Error: Cannot access [NOTESFILE]" if(ckey) diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 422212f976..d159f694ea 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -1,4 +1,4 @@ -/obj/admins/proc/player_panel_new()//The new one +/datum/admins/proc/player_panel_new()//The new one if (!usr.client.holder) return var/dat = "Player Panel" @@ -318,7 +318,7 @@ usr << browse(dat, "window=players;size=600x480") //The old one -/obj/admins/proc/player_panel_old() +/datum/admins/proc/player_panel_old() if (!usr.client.holder) return var/dat = "Player Menu" @@ -377,7 +377,7 @@ -/obj/admins/proc/check_antagonists() +/datum/admins/proc/check_antagonists() if (ticker && ticker.current_state >= GAME_STATE_PLAYING) var/dat = "Round Status

    Round Status

    " dat += "Current Game Mode: [ticker.mode.name]
    " diff --git a/code/modules/admin/verbs/getlogs.dm b/code/modules/admin/verbs/getlogs.dm index fb69ad1fe5..91dafd2c6b 100644 --- a/code/modules/admin/verbs/getlogs.dm +++ b/code/modules/admin/verbs/getlogs.dm @@ -112,7 +112,7 @@ //Other log stuff put here for the sake of organisation //Shows today's server log -/obj/admins/proc/view_txt_log() +/datum/admins/proc/view_txt_log() set category = "Admin" set name = "Show Server Log" set desc = "Shows today's server log." @@ -127,7 +127,7 @@ return //Shows today's attack log -/obj/admins/proc/view_atk_log() +/datum/admins/proc/view_atk_log() set category = "Admin" set name = "Show Server Attack Log" set desc = "Shows today's server attack log." diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 70f3f4a668..43fb36977d 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -1,5 +1,5 @@ var/list/forbidden_varedit_object_types = list( - /obj/admins, //Admins editing their own admin-power object? Yup, sounds like a good idea. + /datum/admins, //Admins editing their own admin-power object? Yup, sounds like a good idea. /obj/machinery/blackbox_recorder, //Prevents people messing with feedback gathering /datum/feedback_variable //Prevents people messing with feedback gathering ) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 42e71a8e38..80434bf65f 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -8,7 +8,7 @@ client/proc/one_click_antag() return -/obj/admins/proc/one_click_antag() +/datum/admins/proc/one_click_antag() var/dat = {"One-click Antagonist
    Make Tratiors
    @@ -32,7 +32,7 @@ client/proc/one_click_antag() return -/obj/admins/proc/makeMalfAImode() +/datum/admins/proc/makeMalfAImode() var/list/mob/living/silicon/AIs = list() var/mob/living/silicon/malfAI = null @@ -53,7 +53,7 @@ client/proc/one_click_antag() return 0 -/obj/admins/proc/makeTratiors() +/datum/admins/proc/makeTratiors() var/datum/game_mode/traitor/temp = new if(config.protect_roles_from_antagonist) @@ -89,7 +89,7 @@ client/proc/one_click_antag() return 0 -/obj/admins/proc/makeChanglings() +/datum/admins/proc/makeChanglings() var/datum/game_mode/changeling/temp = new if(config.protect_roles_from_antagonist) @@ -124,7 +124,7 @@ client/proc/one_click_antag() return 0 -/obj/admins/proc/makeRevs() +/datum/admins/proc/makeRevs() var/datum/game_mode/revolution/temp = new if(config.protect_roles_from_antagonist) @@ -158,7 +158,7 @@ client/proc/one_click_antag() return 0 -/obj/admins/proc/makeWizard() +/datum/admins/proc/makeWizard() var/list/mob/dead/observer/candidates = list() var/mob/dead/observer/theghost = null var/time_passed = world.time @@ -194,7 +194,7 @@ client/proc/one_click_antag() return 0 -/obj/admins/proc/makeCult() +/datum/admins/proc/makeCult() var/datum/game_mode/cult/temp = new if(config.protect_roles_from_antagonist) @@ -232,7 +232,7 @@ client/proc/one_click_antag() -/obj/admins/proc/makeNukeTeam() +/datum/admins/proc/makeNukeTeam() var/list/mob/dead/observer/candidates = list() var/mob/dead/observer/theghost = null @@ -325,15 +325,15 @@ client/proc/one_click_antag() -/obj/admins/proc/makeAliens() +/datum/admins/proc/makeAliens() alien_infestation(3) return 1 -/obj/admins/proc/makeSpaceNinja() +/datum/admins/proc/makeSpaceNinja() space_ninja_arrival() return 1 -/obj/admins/proc/makeDeathsquad() +/datum/admins/proc/makeDeathsquad() var/list/mob/dead/observer/candidates = list() var/mob/dead/observer/theghost = null var/time_passed = world.time @@ -401,7 +401,7 @@ client/proc/one_click_antag() return 1 -/obj/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character +/datum/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character if(!G_found || !G_found.key) return //First we spawn a dude. @@ -423,7 +423,7 @@ client/proc/one_click_antag() return new_character -/obj/admins/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0) +/datum/admins/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0) var/mob/living/carbon/human/new_syndicate_commando = new(spawn_location.loc) var/syndicate_commando_leader_rank = pick("Lieutenant", "Captain", "Major") var/syndicate_commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major") diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index 4380369973..2d5b71b678 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -3,7 +3,7 @@ //////////////// //ADMIN THINGS// //////////////// - var/obj/admins/holder = null + var/datum/admins/holder = null var/buildmode = 0 var/stealth = 0 var/fakekey = null diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 45281fa169..a1c32f3a9e 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -98,11 +98,12 @@ world.update_status() //Admin Authorisation - if( ckey in admins ) - holder = new /obj/admins(src) - holder.rank = admins[ckey] + var/datum/admins/Admin_Obj = admins[ckey] + if(istype(Admin_Obj)) admin_list += src -// update_admins(admins[ckey]) //handled by Login + holder = Admin_Obj + holder.owner = src + holder.state = null ..() //calls mob.Login() @@ -116,11 +117,9 @@ //DISCONNECT// ////////////// /client/Del() - - spawn(0) - if(holder) - admin_list -= src - del(holder) + if(holder) + holder.state = null + admin_list -= src client_list -= src return ..() diff --git a/code/world.dm b/code/world.dm index 387ffdd5e3..a9d96e2957 100644 --- a/code/world.dm +++ b/code/world.dm @@ -207,7 +207,7 @@ Starting up. [time2text(world.timeofday, "hh:mm.ss")] if (pos) var/m_key = copytext(line, 1, pos) var/a_lev = copytext(line, pos + 3, length(line) + 1) - admins[m_key] = a_lev + admins[m_key] = new /datum/admins(a_lev) diary << ("ADMIN: [m_key] = [a_lev]") diff --git a/tgstation.dme b/tgstation.dme index a7c5366ef6..0748e6e4ac 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -813,7 +813,7 @@ #include "code\modules\admin\create_mob.dm" #include "code\modules\admin\create_object.dm" #include "code\modules\admin\create_turf.dm" -#include "code\modules\admin\holder.dm" +#include "code\modules\admin\holder2.dm" #include "code\modules\admin\IsBanned.dm" #include "code\modules\admin\NewBan.dm" #include "code\modules\admin\newbanjob.dm"