From c34592100b07048264f9b85b6af3a3671a1b1872 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Thu, 31 Mar 2011 03:21:58 +0000 Subject: [PATCH] SCAREDOFSHADOWS READ THIS ONE!!! HOSTS OF OTHER SERVERS, READ THIS ONE TOO!!!! Administrator ranks renamed: - Host => Game Master - Coder => Game Agmin - Shit Guy => Admin who Sinned - PA => Trial Agmin - Administrator => Agmin Candidate - SA => Temporary Agmin - Moderator => Agmin Observer - Filthy Xeno => Punnished Agmin Promotion and Demotion ingame can now only be done by Game Admins and Game Masters. THIS COMMIT INCLUDES THE NEW admins.txt FILE FOR TGSTATION. IT USES THE NEW RANK NAMES. ALL OTHER SERVER HOSTS ARE TO UPDATE THEIR ADMIN FILES TO THE NEW RANK NAMES WHEN THEY UPDATE PAST THIS REVISION. Don't yell at me, as if I didn't tell you in caps... git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1318 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/buildmode.dm | 4 +- code/defines/procs/helpers.dm | 2 +- code/game/objects/livestock.dm | 2 +- code/game/verbs/ooc.dm | 6 +- code/modules/admin/admin.dm | 181 +++++++++----------- code/modules/admin/admin_verbs.dm | 55 +++--- code/modules/admin/verbs/adminsay.dm | 2 +- code/modules/admin/verbs/debug.dm | 4 +- code/modules/admin/verbs/massmodvar.dm | 2 +- code/modules/admin/verbs/modifyvariables.dm | 4 +- code/modules/admin/verbs/playsound.dm | 4 +- code/modules/admin/verbs/randomverbs.dm | 4 +- code/modules/admin/verbs/ticklag.dm | 2 +- code/modules/mob/new_player/preferences.dm | 2 +- code/unused/_debug.dm | 2 +- config/admins.txt | 25 ++- 16 files changed, 151 insertions(+), 150 deletions(-) diff --git a/code/WorkInProgress/buildmode.dm b/code/WorkInProgress/buildmode.dm index 9eaadb1ffb2..1227ed67bcc 100644 --- a/code/WorkInProgress/buildmode.dm +++ b/code/WorkInProgress/buildmode.dm @@ -151,13 +151,13 @@ if(objholder in removed_paths) alert("That path is not allowed.") objholder = "/obj/closet" - else if (dd_hasprefix(objholder, "/mob") && !(usr.client.holder.rank in list("Host", "Coder", "Shit Guy"))) + else if (dd_hasprefix(objholder, "/mob") && !(usr.client.holder.rank in list("Game Master", "Game Admin", "Admin who Sinned"))) objholder = "/obj/closet" if(3) var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "urine") master.buildmode.varholder = input(usr,"Enter variable name:" ,"Name", "name") - if(master.buildmode.varholder in locked && !(usr.client.holder.rank in list("Host", "Coder"))) + if(master.buildmode.varholder in locked && !(usr.client.holder.rank in list("Game Master", "Game Admin"))) return var/thetype = input(usr,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference") if(!thetype) return diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm index 4d777fa8e8c..a32738d755e 100644 --- a/code/defines/procs/helpers.dm +++ b/code/defines/procs/helpers.dm @@ -709,7 +709,7 @@ text += "" if (the_client && the_client.holder && the_client.stealth && !include_name) - text += "Administrator" + text += "Administrato" else text += "[the_key]" diff --git a/code/game/objects/livestock.dm b/code/game/objects/livestock.dm index 4692559edec..c2e543a8b0a 100644 --- a/code/game/objects/livestock.dm +++ b/code/game/objects/livestock.dm @@ -447,7 +447,7 @@ patience = 50 view_range = 7 -/* Commented out because of filthy xeno-lovers. +/* Commented out because of Filthy Xeno-lovers. /obj/livestock/cow name = "Pigmy Cow" desc = "That's not my cow!" diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index d6b977c9e31..e4ca85d3a68 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -38,9 +38,9 @@ for (var/client/C) if (src.client.holder && (!src.client.stealth || C.holder)) // C << "OOC: [src.key]: [msg]" - if (src.client.holder.rank == "Filthy Xeno") + if (src.client.holder.rank == "Punnished Admin") C << "OOC: [src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]: [msg]" - else if (src.client.holder.rank == "Host") + else if (src.client.holder.rank == "Game Master") C << "OOC: [src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]: [msg]" else C << "OOC: [src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]: [msg]" @@ -69,7 +69,7 @@ for (var/client/C) if (C.goon) if(src.client.holder && (!src.client.stealth || C.holder)) - if (src.client.holder.rank == "Filthy Xeno") + if (src.client.holder.rank == "Punnished Admin") C << "GOONSAY: [src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]: [msg]" else C << "GOONSAY: [src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]: [msg]" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index bcb8c2cb652..c02cdc8a7be 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -24,7 +24,7 @@ var/showadminmessages = 1 return if(href_list["call_shuttle"]) - if (src.rank in list("Primary Administrator", "Shit Guy", "Coder", "Host")) + if (src.rank in list("Trial Admin", "Admin who Sinned", "Game Admin", "Game Master")) if( ticker.mode.name == "blob" ) alert("You can't call the shuttle during blob!") return @@ -58,7 +58,7 @@ var/showadminmessages = 1 return if(href_list["edit_shuttle_time"]) - if (src.rank in list("Shit Guy", "Coder", "Host")) + if (src.rank in list("Admin who Sinned", "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()]") message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]", 1) @@ -150,7 +150,7 @@ var/showadminmessages = 1 return if(href_list["jobban3"]) - if (src.rank in list( "Administrator", "Secondary Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" )) + if (src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" )) var/mob/M = locate(href_list["jobban4"]) var/job = href_list["jobban3"] if ((M.client && M.client.holder && (M.client.holder.level > src.level))) @@ -172,7 +172,7 @@ var/showadminmessages = 1 if (href_list["boot2"]) - if ((src.rank in list( "Moderator", "Secondary Administrator", "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Observer", "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "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))) @@ -184,7 +184,7 @@ var/showadminmessages = 1 del(M.client) if (href_list["removejobban"]) - if ((src.rank in list("Coder", "Host" ))) + if ((src.rank in list("Game Admin", "Game Master" ))) var/t = href_list["removejobban"] if(t) log_admin("[key_name(usr)] removed [t]") @@ -193,7 +193,7 @@ var/showadminmessages = 1 href_list["ban"] = 1 // lets it fall through and refresh if (href_list["newban"]) - if ((src.rank in list( "Secondary Administrator", "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "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))) @@ -240,7 +240,7 @@ var/showadminmessages = 1 return /* if (href_list["remove"]) - if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/t = href_list["remove"] if(t && isgoon(t)) log_admin("[key_name(usr)] removed [t] from the goonlist.") @@ -248,7 +248,7 @@ var/showadminmessages = 1 remove_goon(t) */ if (href_list["mute2"]) - if ((src.rank in list( "Moderator", "Secondary Administrator", "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Observer", "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/mob/M = locate(href_list["mute2"]) if (ismob(M)) if ((M.client && M.client.holder && (M.client.holder.level >= src.level))) @@ -260,7 +260,7 @@ var/showadminmessages = 1 M << "You have been [(M.muted ? "muted" : "voiced")]." if (href_list["c_mode"]) - if ((src.rank in list( "Secondary Administrator", "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) if (ticker && ticker.mode) return alert(usr, "The game has already started.", null, null, null, null) var/dat = text({"What mode do you wish to play?
@@ -290,7 +290,7 @@ var/showadminmessages = 1 if (href_list["c_mode2"]) - if ((src.rank in list( "Secondary Administrator", "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) if (ticker && ticker.mode) return alert(usr, "The game has already started.", null, null, null, null) switch(href_list["c_mode2"]) @@ -338,7 +338,7 @@ var/showadminmessages = 1 world.save_mode(master_mode) if (href_list["monkeyone"]) - if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/mob/M = locate(href_list["monkeyone"]) if(!ismob(M)) return @@ -352,7 +352,7 @@ var/showadminmessages = 1 return if (href_list["forcespeech"]) - if ((src.rank in list( "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Trial Admin", "Admin who Sinned", "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", "") @@ -367,7 +367,7 @@ var/showadminmessages = 1 return if (href_list["sendtoprison"]) - if ((src.rank in list( "Moderator", "Administrator", "Secondary Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Observer", "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/mob/M = locate(href_list["sendtoprison"]) if (ismob(M)) if(istype(M, /mob/living/silicon/ai)) @@ -402,7 +402,7 @@ var/showadminmessages = 1 return if (href_list["sendtomaze"]) - if ((src.rank in list( "Administrator", "Secondary Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/mob/M = locate(href_list["sendtomaze"]) if (ismob(M)) if(istype(M, /mob/living/silicon/ai)) @@ -434,7 +434,7 @@ var/showadminmessages = 1 return if (href_list["tdome1"]) - if ((src.rank in list( "Administrator", "Secondary Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/mob/M = locate(href_list["tdome1"]) if (ismob(M)) if(istype(M, /mob/living/silicon/ai)) @@ -460,7 +460,7 @@ var/showadminmessages = 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( "Administrator", "Secondary Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/mob/M = locate(href_list["tdome2"]) if (ismob(M)) if(istype(M, /mob/living/silicon/ai)) @@ -486,7 +486,7 @@ var/showadminmessages = 1 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( "Administrator", "Secondary Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/mob/M = locate(href_list["tdomeadmin"]) if (ismob(M)) if(istype(M, /mob/living/silicon/ai)) @@ -501,7 +501,7 @@ var/showadminmessages = 1 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( "Administrator", "Secondary Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/mob/M = locate(href_list["tdomeobserve"]) if (ismob(M)) if(istype(M, /mob/living/silicon/ai)) @@ -531,7 +531,7 @@ var/showadminmessages = 1 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( "Administrator", "Secondary Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "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 @@ -541,7 +541,7 @@ var/showadminmessages = 1 M.client << text("You have been authorized by []", usr.key) if (href_list["revive"]) - if ((src.rank in list( "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/mob/M = locate(href_list["revive"]) if (ismob(M)) if(istype(M, /mob/dead/observer)) @@ -559,7 +559,7 @@ var/showadminmessages = 1 return if (href_list["makeai"]) //Yes, im fucking lazy, so what? it works ... hopefully - if ((src.rank in list( "Primary Administrator", "Coder", "Host", "Administrator", "Shit Guy" ))) + if ((src.rank in list( "Trial Admin", "Game Admin", "Game Master", "Admin Candidate", "Admin who Sinned" ))) var/mob/M = locate(href_list["makeai"]) if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M @@ -749,18 +749,18 @@ var/showadminmessages = 1 else alert("Cannot make this mob a traitor") if (href_list["create_object"]) - if (src.rank in list("Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host")) + if (src.rank in list("Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master")) return create_object(usr) else alert("You are not a high enough administrator! Sorry!!!!") if (href_list["create_turf"]) - if (src.rank in list("Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host")) + if (src.rank in list("Admin Candidate", "Trial Admin", "Admin who Sinned", "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("Shit Guy", "Coder", "Host")) + if (src.rank in list("Admin who Sinned", "Game Admin", "Game Master")) return create_mob(usr) else alert("You are not a high enough administrator! Sorry!!!!") @@ -774,7 +774,7 @@ var/showadminmessages = 1 voteres() if (href_list["prom_demot"]) - if ((src.rank in list("Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list("Trial Admin", "Admin who Sinned", "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]") @@ -783,39 +783,26 @@ var/showadminmessages = 1 if(src.level == 6) //host dat += {" - Coder
Shit Guy
- PA
- A
- SA
- M
- Filthy Xeno
+ Game Admin //coder
+ Admin who Sinned // Shit Guy
+ Trial Admin // Primary Administrator
+ Admin Candidate // // Administrator
+ Temporary Admin // Secondary Admin
+ Admin Observer // Moderator
+ Punnished Admin // Filthy Xeno
Remove Admin
"} else if(src.level == 5) //coder dat += {" - Shit Guy
PA
- A
- SA
- M
- Filthy Xeno
- Remove Admin
"} - else if(src.level == 4) - //shitguy - dat += {" - PA
A
- SA
- M
- Filthy Xeno
- Remove Admin
"} - else if(src.level == 3) - //PA - dat += {" - A
SA
- M
- Filthy Xeno
+ Admin who Sinned // Shit Guy
+ Trial Admin // Primary Administrator
+ Admin Candidate // // Administrator
+ Temporary Admin // Secondary Admin
+ Admin Observer // Moderator
+ Punnished Admin // Filthy Xeno
Remove Admin
"} else - alert("This cannot happen") + alert("Not a high enough level admin, sorry.") return usr << browse(dat, "window=prom_demot;size=480x300") @@ -838,8 +825,8 @@ var/showadminmessages = 1 if (href_list["object_list"]) - if (src.rank in list("Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host")) - if (config.allow_admin_spawning && ((src.state == 2) || (src.rank in list("Shit Guy", "Coder", "Host")))) + if (src.rank in list("Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master")) + if (config.allow_admin_spawning && ((src.state == 2) || (src.rank in list("Admin who Sinned", "Game Admin", "Game Master")))) var/atom/loc = usr.loc var/dirty_paths @@ -856,11 +843,11 @@ var/showadminmessages = 1 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("Coder", "Host"))) + 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/bhole) && !(src.rank in list("Coder", "Host"))) + else if (ispath(path, /obj/bhole) && !(src.rank in list("Game Admin", "Game Master"))) removed_paths += dirty_path - else if (ispath(path, /mob) && !(src.rank in list("Shit Guy", "Coder", "Host"))) + else if (ispath(path, /mob) && !(src.rank in list("Admin who Sinned", "Game Admin", "Game Master"))) removed_paths += dirty_path else @@ -911,7 +898,7 @@ var/showadminmessages = 1 return if (href_list["secretsfun"]) - if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/ok = 0 switch(href_list["secretsfun"]) if("sec_clothes") @@ -1023,7 +1010,7 @@ var/showadminmessages = 1 H.loc = pick(prisonsecuritywarp) prisonwarped += H if("traitor_all") - if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) if(!ticker) alert("The game hasn't started yet!") return @@ -1043,7 +1030,7 @@ var/showadminmessages = 1 else alert("You're not of a high enough rank to do this") if("moveminingshuttle") - if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) if(mining_shuttle_moving) return move_mining_shuttle() @@ -1052,14 +1039,14 @@ var/showadminmessages = 1 else alert("You're not of a high enough rank to do this") if("moveadminshuttle") - if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) 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( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) move_ferry() message_admins("\blue [key_name_admin(usr)] moved the centcom ferry", 1) log_admin("[key_name(usr)] moved the centcom ferry") @@ -1137,7 +1124,7 @@ var/showadminmessages = 1 sleep(rand(30,400)) Wall.ex_act(rand(2,1)) */ if("wave") - if ((src.rank in list("Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list("Trial Admin", "Admin who Sinned", "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") @@ -1217,7 +1204,7 @@ var/showadminmessages = 1 viral_outbreak(V) message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1) if("retardify") - if (src.rank in list("Shit Guy", "Coder", "Host")) + if (src.rank in list("Admin who Sinned", "Game Admin", "Game Master")) for(var/mob/living/carbon/human/H in world) if(H.client) H << "\red You suddenly feel stupid." @@ -1227,7 +1214,7 @@ var/showadminmessages = 1 alert("You cannot perform this action. You must be of a higher administrative rank!") return if("fakeguns") - if (src.rank in list("Shit Guy", "Coder", "Host")) + if (src.rank in list("Admin who Sinned", "Game Admin", "Game Master")) 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 @@ -1239,7 +1226,7 @@ var/showadminmessages = 1 alert("You cannot perform this action. You must be of a higher administrative rank!") return if("schoolgirl") - if (src.rank in list("Shit Guy", "Coder", "Host")) + if (src.rank in list("Admin who Sinned", "Game Admin", "Game Master")) for(var/obj/item/clothing/under/W in world) W.icon_state = "schoolgirl" W.item_state = "w_suit" @@ -1250,7 +1237,7 @@ var/showadminmessages = 1 alert("You cannot perform this action. You must be of a higher administrative rank!") return if("dorf") - if (src.rank in list("Shit Guy","Coder", "Host")) + if (src.rank in list("Admin who Sinned","Game Admin", "Game Master")) for(var/mob/living/carbon/human/B in world) B.face_icon_state = "facial_wise" B.update_face() @@ -1265,7 +1252,7 @@ var/showadminmessages = 1 return if (href_list["secretsadmin"]) - if ((src.rank in list( "Moderator", "Secondary Administrator", "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Observer", "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) var/ok = 0 switch(href_list["secretsadmin"]) if("clear_bombs") @@ -1466,7 +1453,7 @@ var/showadminmessages = 1 world << text("A secret has been activated by []!", usr.key) return if (href_list["secretscoder"]) - if ((src.rank in list( "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin who Sinned", "Game Admin", "Game Master" ))) switch(href_list["secretscoder"]) if("spawn_objects") var/dat = "Admin Log
" @@ -1561,7 +1548,7 @@ var/showadminmessages = 1 /obj/admins/proc/Jobbans() - if ((src.rank in list( "Coder", "Host" ))) + if ((src.rank in list( "Game Admin", "Game Master" ))) var/dat = "Job Bans!
" for(var/t in jobban_keylist) dat += text("") @@ -1573,19 +1560,19 @@ var/showadminmessages = 1 var/dat var/lvl = 0 switch(src.rank) - if("Moderator") + if("Admin Observer") lvl = 1 - if("Secondary Administrator") + if("Temporary Admin") lvl = 2 - if("Administrator") + if("Admin Candidate") lvl = 3 - if("Primary Administrator") + if("Trial Admin") lvl = 4 - if("Shit Guy") + if("Admin who Sinned") lvl = 5 - if("Coder") + if("Game Admin") lvl = 6 - if("Host") + if("Game Master") lvl = 7 dat += "
Game Panel
\n" @@ -1624,19 +1611,19 @@ var/showadminmessages = 1 var/lvl = 0 switch(src.rank) - if("Moderator") + if("Admin Observer") lvl = 1 - if("Secondary Administrator") + if("Temporary Admin") lvl = 2 - if("Administrator") + if("Admin Candidate") lvl = 3 - if("Primary Administrator") + if("Trial Admin") lvl = 4 - if("Shit Guy") + if("Admin who Sinned") lvl = 5 - if("Coder") + if("Game Admin") lvl = 6 - if("Host") + if("Game Master") lvl = 7 var/dat = {" @@ -1707,19 +1694,19 @@ var/showadminmessages = 1 var/dat var/lvl = 0 switch(src.rank) - if("Moderator") + if("Admin Observer") lvl = 1 - if("Secondary Administrator") + if("Temporary Admin") lvl = 2 - if("Administrator") + if("Admin Candidate") lvl = 3 - if("Primary Administrator") + if("Trial Admin") lvl = 4 - if("Shit Guy") + if("Admin who Sinned") lvl = 5 - if("Coder") + if("Game Admin") lvl = 6 - if("Host") + if("Game Master") lvl = 7 @@ -1794,7 +1781,7 @@ var/showadminmessages = 1 if(vote.voting == 0) alert("No votes in progress") return - world << "\red *** Voting aborted by [usr.client.stealth ? "Administrator" : usr.key]." + world << "\red *** Voting aborted by [usr.client.stealth ? "Admin Candidate" : usr.key]." log_admin("Voting aborted by [key_name(usr)]") @@ -1837,7 +1824,7 @@ var/showadminmessages = 1 if(confirm == "Cancel") return if(confirm == "Yes") - world << "\red Restarting world! \blue Initiated by [usr.client.stealth ? "Administrator" : usr.key]!" + world << "\red Restarting world! \blue Initiated by [usr.client.stealth ? "Admin Candidate" : usr.key]!" log_admin("[key_name(usr)] initiated a reboot.") sleep(50) @@ -1849,9 +1836,9 @@ var/showadminmessages = 1 set desc="Announce your desires to the world" var/message = input("Global message to send:", "Admin Announce", null, null) as message if (message) - if(usr.client.holder.rank != "Coder" && usr.client.holder.rank != "Host") + if(usr.client.holder.rank != "Game Admin" && usr.client.holder.rank != "Game Master") message = adminscrub(message,500) - world << "\blue [usr.client.stealth ? "Administrator" : usr.key] Announces:\n \t [message]" + world << "\blue [usr.client.stealth ? "Admin Candidate" : usr.key] Announces:\n \t [message]" log_admin("Announce: [key_name(usr)] : [message]") /obj/admins/proc/toggleooc() set category = "Server" @@ -1997,7 +1984,7 @@ var/showadminmessages = 1 set name="Immediate Reboot" if( alert("Reboot server?",,"Yes","No") == "No") return - world << "\red Rebooting world! \blue Initiated by [usr.client.stealth ? "Administrator" : usr.key]!" + world << "\red Rebooting world! \blue Initiated by [usr.client.stealth ? "Admin Candidate" : usr.key]!" log_admin("[key_name(usr)] initiated an immediate reboot.") world.Reboot() @@ -2088,7 +2075,7 @@ var/showadminmessages = 1 /obj/admins/proc/traitorize(mob/M as mob, var/objective, var/mode) //mode = 1 for normal traitorise, mode = 0 for traitor_all - if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host" ))) + if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master" ))) if(M.stat == 2 || !(M.client)) alert("Person is dead or not logged in or hasn't started yet. Be nice") return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 8412af29762..515d6dba9f8 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -23,7 +23,7 @@ return switch (rank) - if ("Host") + if ("Game Master") src.deadchat = 1 src.holder.level = 6 @@ -162,7 +162,7 @@ // src.verbs += /client/proc/cmd_admin_list_admins // src.verbs += /client/proc/getmobs - if ("Coder") + if ("Game Admin") src.deadchat = 1 src.holder.level = 5 @@ -291,7 +291,7 @@ // src.verbs += /client/proc/cmd_admin_list_admins // src.verbs += /client/proc/getmobs - if ("Shit Guy") + if ("Admin who Sinned") src.deadchat = 1 src.holder.level = 4 @@ -416,7 +416,7 @@ // src.verbs += /client/proc/cmd_admin_list_admins // src.verbs += /client/proc/getmobs - if ("Primary Administrator") + if ("Trial Admin") src.deadchat = 1 src.holder.level = 3 @@ -570,7 +570,7 @@ // src.verbs += /client/proc/cmd_admin_list_admins // src.verbs += /client/proc/getmobs - if ("Administrator") + if ("Admin Candidate") src.holder.level = 2 if(src.holder.state == 2) // if observing @@ -714,7 +714,7 @@ // src.verbs += /client/proc/cmd_admin_list_admins // src.verbs += /client/proc/getmobs - if ("Secondary Administrator") + if ("Temporary Admin") src.holder.level = 1 if(src.holder.state == 2) // if observing @@ -853,7 +853,7 @@ // src.verbs += /client/proc/cmd_admin_list_admins // src.verbs += /client/proc/getmobs - if ("Moderator") + if ("Admin Observer") src.holder.level = 0 // Settings @@ -976,7 +976,7 @@ // src.verbs += /client/proc/cmd_admin_list_admins // src.verbs += /client/proc/getmobs - if ("Filthy Xeno") + if ("Punnished Admin") src.holder.level = -1 src.verbs += /client/proc/cmd_admin_say src.verbs += /client/proc/cmd_admin_gib_self @@ -1437,7 +1437,7 @@ src.verbs += /client/proc/unstealthadmin switch (src.holder.rank) - if ("Host") + if ("Game Master") //Former Host // Settings //src.verbs += /client/proc/colorooc // -- Urist src.verbs += /obj/admins/proc/adjump //toggle admin jumping @@ -1467,7 +1467,7 @@ // Old and unused - if ("Coder") + if ("Game Admin") //Former Coder // Settings //src.verbs += /client/proc/colorooc // -- Urist src.verbs += /obj/admins/proc/adjump //toggle admin jumping @@ -1497,7 +1497,7 @@ // Old and unused - if ("Shit Guy") + if ("Admin who Sinned") //Former Shit Guy // Settings //src.verbs += /client/proc/colorooc // -- Urist src.verbs += /obj/admins/proc/adjump //toggle admin jumping @@ -1527,7 +1527,7 @@ // Old and unused - if ("Primary Administrator") + if ("Trial Admin") //Former Primary Administrator if(src.holder.state == 2) // if observing // Settings src.verbs += /obj/admins/proc/toggleaban //abandon mob @@ -1564,17 +1564,19 @@ // Old and unused - if ("Administrator") + if ("Admin Candidate") //Removed the 'Administrator' rank, has same rights as Trial Admin (Expected that these will be set manually each round) if(src.holder.state == 2) // if observing // Settings src.verbs += /obj/admins/proc/toggleaban //abandon mob - src.verbs += /client/proc/deadchat //toggles deadchat + src.verbs += /obj/admins/proc/toggleooc //toggle ooc + src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc + src.verbs += /obj/admins/proc/toggletraitorscaling // Settings //src.verbs += /client/proc/colorooc // -- Urist - //src.verbs += /obj/admins/proc/adjump //toggle admin jumping - //src.verbs += /obj/admins/proc/adrev //toggle admin revives - //src.verbs += /obj/admins/proc/adspawn //toggle admin item spawning + src.verbs += /obj/admins/proc/adjump //toggle admin jumping + src.verbs += /obj/admins/proc/adrev //toggle admin revives + src.verbs += /obj/admins/proc/adspawn //toggle admin item spawning src.verbs += /obj/admins/proc/delay //game start delay //src.verbs += /obj/admins/proc/toggleaban //abandon mob src.verbs += /obj/admins/proc/toggleAI //Toggle the AI @@ -1585,21 +1587,10 @@ //src.verbs += /obj/admins/proc/toggle_aliens src.verbs += /obj/admins/proc/voteres //toggle votes src.verbs += /client/proc/deadchat //toggles deadchat - //src.verbs += /proc/toggle_adminmsg + src.verbs += /proc/toggle_adminmsg - // Admin "must have" - // Debug - - // Admin helpers - - // Admin game intrusion - - // Unnecessary commands - - // Old and unused - - if ("Secondary Administrator") + if ("Temporary Admin") //Former Secondary Administrator if(src.holder.state == 2) // if observing // Settings src.verbs += /obj/admins/proc/toggleaban //abandon mob @@ -1635,7 +1626,7 @@ // Old and unused - if ("Moderator") + if ("Admin Observer") //Former Moderator // Settings //src.verbs += /client/proc/colorooc // -- Urist //src.verbs += /obj/admins/proc/adjump //toggle admin jumping @@ -1665,4 +1656,4 @@ // Old and unused - if ("Filthy Xeno") \ No newline at end of file + if ("Punnished Admin") //Former Filthy Xeno \ No newline at end of file diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index d54e2ed57f4..d0198bb4b58 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -21,7 +21,7 @@ for (var/mob/M in world) if (M.client && M.client.holder) - if (src.holder.rank == "Filthy Xeno") + if (src.holder.rank == "Punnished Admin") M << "ADMIN: [key_name(usr, M)]: [msg]" else M << "ADMIN: [key_name(usr, M)]: [msg]" diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 5e2dcd41d99..d02b4f7c188 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -4,12 +4,12 @@ if(!src.authenticated || !src.holder) src << "Only administrators may use this command." return - if(src.holder.rank == "Coder") + if(src.holder.rank == "Game Admin") Debug2 = !Debug2 world << "Debugging [Debug2 ? "On" : "Off"]" log_admin("[key_name(src)] toggled debugging to [Debug2]") - else if(src.holder.rank == "Host") + else if(src.holder.rank == "Game Master") Debug2 = !Debug2 world << "Debugging [Debug2 ? "On" : "Off"]" diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm index 9d7bd924d69..ea36692cf8e 100644 --- a/code/modules/admin/verbs/massmodvar.dm +++ b/code/modules/admin/verbs/massmodvar.dm @@ -25,7 +25,7 @@ var/var_value = O.vars[variable] var/dir - if (locked.Find(variable) && !(src.holder.rank in list("Host", "Coder"))) + if (locked.Find(variable) && !(src.holder.rank in list("Game Master", "Game Admin"))) return if(isnull(var_value)) diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 9457d1f24e3..f064d8a41dc 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -114,7 +114,7 @@ var/dir - if (locked.Find(variable) && !(src.holder.rank in list("Host", "Coder"))) + if (locked.Find(variable) && !(src.holder.rank in list("Game Master", "Game Admin"))) return if(isnull(variable)) @@ -249,7 +249,7 @@ var/var_value = O.vars[variable] var/dir - if (locked.Find(variable) && !(src.holder.rank in list("Host", "Coder"))) + if (locked.Find(variable) && !(src.holder.rank in list("Game Master", "Game Admin"))) return if(isnull(var_value)) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index e63d0b45605..b1af76c6d66 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -11,7 +11,7 @@ uploaded_sound.priority = 255 uploaded_sound.wait = 1 - if(src.holder.rank == "Host" || src.holder.rank == "Coder" || src.holder.rank == "Shit Guy") + if(src.holder.rank == "Game Master" || src.holder.rank == "Game Admin" || src.holder.rank == "Admin who Sinned") log_admin("[key_name(src)] played sound [S]") message_admins("[key_name_admin(src)] played sound [S]", 1) for(var/mob/M in world) @@ -80,7 +80,7 @@ client/proc/space_asshole() uploaded_sound.priority = 255 uploaded_sound.wait = 1 - if(src.holder.rank == "Host" || src.holder.rank == "Coder" || src.holder.rank == "Shit Guy") + if(src.holder.rank == "Game Master" || src.holder.rank == "Game Admin" || src.holder.rank == "Admin who Sinned") log_admin("[key_name(src)] played sound [S]") message_admins("[key_name_admin(src)] played sound [S]", 1) world << uploaded_sound diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index ea3a6ff999b..a747199b8c5 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -111,7 +111,7 @@ if (!( ismob(M) )) return var/t = input("Message:", text("Private message to [M.key]")) as text - if(src.holder.rank != "Coder" && src.holder.rank != "Host") + if(src.holder.rank != "Game Admin" && src.holder.rank != "Game Master") t = strip_html(t,500) if (!( t )) return @@ -272,7 +272,7 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is candidates.Add(G) if(candidates.len) var/mob/dead/observer/G = pick(candidates) - message_admins("\blue [key_name_admin(usr)] has spawned [G.key] as a filthy xeno.", 1) + message_admins("\blue [key_name_admin(usr)] has spawned [G.key] as a Punnished Admin.", 1) new_xeno.mind = new//Mind initialize stuff. new_xeno.mind.current = new_xeno diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm index fd09112d32e..45f94b077f9 100644 --- a/code/modules/admin/verbs/ticklag.dm +++ b/code/modules/admin/verbs/ticklag.dm @@ -7,7 +7,7 @@ if(src.authenticated && src.holder) if(!src.mob) return - if(src.holder.rank in list("Coder", "Host")) + if(src.holder.rank in list("Game Admin", "Game Master")) world.tick_lag = number log_admin("[key_name(src.mob)] set tick_lag to [number]") message_admins("[key_name_admin(usr)] modified world's tick_lag to [number]") diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index a2372e55eb4..1dead7a4dc6 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -294,7 +294,7 @@ datum/preferences if(user.client.holder) if(user.client.holder.rank) - if(user.client.holder.rank == "Host") + if(user.client.holder.rank == "Game Master") dat += "
OOC
" dat += "Change colour
[t]
IM
" diff --git a/code/unused/_debug.dm b/code/unused/_debug.dm index 45c182a73f3..83fc8194c3c 100644 --- a/code/unused/_debug.dm +++ b/code/unused/_debug.dm @@ -9,7 +9,7 @@ /client/verb/Debug() set category = "Debug" set name = "Debug-Debug" - if(src.holder.rank == "Coder") + if(src.holder.rank == "Game Admin") Debug = !Debug world << "Debugging [Debug ? "On" : "Off"]" diff --git a/config/admins.txt b/config/admins.txt index c8dded0bf5c..1fe2f5415c6 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -1 +1,24 @@ -Themicrowave - Host \ No newline at end of file +tle - Game Master +xsi - Game Master +sillazi - Game Master +herpa - Game Master +scaredofshadows - Game Master +chicagoted - Game Master + +mport2004 - Game Admin +lj82 - Game Admin +fatmanfive - Game Admin +thickwillynilly - Game Admin +euronumbers - Game Admin +deuryn - Game Admin +rosenritter - Game Admin +lastwish - Game Admin +tashdurandel - Game Admin +mario90900 - Game Admin +atomictroop - Game Admin +neofite - Game Admin +fateweaver - Game Admin +agouri - Game Admin +errorage - Game Admin + +uhangi - Trial Admin \ No newline at end of file