From 01b89fb484011fc32bdf42a2827a491caf713969 Mon Sep 17 00:00:00 2001 From: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> Date: Sun, 2 Jun 2024 01:33:49 -0500 Subject: [PATCH] Admin and Debug Tab QOL (#2956) ## About The Pull Request I came here to capitalize cinematic and move Spawn Planet/Ruin to Admin.game... fixes "Debug verbs - Disable" from stealing a few admin verbs like regenerate because they were in the "debug-mapping" list as well as another default list. The extra debug verbs are enabled by default but I left in the option to disable them again. Organized the tabs a bit. Stuff for running events gets its own tab and admin preferences are put into normal preferences #### NEW ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/ad981169-1d33-4fd6-a52f-e19d790ee7dc) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/3478954c-c200-420e-9521-bc888c96d5d6) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/aabe073e-9cc2-4ee4-b1de-3f4aeb1e4dae) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/e75a9687-3be1-4d89-b709-809aa8a2cc82) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/f010b688-dfb7-4d95-b8cc-87f63a1a39b1) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/7343471f-bc69-4a8c-8a07-6934863bb5f0) #### OLD ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/bf0b5e04-64f8-4162-9d92-508d72548ce9) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/2ed1cdb3-0bfa-4655-b44e-5b1359cfb924) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/b5591fa3-262e-42a5-8ff6-f67e67f57b17) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/1ec2e476-af28-48ad-bbf2-c26b527601d0) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/e2acf174-cb01-4e3c-824e-ea81957352f3) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/6e97fdf9-206a-4f88-bc17-64cbac99b5ec) ![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/ff50e2e1-551c-41a5-8ec2-ff6b8ca636c3) ## Why It's Good For The Game ## Changelog :cl: admin: Improved the silly little menu, HA HA I have messed up your muscle memory!! u /:cl: --- code/controllers/subsystem/events.dm | 2 +- code/modules/admin/admin.dm | 21 +++++-- code/modules/admin/admin_verbs.dm | 41 ++++++++----- code/modules/admin/verbs/anonymousnames.dm | 2 +- code/modules/admin/verbs/atmosdebug.dm | 4 +- code/modules/admin/verbs/beakerpanel.dm | 2 +- code/modules/admin/verbs/cinematic.dm | 4 +- code/modules/admin/verbs/debug.dm | 39 ++++++------ code/modules/admin/verbs/mapping.dm | 68 +++++++++------------ code/modules/admin/verbs/one_click_antag.dm | 2 +- code/modules/admin/verbs/outpost.dm | 2 +- code/modules/admin/verbs/playsound.dm | 10 +-- code/modules/admin/verbs/randomverbs.dm | 50 +++++++-------- code/modules/admin/verbs/selectequipment.dm | 2 +- code/modules/admin/verbs/shuttlepanel.dm | 3 +- code/modules/admin/verbs/spawnobjasmob.dm | 6 +- code/modules/buildmode/buildmode.dm | 3 - code/modules/cargo/centcom_podlauncher.dm | 2 +- code/modules/client/preferences_toggles.dm | 16 ++--- code/modules/donator/_donator.dm | 4 +- code/modules/mob/dead/crew_manifest.dm | 2 +- 21 files changed, 145 insertions(+), 140 deletions(-) diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index 32f404c936a6b..dc55c7ca07552 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -102,7 +102,7 @@ SUBSYSTEM_DEF(events) // Why the heck is this here! Took me so damn long to find! /client/proc/forceEvent() set name = "Trigger Event" - set category = "Admin.Events" + set category = "Event" if(!holder ||!check_rights(R_FUN)) return diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 5bb4b25cc1f11..7b147385c556c 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -215,7 +215,7 @@ /datum/admins/proc/access_news_network() //MARKER - set category = "Admin.Events" + set category = "Event" set name = "Access Newscaster Network" set desc = "Allows you to view, add and edit news feeds." @@ -700,7 +700,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////ADMIN HELPER PROCS /datum/admins/proc/spawn_atom(object as text) - set category = "Debug" + set category = "Event.Spawning" set desc = "(atom path) Spawn an atom" set name = "Spawn" @@ -729,9 +729,9 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Spawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/podspawn_atom(object as text) - set category = "Debug" + set category = "Event.Spawning" set desc = "(atom path) Spawn an atom via supply drop" - set name = "Podspawn" + set name = "Supply drop spawn" if(!check_rights(R_SPAWN)) return @@ -753,7 +753,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Podspawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/spawn_cargo(object as text) - set category = "Debug" + set category = "Event.Spawning" set desc = "(atom path) Spawn a cargo crate" set name = "Spawn Cargo" @@ -1018,3 +1018,14 @@ dat += "Disable footsteps: [SSlag_switch.measures[DISABLE_FOOTSTEPS] ? "On" : "Off"] - trait applies to character
" dat += "" usr << browse(dat.Join(), "window=lag_switch_panel;size=420x480") + +/datum/admins/proc/view_manifest() + set category = "Admin.Game" + set name = "View Manifest" + set desc = "Opens the Manifest UI." + + if(!GLOB.crew_manifest_tgui) + GLOB.crew_manifest_tgui = new /datum/crew_manifest(src) + + if(ismob(usr)) + GLOB.crew_manifest_tgui.ui_interact(usr) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ef2bfae400e47..f4913b6be1e84 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -81,6 +81,7 @@ GLOBAL_PROTECT(admin_verbs_admin) /client/proc/overmap_datum_token_manager, /datum/admins/proc/open_borgopanel, /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ + /datum/admins/proc/view_manifest ) GLOBAL_LIST_INIT(admin_verbs_ban, list( @@ -121,7 +122,6 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list( /client/proc/polymorph_all, /client/proc/show_tip, /client/proc/smite, - /client/proc/spawn_ruin, )) GLOBAL_PROTECT(admin_verbs_fun) GLOBAL_LIST_INIT(admin_verbs_spawn, list( @@ -130,7 +130,9 @@ GLOBAL_LIST_INIT(admin_verbs_spawn, list( /datum/admins/proc/spawn_cargo, /datum/admins/proc/spawn_objasmob, /datum/admins/proc/beaker_panel, - /datum/admins/proc/gift + /datum/admins/proc/gift, + /client/proc/spawn_ruin, + /client/proc/spawn_outpost /* Allows admins to spawn a new outpost. */ )) GLOBAL_PROTECT(admin_verbs_spawn) GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer()) @@ -169,10 +171,13 @@ GLOBAL_PROTECT(admin_verbs_debug) /client/proc/cmd_display_del_log, /client/proc/cmd_display_init_log, /client/proc/cmd_display_overlay_log, + /client/proc/cmd_admin_grantfullaccess, + /client/proc/cmd_assume_direct_control, //-errorage + /client/proc/cmd_give_direct_control, /client/proc/getserverlogs, /*for accessing server logs*/ /client/proc/getcurrentlogs, /*for accessing server logs for the current round*/ /client/proc/restart_controller, - /client/proc/enable_debug_verbs, + /client/proc/disable_debug_verbs, /client/proc/callproc, /client/proc/callproc_datum, /client/proc/SDQL2_query, @@ -205,12 +210,16 @@ GLOBAL_PROTECT(admin_verbs_debug) #endif /datum/admins/proc/create_or_modify_area, /datum/admins/proc/open_shuttlepanel, /* Opens shuttle manipulator UI */ - /client/proc/spawn_outpost, /* Allows admins to spawn a new outpost. */ /datum/admins/proc/open_borgopanel, /datum/admins/proc/overmap_view, /* Opens HTML overmap viewer UI */ /client/proc/toggle_AI_interact, /*toggle admin ability to interact with machines as an AI*/ /client/proc/toggle_cdn, - /client/proc/check_timer_sources + /client/proc/check_timer_sources, + /client/proc/air_status, //Air things + /client/proc/air_status_loc, //More air things + /client/proc/manipulate_organs, + /client/proc/set_server_fps, //allows you to set the ticklag. + /client/proc/start_singlo, ) GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release)) GLOBAL_PROTECT(admin_verbs_possess) @@ -269,10 +278,9 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list( /client/proc/Debug2, /client/proc/reload_admins, /client/proc/cmd_debug_make_powernets, - /client/proc/startSinglo, /client/proc/cmd_debug_mob_lists, /client/proc/cmd_debug_del_all, - /client/proc/enable_debug_verbs, + /client/proc/disable_debug_verbs, /proc/possess, /proc/release, /client/proc/reload_admins, @@ -305,7 +313,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) if(rights & R_SERVER) add_verb(src, GLOB.admin_verbs_server) if(rights & R_DEBUG) - add_verb(src, GLOB.admin_verbs_debug) + add_verb(src, list(GLOB.admin_verbs_debug, GLOB.admin_verbs_debug_extra)) if(rights & R_POSSESS) add_verb(src, GLOB.admin_verbs_possess) if(rights & R_PERMISSIONS) @@ -338,7 +346,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) /client/proc/play_web_sound, GLOB.admin_verbs_spawn, /*Debug verbs added by "show debug verbs"*/ - GLOB.admin_verbs_debug_mapping, + GLOB.admin_verbs_debug_extra, /client/proc/disable_debug_verbs, /client/proc/readmin )) @@ -505,7 +513,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) SSblackbox.record_feedback("tally", "admin_verb", 1, "Stealth Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/drop_bomb() - set category = "Fun" + set category = "Event.Fun" set name = "Drop Bomb" set desc = "Cause an explosion of varying strength at your location." @@ -547,7 +555,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Bomb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/drop_dynex_bomb() - set category = "Fun" + set category = "Event.Fun" set name = "Drop DynEx Bomb" set desc = "Cause an explosion of varying strength at your location." @@ -594,7 +602,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) message_admins("[key_name_admin(usr)] has modified Dynamic Explosion Scale: [ex_scale]") /client/proc/give_spell(mob/T in GLOB.mob_list) - set category = "Fun" + set category = "Event.Fun" set name = "Give Spell" set desc = "Gives a spell to a mob." @@ -618,7 +626,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) message_admins("Spells given to mindless mobs will not be transferred in mindswap or cloning!") /client/proc/remove_spell(mob/T in GLOB.mob_list) - set category = "Fun" + set category = "Event.Fun" set name = "Remove Spell" set desc = "Remove a spell from the selected mob." @@ -631,7 +639,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) SSblackbox.record_feedback("tally", "admin_verb", 1, "Remove Spell") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/give_disease(mob/living/T in GLOB.mob_living_list) - set category = "Fun" + set category = "Event.Fun" set name = "Give Disease" set desc = "Gives a Disease to a mob." if(!istype(T)) @@ -646,7 +654,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) message_admins("[key_name_admin(usr)] gave [key_name_admin(T)] the disease [D].") /client/proc/object_say(obj/O in world) - set category = "Admin.Events" + set category = "Event" set name = "OSay" set desc = "Makes an object say something." var/message = input(usr, "What do you want the message to be?", "Make Sound") as text | null @@ -656,9 +664,10 @@ GLOBAL_PROTECT(admin_verbs_hideable) log_admin("[key_name(usr)] made [O] at [AREACOORD(O)] say \"[message]\"") message_admins("[key_name_admin(usr)] made [O] at [AREACOORD(O)]. say \"[message]\"") SSblackbox.record_feedback("tally", "admin_verb", 1, "Object Say") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + /client/proc/togglebuildmodeself() set name = "Toggle Build Mode Self" - set category = "Admin.Events" + set category = "Event" if (!(holder.rank.rights & R_BUILD)) return if(src.mob) diff --git a/code/modules/admin/verbs/anonymousnames.dm b/code/modules/admin/verbs/anonymousnames.dm index 62c48149af526..c880a74ba6f6f 100644 --- a/code/modules/admin/verbs/anonymousnames.dm +++ b/code/modules/admin/verbs/anonymousnames.dm @@ -1,5 +1,5 @@ /client/proc/anon_names() - set category = "Admin.Events" + set category = "Event" set name = "Setup Anonymous Names" diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm index 6fc5f8a4c7090..56da851fdfd9a 100644 --- a/code/modules/admin/verbs/atmosdebug.dm +++ b/code/modules/admin/verbs/atmosdebug.dm @@ -19,7 +19,7 @@ return list(y + 1 - min(bounds[2], bounds[4]), -(x - 1 - max(bounds[1], bounds[3]))) /client/proc/check_atmos() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Check Atmospherics Piping" if(!check_rights_for(src, R_DEBUG)) to_chat(src, "Only administrators may use this command.", confidential = TRUE) @@ -54,7 +54,7 @@ return results /client/proc/check_wiring() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Check Power" if(!check_rights_for(src, R_DEBUG)) to_chat(src, "Only administrators may use this command.", confidential = TRUE) diff --git a/code/modules/admin/verbs/beakerpanel.dm b/code/modules/admin/verbs/beakerpanel.dm index 1f523c9e46272..3ba2a51b2fe83 100644 --- a/code/modules/admin/verbs/beakerpanel.dm +++ b/code/modules/admin/verbs/beakerpanel.dm @@ -61,7 +61,7 @@ return container /datum/admins/proc/beaker_panel() - set category = "Admin.Events" + set category = "Event.Spawning" set name = "Spawn reagent container" if(!check_rights()) return diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index 722440e11b93f..a8549c6359667 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -1,6 +1,6 @@ /client/proc/cinematic() - set name = "cinematic" - set category = "Fun" + set name = "Cinematic" + set category = "Event.Fun" 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 = TRUE if(!SSticker) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 19ac8a0514d35..ae039c216120d 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -26,7 +26,7 @@ Because if you select a player mob as owner it tries to do the proc for But you can call procs that are of type /mob/living/carbon/human/proc/ for that player. */ -/client/proc/Cell() +/client/proc/air_status_loc() set category = "Debug" set name = "Air Status in Location" if(!mob) @@ -38,7 +38,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that SSblackbox.record_feedback("tally", "admin_verb", 1, "Air Status In Location") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_robotize(mob/M in GLOB.mob_list) - set category = "Fun" + set category = "Event.Fun" set name = "Make Robot" if(!SSticker.HasRoundStarted()) @@ -53,7 +53,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that alert("Invalid mob") /client/proc/cmd_admin_blobize(mob/M in GLOB.mob_list) - set category = "Fun" + set category = "Event.Fun" set name = "Make Blob" if(!SSticker.HasRoundStarted()) @@ -68,7 +68,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /client/proc/cmd_admin_animalize(mob/M in GLOB.mob_list) - set category = "Fun" + set category = "Event.Fun" set name = "Make Simple Animal" if(!SSticker.HasRoundStarted()) @@ -88,7 +88,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /client/proc/makepAI(turf/T in GLOB.mob_list) - set category = "Fun" + set category = "Event.Fun" set name = "Make pAI" set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI" @@ -121,7 +121,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that SSblackbox.record_feedback("tally", "admin_verb", 1, "Make pAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_alienize(mob/M in GLOB.mob_list) - set category = "Fun" + set category = "Event.Fun" set name = "Make Alien" if(!SSticker.HasRoundStarted()) @@ -136,7 +136,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(mob/M in GLOB.mob_list) - set category = "Fun" + set category = "Event.Fun" set name = "Make slime" if(!SSticker.HasRoundStarted()) @@ -228,7 +228,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that message_admins("[key_name_admin(usr)] has granted [M.key] full access.") /client/proc/cmd_assume_direct_control(mob/M in GLOB.mob_list) - set category = "Admin.Game" + set category = "Debug" set name = "Assume direct control" set desc = "Direct intervention" @@ -249,7 +249,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that SSblackbox.record_feedback("tally", "admin_verb", 1, "Assume Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_give_direct_control(mob/M in GLOB.mob_list) - set category = "Admin.Game" + set category = "Debug" set name = "Give direct control" if(!M) @@ -275,7 +275,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_test_atmos_controllers() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Test Atmos Monitoring Consoles" var/list/dat = list() @@ -311,7 +311,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that popup.open() /client/proc/cmd_admin_areatest() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Test Areas" var/list/dat = list() @@ -465,12 +465,12 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /client/proc/cmd_admin_areatest_station() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Test Areas (STATION Z)" cmd_admin_areatest(TRUE) /client/proc/cmd_admin_areatest_all() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Test Areas (ALL)" cmd_admin_areatest(FALSE) @@ -529,8 +529,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that return dresscode -/client/proc/startSinglo() - +/client/proc/start_singlo() set category = "Debug" set name = "Start Singularity" set desc = "Sets up the singularity and all machines to get power flowing through the station" @@ -692,11 +691,11 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that to_chat(usr, "[template.description]", confidential = TRUE) /client/proc/fucky_wucky() - set category = "Debug" + set category = "Event.Fun" set name = "Fucky Wucky" set desc = "Inform the players that the code monkeys at our headquarters are working very hard to fix this." - if(!check_rights(R_DEBUG)) + if(!check_rights(R_FUN)) return remove_verb(/client/proc/fucky_wucky) message_admins("[key_name_admin(src)] did a fucky wucky.") @@ -750,7 +749,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that log_admin("[key_name(src)] pumped a random event.") /client/proc/start_line_profiling() - set category = "Profile" + set category = "Debug.Profile" set name = "Start Line Profiling" set desc = "Starts tracking line by line profiling for code lines that support it" @@ -761,7 +760,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that log_admin("[key_name(src)] started line by line profiling.") /client/proc/stop_line_profiling() - set category = "Profile" + set category = "Debug.Profile" set name = "Stops Line Profiling" set desc = "Stops tracking line by line profiling for code lines that support it" @@ -772,7 +771,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that log_admin("[key_name(src)] stopped line by line profiling.") /client/proc/show_line_profiling() - set category = "Profile" + set category = "Debug.Profile" set name = "Show Line Profiling" set desc = "Shows tracked profiling info from code lines that support it" diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 305cce363c8d3..6d8bac8adcfc8 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -19,42 +19,32 @@ //- Identify how hard it is to break into the area and where the weak points are //- Check if the area has too much empty space. If so, make it smaller and replace the rest with maintenance tunnels. -GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( +GLOBAL_LIST_INIT(admin_verbs_debug_extra, list( /client/proc/camera_view, //-errorage - /client/proc/sec_camera_report, //-errorage - /client/proc/intercom_view, //-errorage - /client/proc/air_status, //Air things - /client/proc/Cell, //More air things /client/proc/check_atmos, /client/proc/check_wiring, - /client/proc/count_objects_on_z_level, - /client/proc/count_objects_all, - /client/proc/cmd_assume_direct_control, //-errorage - /client/proc/cmd_give_direct_control, - /client/proc/startSinglo, - /client/proc/set_server_fps, //allows you to set the ticklag. - /client/proc/cmd_admin_grantfullaccess, /client/proc/cmd_admin_areatest_all, /client/proc/cmd_admin_areatest_station, - #ifdef TESTING - /client/proc/see_dirty_varedits, - #endif /client/proc/cmd_admin_test_atmos_controllers, - /client/proc/cmd_admin_rejuvenate, - /datum/admins/proc/show_traitor_panel, - /client/proc/disable_communication, /client/proc/cmd_show_at_list, /client/proc/cmd_show_at_markers, - /client/proc/manipulate_organs, - /client/proc/start_line_profiling, - /client/proc/stop_line_profiling, - /client/proc/show_line_profiling, + /client/proc/count_objects_all, + /client/proc/count_objects_on_z_level, /client/proc/create_mapping_job_icons, /client/proc/debug_z_levels, + /client/proc/disable_communication, + /client/proc/export_map, + /client/proc/intercom_view, //-errorage /client/proc/map_zones_info, - /client/proc/export_map + /client/proc/sec_camera_report, //-errorage + #ifdef TESTING + /client/proc/see_dirty_varedits, + #endif + /client/proc/show_line_profiling, + /client/proc/start_line_profiling, + /client/proc/stop_line_profiling, )) -GLOBAL_PROTECT(admin_verbs_debug_mapping) +GLOBAL_PROTECT(admin_verbs_debug_extra) /obj/effect/debugging/mapfix_marker name = "map fix marker" @@ -70,7 +60,7 @@ GLOBAL_PROTECT(admin_verbs_debug_mapping) return 0 /client/proc/camera_view() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Camera Range Display" var/on = FALSE @@ -93,7 +83,7 @@ GLOBAL_PROTECT(admin_verbs_debug_mapping) GLOBAL_LIST_EMPTY(dirty_vars) /client/proc/see_dirty_varedits() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Dirty Varedits" var/list/dat = list() @@ -107,7 +97,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) #endif /client/proc/sec_camera_report() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Camera Report" if(!Master) @@ -147,7 +137,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Camera Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/intercom_view() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Intercom Range Display" var/static/intercom_range_display_status = FALSE @@ -165,7 +155,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Intercom Range") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_show_at_list() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Show roundstart AT list" set desc = "Displays a list of active turfs coordinates at roundstart" @@ -182,7 +172,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Roundstart Active Turfs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_show_at_markers() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Show roundstart AT markers" set desc = "Places a marker on all active-at-roundstart turfs" @@ -207,18 +197,18 @@ GLOBAL_LIST_EMPTY(dirty_vars) if(!check_rights(R_DEBUG)) return remove_verb(src, /client/proc/enable_debug_verbs) - add_verb(src, list(/client/proc/disable_debug_verbs, GLOB.admin_verbs_debug_mapping)) + add_verb(src, list(/client/proc/disable_debug_verbs, GLOB.admin_verbs_debug_extra)) SSblackbox.record_feedback("tally", "admin_verb", 1, "Enable Debug Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/disable_debug_verbs() set category = "Debug" set name = "Debug verbs - Disable" - remove_verb(src, list(/client/proc/disable_debug_verbs, GLOB.admin_verbs_debug_mapping)) + remove_verb(src, list(/client/proc/disable_debug_verbs, GLOB.admin_verbs_debug_extra)) add_verb(src, /client/proc/enable_debug_verbs) SSblackbox.record_feedback("tally", "admin_verb", 1, "Disable Debug Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/count_objects_on_z_level() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Count Objects On Level" var/level = input("Which z-level?","Level?") as text|null if(!level) @@ -257,7 +247,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) SSblackbox.record_feedback("tally", "admin_verb", 1, "Count Objects Zlevel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/count_objects_all() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Count Objects All" var/type_text = input("Which type path?","") as text|null @@ -280,7 +270,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) //This proc is intended to detect lag problems relating to communication procs GLOBAL_VAR_INIT(say_disabled, FALSE) /client/proc/disable_communication() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Disable all communication verbs" GLOB.say_disabled = !GLOB.say_disabled @@ -292,7 +282,7 @@ GLOBAL_VAR_INIT(say_disabled, FALSE) //This generates the icon states for job starting location landmarks. /client/proc/create_mapping_job_icons() set name = "Generate job landmarks icons" - set category = "Mapping" + set category = "Debug.Mapping" var/icon/final = icon() var/mob/living/carbon/human/dummy/D = new(locate(1,1,1)) //spawn on 1,1,1 so we don't have runtimes when items are deleted D.setDir(SOUTH) @@ -319,7 +309,7 @@ GLOBAL_VAR_INIT(say_disabled, FALSE) /client/proc/debug_z_levels() set name = "Debug Z-Levels" - set category = "Mapping" + set category = "Debug.Mapping" var/list/z_list = SSmapping.z_list var/list/messages = list() @@ -350,7 +340,7 @@ GLOBAL_VAR_INIT(say_disabled, FALSE) /client/proc/map_zones_info() set name = "Map-Zones Info" - set category = "Mapping" + set category = "Debug.Mapping" var/list/dat = list() for(var/datum/map_zone/map_zone as anything in SSmapping.map_zones) @@ -405,7 +395,7 @@ GLOBAL_VAR_INIT(say_disabled, FALSE) #undef MAP_ZONE_INFO /client/proc/export_map() - set category = "Mapping" + set category = "Debug.Mapping" set name = "Export Map" var/z_level = input("Export Which Z-Level?", "Map Exporter", 2) as num diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index dff0335b7e9ef..028c9729131a6 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -4,7 +4,7 @@ /client/proc/one_click_antag() set name = "Create Antagonist" set desc = "Auto-create an antagonist of your choice" - set category = "Admin.Events" + set category = "Event" if(holder) holder.one_click_antag() diff --git a/code/modules/admin/verbs/outpost.dm b/code/modules/admin/verbs/outpost.dm index 358da03d2844f..25632838f45f5 100644 --- a/code/modules/admin/verbs/outpost.dm +++ b/code/modules/admin/verbs/outpost.dm @@ -19,7 +19,7 @@ /client/proc/spawn_outpost() set name = "Spawn Outpost" - set category = "Admin.Events" + set category = "Event.Spawning" set desc = "Spawns the selected /datum/overmap/outpost subtype." if(!holder) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 131dd55ad82bc..e3e5bc8c1ede9 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.Fun" set name = "Play Global Sound" if(!check_rights(R_SOUND)) return @@ -40,7 +40,7 @@ /client/proc/play_local_sound(S as sound) - set category = "Fun" + set category = "Event.Fun" set name = "Play Local Sound" if(!check_rights(R_SOUND)) return @@ -52,7 +52,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Local Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/play_direct_mob_sound(S as sound, mob/M) - set category = "Fun" + set category = "Event.Fun" set name = "Play Direct Mob Sound" if(!check_rights(R_SOUND)) return @@ -67,7 +67,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Direct Mob Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/play_web_sound() - set category = "Fun" + set category = "Event.Fun" set name = "Play Internet Sound" if(!check_rights(R_SOUND)) return @@ -151,7 +151,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Internet Sound") /client/proc/set_round_end_sound(S as sound) - set category = "Fun" + set category = "Event.Fun" set name = "Set Round End Sound" if(!check_rights(R_SOUND)) return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index ae621e17d479e..df5b1d6d18d32 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -20,7 +20,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_subtle_message(mob/M in GLOB.mob_list) - set category = "Admin.Events" + set category = "Event" set name = "Subtle Message" if(!ismob(M)) @@ -46,7 +46,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_headset_message(mob/M in GLOB.mob_list) - set category = "Admin.Events" + set category = "Event" set name = "Headset Message" admin_headset_message(M) @@ -92,7 +92,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_world_narrate() - set category = "Admin.Events" + set category = "Event" set name = "Global Narrate" if(!check_rights(R_ADMIN)) @@ -108,7 +108,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Global Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_direct_narrate(mob/M) - set category = "Admin.Events" + set category = "Event" set name = "Direct Narrate" if(!check_rights(R_ADMIN)) @@ -133,7 +133,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_local_narrate(atom/A) - set category = "Admin.Events" + set category = "Event" set name = "Local Narrate" if(!check_rights(R_ADMIN)) @@ -295,7 +295,7 @@ return 1 /client/proc/cmd_admin_add_freeform_ai_law() - set category = "Admin.Events" + set category = "Event" set name = "Add Custom AI law" if(!check_rights(R_ADMIN)) @@ -318,7 +318,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Add Custom AI Law") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_create_centcom_report() - set category = "Admin.Events" + set category = "Event" set name = "Create Command Report" if(!check_rights(R_FUN)) @@ -347,7 +347,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_change_command_name() - set category = "Admin.Events" + set category = "Event" set name = "Change Command Name" if(!check_rights(R_FUN)) @@ -370,7 +370,7 @@ admin_delete(A) /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world) - set category = "Fun" + set category = "Event.Fun" set name = "Explosion" if(!check_rights(R_ADMIN)) @@ -406,7 +406,7 @@ return /client/proc/cmd_admin_emp(atom/O as obj|mob|turf in world) - set category = "Fun" + set category = "Event.Fun" set name = "EM Pulse" if(!check_rights(R_ADMIN)) @@ -431,7 +431,7 @@ return /client/proc/cmd_admin_gib(mob/M in GLOB.mob_list) - set category = "Fun" + set category = "Event.Fun" set name = "Gib" if(!check_rights(R_ADMIN)) @@ -458,7 +458,7 @@ /client/proc/cmd_admin_gib_self() set name = "Gibself" - set category = "Fun" + set category = "Event.Fun" var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No") if(confirm == "Yes") @@ -492,7 +492,7 @@ SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Change View Range", "[view]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/admin_initiate_jump() - set category = "Admin.Events" + set category = "Event" set name = "Initiate Jump" if(!check_rights(R_ADMIN)) return @@ -510,7 +510,7 @@ message_admins("[key_name_admin(usr)] admin-initiated a bluespace jump.") /client/proc/admin_cancel_jump() - set category = "Admin.Events" + set category = "Event" set name = "Cancel Jump" if(!check_rights(0)) return @@ -528,7 +528,7 @@ message_admins("[key_name_admin(usr)] admin-cancelled a bluespace jump.") /client/proc/everyone_random() - set category = "Fun" + set category = "Event.Fun" set name = "Make Everyone Random" set desc = "Make everyone have a random appearance. You can only use this before rounds!" @@ -576,7 +576,7 @@ /client/proc/admin_change_sec_level() - set category = "Admin.Events" + set category = "Event" set name = "Set Security Level" set desc = "Changes the security level. Announcement only, i.e. setting to Delta won't activate nuke" @@ -593,7 +593,7 @@ /client/proc/toggle_nuke(obj/machinery/nuclearbomb/N in GLOB.nuke_list) set name = "Toggle Nuke" - set category = "Admin.Events" + set category = "Event" set popup_menu = 0 if(!check_rights(R_DEBUG)) return @@ -646,7 +646,7 @@ /client/proc/run_weather() - set category = "Admin.Events" + set category = "Event" set name = "Run Weather" set desc = "Triggers a weather on the z-level you choose." @@ -669,7 +669,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Run Weather") /client/proc/mass_zombie_infection() - set category = "Fun" + set category = "Event.Fun" set name = "Mass Zombie Infection" set desc = "Infects all humans with a latent organ that will zombify \ them on death." @@ -690,7 +690,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Infection") /client/proc/mass_zombie_cure() - set category = "Fun" + set category = "Event.Fun" set name = "Mass Zombie Cure" set desc = "Removes the zombie infection from all humans, returning them to normal." if(!check_rights(R_ADMIN)) @@ -708,7 +708,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Cure") /client/proc/polymorph_all() - set category = "Fun" + set category = "Event.Fun" set name = "Polymorph All" set desc = "Applies the effects of the bolt of change to every single mob." @@ -819,7 +819,7 @@ /client/proc/spawn_ruin() set name = "Spawn Planet/Ruin" - set category = "Fun" + set category = "Event.Spawning" if(!check_rights(R_ADMIN) || !check_rights(R_SPAWN)) return @@ -880,7 +880,7 @@ /client/proc/smite(mob/living/target as mob) set name = "Smite" - set category = "Fun" + set category = "Event.Fun" if(!check_rights(R_ADMIN) || !check_rights(R_FUN)) return @@ -1068,8 +1068,8 @@ REMOVE_TRAIT(D,chosen_trait,source) /datum/admins/proc/gift(mob/living/carbon/human/target as mob, object as text) - set name = "Gift" - set category = "Fun" + set name = "Gift a mob" + set category = "Event.Spawning" set desc = "Give a mob an item directly." if(!check_rights(R_ADMIN) || !check_rights(R_FUN)) return diff --git a/code/modules/admin/verbs/selectequipment.dm b/code/modules/admin/verbs/selectequipment.dm index 9bc6ab3dcea93..03a560d5e712f 100644 --- a/code/modules/admin/verbs/selectequipment.dm +++ b/code/modules/admin/verbs/selectequipment.dm @@ -1,5 +1,5 @@ /client/proc/cmd_select_equipment(mob/target in GLOB.mob_list) - set category = "Admin.Events" + set category = "Event" set name = "Select equipment" diff --git a/code/modules/admin/verbs/shuttlepanel.dm b/code/modules/admin/verbs/shuttlepanel.dm index b4e374f41cb8c..bb3bd11b7f42e 100644 --- a/code/modules/admin/verbs/shuttlepanel.dm +++ b/code/modules/admin/verbs/shuttlepanel.dm @@ -1,5 +1,5 @@ /datum/admins/proc/open_shuttlepanel() - set category = "Admin.Events" + set category = "Event" set name = "Shuttle Manipulator" set desc = "Opens the shuttle manipulator UI." @@ -8,7 +8,6 @@ SSshuttle.ui_interact(usr) - /obj/docking_port/mobile/proc/admin_fly_shuttle(mob/user) var/list/options = list() diff --git a/code/modules/admin/verbs/spawnobjasmob.dm b/code/modules/admin/verbs/spawnobjasmob.dm index f840516d49f1c..e787ecfde6644 100644 --- a/code/modules/admin/verbs/spawnobjasmob.dm +++ b/code/modules/admin/verbs/spawnobjasmob.dm @@ -1,7 +1,7 @@ /datum/admins/proc/spawn_objasmob(object as text) - set category = "Debug" - set desc = "(obj path) Spawn object-mob" - set name = "Spawn object-mob" + set category = "Event.Spawning" + set desc = "(obj path) Spawn object-mob from Object" + set name = "Spawn Living Mob" if(!check_rights(R_SPAWN)) return diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm index 81c46eebd10c3..d85929daa0a83 100644 --- a/code/modules/buildmode/buildmode.dm +++ b/code/modules/buildmode/buildmode.dm @@ -182,9 +182,6 @@ return TRUE // no doing underlying actions /proc/togglebuildmode(mob/M as mob in GLOB.player_list) - set name = "Toggle Build Mode" - set category = "Event" - if(M.client) if(istype(M.client.click_intercept,/datum/buildmode)) var/datum/buildmode/B = M.client.click_intercept diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index 61e416e9d4f16..dfec659e1644f 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -19,7 +19,7 @@ /client/proc/centcom_podlauncher() //Creates a verb for admins to open up the ui set name = "Config/Launch Supplypod" set desc = "Configure and launch a CentCom supplypod full of whatever your heart desires!" - set category = "Admin.Events" + set category = "Event" new /datum/centcom_podlauncher(usr)//create the datum //Variables declared to change how items in the launch bay are picked and launched. (Almost) all of these are changed in the ui_act proc diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index b12e7cdf3d009..b40e1702652ef 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -443,7 +443,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS //Admin Preferences /client/proc/toggleadminhelpsound() set name = "Hear/Silence Adminhelps" - set category = "Prefs - Admin" + set category = "Preferences.Admin" set desc = "Toggle hearing a notification when admin PMs are received" if(!holder) return @@ -454,7 +454,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS /client/proc/toggleannouncelogin() set name = "Do/Don't Announce Login" - set category = "Prefs - Admin" + set category = "Preferences.Admin" set desc = "Toggle if you want an announcement to admins when you login during a round" if(!holder) return @@ -465,7 +465,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS /client/proc/toggle_hear_radio() set name = "Show/Hide Radio Chatter" - set category = "Prefs - Admin" + set category = "Preferences.Admin" set desc = "Toggle seeing radiochatter from nearby radios and speakers" if(!holder) return @@ -487,7 +487,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS /client/proc/deadchat() set name = "Show/Hide Deadchat" - set category = "Prefs - Admin" + set category = "Preferences.Admin" set desc ="Toggles seeing deadchat" if(!holder) return @@ -498,7 +498,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS /client/proc/toggleprayers() set name = "Show/Hide Prayers" - set category = "Prefs - Admin" + set category = "Preferences.Admin" set desc = "Toggles seeing prayers" if(!holder) return @@ -509,7 +509,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS /client/proc/toggle_prayer_sound() set name = "Hear/Silence Prayer Sounds" - set category = "Prefs - Admin" + set category = "Preferences.Admin" set desc = "Hear Prayer Sounds" if(!holder) return @@ -520,7 +520,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS /client/proc/colorasay() set name = "Set Admin Say Color" - set category = "Prefs - Admin" + set category = "Preferences.Admin" set desc = "Set the color of your ASAY messages" if(!holder) return @@ -537,7 +537,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS /client/proc/resetasaycolor() set name = "Reset your Admin Say Color" set desc = "Returns your ASAY Color to default" - set category = "Prefs - Admin" + set category = "Preferences.Admin" if(!holder) return if(!CONFIG_GET(flag/allow_admin_asaycolor)) diff --git a/code/modules/donator/_donator.dm b/code/modules/donator/_donator.dm index b18dbe8f78b34..dd4df369cfea1 100644 --- a/code/modules/donator/_donator.dm +++ b/code/modules/donator/_donator.dm @@ -23,7 +23,7 @@ GLOBAL_PROTECT(donators) /client/proc/do_donator_redemption() set name = "Redeem Donator Reward" - set category = "Donator" + set category = "OOC.Donator" set desc = "Redeem a reward" var/mob/client_mob = mob @@ -38,7 +38,7 @@ GLOBAL_PROTECT(donators) /client/proc/do_donator_wcir() set name = "What Can I Redeem" - set category = "Donator" + set category = "OOC.Donator" set desc = "Currently available redemptions" donator?.what_can_i_redeem(src.mob) diff --git a/code/modules/mob/dead/crew_manifest.dm b/code/modules/mob/dead/crew_manifest.dm index c7ca52968f865..da742342218c0 100644 --- a/code/modules/mob/dead/crew_manifest.dm +++ b/code/modules/mob/dead/crew_manifest.dm @@ -4,7 +4,7 @@ return GLOB.always_state /datum/crew_manifest/ui_status(mob/user, datum/ui_state/state) - return (isnewplayer(user) || isobserver(user) || isAI(user) || ispAI(user)) ? UI_INTERACTIVE : UI_CLOSE + return (ismob(user)) ? UI_INTERACTIVE : UI_CLOSE /datum/crew_manifest/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui)