diff --git a/code/__defines/admin.dm b/code/__defines/admin.dm index 1e64ed8a1b..5f9ada5e98 100644 --- a/code/__defines/admin.dm +++ b/code/__defines/admin.dm @@ -36,7 +36,7 @@ #define R_SOUNDS 0x800 #define R_SPAWN 0x1000 #define R_MOD 0x2000 -#define R_MENTOR 0x4000 +#define R_EVENT 0x4000 #define R_HOST 0x8000 //higher than this will overflow #define R_MAXPERMISSION 0x8000 // This holds the maximum value for a permission. It is used in iteration, so keep it updated. \ No newline at end of file diff --git a/code/_helpers/type2type.dm b/code/_helpers/type2type.dm index 975e65e3ec..c330faefdf 100644 --- a/code/_helpers/type2type.dm +++ b/code/_helpers/type2type.dm @@ -148,7 +148,7 @@ if (rights & R_SOUNDS) . += "[seperator]+SOUND" if (rights & R_SPAWN) . += "[seperator]+SPAWN" if (rights & R_MOD) . += "[seperator]+MODERATOR" - if (rights & R_MENTOR) . += "[seperator]+MENTOR" + if (rights & R_EVENT) . += "[seperator]+EVENT" return . // Converts a hexadecimal color (e.g. #FF0050) to a list of numbers for red, green, and blue (e.g. list(255,0,80) ). diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index b985c5680b..b80652d6d6 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -67,7 +67,7 @@ var/list/gamemode_cache = list() var/kick_inactive = 0 //force disconnect for inactive players after this many minutes, if non-0 var/show_mods = 0 var/show_devs = 0 - var/show_mentors = 0 + var/show_event_managers = 0 var/mods_can_tempban = 0 var/mods_can_job_tempban = 0 var/mod_tempban_max = 1440 @@ -511,8 +511,8 @@ var/list/gamemode_cache = list() if("show_devs") config.show_devs = 1 - if("show_mentors") - config.show_mentors = 1 + if("show_event_managers") + config.show_event_managers = 1 if("mods_can_tempban") config.mods_can_tempban = 1 diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 8b50dfb095..339d9a709b 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -70,16 +70,16 @@ var/msg = "" var/modmsg = "" var/devmsg = "" - var/mentmsg = "" + var/eventMmsg = "" var/num_mods_online = 0 var/num_admins_online = 0 var/num_devs_online = 0 - var/num_mentors_online = 0 + var/num_event_managers_online = 0 if(holder) for(var/client/C in admins) - if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights && !R_MENTOR & C.holder.rights)) //Used to determine who shows up in admin rows + if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights && !R_EVENT & C.holder.rights)) //Used to determine who shows up in admin rows - if(C.holder.fakekey && (!R_ADMIN & holder.rights && !R_MOD & holder.rights)) //Mentors can't see stealthmins + if(C.holder.fakekey && (!R_ADMIN & holder.rights && !R_MOD & holder.rights)) //Event Managers can't see stealthmins continue msg += "\t[C] is a [C.holder.rank]" @@ -102,7 +102,7 @@ msg += "\n" num_admins_online++ - else if(R_MOD & C.holder.rights) //Who shows up in mod/mentor rows. + else if(R_MOD & C.holder.rights) //Who shows up in mod/event rows. modmsg += "\t[C] is a [C.holder.rank]" if(isobserver(C.mob)) @@ -137,26 +137,26 @@ devmsg += "\n" num_devs_online++ - else if(R_MENTOR & C.holder.rights) - mentmsg += "\t[C] is a [C.holder.rank]" + else if(R_EVENT & C.holder.rights) + eventMmsg += "\t[C] is a [C.holder.rank]" if(isobserver(C.mob)) - mentmsg += " - Observing" + eventMmsg += " - Observing" else if(istype(C.mob,/mob/new_player)) - mentmsg += " - Lobby" + eventMmsg += " - Lobby" else - mentmsg += " - Playing" + eventMmsg += " - Playing" if(C.is_afk()) var/seconds = C.last_activity_seconds() - mentmsg += " (AFK - " - mentmsg += "[round(seconds / 60)] minutes, " - mentmsg += "[seconds % 60] seconds)" - mentmsg += "\n" - num_mentors_online++ + eventMmsg += " (AFK - " + eventMmsg += "[round(seconds / 60)] minutes, " + eventMmsg += "[seconds % 60] seconds)" + eventMmsg += "\n" + num_event_managers_online++ else for(var/client/C in admins) - if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights && !R_MENTOR & C.holder.rights)) + if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights && !R_EVENT & C.holder.rights)) if(!C.holder.fakekey) msg += "\t[C] is a [C.holder.rank]\n" num_admins_online++ @@ -166,9 +166,9 @@ else if (R_SERVER & C.holder.rights) devmsg += "\t[C] is a [C.holder.rank]\n" num_devs_online++ - else if (R_MENTOR & C.holder.rights) - mentmsg += "\t[C] is a [C.holder.rank]\n" - num_mentors_online++ + else if (R_EVENT & C.holder.rights) + eventMmsg += "\t[C] is a [C.holder.rank]\n" + num_event_managers_online++ if(config.admin_irc) src << "Adminhelps are also sent to IRC. If no admins are available in game try anyway and an admin on IRC may see it and respond." @@ -180,7 +180,7 @@ if(config.show_devs) msg += "\n Current Developers ([num_devs_online]):\n" + devmsg - if(config.show_mentors) - msg += "\n Current Mentors ([num_mentors_online]):\n" + mentmsg + if(config.show_event_managers) + msg += "\n Current Event Managers ([num_event_managers_online]):\n" + eventMmsg src << msg diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 9e4a5a6344..e5d533ace6 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1225,16 +1225,16 @@ proc/admin_notice(var/message, var/rights) /* - helper proc to test if someone is a mentor or not. Got tired of writing this same check all over the place. + helper proc to test if someone is a event manager or not. Got tired of writing this same check all over the place. */ -/proc/is_mentor(client/C) +/proc/is_event_manager(client/C) if(!istype(C)) return 0 if(!C.holder) return 0 - if(C.holder.rights == R_MENTOR) + if(C.holder.rights == R_EVENT) return 1 return 0 @@ -1266,7 +1266,7 @@ proc/admin_notice(var/message, var/rights) var/ref_mob = "\ref[M]" return "[key_name(C, link, name, highlight_special)](VV)([admin_jump_link(M, src)]) (TAKE)" - if(4) //Mentors + if(4) //Event Managers var/ref_mob = "\ref[M]" return "[key_name(C, link, name, highlight_special)] (?) (PP) (VV) (SM) ([admin_jump_link(M, src)]) (TAKE)" diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 3652237454..12c00aa708 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -37,11 +37,11 @@ var/list/admin_ranks = list() //list of all ranks with associated rights if("stealth") rights |= R_STEALTH if("rejuv","rejuvinate") rights |= R_REJUVINATE if("varedit") rights |= R_VAREDIT - if("everything","host","all") rights |= (R_HOST | R_BUILDMODE | R_ADMIN | R_BAN | R_FUN | R_SERVER | R_DEBUG | R_PERMISSIONS | R_POSSESS | R_STEALTH | R_REJUVINATE | R_VAREDIT | R_SOUNDS | R_SPAWN | R_MOD| R_MENTOR) + if("everything","host","all") rights |= (R_HOST | R_BUILDMODE | R_ADMIN | R_BAN | R_FUN | R_SERVER | R_DEBUG | R_PERMISSIONS | R_POSSESS | R_STEALTH | R_REJUVINATE | R_VAREDIT | R_SOUNDS | R_SPAWN | R_MOD| R_EVENT) if("sound","sounds") rights |= R_SOUNDS if("spawn","create") rights |= R_SPAWN if("mod") rights |= R_MOD - if("mentor") rights |= R_MENTOR + if("event") rights |= R_EVENT admin_ranks[rank] = rights previous_rights = rights diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index bb2768d69d..ebf7a5f619 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -8,7 +8,7 @@ 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_mentor_check_new_players, + /client/proc/cmd_event_manager_check_new_players, // /client/proc/deadchat //toggles deadchat on/off, // /client/proc/toggle_ahelp_sound, ) @@ -186,7 +186,7 @@ var/list/admin_verbs_debug = list( /client/proc/cmd_debug_tog_aliens, /client/proc/air_report, /client/proc/reload_admins, - /client/proc/reload_mentors, + /client/proc/reload_event_managers, /client/proc/restart_controller, /datum/admins/proc/restart, /client/proc/print_random_map, @@ -331,15 +331,65 @@ var/list/admin_verbs_mod = list( ) -var/list/admin_verbs_mentor = list( +var/list/admin_verbs_event_manager = list( /client/proc/cmd_admin_pm_context, /client/proc/cmd_admin_pm_panel, /datum/admins/proc/PlayerNotes, /client/proc/admin_ghost, - /client/proc/cmd_mod_say, + /client/proc/cmd_event_say, /datum/admins/proc/show_player_info, -// /client/proc/dsay, - /client/proc/cmd_admin_subtle_message + /client/proc/dsay, + /client/proc/cmd_admin_subtle_message, + /datum/admins/proc/change_weather, + /datum/admins/proc/change_time, + /client/proc/admin_give_modifier, + /datum/admins/proc/announce, //priority announce something to all clients., + /datum/admins/proc/intercom, //send a fake intercom message, like an arrivals announcement, + /client/proc/admin_ghost, + /client/proc/check_antagonists, + /client/proc/aooc, + /client/proc/cmd_admin_subtle_message, //send an message to somebody as a 'voice in their head', + /datum/admins/proc/paralyze_mob, + /client/proc/cmd_admin_direct_narrate, + /client/proc/allow_character_respawn, // Allows a ghost to respawn , + /datum/admins/proc/sendFax, + /client/proc/roll_dices, + /proc/possess, + /proc/release, + /datum/admins/proc/set_tcrystals, + /datum/admins/proc/access_news_network, + /client/proc/admin_call_shuttle, + /client/proc/admin_cancel_shuttle, + /client/proc/cmd_admin_world_narrate, + /client/proc/check_words, + /client/proc/play_local_sound, + /client/proc/play_sound, + /client/proc/play_server_sound, + /client/proc/object_talk, + /client/proc/cmd_admin_dress, + /client/proc/cmd_admin_gib_self, + /client/proc/drop_bomb, + /client/proc/cinematic, + /client/proc/respawn_character, + /client/proc/cmd_admin_delete, //delete an instance/object/mob/etc, + /client/proc/cmd_debug_del_all, + /datum/admins/proc/delay, + /datum/admins/proc/spawn_fruit, + /datum/admins/proc/spawn_custom_item, + /datum/admins/proc/check_custom_items, + /datum/admins/proc/spawn_plant, + /datum/admins/proc/spawn_atom, //allows us to spawn instances, + /client/proc/respawn_character, + /client/proc/virus2_editor, + /client/proc/spawn_chemdisp_cartridge, + /client/proc/map_template_load, + /client/proc/map_template_upload, + /client/proc/map_template_load_on_new_z, + /client/proc/check_words, //displays cult-words, + /client/proc/check_ai_laws, //shows AI and borg laws, + /client/proc/rename_silicon, //properly renames silicons, + /client/proc/manage_silicon_laws, // Allows viewing and editing silicon laws. , + /client/proc/check_antagonists, ) /client/proc/add_admin_verbs() @@ -361,7 +411,7 @@ var/list/admin_verbs_mentor = list( if(holder.rights & R_SOUNDS) verbs += admin_verbs_sounds if(holder.rights & R_SPAWN) verbs += admin_verbs_spawn if(holder.rights & R_MOD) verbs += admin_verbs_mod - if(holder.rights & R_MENTOR) verbs += admin_verbs_mentor + if(holder.rights & R_EVENT) verbs += admin_verbs_event_manager /client/proc/remove_admin_verbs() verbs.Remove( @@ -424,13 +474,8 @@ var/list/admin_verbs_mentor = list( if(istype(mob,/mob/observer/dead)) //re-enter var/mob/observer/dead/ghost = mob - if(!is_mentor(usr.client)) - ghost.can_reenter_corpse = 1 if(ghost.can_reenter_corpse) ghost.reenter_corpse() - else - ghost << "Error: Aghost: Can't reenter corpse, mentors that use adminHUD while aghosting are not permitted to enter their corpse again" - 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 ece5f068d7..0338b8c612 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -367,7 +367,7 @@ if(usr.client) var/client/C = usr.client - if(is_mentor(C)) + if(is_event_manager(C)) dat += {" N/A "} else switch(is_special_character(M)) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 350bfe9a24..8000ae245a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1194,7 +1194,7 @@ show_player_panel(M) else if(href_list["adminplayerobservejump"]) - if(!check_rights(R_MENTOR|R_MOD|R_ADMIN|R_SERVER)) return + if(!check_rights(R_EVENT|R_MOD|R_ADMIN|R_SERVER)) return var/mob/M = locate(href_list["adminplayerobservejump"]) @@ -1204,7 +1204,7 @@ C.jumptomob(M) else if(href_list["adminplayerobservefollow"]) - if(!check_rights(R_MENTOR|R_MOD|R_ADMIN|R_SERVER)) + if(!check_rights(R_EVENT|R_MOD|R_ADMIN|R_SERVER)) return var/mob/M = locate(href_list["adminplayerobservefollow"]) @@ -1224,7 +1224,7 @@ if(ismob(M)) var/take_msg = "ADMINHELP: [key_name(usr.client)] is attending to [key_name(M)]'s adminhelp, please don't dogpile them." for(var/client/X in admins) - if((R_ADMIN|R_MOD|R_MENTOR) & X.holder.rights) + if((R_ADMIN|R_MOD|R_EVENT) & X.holder.rights) to_chat(X, take_msg) to_chat(M, "Your adminhelp is being attended to by [usr.client]. Thanks for your patience!") else diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 5f3206b6df..32937599c2 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -88,22 +88,19 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," if(ai_found) ai_cl = " (CL)" - //Options bar: mob, details ( admin = 2, dev = 3, mentor = 4, character name (0 = just ckey, 1 = ckey and character name), link? (0 no don't make it a link, 1 do so), + //Options bar: mob, details ( admin = 2, dev = 3, event manager = 4, character name (0 = just ckey, 1 = ckey and character name), link? (0 no don't make it a link, 1 do so), // highlight special roles (0 = everyone has same looking name, 1 = antags / special roles get a golden name) - var/mentor_msg = "Request for Help: [get_options_bar(mob, 4, 1, 1, 0)][ai_cl]: [msg]" msg = "Request for Help: [get_options_bar(mob, 2, 1, 1)][ai_cl] [msg]" var/admin_number_afk = 0 for(var/client/X in admins) - if((R_ADMIN|R_MOD|R_MENTOR|R_SERVER) & X.holder.rights) + if((R_ADMIN|R_MOD|R_EVENT|R_SERVER) & X.holder.rights) if(X.is_afk()) admin_number_afk++ if(X.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping)) X << 'sound/effects/adminhelp.ogg' - if(X.holder.rights == R_MENTOR) - X << mentor_msg // Mentors won't see coloring of names on people with special_roles (Antags, etc.) else X << msg @@ -117,5 +114,4 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," else send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)]") feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - + return \ No newline at end of file diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index e57720bb62..1ff2f6531b 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -8,7 +8,7 @@ set name = "Jump to Area" set desc = "Area to jump to" set category = "Admin" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_DEBUG)) return if(config.allow_admin_jump) @@ -24,7 +24,7 @@ /client/proc/jumptoturf(var/turf/T in world) set name = "Jump to Turf" set category = "Admin" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_DEBUG)) return if(config.allow_admin_jump) log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]") @@ -40,7 +40,7 @@ set category = "Admin" set name = "Jump to Mob" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_DEBUG)) return if(config.allow_admin_jump) @@ -62,7 +62,7 @@ set category = "Admin" set name = "Jump to Coordinate" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_DEBUG)) return if (config.allow_admin_jump) @@ -82,7 +82,7 @@ set category = "Admin" set name = "Jump to Key" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_DEBUG)) return if(config.allow_admin_jump) @@ -106,7 +106,7 @@ set category = "Admin" set name = "Get Mob" set desc = "Mob to teleport" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_DEBUG)) return if(config.allow_admin_jump) log_admin("[key_name(usr)] teleported [key_name(M)]") @@ -122,7 +122,7 @@ set name = "Get Key" set desc = "Key to teleport" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_DEBUG)) return if(config.allow_admin_jump) @@ -148,7 +148,7 @@ /client/proc/sendmob(var/mob/M in sortmobs()) set category = "Admin" set name = "Send Mob" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_DEBUG)) return var/area/A = input(usr, "Pick an area.", "Pick an area") in return_sorted_areas() if(A) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index bcb87f06d8..6f8163eef6 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -112,7 +112,7 @@ //check client/X is an admin and isn't the sender or recipient if(X == C || X == src) continue - if(X.key != key && X.key != C.key && (X.holder.rights & R_ADMIN|R_MOD|R_MENTOR)) + if(X.key != key && X.key != C.key && (X.holder.rights & R_ADMIN|R_MOD|R_EVENT)) X << "" + create_text_tag("pm_other", "PM:", X) + " [key_name(src, X, 0)] to [key_name(C, X, 0)]: [msg]" /client/proc/cmd_admin_irc_pm(sender) @@ -141,5 +141,5 @@ for(var/client/X in admins) if(X == src) continue - if(X.holder.rights & R_ADMIN|R_MOD) + if(X.holder.rights & R_ADMIN|R_MOD|R_EVENT) X << "" + create_text_tag("pm_other", "PM:", X) + " [key_name(src, X, 0)] to IRC-[sender]: [msg]" diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index b4e60fbd62..63209f84b4 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -23,7 +23,7 @@ set name = "Msay" set hidden = 1 - if(!check_rights(R_ADMIN|R_MOD|R_MENTOR|R_SERVER)) + if(!check_rights(R_ADMIN|R_MOD|R_SERVER)) return msg = sanitize(msg) @@ -45,7 +45,7 @@ set name = "Esay" set hidden = 1 - if(!check_rights(R_ADMIN|R_MOD|R_MENTOR|R_SERVER)) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_SERVER)) return msg = sanitize(msg) diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index b416cb661a..3266b966d3 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -108,13 +108,13 @@ load_admins() feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/reload_mentors() - set name = "Reload Mentors" +/client/proc/reload_event_managers() + set name = "Reload Event Managers" set category = "Debug" if(!check_rights(R_SERVER)) return - message_admins("[usr] manually reloaded Mentors") + message_admins("[usr] manually reloaded Event Managers") world.load_mods() diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index fcf4a5db0c..6ada0db899 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -65,7 +65,7 @@ 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_mentor_check_new_players() //Allows mentors / admins to determine who the newer players are. +/client/proc/cmd_event_manager_check_new_players() //Allows event managers / admins to determine who the newer players are. set category = "Admin" set name = "Check new Players" if(!holder) @@ -82,7 +82,7 @@ var/msg = "" var/highlight_special_characters = 1 - if(is_mentor(usr.client)) + if(is_event_manager(usr.client)) highlight_special_characters = 0 for(var/client/C in clients) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 64893a973b..f298537153 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -310,19 +310,19 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!client) return - var/mentor = is_mentor(usr.client) - if(!config.antag_hud_allowed && (!client.holder || mentor)) + var/event_manager = is_event_manager(usr.client) + if(!config.antag_hud_allowed && (!client.holder || event_manager)) 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 || event_manager)) 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 || event_manager)) 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 0d4b3ad085..f169ddb8fd 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_mentor(M.client))) && M.is_preference_enabled(/datum/client_preference/show_dsay)) + if(M.client && ((!istype(M, /mob/new_player) && M.stat == DEAD) || (M.client.holder && !is_event_manager(M.client))) && M.is_preference_enabled(/datum/client_preference/show_dsay)) var/follow var/lname if(M.forbid_seeing_deadchat && !M.client.holder) diff --git a/code/world.dm b/code/world.dm index d9d2c8564b..b7c99689e7 100644 --- a/code/world.dm +++ b/code/world.dm @@ -479,7 +479,7 @@ var/world_topic_spam_protect_time = world.timeofday /hook/startup/proc/loadMods() world.load_mods() - world.load_mentors() // no need to write another hook. + world.load_event_managers() // no need to write another hook. return 1 /world/proc/load_mods() @@ -503,11 +503,11 @@ var/world_topic_spam_protect_time = world.timeofday var/datum/admins/D = new /datum/admins(title, rights, ckey) D.associate(directory[ckey]) -/world/proc/load_mentors() +/world/proc/load_event_managers() if(config.admin_legacy_system) - var/text = file2text("config/mentors.txt") + var/text = file2text("config/event_managers.txt") if (!text) - error("Failed to load config/mentors.txt") + error("Failed to load config/event_managers.txt") else var/list/lines = splittext(text, "\n") for(var/line in lines) @@ -516,7 +516,7 @@ var/world_topic_spam_protect_time = world.timeofday if (copytext(line, 1, 2) == ";") continue - var/title = "Mentor" + var/title = "Event Manager" var/rights = admin_ranks[title] var/ckey = copytext(line, 1, length(line)+1) diff --git a/config/example/admin_ranks.txt b/config/example/admin_ranks.txt index e02a56df04..69696db5df 100644 --- a/config/example/admin_ranks.txt +++ b/config/example/admin_ranks.txt @@ -29,7 +29,7 @@ Admin Observer Moderator +MOD -Mentor +MENTOR +Event Manager +ADMIN +EVENT +SPAWN +REJUV +VAREDIT +POSSESS +BUILDMODE +FUN +SOUNDS Admin Candidate +ADMIN Trial Admin +@ +SPAWN +REJUV +VAREDIT +BAN @@ -43,3 +43,4 @@ Host +EVERYTHING Developer +DEBUG +VAREDIT +SERVER +SPAWN +REJUV +POSSESS +BUILDMODE Dev Mod +@ +MOD +Dev Min +@ +ADMIN \ No newline at end of file