diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 740b38ec3ce..e114ec25730 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -317,7 +317,7 @@ proc/tg_text2list(text, glue=",", assocglue=";") if(rights & R_BUILDMODE) . += "[seperator]+BUILDMODE" if(rights & R_ADMIN) . += "[seperator]+ADMIN" if(rights & R_BAN) . += "[seperator]+BAN" - if(rights & R_FUN) . += "[seperator]+FUN" + if(rights & R_EVENT) . += "[seperator]+EVENT" if(rights & R_SERVER) . += "[seperator]+SERVER" if(rights & R_DEBUG) . += "[seperator]+DEBUG" if(rights & R_POSSESS) . += "[seperator]+POSSESS" @@ -328,7 +328,6 @@ proc/tg_text2list(text, glue=",", assocglue=";") if(rights & R_SOUNDS) . += "[seperator]+SOUND" if(rights & R_SPAWN) . += "[seperator]+SPAWN" if(rights & R_MOD) . += "[seperator]+MODERATOR" - if(rights & R_MENTOR) . += "[seperator]+MENTOR" return . /proc/ui_style2icon(ui_style) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index e0080512806..4ee99ac3fdf 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -505,7 +505,7 @@ client href_list["datumrefresh"] = href_list["mob_player_panel"] else if(href_list["give_spell"]) - if(!check_rights(R_ADMIN|R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return var/mob/M = locate(href_list["give_spell"]) if(!istype(M)) @@ -516,7 +516,7 @@ client href_list["datumrefresh"] = href_list["give_spell"] else if(href_list["give_disease"]) - if(!check_rights(R_ADMIN|R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return var/mob/M = locate(href_list["give_disease"]) if(!istype(M)) @@ -525,9 +525,9 @@ client src.give_disease(M) href_list["datumrefresh"] = href_list["give_spell"] - + else if(href_list["give_disease2"]) - if(!check_rights(R_ADMIN|R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return var/mob/M = locate(href_list["give_disease2"]) if(!istype(M)) @@ -603,7 +603,7 @@ client usr.client.cmd_assume_direct_control(M) else if(href_list["make_skeleton"]) - if(!check_rights(R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return var/mob/living/carbon/human/H = locate(href_list["make_skeleton"]) if(!istype(H)) @@ -687,7 +687,7 @@ client message_admins("\blue [key_name(usr)] has added [amount] units of [chosen] to \the [A]") else if(href_list["explode"]) - if(!check_rights(R_DEBUG|R_FUN)) return + if(!check_rights(R_DEBUG|R_EVENT)) return var/atom/A = locate(href_list["explode"]) if(!isobj(A) && !ismob(A) && !isturf(A)) @@ -698,7 +698,7 @@ client href_list["datumrefresh"] = href_list["explode"] else if(href_list["emp"]) - if(!check_rights(R_DEBUG|R_FUN)) return + if(!check_rights(R_DEBUG|R_EVENT)) return var/atom/A = locate(href_list["emp"]) if(!isobj(A) && !ismob(A) && !isturf(A)) @@ -801,8 +801,8 @@ client usr << "Mob doesn't exist anymore" return holder.Topic(href, list("makeai"=href_list["makeai"])) - - + + else if(href_list["makemask"]) if(!check_rights(R_SPAWN)) return var/mob/currentMob = locate(href_list["makemask"]) @@ -811,8 +811,8 @@ client usr << "Mob doesn't exist anymore" return holder.Topic(href, list("makemask"=href_list["makemask"])) - - + + else if(href_list["setmutantrace"]) if(!check_rights(R_SPAWN)) return @@ -955,7 +955,7 @@ client M.regenerate_icons() else if(href_list["adjustDamage"] && href_list["mobToDamage"]) - if(!check_rights(R_DEBUG|R_ADMIN|R_FUN)) return + if(!check_rights(R_DEBUG|R_ADMIN|R_EVENT)) return var/mob/living/L = locate(href_list["mobToDamage"]) if(!istype(L)) return diff --git a/code/datums/mind.dm b/code/datums/mind.dm index f34d6eecab1..aad357b98cf 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -392,7 +392,7 @@ datum/mind crystals = suplink.uses if (suplink) text += "|take" - if (usr.client.holder.rights & R_FUN) + if (usr.client.holder.rights & (R_SERVER|R_EVENT)) text += ", [crystals] crystals" else text += ", [crystals] crystals" @@ -1059,7 +1059,7 @@ datum/mind take_uplink() memory = null//Remove any memory they may have had. if("crystals") - if (usr.client.holder.rights & R_FUN) + if (usr.client.holder.rights & (R_SERVER|R_EVENT)) var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink() var/crystals if (suplink) diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index 2cd06199bd8..56077a43dce 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -121,7 +121,7 @@ var/global/Holiday = null //Allows GA and GM to set the Holiday variable /client/proc/Set_Holiday(T as text|null) set name = ".Set Holiday" - set category = "Fun" + set category = "Event" set desc = "Force-set the Holiday variable to make the game think it's a certain day." if(!check_rights(R_SERVER)) return diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm index 011c6c95fdb..2aa28fadd24 100644 --- a/code/game/gamemodes/events/space_ninja.dm +++ b/code/game/gamemodes/events/space_ninja.dm @@ -465,7 +465,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. //=======//CURRENT GHOST VERB//=======// /client/proc/send_space_ninja() - set category = "Fun" + set category = "Event" set name = "Spawn Space Ninja" set desc = "Spawns a space ninja for when you need a teenager with attitude." set popup_menu = 0 diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index e17dbc023fa..b37ac32777d 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -82,7 +82,7 @@ var/global/normal_ooc_colour = "#002eb8" /client/proc/set_ooc(newColor as color) set name = "Set Player OOC Colour" set desc = "Set to yellow for eye burning goodness." - set category = "Fun" + set category = "Server" normal_ooc_colour = newColor diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index d0a441bc338..f5d5998e24a 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -53,7 +53,7 @@ var/num_admins_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)) + if(R_ADMIN & C.holder.rights || !R_MOD & C.holder.rights) if(C.holder.fakekey && !R_ADMIN & holder.rights) //Mentors/Mods can't see stealthmins continue @@ -77,7 +77,7 @@ num_admins_online++ - else if(R_MOD & C.holder.rights || R_MENTOR & C.holder.rights) + else if(R_MOD & C.holder.rights) modmsg += "\t[C] is a [C.holder.rank]" if(isobserver(C.mob)) @@ -94,11 +94,11 @@ 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) if(!C.holder.fakekey) msg += "\t[C] is a [C.holder.rank]\n" num_admins_online++ - else if (R_MOD & C.holder.rights || R_MENTOR & C.holder.rights) + else if (R_MOD & C.holder.rights) modmsg += "\t[C] is a [C.holder.rank]\n" num_mods_online++ diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 9bc6131d5d6..b08e561eb4d 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -293,7 +293,7 @@ var/global/nologevent = 0 /datum/admins/proc/access_news_network() //MARKER - set category = "Fun" + set category = "Event" set name = "Access Newscaster Network" set desc = "Allows you to view, add and edit news feeds." diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index a0815cc338b..3ab8525d342 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -29,7 +29,7 @@ var/list/admin_ranks = list() //list of all ranks with associated rights if("buildmode","build") rights |= R_BUILDMODE if("admin") rights |= R_ADMIN if("ban") rights |= R_BAN - if("fun") rights |= R_FUN + if("event") rights |= R_EVENT if("server") rights |= R_SERVER if("debug") rights |= R_DEBUG if("permissions","rights") rights |= R_PERMISSIONS @@ -41,7 +41,6 @@ var/list/admin_ranks = list() //list of all ranks with associated rights if("sound","sounds") rights |= R_SOUNDS if("spawn","create") rights |= R_SPAWN if("mod") rights |= R_MOD - if("mentor") rights |= R_MENTOR admin_ranks[rank] = rights previous_rights = rights diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ae748e7d078..a9be94daf03 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -28,7 +28,6 @@ var/list/admin_verbs_admin = list( /client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/ /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ - /datum/admins/proc/access_news_network, /*allows access of newscasters*/ /client/proc/giveruntimelog, /*allows us to give access to runtime logs to somebody*/ /client/proc/getruntimelog, /*allows us to access runtime logs to somebody*/ /client/proc/getserverlog, /*allows us to fetch server logs (diary) for other days*/ @@ -41,8 +40,6 @@ var/list/admin_verbs_admin = list( /client/proc/jumptoturf, /*allows us to jump to a specific turf*/ /client/proc/admin_call_shuttle, /*allows us to call the emergency shuttle*/ /client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcomm*/ - /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ - /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ /client/proc/cmd_admin_create_centcom_report, /client/proc/check_words, /*displays cult-words*/ /client/proc/check_ai_laws, /*shows AI and borg laws*/ @@ -70,7 +67,6 @@ var/list/admin_verbs_admin = list( /client/proc/check_customitem_activity, /client/proc/man_up, /client/proc/global_man_up, - /client/proc/response_team, // Response Teams admin verb /client/proc/delbook ) var/list/admin_verbs_ban = list( @@ -81,7 +77,7 @@ var/list/admin_verbs_sounds = list( /client/proc/play_local_sound, /client/proc/play_sound ) -var/list/admin_verbs_fun = list( +var/list/admin_verbs_event = list( /client/proc/object_talk, /client/proc/cmd_admin_dress, /client/proc/cmd_admin_gib_self, @@ -95,10 +91,15 @@ var/list/admin_verbs_fun = list( /client/proc/cmd_admin_add_random_ai_law, /client/proc/make_sound, /client/proc/toggle_random_events, - /client/proc/set_ooc, /client/proc/editappear, + /client/proc/toggle_random_events, + /datum/admins/proc/access_news_network, /*allows access of newscasters*/ + /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ + /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ + /client/proc/response_team, // Response Teams admin verb /client/proc/gib_money // /vg/ ) + var/list/admin_verbs_spawn = list( /datum/admins/proc/spawn_atom, /*allows us to spawn instances*/ /client/proc/respawn_character @@ -118,11 +119,19 @@ var/list/admin_verbs_server = list( /client/proc/cmd_debug_del_all, /datum/admins/proc/toggle_aliens, /datum/admins/proc/toggle_space_ninja, - /client/proc/toggle_random_events, /client/proc/check_customitem_activity, /client/proc/delbook, /client/proc/toggle_antagHUD_use, - /client/proc/toggle_antagHUD_restrictions + /client/proc/toggle_antagHUD_restrictions, + /client/proc/set_ooc, + + //Doubling of certain event verbs for senior admins + /datum/admins/proc/access_news_network, /*allows access of newscasters*/ + /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ + /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ + /client/proc/toggle_random_events, + /client/proc/response_team // Response Teams admin verb + ) var/list/admin_verbs_debug = list( /client/proc/cmd_admin_list_open_jobs, @@ -239,24 +248,13 @@ var/list/admin_verbs_mod = list( ) -var/list/admin_verbs_mentor = 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/add_admin_verbs() if(holder) verbs += admin_verbs_default if(holder.rights & R_BUILDMODE) verbs += /client/proc/togglebuildmodeself if(holder.rights & R_ADMIN) verbs += admin_verbs_admin if(holder.rights & R_BAN) verbs += admin_verbs_ban - if(holder.rights & R_FUN) verbs += admin_verbs_fun + if(holder.rights & R_EVENT) verbs += admin_verbs_event if(holder.rights & R_SERVER) verbs += admin_verbs_server if(holder.rights & R_DEBUG) verbs += admin_verbs_debug if(holder.rights & R_POSSESS) verbs += admin_verbs_possess @@ -266,7 +264,6 @@ 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 /client/proc/remove_admin_verbs() verbs.Remove( @@ -274,7 +271,7 @@ var/list/admin_verbs_mentor = list( /client/proc/togglebuildmodeself, admin_verbs_admin, admin_verbs_ban, - admin_verbs_fun, + admin_verbs_event, admin_verbs_server, admin_verbs_debug, admin_verbs_possess, @@ -443,7 +440,7 @@ var/list/admin_verbs_mentor = list( return /client/proc/colorooc() - set category = "Fun" + set category = "Admin" set name = "OOC Text Color" if(!holder) return var/new_ooccolor = input(src, "Please select your OOC colour.", "OOC colour") as color|null @@ -538,7 +535,7 @@ var/list/admin_verbs_mentor = list( feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/give_spell(mob/T as mob in mob_list) // -- Urist - set category = "Fun" + set category = "Event" set name = "Give Spell" set desc = "Gives a spell to a mob." var/obj/effect/proc_holder/spell/S = input("Choose the spell to give to that guy", "ABRAKADABRA") as null|anything in spells @@ -549,7 +546,7 @@ var/list/admin_verbs_mentor = list( message_admins("\blue [key_name_admin(usr)] gave [key_name(T)] the spell [S].", 1) /client/proc/give_disease(mob/T as mob in mob_list) // -- Giacom - set category = "Fun" + set category = "Event" set name = "Give Disease (old)" set desc = "Gives a (tg-style) Disease to a mob." var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in diseases @@ -560,7 +557,7 @@ var/list/admin_verbs_mentor = list( message_admins("\blue [key_name_admin(usr)] gave [key_name(T)] the disease [D].", 1) /client/proc/give_disease2(mob/T as mob in mob_list) // -- Giacom - set category = "Fun" + set category = "Event" set name = "Give Disease" set desc = "Gives a Disease to a mob." @@ -692,9 +689,9 @@ var/list/admin_verbs_mentor = list( /client/proc/editappear(mob/living/carbon/human/M as mob in world) set name = "Edit Appearance" - set category = "Fun" + set category = "Event" - if(!check_rights(R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return if(!istype(M, /mob/living/carbon/human)) usr << "\red You can only do this to humans!" @@ -812,7 +809,7 @@ var/list/admin_verbs_mentor = list( /client/proc/man_up(mob/T as mob in mob_list) - set category = "Fun" + set category = "Admin" set name = "Man Up" set desc = "Tells mob to man up and deal with it." @@ -823,7 +820,7 @@ var/list/admin_verbs_mentor = list( message_admins("\blue [key_name_admin(usr)] told [key_name(T)] to man up and deal with it.", 1) /client/proc/global_man_up() - set category = "Fun" + set category = "Admin" set name = "Man Up Global" set desc = "Tells everyone to man up and deal with it." diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index e4fd42a4419..81070017d8f 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -61,7 +61,7 @@
"} if (1) - if(check_rights(R_FUN,0)) + if(check_rights((R_EVENT|R_SERVER),0)) dat += {" 'Random' Events

@@ -98,7 +98,7 @@ if (2) - if(check_rights(R_FUN,0)) + if(check_rights((R_SERVER|R_EVENT),0)) dat += {" Fun Secrets

diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index d91dab36c7a..a6270c10927 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1073,7 +1073,7 @@ H.corgize() else if(href_list["forcespeech"]) - if(!check_rights(R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return var/mob/M = locate(href_list["forcespeech"]) if(!ismob(M)) @@ -1132,7 +1132,7 @@ message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) else if(href_list["tdome1"]) - if(!check_rights(R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes") return @@ -1161,7 +1161,7 @@ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1) else if(href_list["tdome2"]) - if(!check_rights(R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes") return @@ -1190,7 +1190,7 @@ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1) else if(href_list["tdomeadmin"]) - if(!check_rights(R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes") return @@ -1212,7 +1212,7 @@ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1) else if(href_list["tdomeobserve"]) - if(!check_rights(R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes") return @@ -1245,7 +1245,7 @@ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1) else if(href_list["aroomwarp"]) - if(!check_rights(R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes") return @@ -1474,7 +1474,7 @@ src.owner << "(PM) (PP) (VV) (SM) (JMP) (CA)" else if(href_list["adminspawncookie"]) - if(!check_rights(R_ADMIN|R_FUN)) return + if(!check_rights(R_ADMIN|R_EVENT)) return var/mob/living/carbon/human/H = locate(href_list["adminspawncookie"]) if(!ishuman(H)) @@ -1498,7 +1498,7 @@ H << "\blue Your prayers have been answered!! You received the best cookie!" else if(href_list["BlueSpaceArtillery"]) - if(!check_rights(R_ADMIN|R_FUN)) return + if(!check_rights(R_ADMIN|R_EVENT)) return var/mob/living/M = locate(href_list["BlueSpaceArtillery"]) if(!isliving(M)) @@ -1712,15 +1712,15 @@ removed_paths += dirty_path continue else if(ispath(path, /obj/item/weapon/gun/energy/pulse_rifle)) - if(!check_rights(R_FUN,0)) + if(!check_rights((R_SERVER|R_EVENT),0)) removed_paths += dirty_path continue else if(ispath(path, /obj/item/weapon/melee/energy/blade))//Not an item one should be able to spawn./N - if(!check_rights(R_FUN,0)) + if(!check_rights((R_SERVER|R_EVENT),0)) removed_paths += dirty_path continue else if(ispath(path, /obj/effect/anomaly/bhole)) - if(!check_rights(R_FUN,0)) + if(!check_rights((R_SERVER|R_EVENT),0)) removed_paths += dirty_path continue paths += path @@ -1814,7 +1814,7 @@ return else if(href_list["secretsfun"]) - if(!check_rights(R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return var/ok = 0 switch(href_list["secretsfun"]) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 318bd1f5879..1ac8a686d54 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -198,7 +198,7 @@ if(X.key!=key && X.key!=C.key) switch(type) if("Question") - if(X.holder.rights & (R_MOD|R_MENTOR)) + if(X.holder.rights & R_MOD) X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" //inform X else if(!modholders.len && X.holder.rights & R_ADMIN) X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" //inform X @@ -211,7 +211,7 @@ else if(!debugholders.len && X.holder.rights & R_ADMIN) X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" //inform X else - if((X.holder.rights & R_ADMIN) || (X.holder.rights & (R_MOD|R_MENTOR)) ) + if((X.holder.rights & R_ADMIN) || (X.holder.rights & R_MOD) ) X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" //inform X /client/proc/cmd_admin_irc_pm() diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index e5bc03ded2e..ceefd17c3a6 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -24,7 +24,7 @@ set name = "Msay" set hidden = 1 - if(!check_rights(R_ADMIN|R_MOD|R_MENTOR)) return + if(!check_rights(R_ADMIN|R_MOD)) return msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN) log_admin("MOD: [key_name(src)] : [msg]") @@ -39,5 +39,5 @@ if(config.mods_are_mentors) channel = "MENTOR:" for(var/client/C in admins) - if((R_ADMIN|R_MOD|R_MENTOR) & C.holder.rights) + if((R_ADMIN|R_MOD) & C.holder.rights) C << "[channel] [key_name(src,1)] (JMP): [msg]" diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index 863efb6bc9f..e78dfcf1bd5 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -1,6 +1,6 @@ /client/proc/cinematic(var/cinematic as anything in list("explosion",null)) set name = "cinematic" - set category = "Fun" + set category = "Event" set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted. set hidden = 1 if(alert("Are you sure you want to run [cinematic]?","Confirmation","Yes","No")=="No") return diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm index 3021cc28281..7f0c6724eff 100644 --- a/code/modules/admin/verbs/custom_event.dm +++ b/code/modules/admin/verbs/custom_event.dm @@ -1,6 +1,6 @@ // verb for admins to set custom event /client/proc/cmd_admin_change_custom_event() - set category = "Fun" + set category = "OOC" set name = "Change Custom Event" if(!holder) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index 67c12547d8a..b4253848893 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -22,11 +22,9 @@ var/stafftype = null if(src.holder.rights & R_MOD && !(src.holder.rights & R_ADMIN)) - stafftype = "MOD" - - if (src.holder.rights & R_MENTOR) stafftype = "MENTOR" + if (src.holder.rights & R_ADMIN) stafftype = "ADMIN" diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 132c4b64aa5..4d0395b3e95 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -151,7 +151,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_robotize(var/mob/M in mob_list) - set category = "Fun" + set category = "Event" set name = "Make Robot" if(!ticker) @@ -166,7 +166,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that alert("Invalid mob") /client/proc/cmd_admin_animalize(var/mob/M in mob_list) - set category = "Fun" + set category = "Event" set name = "Make Simple Animal" if(!ticker) @@ -187,7 +187,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /client/proc/makepAI(var/turf/T in mob_list) - set category = "Fun" + set category = "Event" set name = "Make pAI" set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI" @@ -214,7 +214,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that feedback_add_details("admin_verb","MPAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_alienize(var/mob/M in mob_list) - set category = "Fun" + set category = "Event" set name = "Make Alien" if(!ticker) @@ -231,7 +231,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that alert("Invalid mob") /client/proc/cmd_admin_slimeize(var/mob/M in mob_list) - set category = "Fun" + set category = "Event" set name = "Make slime" if(!ticker) @@ -249,7 +249,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /* /client/proc/cmd_admin_monkeyize(var/mob/M in world) - set category = "Fun" + set category = "Event" set name = "Make Monkey" if(!ticker) @@ -264,7 +264,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that alert("Invalid mob") /client/proc/cmd_admin_changelinginize(var/mob/M in world) - set category = "Fun" + set category = "Event" set name = "Make Changeling" if(!ticker) @@ -299,7 +299,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that */ /* /client/proc/make_cultist(var/mob/M in world) // -- TLE, modified by Urist - set category = "Fun" + set category = "Event" set name = "Make Cultist" set desc = "Makes target a cultist" if(!cultwords["travel"]) @@ -525,7 +525,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that world << "* [areatype]" /client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in mob_list) - set category = "Fun" + set category = "Event" set name = "Select equipment" if(!ishuman(M)) alert("Invalid mob") @@ -1089,7 +1089,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that alert("Invalid mob") /client/proc/gib_money() - set category = "Fun" + set category = "Event" set name = "Dispense Money" set desc = "Honk" diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 7264fac8f9f..7bbe4b3bff6 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -1,5 +1,5 @@ /client/proc/play_sound(S as sound) - set category = "Fun" + set category = "Event" set name = "Play Global Sound" if(!check_rights(R_SOUNDS)) return @@ -16,7 +16,7 @@ /client/proc/play_local_sound(S as sound) - set category = "Fun" + set category = "Event" set name = "Play Local Sound" if(!check_rights(R_SOUNDS)) return @@ -28,7 +28,7 @@ /* /client/proc/cuban_pete() - set category = "Fun" + set category = "Event" set name = "Cuban Pete Time" message_admins("[key_name_admin(usr)] has declared Cuban Pete Time!", 1) @@ -44,7 +44,7 @@ /client/proc/bananaphone() - set category = "Fun" + set category = "Event" set name = "Banana Phone" message_admins("[key_name_admin(usr)] has activated Banana Phone!", 1) @@ -55,7 +55,7 @@ client/proc/space_asshole() - set category = "Fun" + set category = "Event" set name = "Space Asshole" message_admins("[key_name_admin(usr)] has played the Space Asshole Hymn.", 1) @@ -66,7 +66,7 @@ client/proc/space_asshole() client/proc/honk_theme() - set category = "Fun" + set category = "Event" set name = "Honk" message_admins("[key_name_admin(usr)] has creeped everyone out with Blackest Honks.", 1) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index d62866ee55e..e2da9ec3fd4 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -73,7 +73,7 @@ var/age = alert(src, "Age check", "Show accounts yonger then _____ days","7", "30" , "All") - if(age == "All") + if(age == "All") age = 9999999 else age = text2num(age) @@ -86,7 +86,7 @@ continue if(C.player_age < age) msg += "[key_name_admin(C)]: 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" @@ -202,7 +202,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) /client/proc/cmd_admin_add_random_ai_law() - set category = "Fun" + set category = "Event" set name = "Add Random AI Law" if(!holder) src << "Only administrators may use this command." @@ -624,7 +624,7 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("Admin [key_name_admin(usr)] has [action] on joining the round if they use AntagHUD", 1) /client/proc/cmd_admin_add_freeform_ai_law() - set category = "Fun" + set category = "Event" set name = "Add Custom AI law" if(!holder) src << "Only administrators may use this command." @@ -730,7 +730,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_EVENT)) return var/devastation = input("Range of total devastation. -1 to none", text("Input")) as num|null if(devastation == null) return @@ -758,7 +758,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_EVENT)) return var/heavy = input("Range of heavy pulse.", text("Input")) as num|null if(heavy == null) return @@ -780,7 +780,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_EVENT)) return var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No") if(confirm != "Yes") return @@ -799,7 +799,7 @@ Traitors and the like can also be revived with the previous role mostly intact. /client/proc/cmd_admin_gib_self() set name = "Gibself" - set category = "Fun" + set category = "Event" var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No") if(confirm == "Yes") @@ -999,11 +999,11 @@ Traitors and the like can also be revived with the previous role mostly intact. /client/proc/everyone_random() - set category = "Fun" + set category = "Event" set name = "Make Everyone Random" set desc = "Make everyone have a random appearance. You can only use this before rounds!" - if(!check_rights(R_FUN)) return + if(!check_rights(R_SERVER|R_EVENT)) return if (ticker && ticker.mode) usr << "Nope you can't do this, the game's already started. This only works before rounds!" diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index d27f57f4567..54eed936541 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -3,7 +3,7 @@ var/const/syndicate_commandos_possible = 6 //if more Commandos are needed in the future var/global/sent_syndicate_strike_team = 0 /client/proc/syndicate_strike_team() - set category = "Fun" + set category = "Event" 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.holder) diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm index 5e5ccbb1237..35219c4c1c8 100644 --- a/code/modules/admin/verbs/tripAI.dm +++ b/code/modules/admin/verbs/tripAI.dm @@ -1,5 +1,5 @@ /client/proc/triple_ai() - set category = "Fun" + set category = "Event" set name = "Create AI Triumvirate" if(ticker.current_state > GAME_STATE_PREGAME) diff --git a/code/setup.dm b/code/setup.dm index 7ac361ab38f..045b852d610 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -656,7 +656,7 @@ var/list/TAGGERLOCATIONS = list("Disposals", #define R_BUILDMODE 1 #define R_ADMIN 2 #define R_BAN 4 -#define R_FUN 8 +#define R_EVENT 8 #define R_SERVER 16 #define R_DEBUG 32 #define R_POSSESS 64 @@ -667,9 +667,8 @@ var/list/TAGGERLOCATIONS = list("Disposals", #define R_SOUNDS 2048 #define R_SPAWN 4096 #define R_MOD 8192 -#define R_MENTOR 16384 -#define R_MAXPERMISSION 16384 //This holds the maximum value for a permission. It is used in iteration, so keep it updated. +#define R_MAXPERMISSION 8192 //This holds the maximum value for a permission. It is used in iteration, so keep it updated. #define R_HOST 65535