From 62a6c75e537ff2c09411ba32313aaaede50a3e61 Mon Sep 17 00:00:00 2001 From: Jolly <70232195+Jolly-66@users.noreply.github.com> Date: Sat, 24 Dec 2022 07:15:58 -0500 Subject: [PATCH] Organizes the lists in `admin_verbs.dm` because I got sick and tired of looking at them, and one in particular (#72151) ## About The Pull Request Title for the most part. ## Why It's Good For The Game I was told, many, MANY, moons go, as a downstream host, that one of these lists would rarely ever get touched. What a fat lie that was. The more I had to stare at this list the more infuriated I got with it. Now, I just went ahead and organized most of the lists in this file, as well as fixing comments to fit the format of `/* hey bozo */`. Where applicable, things were organized into `/datums/admins/` and `/client/proc` as well. ## Changelog :cl: Jolly code: The lists in admin_verbs.dm was organized to be made better. This shouldn't affect the panels admins use at all, since they're already alphabetized. /:cl: --- code/modules/admin/admin_verbs.dm | 311 +++++++++++++++--------------- 1 file changed, 157 insertions(+), 154 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 8a28b50c246..5ea40f4da84 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -4,125 +4,127 @@ GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault()) GLOBAL_PROTECT(admin_verbs_default) /world/proc/AVerbsDefault() return list( - /client/proc/deadmin, /*destroys our own admin datum so we can play as a regular player*/ - /client/proc/cmd_admin_say, /*admin-only ooc chat*/ - /client/proc/hide_verbs, /*hides all our adminverbs*/ - /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/ - /client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/ - /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ - /client/proc/secrets, - /client/proc/reload_admins, - /client/proc/reestablish_db_connection, /*reattempt a connection to the database*/ /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ - /client/proc/stop_sounds, - /client/proc/mark_datum_mapview, - /client/proc/tag_datum_mapview, + /client/proc/cmd_admin_say, /*admin-only ooc chat*/ + /client/proc/deadmin, /*destroys our own admin datum so we can play as a regular player*/ /client/proc/debugstatpanel, + /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/ + /client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/ /client/proc/fix_air, /*resets air in designated radius to its default atmos composition*/ - /client/proc/requests + /client/proc/hide_verbs, /*hides all our adminverbs*/ + /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ + /client/proc/mark_datum_mapview, + /client/proc/reestablish_db_connection, /*reattempt a connection to the database*/ + /client/proc/reload_admins, + /client/proc/requests, + /client/proc/secrets, + /client/proc/stop_sounds, + /client/proc/tag_datum_mapview, ) GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin()) GLOBAL_PROTECT(admin_verbs_admin) /world/proc/AVerbsAdmin() return list( - /client/proc/invisimin, /*allows our mob to go invisible/visible*/ -// /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage +// Admin datums + /datum/admins/proc/access_news_network, /*allows access of newscasters*/ + /datum/admins/proc/announce, /*priority announce something to all clients.*/ + /datum/admins/proc/display_tags, + /datum/admins/proc/fishing_calculator, + /datum/admins/proc/known_alts_panel, /datum/admins/proc/show_lag_switch_panel, + /datum/admins/proc/open_borgopanel, + /datum/admins/proc/open_shuttlepanel, /* Opens shuttle manipulator UI */ + /datum/admins/proc/paintings_manager, + /datum/admins/proc/set_admin_notice, /*announcement all clients see when joining the server.*/ /datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags*/ - /datum/verbs/menu/Admin/verb/playerpanel, - /client/proc/game_panel, /*game panel, allows to change game-mode etc*/ - /client/proc/check_ai_laws, /*shows AI and borg laws*/ - /client/proc/ghost_pool_protection, /*opens a menu for toggling ghost roles*/ - /datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/ - /datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/ /datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/ /datum/admins/proc/toggleguests, /*toggles whether guests can join the current game*/ - /datum/admins/proc/announce, /*priority announce something to all clients.*/ - /datum/admins/proc/set_admin_notice, /*announcement all clients see when joining the server.*/ - /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ - /client/proc/toggle_view_range, /*changes how far we can see*/ - /client/proc/getserverlogs, /*for accessing server logs*/ - /client/proc/getcurrentlogs, /*for accessing server logs for the current round*/ - /client/proc/cmd_admin_subtle_message, /*send a message to somebody as a 'voice in their head'*/ - /client/proc/cmd_admin_headset_message, /*send a message to somebody through their headset as CentCom*/ - /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ - /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ - /client/proc/centcom_podlauncher,/*Open a window to launch a Supplypod and configure it or it's contents*/ - /client/proc/check_antagonists, /*shows all antags*/ - /datum/admins/proc/access_news_network, /*allows access of newscasters*/ - /client/proc/jumptocoord, /*we ghost and jump to a coordinate*/ - /client/proc/Getmob, /*teleports a mob to our location*/ - /client/proc/Getkey, /*teleports a mob with a certain ckey to our location*/ -// /client/proc/sendmob, /*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage - /client/proc/jumptoarea, - /client/proc/jumptokey, /*allows us to jump to the location of a mob with a certain ckey*/ - /client/proc/jumptomob, /*allows us to jump to a specific mob*/ - /client/proc/jumptoturf, /*allows us to jump to a specific turf*/ + /datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/ + /datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/ + /datum/admins/proc/trophy_manager, + /datum/admins/proc/view_all_circuits, + /datum/verbs/menu/Admin/verb/playerpanel, /* It isn't /datum/admin but it fits no less */ +// Client procs /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 centcom*/ /client/proc/admin_disable_shuttle, /*allows us to disable the emergency shuttle admin-wise so that it cannot be called*/ /client/proc/admin_enable_shuttle, /*undoes the above*/ + /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ /client/proc/admin_hostile_environment, /*Allows admins to prevent the emergency shuttle from leaving, also lets admins clear hostile environments if theres one stuck*/ - /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_local_narrate, /*sends text to all mobs within view of atom*/ - /client/proc/cmd_admin_create_centcom_report, - /client/proc/cmd_change_command_name, + /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ /client/proc/cmd_admin_check_player_exp, /* shows players by playtime */ - /client/proc/toggle_combo_hud, // toggle display of the combination pizza antag and taco sci/med/eng hud - /client/proc/toggle_AI_interact, /*toggle admin ability to interact with machines as an AI*/ - /datum/admins/proc/open_shuttlepanel, /* Opens shuttle manipulator UI */ - /client/proc/respawn_character, - /datum/admins/proc/open_borgopanel, - /datum/admins/proc/view_all_circuits, - /datum/admins/proc/known_alts_panel, - /datum/admins/proc/paintings_manager, - /datum/admins/proc/display_tags, - /datum/admins/proc/fishing_calculator, + /client/proc/cmd_admin_create_centcom_report, + /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ + /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_headset_message, /*send a message to somebody through their headset as CentCom*/ + /client/proc/cmd_admin_local_narrate, /*sends text to all mobs within view of atom*/ + /client/proc/cmd_admin_subtle_message, /*send a message to somebody as a 'voice in their head'*/ + /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ + /client/proc/cmd_change_command_name, + /client/proc/centcom_podlauncher,/*Open a window to launch a Supplypod and configure it or it's contents*/ + /client/proc/check_ai_laws, /*shows AI and borg laws*/ + /client/proc/check_antagonists, /*shows all antags*/ + /client/proc/fax_panel, /*send a paper to fax*/ + /client/proc/force_load_lazy_template, + /client/proc/game_panel, /*game panel, allows to change game-mode etc*/ + /client/proc/Getmob, /*teleports a mob to our location*/ + /client/proc/Getkey, /*teleports a mob with a certain ckey to our location*/ + /client/proc/getserverlogs, /*for accessing server logs*/ + /client/proc/getcurrentlogs, /*for accessing server logs for the current round*/ + /client/proc/ghost_pool_protection, /*opens a menu for toggling ghost roles*/ + /client/proc/invisimin, /*allows our mob to go invisible/visible*/ + /client/proc/jumptoarea, + /client/proc/jumptokey, /*allows us to jump to the location of a mob with a certain ckey*/ + /client/proc/jumptomob, /*allows us to jump to a specific mob*/ + /client/proc/jumptoturf, /*allows us to jump to a specific turf*/ + /client/proc/jumptocoord, /*we ghost and jump to a coordinate*/ /client/proc/list_bombers, - /client/proc/list_signalers, - /client/proc/list_law_changes, - /client/proc/show_manifest, /client/proc/list_dna, /client/proc/list_fingerprints, + /client/proc/list_law_changes, + /client/proc/list_signalers, /client/proc/message_pda, /*send a message to somebody on PDA*/ - /client/proc/fax_panel, /*send a paper to fax*/ - /datum/admins/proc/trophy_manager, - /client/proc/force_load_lazy_template, + /client/proc/respawn_character, + /client/proc/show_manifest, + /client/proc/toggle_AI_interact, /*toggle admin ability to interact with machines as an AI*/ + /client/proc/toggle_combo_hud, /* toggle display of the combination pizza antag and taco sci/med/eng hud */ + /client/proc/toggle_view_range, /*changes how far we can see*/ ) GLOBAL_LIST_INIT(admin_verbs_ban, list(/client/proc/unban_panel, /client/proc/ban_panel, /client/proc/stickybanpanel)) GLOBAL_PROTECT(admin_verbs_ban) GLOBAL_LIST_INIT(admin_verbs_sounds, list(/client/proc/play_local_sound, /client/proc/play_direct_mob_sound, /client/proc/play_sound, /client/proc/set_round_end_sound)) GLOBAL_PROTECT(admin_verbs_sounds) GLOBAL_LIST_INIT(admin_verbs_fun, list( - /client/proc/cmd_select_equipment, - /client/proc/cmd_admin_gib_self, - /client/proc/drop_bomb, - /client/proc/set_dynex_scale, - /client/proc/drop_dynex_bomb, - /client/proc/cinematic, - /client/proc/summon_ert, - /client/proc/cmd_admin_add_freeform_ai_law, - /client/proc/object_say, - /client/proc/toggle_random_events, - /client/proc/set_ooc, - /client/proc/reset_ooc, - /client/proc/forceEvent, - /client/proc/admin_change_sec_level, - /client/proc/toggle_nuke, - /client/proc/run_weather, - /client/proc/mass_zombie_infection, - /client/proc/mass_zombie_cure, - /client/proc/polymorph_all, - /client/proc/show_tip, - /client/proc/smite, +// Admin datums + /datum/admins/proc/station_traits_panel, +// Client procs /client/proc/admin_away, /client/proc/add_mob_ability, - /client/proc/remove_mob_ability, + /client/proc/admin_change_sec_level, + /client/proc/cinematic, + /client/proc/cmd_admin_add_freeform_ai_law, + /client/proc/cmd_admin_gib_self, + /client/proc/cmd_select_equipment, /client/proc/command_report_footnote, /client/proc/delay_command_report, - /datum/admins/proc/station_traits_panel, + /client/proc/drop_bomb, + /client/proc/drop_dynex_bomb, + /client/proc/forceEvent, + /client/proc/mass_zombie_cure, + /client/proc/mass_zombie_infection, + /client/proc/object_say, + /client/proc/polymorph_all, + /client/proc/remove_mob_ability, + /client/proc/reset_ooc, + /client/proc/run_weather, + /client/proc/set_dynex_scale, + /client/proc/set_ooc, + /client/proc/show_tip, + /client/proc/smite, + /client/proc/summon_ert, + /client/proc/toggle_nuke, + /client/proc/toggle_random_events, )) GLOBAL_PROTECT(admin_verbs_fun) GLOBAL_LIST_INIT(admin_verbs_spawn, list(/datum/admins/proc/spawn_atom, /datum/admins/proc/podspawn_atom, /datum/admins/proc/spawn_cargo, /datum/admins/proc/spawn_objasmob, /client/proc/respawn_character, /datum/admins/proc/beaker_panel)) @@ -131,96 +133,97 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer()) GLOBAL_PROTECT(admin_verbs_server) /world/proc/AVerbsServer() return list( - /datum/admins/proc/startnow, - /datum/admins/proc/restart, - /datum/admins/proc/end_round, +// Admin datums /datum/admins/proc/delay, /datum/admins/proc/delay_round_end, + /datum/admins/proc/end_round, + /datum/admins/proc/restart, + /datum/admins/proc/startnow, /datum/admins/proc/toggleaban, - /client/proc/everyone_random, /datum/admins/proc/toggleAI, +// Client procs + /client/proc/adminchangemap, /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_debug_del_all, /client/proc/cmd_debug_force_del_all, /client/proc/cmd_debug_hard_del_all, - /client/proc/toggle_random_events, + /client/proc/everyone_random, /client/proc/forcerandomrotate, - /client/proc/adminchangemap, - /client/proc/panicbunker, - /client/proc/toggle_interviews, - /client/proc/toggle_hub, - /client/proc/toggle_cdn, /client/proc/generate_job_config, + /client/proc/panicbunker, + /client/proc/toggle_cdn, + /client/proc/toggle_hub, + /client/proc/toggle_interviews, + /client/proc/toggle_random_events, ) GLOBAL_LIST_INIT(admin_verbs_debug, world.AVerbsDebug()) GLOBAL_PROTECT(admin_verbs_debug) /world/proc/AVerbsDebug() return list( - /client/proc/restart_controller, - /client/proc/debug_controller, - /client/proc/cmd_admin_list_open_jobs, - /client/proc/Debug2, - /client/proc/cmd_debug_make_powernets, - /client/proc/cmd_debug_mob_lists, - /client/proc/cmd_admin_delete, - /client/proc/cmd_debug_del_all, - /client/proc/cmd_debug_force_del_all, - /client/proc/cmd_debug_hard_del_all, - /client/proc/restart_controller, - /client/proc/enable_mapping_verbs, - /client/proc/callproc, - /client/proc/callproc_datum, - /client/proc/SDQL2_query, - /client/proc/test_movable_UI, - /client/proc/test_snap_UI, - /client/proc/debugNatureMapGenerator, - /client/proc/check_bomb_impacts, - /proc/machine_upgrade, - /client/proc/populate_world, - /client/proc/get_dynex_power, //*debug verbs for dynex explosions. - /client/proc/get_dynex_range, //*debug verbs for dynex explosions. - /client/proc/set_dynex_scale, - /client/proc/cmd_display_del_log, - /client/proc/outfit_manager, - /client/proc/open_colorblind_test, - /client/proc/debug_plane_masters, - /client/proc/generate_wikichem_list, - /client/proc/modify_goals, - /client/proc/debug_huds, - /client/proc/map_template_load, - /client/proc/map_template_upload, - /client/proc/jump_to_ruin, - /client/proc/unload_ctf, - /client/proc/clear_dynamic_transit, - /client/proc/run_empty_query, - /client/proc/toggle_medal_disable, - /client/proc/view_runtimes, - /client/proc/pump_random_event, - /client/proc/cmd_display_init_log, - /client/proc/cmd_display_overlay_log, - /client/proc/reload_configuration, - /client/proc/atmos_control, - /client/proc/reload_cards, - /client/proc/validate_cards, - /client/proc/test_cardpack_distribution, - /client/proc/print_cards, - #ifdef TESTING + #ifdef TESTING /* Keep these at the top to not make the list look fugly */ /client/proc/check_missing_sprites, /client/proc/run_dynamic_simulations, #endif - /client/proc/display_sendmaps, + /proc/machine_upgrade, /datum/admins/proc/create_or_modify_area, - /client/proc/check_timer_sources, - /client/proc/toggle_cdn, /client/proc/adventure_manager, - /client/proc/load_circuit, - /client/proc/cmd_admin_toggle_fov, + /client/proc/atmos_control, + /client/proc/callproc, + /client/proc/callproc_datum, + /client/proc/check_bomb_impacts, + /client/proc/check_timer_sources, + /client/proc/clear_dynamic_transit, /client/proc/cmd_admin_debug_traitor_objectives, - /client/proc/spawn_debug_full_crew, - /client/proc/open_lua_editor, - /client/proc/validate_puzzgrids, - /client/proc/debug_spell_requirements, + /client/proc/cmd_admin_delete, + /client/proc/cmd_admin_list_open_jobs, + /client/proc/cmd_admin_toggle_fov, + /client/proc/cmd_debug_del_all, + /client/proc/cmd_debug_force_del_all, + /client/proc/cmd_debug_hard_del_all, + /client/proc/cmd_debug_make_powernets, + /client/proc/cmd_debug_mob_lists, + /client/proc/cmd_display_del_log, + /client/proc/cmd_display_init_log, + /client/proc/cmd_display_overlay_log, + /client/proc/Debug2, + /client/proc/debug_controller, /client/proc/debug_hallucination_weighted_list_per_type, + /client/proc/debug_huds, + /client/proc/debugNatureMapGenerator, + /client/proc/debug_plane_masters, + /client/proc/debug_spell_requirements, + /client/proc/display_sendmaps, + /client/proc/enable_mapping_verbs, + /client/proc/generate_wikichem_list, + /client/proc/get_dynex_power, /*debug verbs for dynex explosions.*/ + /client/proc/get_dynex_range, /*debug verbs for dynex explosions.*/ + /client/proc/jump_to_ruin, + /client/proc/load_circuit, + /client/proc/map_template_load, + /client/proc/map_template_upload, + /client/proc/modify_goals, + /client/proc/open_colorblind_test, + /client/proc/open_lua_editor, + /client/proc/outfit_manager, + /client/proc/populate_world, + /client/proc/pump_random_event, + /client/proc/print_cards, + /client/proc/reload_cards, + /client/proc/reload_configuration, + /client/proc/restart_controller, + /client/proc/run_empty_query, + /client/proc/SDQL2_query, + /client/proc/set_dynex_scale, + /client/proc/spawn_debug_full_crew, + /client/proc/test_cardpack_distribution, + /client/proc/test_movable_UI, + /client/proc/test_snap_UI, + /client/proc/toggle_cdn, + /client/proc/toggle_medal_disable, + /client/proc/unload_ctf, + /client/proc/validate_cards, + /client/proc/validate_puzzgrids, + /client/proc/view_runtimes, ) GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release)) GLOBAL_PROTECT(admin_verbs_possess)