diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 121e355d22..c7d0bb262b 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1223,21 +1223,6 @@ proc/admin_notice(var/message, var/rights)
if(istype(H))
H.regenerate_icons()
-
-/*
- helper proc to test if someone is an event manager or not. Got tired of writing this same check all over the place.
-*/
-/proc/is_eventM(client/C)
-
- if(!istype(C))
- return 0
- if(!C.holder)
- return 0
-
- if(C.holder.rights == R_EVENT)
- return 1
- return 0
-
/proc/get_options_bar(whom, detail = 2, name = 0, link = 1, highlight_special = 1)
if(!whom)
return "(*null*)"
diff --git a/code/modules/admin/admin_secrets.dm b/code/modules/admin/admin_secrets.dm
index b6d0abbe1c..473770ac2b 100644
--- a/code/modules/admin/admin_secrets.dm
+++ b/code/modules/admin/admin_secrets.dm
@@ -100,18 +100,18 @@ var/datum/admin_secrets/admin_secrets = new()
/datum/admin_secret_item/admin_secret
category = /datum/admin_secret_category/admin_secrets
log = 0
- permissions = R_ADMIN
+ permissions = R_ADMIN|R_EVENT
/datum/admin_secret_item/random_event
category = /datum/admin_secret_category/random_events
- permissions = R_FUN
+ permissions = R_FUN|R_EVENT
warn_before_use = 1
/datum/admin_secret_item/fun_secret
category = /datum/admin_secret_category/fun_secrets
- permissions = R_FUN
+ permissions = R_FUN|R_EVENT
warn_before_use = 1
/datum/admin_secret_item/final_solution
category = /datum/admin_secret_category/final_solutions
- permissions = R_FUN|R_SERVER|R_ADMIN
+ permissions = R_FUN|R_SERVER|R_ADMIN|R_EVENT
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 2503c73abb..508474f683 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -8,7 +8,6 @@ var/list/admin_verbs_default = list(
/client/proc/debug_variables, //allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify,
// /client/proc/check_antagonists, //shows all antags,
// /client/proc/cmd_mod_say,
- /client/proc/cmd_eventM_check_new_players,
// /client/proc/deadchat //toggles deadchat on/off,
// /client/proc/toggle_ahelp_sound,
)
@@ -448,9 +447,6 @@ var/list/admin_verbs_event_manager = list(
feedback_add_details("admin_verb","TAVVS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-
/client/proc/admin_ghost()
set category = "Admin"
set name = "Aghost"
@@ -461,7 +457,7 @@ var/list/admin_verbs_event_manager = list(
if(ghost.can_reenter_corpse)
ghost.reenter_corpse()
else
- ghost << "Error: Aghost: Can't reenter corpse, event managers that use adminHUD while aghosting are not permitted to enter their corpse again"
+ to_chat(ghost, "Error: Aghost: Can't reenter corpse.")
return
feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 1531790268..92536a6e05 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -363,20 +363,14 @@
PM |
"}
-
-
if(usr.client)
- var/client/C = usr.client
- if(is_eventM(C))
- dat += {" N/A | "}
- else
- switch(is_special_character(M))
- if(0)
- dat += {"Traitor? | "}
- if(1)
- dat += {"Traitor? | "}
- if(2)
- dat += {"Traitor? | "}
+ switch(is_special_character(M))
+ if(0)
+ dat += {"Traitor? | "}
+ if(1)
+ dat += {"Traitor? | "}
+ if(2)
+ dat += {"Traitor? | "}
else
dat += {" N/A | "}
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index c14c74edd1..b80d95e3c1 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -65,42 +65,6 @@
message_admins("SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1)
feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/client/proc/cmd_eventM_check_new_players() //Allows event managers / admins to determine who the newer players are.
- set category = "Admin"
- set name = "Check new Players"
- if(!holder)
- src << "Only staff members may use this command."
-
- var/age = alert(src, "Age check", "Show accounts yonger then _____ days","7", "30" , "All")
-
- if(age == "All")
- age = 9999999
- else
- age = text2num(age)
-
- var/missing_ages = 0
- var/msg = ""
-
- var/highlight_special_characters = 1
- if(is_eventM(usr.client))
- highlight_special_characters = 0
-
- for(var/client/C in clients)
- if(C.player_age == "Requires database")
- missing_ages = 1
- continue
- if(C.player_age < age)
- msg += "[key_name(C, 1, 1, highlight_special_characters)]: account is [C.player_age] days old
"
-
- if(missing_ages)
- src << "Some accounts did not have proper ages set in their clients. This function requires database to be present"
-
- if(msg != "")
- src << browse(msg, "window=Player_age_check")
- else
- src << "No matches for that age range found."
-
-
/client/proc/cmd_admin_world_narrate() // Allows administrators to fluff events a little easier -- TLE
set category = "Special Verbs"
set name = "Global Narrate"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 83bf724607..a84ef1d770 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -310,19 +310,18 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!client)
return
- var/mentor = is_eventM(usr.client)
- if(!config.antag_hud_allowed && (!client.holder || mentor))
+ if(!config.antag_hud_allowed && !client.holder)
src << "Admins have disabled this for this round."
return
var/mob/observer/dead/M = src
if(jobban_isbanned(M, "AntagHUD"))
src << "You have been banned from using this feature"
return
- if(config.antag_hud_restricted && !M.has_enabled_antagHUD && (!client.holder || mentor))
+ if(config.antag_hud_restricted && !M.has_enabled_antagHUD && !client.holder)
var/response = alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?","Yes","No")
if(response == "No") return
M.can_reenter_corpse = 0
- if(!M.has_enabled_antagHUD && (!client.holder || mentor))
+ if(!M.has_enabled_antagHUD && !client.holder)
M.has_enabled_antagHUD = 1
if(M.antagHUD)
M.antagHUD = 0
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 56104d34f4..b7fdd7714d 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -400,7 +400,7 @@ proc/is_blind(A)
return // Can't talk in deadchat if you can't see it.
for(var/mob/M in player_list)
- if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || (M.client.holder && !is_eventM(M.client))) && M.is_preference_enabled(/datum/client_preference/show_dsay))
+ if(M.client && (!istype(M, /mob/new_player) && M.stat == DEAD) && M.is_preference_enabled(/datum/client_preference/show_dsay))
var/follow
var/lname
if(M.forbid_seeing_deadchat && !M.client.holder)