diff --git a/baystation12.dme b/baystation12.dme
index 1cc62f3e5e..c4f6822b82 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -686,7 +686,6 @@
#include "code\game\objects\tanks\oxygen.dm"
#include "code\game\structure\structure.dm"
#include "code\game\verbs\AI_status.dm"
-#include "code\game\verbs\authorize.dm"
#include "code\game\verbs\checkkarma.dm"
#include "code\game\verbs\ooc.dm"
#include "code\game\verbs\sound.dm"
diff --git a/code/WorkInProgress/mapload/reader.dm b/code/WorkInProgress/mapload/reader.dm
index 57b76a4bd8..755b96fc2d 100644
--- a/code/WorkInProgress/mapload/reader.dm
+++ b/code/WorkInProgress/mapload/reader.dm
@@ -158,7 +158,7 @@ dmm_suite/preloader
set name = "LoadMap"
set desc = "Loads a map"
set hidden = 1
- if(src.authenticated && src.holder)
+ if(src.holder)
if(!src.mob)
return
if(src.holder.rank in list("Game Admin", "Game Master"))
diff --git a/code/datums/configuration.dm b/code/datums/configuration.dm
index f3dff45d63..b0317a1605 100644
--- a/code/datums/configuration.dm
+++ b/code/datums/configuration.dm
@@ -22,7 +22,6 @@
var/vote_period = 60 // length of voting period (seconds, default 1 minute)
var/vote_no_default = 0 // vote does not default to nochange/norestart (tbi)
var/vote_no_dead = 0 // dead people can't vote (tbi)
- var/enable_authentication = 0 // goon authentication
var/del_new_on_log = 1 // del's new players if they log before they spawn in
var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
var/traitor_scaling = 0 //if amount of traitors scales based on amount of players
@@ -168,9 +167,6 @@
if ("allow_ai")
config.allow_ai = 1
- if ("authentication")
- config.enable_authentication = 1
-
if ("norespawn")
config.respawn = 0
diff --git a/code/defines/client.dm b/code/defines/client.dm
index b5666d7d8c..41b3a612ec 100644
--- a/code/defines/client.dm
+++ b/code/defines/client.dm
@@ -1,7 +1,7 @@
/client
//START Admin Things
//This should be changed to a datum
- var/obj/admins/holder = null
+ var/obj/admins/holder = null // Stays null if client isn't an admin. Stores properties about the admin, if not null.
var/buildmode = 0
var/stealth = 0
var/fakekey = null
@@ -14,11 +14,6 @@
//END Admin Things
- //Key auth things
- authenticate = 0
- var/authenticated = 0
- var/authenticating = 0
-
var/listen_ooc = 1
var/move_delay = 1
var/moving = null
diff --git a/code/defines/procs/statistics.dm b/code/defines/procs/statistics.dm
index 6f41418ed9..824f8ac57d 100644
--- a/code/defines/procs/statistics.dm
+++ b/code/defines/procs/statistics.dm
@@ -23,7 +23,7 @@ proc/sql_poll_admins()
return
var/admincount = 0
for (var/mob/M in world)
- if(M && M.client && M.client.holder && M.client.authenticated)
+ if(M && M.client && M.client.holder)
admincount += 1
var/DBConnection/dbcon = new()
dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm
index d64d984901..02a81e97c5 100644
--- a/code/game/gamemodes/events/space_ninja.dm
+++ b/code/game/gamemodes/events/space_ninja.dm
@@ -382,7 +382,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
set desc = "Spawns a space ninja for when you need a teenager with attitude."
set popup_menu = 0
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
if(!ticker.mode)
diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm
index 67fd4208e2..18b3b1892d 100644
--- a/code/game/gamemodes/sandbox/sandbox.dm
+++ b/code/game/gamemodes/sandbox/sandbox.dm
@@ -10,7 +10,7 @@
/datum/game_mode/sandbox/pre_setup()
for(var/mob/M in world)
- if(M.client && M.client.authenticated)
+ if(M.client)
M.CanBuild()
setup_sectors()
diff --git a/code/game/verbs/authorize.dm b/code/game/verbs/authorize.dm
index 21638713c8..5e2d59a603 100644
--- a/code/game/verbs/authorize.dm
+++ b/code/game/verbs/authorize.dm
@@ -1,3 +1,7 @@
+/*
+
+The old goon auth/beta code is here:
+
/client/proc/authorize()
set name = "Authorize"
@@ -42,7 +46,7 @@
src << "\blue[no_auth_motd]"
src.authenticating = 0
-/* The old goon auth/beta code is here
+
/client/proc/beta_tester_auth()
set name = "Tester?"
/*if(istester(src))
@@ -163,4 +167,4 @@ var/list/beta_tester_keylist
goon_savefile()
return 1
return 0
-*/
\ No newline at end of file
+*/
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index a8b4a72978..4f8a60a2f9 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -12,9 +12,7 @@
/mob/verb/ooc(msg as text)
set name = "OOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite
set category = "OOC"
- if (!src.client.authenticated || IsGuestKey(src.key))
- src << "You are not authorized to communicate over these channels."
- return
+
msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
if(!msg)
return
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index fae146bb09..8ce32872d5 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -6,24 +6,14 @@
var/list/peeps = list()
- if (config.enable_authentication)
- for (var/mob/M in world)
- if (!M.client)
- continue
+ for (var/mob/M in world)
+ if (!M.client)
+ continue
- if (M.client.authenticated && M.client.authenticated != 1)
- peeps += "\t[M.client] ([html_encode(M.client.authenticated)])"
- else
- peeps += "\t[M.client]"
- else
- for (var/mob/M in world)
- if (!M.client)
- continue
-
- if (M.client.stealth && !usr.client.holder)
- peeps += "\t[M.client.fakekey]"
- else
- peeps += "\t[M.client][M.client.stealth ? " (as [M.client.fakekey])" : ""]"
+ if (M.client.stealth && !usr.client.holder)
+ peeps += "\t[M.client.fakekey]"
+ else
+ peeps += "\t[M.client][M.client.stealth ? " (as [M.client.fakekey])" : ""]"
peeps = sortList(peeps)
@@ -39,7 +29,7 @@
usr << "Current Admins:"
for (var/mob/M in world)
- if(M && M.client && M.client.holder && M.client.authenticated)
+ if(M && M.client && M.client.holder)
if(usr.client.holder)
usr << "[M.key] is a [M.client.holder.rank][M.client.stealth ? " (as [M.client.fakekey])" : ""]"
else if(!M.client.stealth && (M.client.holder.level != -3))
diff --git a/code/game/vote.dm b/code/game/vote.dm
index cd62786617..7741f2c182 100644
--- a/code/game/vote.dm
+++ b/code/game/vote.dm
@@ -176,9 +176,6 @@
/mob/verb/vote()
set category = "OOC"
set name = "Vote"
- if(!usr.client.authenticated)
- usr << "You're not authenticated, you can't vote."
- return
usr.client.showvote = 1
@@ -407,7 +404,7 @@
for(var/mob/CM in world)
if(CM.client)
- if(config.vote_no_default || (config.vote_no_dead && CM.stat == 2) || !CM.client.authenticated)
+ if(config.vote_no_default || (config.vote_no_dead && CM.stat == 2))
CM.client.vote = "none"
else
CM.client.vote = "default"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 1e67e8179d..42b4f172ad 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -3,7 +3,7 @@
/proc/message_admins(var/text, var/admin_ref = 0)
var/rendered = "ADMIN LOG: [text]"
for (var/mob/M in world)
- if (M && M.client && M.client.holder && M.client.authenticated)
+ if (M && M.client && M.client.holder)
if (admin_ref)
M << dd_replaceText(rendered, "%admin_ref%", "\ref[M]")
else
@@ -702,16 +702,6 @@
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"])
@@ -1760,12 +1750,8 @@
usr << "Error: you are not an admin!"
return
var/dat = "Options for [M.key]"
- var/foo = "\[ "
+ var/foo = " "
if (ismob(M) && M.client)
- if(!M.client.authenticated && !M.client.authenticating)
- foo += text("Authorize | ")
- else
- foo += text("Authorized | ")
foo += text("Promote/Demote | ")
if(!istype(M, /mob/new_player))
if(!ismonkey(M))
@@ -2254,14 +2240,14 @@
for(var/mob/CM in world)
if(CM.client)
- if(config.vote_no_default || (config.vote_no_dead && CM.stat == 2) || !CM.client.authenticated)
+ if(config.vote_no_default || (config.vote_no_dead && CM.stat == 2))
CM.client.vote = "none"
else
CM.client.vote = "default"
for(var/mob/CM in world)
if(CM.client)
- if(config.vote_no_default || (config.vote_no_dead && CM.stat == 2) || !CM.client.authenticated)
+ if(config.vote_no_default || (config.vote_no_dead && CM.stat == 2))
CM.client.vote = "none"
else
CM.client.vote = "default"
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 99ee24a0fc..67e10b1b7b 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -524,7 +524,7 @@
/client/proc/stealth()
set category = "Admin"
set name = "Stealth Mode"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
stealth = !stealth
@@ -542,12 +542,13 @@
log_admin("[key_name(usr)] has turned stealth mode [stealth ? "ON" : "OFF"]")
message_admins("[key_name_admin(usr)] has turned stealth mode [stealth ? "ON" : "OFF"]", 1)
-#define AUTOBATIME 10
+#define AUTOBANTIME 10
/client/proc/warn(var/mob/M in world)
set category = "Special Verbs"
set name = "Warn"
- set desc = "Warn a player"
- if(!authenticated || !holder)
+ // If you've edited AUTOBANTIME, change the below desc.
+ set desc = "Warn a player. If player is already warned, they will be autobanned for 10 minutes."
+ if(!holder)
src << "Only administrators may use this command."
return
if(M.client && M.client.holder && (M.client.holder.level >= holder.level))
@@ -558,12 +559,12 @@
M.client.warned = 1
message_admins("\blue [ckey] warned [M.ckey].")
else
- AddBan(M.ckey, M.computer_id, "Autobanning due to previous warn", ckey, 1, AUTOBATIME)
+ AddBan(M.ckey, M.computer_id, "Autobanning due to previous warn", ckey, 1, AUTOBANTIME)
M << "\redYou have been autobanned by [ckey]. This is what we in the biz like to call a \"second warning\"."
- M << "\red This is a temporary ban; it will automatically be removed in [AUTOBATIME] minutes."
- log_admin("[ckey] warned [M.ckey], resulting in a [AUTOBATIME] minute autoban.")
- ban_unban_log_save("[ckey] warned [M.ckey], resulting in a [AUTOBATIME] minute autoban.")
- message_admins("\blue [ckey] warned [M.ckey], resulting in a [AUTOBATIME] minute autoban.")
+ M << "\red This is a temporary ban; it will automatically be removed in [AUTOBANTIME] minutes."
+ log_admin("[ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
+ ban_unban_log_save("[ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
+ message_admins("\blue [ckey] warned [M.ckey], resulting in a [AUTOBANTIME] minute autoban.")
feedback_inc("ban_warn",1)
del(M.client)
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 426c94c88e..a6436adf20 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -1,9 +1,6 @@
/mob/verb/adminhelp(msg as text)
set category = "Admin"
set name = "Adminhelp"
- if(!usr.client.authenticated)
- src << "Please authorize before sending these messages."
- return
msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index 9248fcf93f..e9c3497c49 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -2,7 +2,7 @@
set name = "Jump to Area"
set desc = "Area to jump to"
set category = "Admin"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
@@ -17,7 +17,7 @@
/client/proc/jumptoturf(var/turf/T in world)
set name = "Jump to Turf"
set category = "Admin"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
if(config.allow_admin_jump)
@@ -32,7 +32,7 @@
set category = "Admin"
set name = "Jump to Mob"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
@@ -53,7 +53,7 @@
set category = "Admin"
set name = "Jump to Key"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
@@ -75,7 +75,7 @@
set category = "Admin"
set name = "Get Mob"
set desc = "Mob to teleport"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
if(config.allow_admin_jump)
@@ -90,7 +90,7 @@
set name = "Get Key"
set desc = "Key to teleport"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
@@ -115,7 +115,7 @@
/client/proc/sendmob(var/mob/M in world, var/area/A in world)
set category = "Admin"
set name = "Send Mob"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
if(config.allow_admin_jump)
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 75098de01d..bd5946ff05 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -5,7 +5,7 @@
// All admins should be authenticated, but... what if?
- if (!src.authenticated || !src.holder)
+ if (!src.holder)
src << "Only administrators may use this command."
return
diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm
index 352672e4d6..84910af33c 100644
--- a/code/modules/admin/verbs/atmosdebug.dm
+++ b/code/modules/admin/verbs/atmosdebug.dm
@@ -1,7 +1,7 @@
/client/proc/atmosscan()
set category = "Mapping"
set name = "Check Plumbing"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm
index c4eed427a4..a0d6ecef10 100644
--- a/code/modules/admin/verbs/custom_event.dm
+++ b/code/modules/admin/verbs/custom_event.dm
@@ -3,7 +3,7 @@
set category = "Fun"
set name = "Change Custom Event"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index 0b2afb5dd7..a9f2f1d4d1 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -3,7 +3,7 @@
set name = "Dsay" //Gave this shit a shorter name so you only have to time out "dsay" rather than "dead say" to use it --NeoFite
set hidden = 1
// All admins should be authenticated, but... what if?
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
if(!src.mob)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index cba9a1d22c..699facbd3d 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -1,7 +1,7 @@
/client/proc/Debug2()
set category = "Debug"
set name = "Debug-Game"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
if(holder.rank == "Game Admin")
@@ -32,7 +32,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
/client/proc/callproc()
set category = "Debug"
set name = "Advanced ProcCall (TG Version)"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
var/target = null
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index 108092a47a..3722cf009c 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -180,7 +180,7 @@
jump_to_dead_group()
set name = "Jump to dead group"
set category = "Debug"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
diff --git a/code/modules/admin/verbs/gimmicks.dm b/code/modules/admin/verbs/gimmicks.dm
index ae37d3ce2a..f39cb8c29a 100644
--- a/code/modules/admin/verbs/gimmicks.dm
+++ b/code/modules/admin/verbs/gimmicks.dm
@@ -5,7 +5,7 @@ var/global/gimmick_hat = null
set category = "Fun"
set name = "Christmas Time"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm
index 3358920873..bde0e19ee9 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -23,7 +23,7 @@
/client/proc/massmodify_variables(var/atom/O, var/var_name = "", var/method = 0)
var/list/locked = list("vars", "key", "ckey", "client")
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 219d76ec20..4126ab5c39 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -263,7 +263,7 @@
/client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "urine", "poo", "icon", "icon_state")
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index db64d6811f..48210e226a 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -3,7 +3,7 @@
set name = "Play Global Sound"
//if(Debug2)
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
@@ -37,7 +37,7 @@
set category = "Fun"
set name = "Play Local Sound"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 303779597a..a75c2fa929 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -1,9 +1,6 @@
/mob/verb/pray(msg as text)
set category = "IC"
set name = "Pray"
- if(!usr.client.authenticated)
- src << "Please authorize before sending these messages."
- return
msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index a4e021d50c..c08002d4a1 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1,7 +1,7 @@
/client/proc/cmd_admin_drop_everything(mob/M as mob in world)
set category = null
set name = "Drop Everything"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
for(var/obj/item/W in M)
@@ -13,7 +13,7 @@
/client/proc/cmd_admin_prison(mob/M as mob in world)
set category = "Admin"
set name = "Prison"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
if (ismob(M))
@@ -41,7 +41,7 @@
set name = "Subtle Message"
if(!ismob(M)) return
- if (!authenticated || !holder)
+ if (!holder)
src << "Only administrators may use this command."
return
@@ -61,7 +61,7 @@
set category = "Special Verbs"
set name = "Global Narrate"
- if (!authenticated || !holder)
+ if (!holder)
src << "Only administrators may use this command."
return
@@ -77,7 +77,7 @@
set category = "Special Verbs"
set name = "Direct Narrate"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
var/msg = input("Message:", text("Enter the text you wish to appear to your target:")) as text
@@ -88,7 +88,7 @@
/client/proc/cmd_admin_pm(mob/M as mob in world)
set category = "Admin"
set name = "Admin PM"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
if(M)
@@ -121,7 +121,7 @@
/client/proc/cmd_admin_mute(mob/M as mob in world)
set category = "Special Verbs"
set name = "Admin Mute"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
if (M.client && M.client.holder && (M.client.holder.level >= holder.level))
@@ -141,7 +141,7 @@
/client/proc/cmd_admin_add_random_ai_law()
set category = "Fun"
set name = "Add Random AI Law"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
log_admin("[key_name(src)] has added a random AI law.")
@@ -164,7 +164,7 @@
set desc = "Spawns a xenomorph for all those boring rounds, without having you to do so manually."
set popup_menu = 0
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
@@ -224,7 +224,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Special Verbs"
set name = "Respawn Character"
set desc = "Respawn a person that has been gibbed/dusted/killed. They must be a ghost for this to work and preferably should not have a body to go back into."
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
var/input = input(src, "Please specify which key will be respawned.", "Key", "")
@@ -443,7 +443,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_admin_add_freeform_ai_law()
set category = "Fun"
set name = "Add Custom AI law"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
var/input = input(usr, "Please enter anything you want the AI to do. Anything. Serious.", "What?", "") as text|null
@@ -471,7 +471,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Special Verbs"
set name = "Rejuvenate"
// All admins should be authenticated, but... what if?
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
if(!mob)
@@ -506,7 +506,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_admin_create_centcom_report()
set category = "Special Verbs"
set name = "Create Command Report"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null
@@ -530,7 +530,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Admin"
set name = "Delete"
- if (!authenticated || !holder)
+ if (!holder)
src << "Only administrators may use this command."
return
@@ -543,7 +543,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Admin"
set name = "List free slots"
- if (!authenticated || !holder)
+ if (!holder)
src << "Only administrators may use this command."
return
if(job_master)
@@ -554,7 +554,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Special Verbs"
set name = "Explosion"
- if (!authenticated || !holder)
+ if (!holder)
src << "Only administrators may use this command."
return
@@ -584,7 +584,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Special Verbs"
set name = "EM Pulse"
- if (!authenticated || !holder)
+ if (!holder)
src << "Only administrators may use this command."
return
@@ -607,7 +607,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Special Verbs"
set name = "Gib"
- if (!authenticated || !holder)
+ if (!holder)
src << "Only administrators may use this command."
return
@@ -635,7 +635,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_manual_ban()
set name = "Manual Ban"
set category = "Special Verbs"
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
var/mob/M = null
@@ -706,7 +706,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_admin_remove_plasma()
set category = "Debug"
set name = "Stabilize Atmos."
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
// DEFERRED
@@ -751,7 +751,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if ((!( ticker ) || emergency_shuttle.location))
return
- if (!authenticated || !holder)
+ if (!holder)
src << "Only administrators may use this command."
return
@@ -778,7 +778,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if ((!( ticker ) || emergency_shuttle.location || emergency_shuttle.direction == 0))
return
- if (!authenticated || !holder)
+ if (!holder)
src << "Only administrators may use this command."
return
diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm
index 3af6453fcb..8bbe8ef320 100644
--- a/code/modules/admin/verbs/striketeam.dm
+++ b/code/modules/admin/verbs/striketeam.dm
@@ -6,7 +6,7 @@ var/global/sent_strike_team = 0
set category = "Fun"
set name = "Spawn Death Squad"
set desc = "Spawns a squad of commandos in CentCom if you want to run an admin event."
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
if(!ticker)
diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm
index 07eefef737..1fc2a4bbde 100644
--- a/code/modules/admin/verbs/striketeam_syndicate.dm
+++ b/code/modules/admin/verbs/striketeam_syndicate.dm
@@ -6,7 +6,7 @@ var/global/sent_syndicate_strike_team = 0
set category = "Fun"
set name = "Spawn Syndicate Strike Team"
set desc = "Spawns a squad of commandos in the Syndicate Mothership if you want to run an admin event."
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
if(!ticker)
diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm
index 45f94b077f..59c59ba4b5 100644
--- a/code/modules/admin/verbs/ticklag.dm
+++ b/code/modules/admin/verbs/ticklag.dm
@@ -4,7 +4,7 @@
set desc = "Ticklag"
set hidden = 1
if(Debug2)
- if(src.authenticated && src.holder)
+ if(src.holder)
if(!src.mob)
return
if(src.holder.rank in list("Game Admin", "Game Master"))
diff --git a/code/modules/mob/living/blob/blob.dm b/code/modules/mob/living/blob/blob.dm
index 38d848bb9c..b1c4795d6c 100644
--- a/code/modules/mob/living/blob/blob.dm
+++ b/code/modules/mob/living/blob/blob.dm
@@ -202,7 +202,7 @@
set desc = "Ghost into blobthing."
set hidden = 1
- if(!authenticated || !holder)
+ if(!holder)
src << "Only administrators may use this command."
return
var/input = input(src, "Please specify which key will be turned into a bloby.", "Key", "")
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index a8c5686c8b..21a4227c65 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -721,8 +721,6 @@
if (join_motd)
src << "[join_motd]
"
- authorize()
-
if(custom_event_msg && custom_event_msg != "")
src << "Custom Event
"
src << "A custom event is taking place. OOC Info:
"
@@ -734,7 +732,7 @@
holder.rank = admins[ckey]
update_admins(admins[ckey])
- if(ticker && ticker.mode && ticker.mode.name =="sandbox" && authenticated)
+ if(ticker && ticker.mode && ticker.mode.name =="sandbox")
mob.CanBuild()
/client/Del()
@@ -1105,4 +1103,4 @@ note dizziness decrements automatically in the mob's Life() proc.
/mob/proc/AdjustParalysis(amount)
paralysis = max(paralysis + amount,0)
- return
+ return
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index e25605fd99..af2c6097c0 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -178,9 +178,6 @@
return 1
if(href_list["ready"])
- if (!client.authenticated)
- src << "You are not authorized to enter the game."
- return
if(!ready)
ready = 1
@@ -192,9 +189,6 @@
new_player_panel_proc()
if(href_list["observe"])
- if (!client.authenticated)
- src << "You are not authorized to enter the game."
- return
if(alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No") == "Yes")
var/mob/dead/observer/observer = new()
@@ -231,9 +225,6 @@
ViewManifest()
if(href_list["SelectedJob"])
- if(!client.authenticated)
- src << "You are not authorized to enter the game."
- return
if(!enter_allowed)
usr << "\blue There is an administrative lock on entering the game!"
diff --git a/code/unused/_debug.dm b/code/unused/_debug.dm
index 2bd5370feb..61ec522c9c 100644
--- a/code/unused/_debug.dm
+++ b/code/unused/_debug.dm
@@ -508,10 +508,10 @@ Doing this because FindTurfs() isn't even used
/mob/verb/revent(number as num)
set category = "Debug"
set name = "Change event %"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
- if(src.authenticated && src.holder)
+ if(src.holder)
eventchance = number
log_admin("[src.key] set the random event chance to [eventchance]%")
message_admins("[src.key] set the random event chance to [eventchance]%")
@@ -520,7 +520,7 @@ Doing this because FindTurfs() isn't even used
/mob/verb/funbutton()
set category = "Admin"
set name = "Random Expl.(REMOVE ME)"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
for(var/turf/T in world)
@@ -544,7 +544,7 @@ Doing this because FindTurfs() isn't even used
/mob/verb/removeplasma()
set category = "Debug"
set name = "Stabilize Atmos."
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
spawn(0)
@@ -571,7 +571,7 @@ Doing this because FindTurfs() isn't even used
/mob/verb/fire(turf/T as turf in world)
set category = "Special Verbs"
set name = "Create Fire"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
world << "[usr.key] created fire"
@@ -582,7 +582,7 @@ Doing this because FindTurfs() isn't even used
/mob/verb/co2(turf/T as turf in world)
set category = "Special Verbs"
set name = "Create CO2"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
world << "[usr.key] created CO2"
@@ -592,7 +592,7 @@ Doing this because FindTurfs() isn't even used
/mob/verb/n2o(turf/T as turf in world)
set category = "Special Verbs"
set name = "Create N2O"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
world << "[usr.key] created N2O"
@@ -602,7 +602,7 @@ Doing this because FindTurfs() isn't even used
/mob/verb/explosion(T as obj|mob|turf in world)
set category = "Special Verbs"
set name = "Create Explosion"
- if(!src.authenticated || !src.holder)
+ if(!src.holder)
src << "Only administrators may use this command."
return
world << "[usr.key] created an explosion"