diff --git a/code/defines/client.dm b/code/defines/client.dm index 754ffb5eca4..d803c6a9e4a 100644 --- a/code/defines/client.dm +++ b/code/defines/client.dm @@ -32,7 +32,6 @@ var/STFU_ghosts //80+ people rounds are fun to admin when text flies faster than airport security var/STFU_radio //80+ people rounds are fun to admin when text flies faster than airport security var/sound_adminhelp = 0 //If set to 1 this will play a sound when adminhelps are received. - var/hearamessage //In case you... Don't like adminning or something? var/midis = 1 //Check if midis should be played for someone var/bubbles = 1 //Check if bubbles should be displayed for someone diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index ad1b631213b..93483db048b 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -6,7 +6,7 @@ var/global/BSACooldown = 0 /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.holder.level > -3 && !M.client.hearamessage) //Lets not spam our retirees. + if (M && M.client && M.client.holder && M.client.holder.level > -3) //Lets not spam our retirees. if (admin_ref) M << dd_replaceText(rendered, "%admin_ref%", "\ref[M]") else diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 694eca178df..5d9aa9f5d9f 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -248,7 +248,6 @@ verbs += /obj/admins/proc/restart //restart verbs += /client/proc/cmd_admin_create_centcom_report verbs += /client/proc/toggle_hear_deadcast - verbs += /client/proc/toggle_adminmessage verbs += /client/proc/toggle_hear_radio verbs += /client/proc/cmd_admin_change_custom_event @@ -424,7 +423,6 @@ verbs -= /client/proc/Blobize verbs -= /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested) verbs -= /client/proc/toggle_hear_deadcast - verbs += /client/proc/toggle_adminmessage verbs -= /client/proc/toggle_hear_radio verbs -= /client/proc/tension_report verbs -= /client/proc/toggle_gravity_on @@ -928,11 +926,3 @@ else NewObj.vars[V] = vars[V] return NewObj - -/client/proc/toggle_adminmessage() - set name = "Toggle Admin Message" - set category = "Admin" - - if(!holder) return - hearamessage = !hearamessage - usr << "You will now [STFU_ghosts ? "hear" : "not hear"] admin messages."