From cad5ef12e7f4011b3944d94351f6e263708309c8 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Wed, 18 Oct 2017 20:00:01 -0500 Subject: [PATCH] Does work on the event manager role again --- code/__defines/admin.dm | 2 +- code/_helpers/type2type.dm | 2 +- code/controllers/configuration.dm | 6 +-- code/game/verbs/who.dm | 42 ++++++++--------- code/modules/admin/admin.dm | 10 ++-- code/modules/admin/admin_ranks.dm | 4 +- code/modules/admin/admin_verbs.dm | 54 +++++++++++++++++----- code/modules/admin/player_panel.dm | 2 +- code/modules/admin/topic.dm | 12 ++--- code/modules/admin/verbs/adminhelp.dm | 11 ++--- code/modules/admin/verbs/adminpm.dm | 2 +- code/modules/admin/verbs/adminsay.dm | 4 +- code/modules/admin/verbs/diagnostics.dm | 6 +-- code/modules/admin/verbs/randomverbs.dm | 18 ++++---- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/mob_helpers.dm | 2 +- config/example/config.txt | 2 +- 17 files changed, 105 insertions(+), 76 deletions(-) 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..0316e1d186 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..06402a90a4 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 Managerss 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 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..121e355d22 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -860,7 +860,7 @@ proc/admin_notice(var/message, var/rights) set desc="Delay the game start/end" set name="Delay" - if(!check_rights(R_SERVER)) return + if(!check_rights(R_SERVER|R_EVENT)) return if (!ticker || ticker.current_state != GAME_STATE_PREGAME) ticker.delay_end = !ticker.delay_end log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].") @@ -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 an event manager or not. Got tired of writing this same check all over the place. */ -/proc/is_mentor(client/C) +/proc/is_eventM(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 761193eb33..2503c73abb 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_eventM_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_eventMs, /client/proc/restart_controller, /datum/admins/proc/restart, /client/proc/print_random_map, @@ -327,19 +327,53 @@ var/list/admin_verbs_mod = list( /client/proc/getserverlog, //allows us to fetch server logs (diary) for other days, /datum/admins/proc/view_txt_log, //shows the server log (diary) for today, /datum/admins/proc/view_atk_log //shows the server combat-log, doesn't do anything presently, - - ) -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, /datum/admins/proc/show_player_info, -// /client/proc/dsay, - /client/proc/cmd_admin_subtle_message + /client/proc/dsay, + /client/proc/cmd_admin_subtle_message, + /client/proc/debug_variables, + /client/proc/check_antagonists, + /client/proc/aooc, + /datum/admins/proc/paralyze_mob, + /client/proc/cmd_admin_direct_narrate, + /client/proc/allow_character_respawn, + /datum/admins/proc/sendFax, + /client/proc/respawn_character, + /proc/possess, + /proc/release, + /client/proc/callproc, + /client/proc/callproc_target, + /client/proc/debug_controller, + /client/proc/show_gm_status, + /datum/admins/proc/change_weather, + /datum/admins/proc/change_time, + /client/proc/admin_give_modifier, + /client/proc/Jump, + /client/proc/jumptomob, + /client/proc/jumptocoord, + /client/proc/cmd_admin_delete, + /datum/admins/proc/delay, + /client/proc/Set_Holiday, + /client/proc/make_sound, + /client/proc/toggle_random_events, + /datum/admins/proc/cmd_admin_dress, + /client/proc/cmd_admin_gib_self, + /client/proc/drop_bomb, + /client/proc/cmd_admin_add_freeform_ai_law, + /client/proc/cmd_admin_add_random_ai_law, + /client/proc/make_sound, + /client/proc/toggle_random_events, + /client/proc/editappear, + /client/proc/roll_dices, + /datum/admins/proc/call_supply_drop, + /datum/admins/proc/call_drop_pod ) /client/proc/add_admin_verbs() @@ -361,7 +395,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,12 +458,10 @@ 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" + ghost << "Error: Aghost: Can't reenter corpse, event managers 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..1531790268 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_eventM(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..71069be22e 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -237,7 +237,7 @@ href_list["secretsadmin"] = "check_antagonist" else if(href_list["delay_round_end"]) - if(!check_rights(R_SERVER)) return + if(!check_rights(R_SERVER|R_EVENT)) return ticker.delay_end = !ticker.delay_end log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].") @@ -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|R_EVENT)) 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|R_EVENT)) return var/mob/M = locate(href_list["adminplayerobservefollow"]) @@ -1224,14 +1224,14 @@ 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 to_chat(usr, "Unable to locate mob.") else if(href_list["adminplayerobservecoodjump"]) - if(!check_rights(R_ADMIN|R_SERVER|R_MOD)) return + if(!check_rights(R_ADMIN|R_SERVER|R_MOD|R_EVENT)) return var/x = text2num(href_list["X"]) var/y = text2num(href_list["Y"]) @@ -1843,7 +1843,7 @@ vsc.SetDefault(usr) else if(href_list["toglang"]) - if(check_rights(R_SPAWN)) + if(check_rights(R_SPAWN|R_EVENT)) var/mob/M = locate(href_list["toglang"]) if(!istype(M)) usr << "[M] is illegal type, must be /mob!" diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 5f3206b6df..65fae5b528 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -88,24 +88,21 @@ 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 + if(X.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping)) + X << 'sound/effects/adminhelp.ogg' //show it to the person adminhelping too src << "PM to-Staff : [original_msg]" diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index bcb87f06d8..dcaa745485 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) 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 b78b473e65..595675ea80 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_eventMs() + 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..c14c74edd1 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_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) @@ -82,7 +82,7 @@ var/msg = "" var/highlight_special_characters = 1 - if(is_mentor(usr.client)) + if(is_eventM(usr.client)) highlight_special_characters = 0 for(var/client/C in clients) @@ -610,7 +610,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Special Verbs" set name = "Explosion" - if(!check_rights(R_DEBUG|R_FUN)) return + if(!check_rights(R_DEBUG|R_FUN|R_EVENT)) return var/devastation = input("Range of total devastation. -1 to none", text("Input")) as num|null if(devastation == null) return @@ -638,7 +638,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Special Verbs" set name = "EM Pulse" - if(!check_rights(R_DEBUG|R_FUN)) return + if(!check_rights(R_DEBUG|R_FUN|R_EVENT)) return var/heavy = input("Range of heavy pulse.", text("Input")) as num|null if(heavy == null) return @@ -664,7 +664,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Special Verbs" set name = "Gib" - if(!check_rights(R_ADMIN|R_FUN)) return + if(!check_rights(R_ADMIN|R_FUN|R_EVENT)) return var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No") if(confirm != "Yes") return @@ -820,7 +820,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if ((!( ticker ) || !emergency_shuttle.location())) return - if(!check_rights(R_ADMIN)) return + if(!check_rights(R_ADMIN|R_EVENT)) return var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No") if(confirm != "Yes") return @@ -849,7 +849,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Admin" set name = "Cancel Shuttle" - if(!check_rights(R_ADMIN)) return + if(!check_rights(R_ADMIN|R_EVENT)) return if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes") return @@ -870,7 +870,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if (!ticker) return - if(!check_rights(R_ADMIN)) return + if(!check_rights(R_ADMIN|R_EVENT)) return emergency_shuttle.deny_shuttle = !emergency_shuttle.deny_shuttle @@ -926,7 +926,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set name = "Toggle random events on/off" set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off" - if(!check_rights(R_SERVER)) return + if(!check_rights(R_SERVER|R_EVENT)) return if(!config.allow_random_events) config.allow_random_events = 1 diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 64893a973b..83bf724607 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -310,7 +310,7 @@ 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) + var/mentor = is_eventM(usr.client) if(!config.antag_hud_allowed && (!client.holder || mentor)) src << "Admins have disabled this for this round." return diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 0d4b3ad085..56104d34f4 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_eventM(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/config/example/config.txt b/config/example/config.txt index 52892bc14a..74a80dc88e 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -93,7 +93,7 @@ SHOW_DEVS SHOW_MODS ##Show mentors on staffwho -SHOW_MENTORS +SHOW_EVENT ## Chooses whether mods have the ability to tempban or not MODS_CAN_TEMPBAN