From 96bcbe60a0c25598a5d25be2a9bb75cf654f6142 Mon Sep 17 00:00:00 2001 From: Cannibal Hunter <135169022+CannibalHunter@users.noreply.github.com> Date: Sat, 17 Aug 2024 17:23:11 -0500 Subject: [PATCH] shquasdh --- code/controllers/subsystem/rogue/devotion.dm | 2 +- .../rogue/triumphs/triumphs_unsorted.dm | 2 +- code/modules/admin/admin.dm | 13 ++++--- code/modules/admin/admin_verbs.dm | 16 ++++---- code/modules/admin/adminmenu.dm | 2 +- code/modules/admin/patreon.dm | 2 +- code/modules/admin/playerquality.dm | 8 ++-- code/modules/admin/verbs/adminjump.dm | 6 +-- code/modules/admin/verbs/adminsay.dm | 2 +- code/modules/admin/verbs/deadsay.dm | 2 +- code/modules/admin/verbs/debug.dm | 6 +++ code/modules/admin/verbs/getlogs.dm | 4 +- code/modules/admin/verbs/playsound.dm | 19 ++-------- code/modules/admin/verbs/randomverbs.dm | 37 ++++++++++--------- .../admin/verbs/reestablish_db_connection.dm | 2 +- code/modules/admin/verbs/tripAI.dm | 1 + code/modules/client/preferences_toggles.dm | 10 ++--- code/modules/client/verbs/ghost.dm | 2 +- code/modules/client/verbs/ooc.dm | 10 ++--- code/modules/client/verbs/ping.dm | 4 +- code/modules/client/verbs/who.dm | 2 +- .../modules/mob/dead/new_player/new_player.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 2 +- .../mob/living/carbon/spirit/spirit.dm | 2 +- code/modules/mob/mob.dm | 7 ++-- code/modules/mob/mob_movement.dm | 2 +- interface/interface.dm | 15 ++++---- 27 files changed, 92 insertions(+), 90 deletions(-) diff --git a/code/controllers/subsystem/rogue/devotion.dm b/code/controllers/subsystem/rogue/devotion.dm index 8e4b0e9c8..6d0816963 100644 --- a/code/controllers/subsystem/rogue/devotion.dm +++ b/code/controllers/subsystem/rogue/devotion.dm @@ -157,7 +157,7 @@ // Debug verb /mob/living/carbon/human/proc/devotionchange() set name = "(DEBUG)Change Devotion" - set category = "Special Verbs" + set category = "Debug" if(!devotion) return FALSE diff --git a/code/controllers/subsystem/rogue/triumphs/triumphs_unsorted.dm b/code/controllers/subsystem/rogue/triumphs/triumphs_unsorted.dm index 8d03df195..7e5f20b7a 100644 --- a/code/controllers/subsystem/rogue/triumphs/triumphs_unsorted.dm +++ b/code/controllers/subsystem/rogue/triumphs/triumphs_unsorted.dm @@ -12,7 +12,7 @@ return SStriumphs.get_triumphs(ckey) /client/proc/adjusttriumph() - set category = "GameMaster" + set category = "Admin" set name = "Adjust Triumphs" var/input = input(src, "how much") as num if(mob && input) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index a30415116..b0d7c56f1 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -14,7 +14,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////Panels /datum/admins/proc/show_player_panel(mob/M in GLOB.mob_list) - set category = "GameMaster" + set category = "Admin" set name = "Show Player Panel" set desc="Edit player (respawn, ban, heal, etc)" @@ -195,7 +195,7 @@ /datum/admins/proc/admin_heal(mob/living/M in GLOB.mob_list) set name = "Heal Mob" set desc = "Heal a mob to full health" - set category = "GameMaster" + set category = "Admin" if(!check_rights()) return @@ -207,7 +207,7 @@ /datum/admins/proc/admin_revive(mob/living/M in GLOB.mob_list) set name = "Revive Mob" set desc = "Resuscitate a mob" - set category = "GameMaster" + set category = "Admin" if(!check_rights()) return @@ -233,7 +233,7 @@ /datum/admins/proc/admin_sleep(mob/living/M in GLOB.mob_list) set name = "Toggle Sleeping" set desc = "Toggle a mob's sleeping state" - set category = "GameMaster" + set category = "Admin" if(!check_rights()) return @@ -298,6 +298,7 @@ set category = "Fun" set name = "Access Newscaster Network" set desc = "" + set hidden = 1 if (!istype(src, /datum/admins)) src = usr.client.holder @@ -599,7 +600,7 @@ /datum/admins/proc/announce() - set category = "Special Verbs" + set category = "Admin" set name = "Announce" set desc="Announce your desires to the world" if(!check_rights(0)) @@ -614,7 +615,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Announce") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/set_admin_notice() - set category = "Special Verbs" + set category = "Admin" set name = "Set Admin Notice" set desc ="Set an announcement that appears to everyone who joins the server. Only lasts this round" if(!check_rights(0)) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f802428d3..2a23d198a 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -369,7 +369,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) to_chat(src, show_popup_menus ? "Right click menus are now enabled" : "Right click menus are now disabled") /client/proc/admin_ghost() - set category = "GameMaster" + set category = "Admin" set name = "Aghost" if(!holder) return @@ -438,7 +438,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) /client/proc/check_antagonists() set name = "Check Antagonists" - set category = "GameMaster" + set category = "Admin" if(holder) holder.check_antagonists() log_admin("[key_name(usr)] checked antagonists.") //for tsar~ @@ -545,7 +545,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 = "Special Verbs" + set category = "Fun" set name = "Drop Bomb" set desc = "" @@ -587,7 +587,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 = "Special Verbs" + set category = "Fun" set name = "Drop DynEx Bomb" set desc = "" @@ -673,6 +673,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) /client/proc/give_disease(mob/living/T in GLOB.mob_living_list) set category = "Fun" set name = "Give Disease" + set hidden = 1 set desc = "" if(!istype(T)) to_chat(src, span_notice("I can only give a disease to a mob of type /mob/living.")) @@ -686,7 +687,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) message_admins(span_adminnotice("[key_name_admin(usr)] gave [key_name_admin(T)] the disease [D].")) /client/proc/object_say(obj/O in world) - set category = "Special Verbs" + set category = "Fun" set name = "OSay" set desc = "" var/message = input(usr, "What do you want the message to be?", "Make Sound") as text | null @@ -698,7 +699,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) 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 = "Special Verbs" + set category = "Admin" if (!(holder.rank.rights & R_BUILD)) return if(src.mob) @@ -793,6 +794,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) set name = "Toggle Admin AI Interact" set category = "Admin" set desc = "" + set hidden = 1 AI_Interact = !AI_Interact if(mob && IsAdminGhost(mob)) @@ -802,7 +804,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) message_admins("[key_name_admin(usr)] has [AI_Interact ? "activated" : "deactivated"] their AI interaction") /client/proc/end_party() - set category = "GameMaster" + set category = "Admin" set name = "EndPlaytest" set hidden = 1 if(!holder) diff --git a/code/modules/admin/adminmenu.dm b/code/modules/admin/adminmenu.dm index 0e7515d1c..41703f8a4 100644 --- a/code/modules/admin/adminmenu.dm +++ b/code/modules/admin/adminmenu.dm @@ -6,7 +6,7 @@ /datum/verbs/menu/Admin/verb/playerpanel() set name = "Player Panel New" set desc = "" - set category = "GameMaster" + set category = "Admin" if(usr.client.holder) usr.client.holder.player_panel_new() SSblackbox.record_feedback("tally", "admin_verb", 1, "Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/patreon.dm b/code/modules/admin/patreon.dm index f5a1a739c..a865eb981 100644 --- a/code/modules/admin/patreon.dm +++ b/code/modules/admin/patreon.dm @@ -230,7 +230,7 @@ GLOBAL_LIST_EMPTY(hiderole) GLOBAL_LIST_EMPTY(anonymize) /mob/dead/new_player/verb/anonymize() - set category = "Options" + set category = "OOC" set name = "Anonymize" if(!client) return diff --git a/code/modules/admin/playerquality.dm b/code/modules/admin/playerquality.dm index 82730a276..7e122fccf 100644 --- a/code/modules/admin/playerquality.dm +++ b/code/modules/admin/playerquality.dm @@ -85,8 +85,8 @@ log_admin("[admin] adjusted [key]'s PQ by [amt] for reason: [reason]") /client/proc/check_pq() - set category = "GameMaster" - set name = "CheckPQ" + set category = "Admin" + set name = "PQ-Check" if(!holder) return var/selection = alert(src, "Check VIA...", "Check PQ", "Character List", "Player List", "Player Name") @@ -148,8 +148,8 @@ popup.open() /client/proc/adjust_pq() - set category = "GameMaster" - set name = "AdjustPQ" + set category = "Admin" + set name = "PQ-Adjust" if(!holder) return var/selection = alert(src, "Adjust VIA...", "MODIFY PQ", "Character List", "Player List", "Player Name") diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index c9a739377..fbae246d4 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -1,7 +1,7 @@ /client/proc/jumptoarea(area/A in GLOB.sortedAreas) set name = "Jump to Area" set desc = "" - set category = "GameMaster" + set category = "Admin" if(!src.holder) // //to_chat(src, "Only administrators may use this command.") return @@ -38,7 +38,7 @@ return /client/proc/jumptomob(mob/M in GLOB.mob_list) - set category = "GameMaster" + set category = "Admin" set name = "Jump to Mob" if(!src.holder) @@ -72,7 +72,7 @@ message_admins("[key_name_admin(usr)] jumped to coordinates [tx], [ty], [tz]") /client/proc/jumptokey() - set category = "GameMaster" + set category = "Admin" set name = "Jump to Key" if(!src.holder) diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 524e033f7..b34d7bac4 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -1,5 +1,5 @@ /client/proc/cmd_admin_say(msg as text) - set category = "GameMaster" + set category = "Admin" set name = "Asay" //Gave this shit a shorter name so you only have to time out "asay" rather than "admin say" to use it --NeoFite set hidden = 0 if(!check_rights(0)) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index a6ab21c31..a99a84411 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -1,5 +1,5 @@ /client/proc/dsay(msg as text) - set category = "Special Verbs" + set category = "Admin" set name = "Dsay" set hidden = 1 if(!holder) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index b1a84db71..283af4e46 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -40,6 +40,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /client/proc/cmd_admin_robotize(mob/M in GLOB.mob_list) set category = "Fun" set name = "Make Robot" + set hidden = 1 if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") @@ -55,6 +56,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /client/proc/cmd_admin_blobize(mob/M in GLOB.mob_list) set category = "Fun" set name = "Make Blob" + set hidden = 1 if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") @@ -70,6 +72,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 name = "Make Simple Animal" + set hidden = 1 if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") @@ -91,6 +94,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that set category = "Fun" set name = "Make pAI" set desc = "" + set hidden = 1 var/list/available = list() for(var/mob/C in GLOB.mob_list) @@ -123,6 +127,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /client/proc/cmd_admin_alienize(mob/M in GLOB.mob_list) set category = "Fun" set name = "Make Alien" + set hidden = 1 if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") @@ -138,6 +143,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /client/proc/cmd_admin_slimeize(mob/M in GLOB.mob_list) set category = "Fun" set name = "Make slime" + set hidden = 1 if(!SSticker.HasRoundStarted()) alert("Wait until the game starts") diff --git a/code/modules/admin/verbs/getlogs.dm b/code/modules/admin/verbs/getlogs.dm index 0813d9aae..ea389db5e 100644 --- a/code/modules/admin/verbs/getlogs.dm +++ b/code/modules/admin/verbs/getlogs.dm @@ -2,14 +2,14 @@ /client/proc/getserverlogs() set name = "Get Server Logs" set desc = "" - set category = "GameMaster" + set category = "Admin" browseserverlogs() /client/proc/getcurrentlogs() set name = "Get Current Logs" set desc = "" - set category = "GameMaster" + set category = "Admin" browseserverlogs("[GLOB.log_directory]/") diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 879e08e06..30d2ab51d 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -40,7 +40,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Global Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/change_music_vol() - set category = "Options" + set category = "OOC" set name = "ChangeMusicPower" if(prefs) @@ -67,7 +67,7 @@ /client/verb/show_rolls() - set category = "Options" + set category = "OOC" set name = "ShowRolls" if(prefs) @@ -79,7 +79,7 @@ to_chat(src, "ShowRolls Disabled") /client/verb/change_master_vol() - set category = "Options" + set category = "OOC" set name = "ChangeVolPower" if(prefs) @@ -92,19 +92,6 @@ prefs.save_preferences() mob.update_channel_volume(CHANNEL_AMBIENCE, prefs.mastervol) -/* -/client/verb/help_rpguide() - set category = "Options" - set name = "zHelp-RPGuide" - - src << link("https://cdn.discordapp.com/attachments/844865105040506891/938971395445112922/rpguide.jpg") - -/client/verb/help_uihelp() - set category = "Options" - set name = "zHelp-UIGuide" - - src << link("https://cdn.discordapp.com/attachments/844865105040506891/938275090414579762/unknown.png") -*/ /client/proc/play_local_sound(S as sound) set category = "Fun" diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index b2e10b394..b957febf8 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 = "Special Verbs" + set category = "Admin" 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 = "Special Verbs" + set category = "Admin" set name = "Headset Message" set hidden = 1 @@ -83,7 +83,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_mod_antag_rep(client/C in GLOB.clients, operation) - set category = "Special Verbs" + set category = "Admin" set name = "Modify Antagonist Reputation" if(!check_rights(R_ADMIN)) @@ -129,7 +129,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Modify Antagonist Reputation") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_world_narrate() - set category = "Special Verbs" + set category = "Fun" set name = "Global Narrate" if(!check_rights(R_ADMIN)) @@ -145,7 +145,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 = "Special Verbs" + set category = "Fun" set name = "Direct Narrate" if(!check_rights(R_ADMIN)) @@ -170,7 +170,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 = "Special Verbs" + set category = "Fun" set name = "Local Narrate" if(!check_rights(R_ADMIN)) @@ -191,7 +191,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list) - set category = "Special Verbs" + set category = "Admin" set name = "Godmode" if(!check_rights(R_ADMIN)) return @@ -336,7 +336,7 @@ Works kind of like entering the game with a new character. Character receives a Traitors and the like can also be revived with the previous role mostly intact. /N */ /client/proc/respawn_character() - set category = "Special Verbs" + set category = "Admin" set name = "Respawn Character" set desc = "" if(!check_rights(R_ADMIN)) @@ -528,7 +528,7 @@ Traitors and the like can also be revived with the previous role mostly intact. 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_rejuvenate(mob/living/M in GLOB.mob_list) - set category = "Special Verbs" + set category = "Admin" set name = "Rejuvenate" if(!check_rights(R_ADMIN)) @@ -548,8 +548,9 @@ Traitors and the like can also be revived with the previous role mostly intact. SSblackbox.record_feedback("tally", "admin_verb", 1, "Rejuvinate") //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 = "Special Verbs" + set category = "Admin" set name = "Create Command Report" + set hidden = 1 if(!check_rights(R_ADMIN)) return @@ -574,8 +575,9 @@ Traitors and the like can also be revived with the previous role mostly intact. 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 = "Special Verbs" + set category = "Admin" set name = "Change Command Name" + set hidden = 1 if(!check_rights(R_ADMIN)) return @@ -606,7 +608,7 @@ Traitors and the like can also be revived with the previous role mostly intact. SSblackbox.record_feedback("tally", "admin_verb", 1, "Manage Job Slots") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world) - set category = "Special Verbs" + set category = "Fun" set name = "Explosion" if(!check_rights(R_ADMIN)) @@ -642,7 +644,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return /client/proc/cmd_admin_emp(atom/O as obj|mob|turf in world) - set category = "Special Verbs" + set category = "Fun" set name = "EM Pulse" if(!check_rights(R_ADMIN)) @@ -667,7 +669,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return /client/proc/cmd_admin_gib(mob/M in GLOB.mob_list) - set category = "Special Verbs" + set category = "Fun" set name = "Gib" if(!check_rights(R_ADMIN)) @@ -704,7 +706,7 @@ Traitors and the like can also be revived with the previous role mostly intact. mob.gib(1, 1, 1) /client/proc/cmd_admin_check_contents(mob/living/M in GLOB.mob_list) - set category = "Special Verbs" + set category = "Admin" set name = "Check Contents" var/list/L = M.get_contents() @@ -713,7 +715,7 @@ Traitors and the like can also be revived with the previous role mostly intact. SSblackbox.record_feedback("tally", "admin_verb", 1, "Check Contents") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_view_range() - set category = "Special Verbs" + set category = "Admin" set name = "Change View Range" set desc = "" @@ -772,6 +774,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Fun" set name = "Make Everyone Random" set desc = "" + set hidden = 1 if(SSticker.HasRoundStarted()) to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!") @@ -817,7 +820,7 @@ Traitors and the like can also be revived with the previous role mostly intact. /client/proc/admin_change_sec_level() - set category = "Special Verbs" + set category = "Admin" set name = "Set Security Level" set desc = "" set hidden = 1 diff --git a/code/modules/admin/verbs/reestablish_db_connection.dm b/code/modules/admin/verbs/reestablish_db_connection.dm index bd4943456..5700aa5ab 100644 --- a/code/modules/admin/verbs/reestablish_db_connection.dm +++ b/code/modules/admin/verbs/reestablish_db_connection.dm @@ -1,5 +1,5 @@ /client/proc/reestablish_db_connection() - set category = "Special Verbs" + set category = "Admin" set name = "Reestablish DB Connection" if (!CONFIG_GET(flag/sql_enabled)) to_chat(usr, span_adminnotice("The Database is not enabled!")) diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm index 1e9fbc474..70ad42dc0 100644 --- a/code/modules/admin/verbs/tripAI.dm +++ b/code/modules/admin/verbs/tripAI.dm @@ -1,6 +1,7 @@ /client/proc/triple_ai() set category = "Fun" set name = "Create AI Triumvirate" + set hidden = 1 if(SSticker.current_state > GAME_STATE_PREGAME) to_chat(usr, "This option is currently only usable during pregame. This may change at a later date.") diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 027a245d9..ce268b29e 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -14,7 +14,7 @@ /datum/verbs/menu/Settings/verb/setup_character() set name = "Game Preferences" - set category = "Options" + set category = "OOC" set desc = "" set hidden = 1 usr.client.prefs.current_tab = 1 @@ -23,7 +23,7 @@ /client/verb/toggle_fullscreen() set name = "ToggleFullscreen" - set category = "Options" + set category = "OOC" set desc = "" if(prefs) prefs.toggles ^= TOGGLE_FULLSCREEN @@ -31,7 +31,7 @@ /client/verb/stop_sounds_rogue() set name = "StopSounds" - set category = "Options" + set category = "OOC" set desc = "" if(mob) SEND_SOUND(mob, sound(null)) @@ -143,7 +143,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost, togglemidroundantag)() /* TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggletitlemusic)() set name = "LobbyMusic" - set category = "Options" + set category = "OOC" set desc = "" set hidden = 1 usr.client.prefs.toggles ^= SOUND_LOBBY @@ -247,7 +247,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_announcement_sound)() /datum/verbs/menu/Settings/Sound/verb/stop_client_sounds() set name = "Stop Sounds" - set category = "Options" + set category = "OOC" set desc = "" SEND_SOUND(usr, sound(null)) var/client/C = usr.client diff --git a/code/modules/client/verbs/ghost.dm b/code/modules/client/verbs/ghost.dm index cca89ea27..74cc25e18 100644 --- a/code/modules/client/verbs/ghost.dm +++ b/code/modules/client/verbs/ghost.dm @@ -55,7 +55,7 @@ GLOBAL_LIST_INIT(ghost_verbs, list( /mob/verb/returntolobby() set name = "{RETURN TO LOBBY}" - set category = "Options" + set category = "OOC" set hidden = 1 if(key) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 2440cc872..aaed0d450 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -302,12 +302,12 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") /* /client/verb/jcoindate() set name = "{CHECKJOINDATE}" - set category = "Options" + set category = "OOC" testing("[CheckJoinDate(ckey)]") */ /mob/dead/new_player/verb/togglobb() set name = "SilenceLobbyMusic" - set category = "Options" + set category = "OOC" stop_sound_channel(CHANNEL_LOBBYMUSIC) /proc/CheckJoinDate(ckey) @@ -353,7 +353,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") /client/verb/fix_chat() set name = "{FIX CHAT}" - set category = "Options" + set category = "OOC" set hidden = 1 if(!check_rights(0)) return @@ -493,7 +493,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") /client/verb/select_ignore() set name = "Ignore" - set category = "Options" + set category = "OOC" set desc ="Ignore a player's messages on the OOC channel" set hidden = 1 if(!holder) @@ -531,7 +531,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") /client/verb/fit_viewport() set name = "Fit Viewport" - set category = "Options" + set category = "OOC" set desc = "" set hidden = 1 if(!holder) diff --git a/code/modules/client/verbs/ping.dm b/code/modules/client/verbs/ping.dm index 3e700542c..dfc38d4fc 100644 --- a/code/modules/client/verbs/ping.dm +++ b/code/modules/client/verbs/ping.dm @@ -19,5 +19,5 @@ /client/verb/ping() set name = "Ping" - set category = "Options" - winset(src, null, "command=.display_ping+[world.time+world.tick_lag*TICK_USAGE_REAL/100]") \ No newline at end of file + set category = "OOC" + winset(src, null, "command=.display_ping+[world.time+world.tick_lag*TICK_USAGE_REAL/100]") diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm index 7c05d9071..1b336c1f5 100644 --- a/code/modules/client/verbs/who.dm +++ b/code/modules/client/verbs/who.dm @@ -1,7 +1,7 @@ /client/verb/who() set name = "Whom" - set category = "Options" + set category = "OOC" var/msg = "" diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 241f867cc..4e97889a7 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -275,7 +275,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt")) /mob/dead/new_player/verb/do_rp_prompt() set name = "Lore Primer" - set category = "Memory" + set category = "OOC" var/list/dat = list() dat += GLOB.roleplay_readme if(dat) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 43274877f..713d784ee 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -514,7 +514,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/returntolobby(modifier as num) set name = "{RETURN TO LOBBY}" - set category = "Options" + set category = "OOC" set hidden = 1 if (CONFIG_GET(flag/norespawn)) return diff --git a/code/modules/mob/living/carbon/spirit/spirit.dm b/code/modules/mob/living/carbon/spirit/spirit.dm index 58cb9743a..4eed0e917 100644 --- a/code/modules/mob/living/carbon/spirit/spirit.dm +++ b/code/modules/mob/living/carbon/spirit/spirit.dm @@ -120,7 +120,7 @@ /mob/living/carbon/spirit/returntolobby() set name = "{RETURN TO LOBBY}" - set category = "Options" + set category = "OOC" set hidden = 1 if(key) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index f44d06daf..71bca41b2 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -552,7 +552,7 @@ GLOBAL_VAR_INIT(mobids, 1) * This actually gets the mind datums notes */ /mob/verb/memory() - set name = "Notes" + set name = "Memories" set category = "Memory" set desc = "" if(mind) @@ -564,8 +564,9 @@ GLOBAL_VAR_INIT(mobids, 1) * Add a note to the mind datum */ /mob/verb/add_memory(msg as message) - set name = "AddNote" + set name = "New Memory" set category = "Memory" + if(mind) if (world.time < memory_throttle_time) return @@ -586,7 +587,7 @@ GLOBAL_VAR_INIT(mobids, 1) */ /mob/verb/abandon_mob() set name = "{RETURN TO LOBBY}" - set category = "Options" + set category = "OOC" set hidden = 1 if(!check_rights(0)) return diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 10f65f85f..d7e76084f 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -698,7 +698,7 @@ playsound_local(src, 'sound/misc/click.ogg', 100) /client/proc/hearallasghost() - set category = "GameMaster" + set category = "Admin" set name = "HearAllAsAdmin" if(!holder) return diff --git a/interface/interface.dm b/interface/interface.dm index a4035ec2b..7e1b27eaa 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -98,11 +98,12 @@ prefs.save_preferences() winset(src, "infowindow.changelog", "font-style=;") +/* /client/verb/hotkeys_help() set name = "_Help-Controls" set category = "OOC" mob.hotkey_help() - +*/ /mob/proc/hotkey_help() var/hotkey_mode = {" @@ -145,7 +146,7 @@ Hotkey-Mode: (hotkey-mode must be on) /client/verb/set_fixed() set name = "IconSize" - set category = "Options" + set category = "OOC" if(winget(src, "mapwindow.map", "icon-size") == "64") to_chat(src, "Stretch-to-fit... OK") @@ -156,7 +157,7 @@ Hotkey-Mode: (hotkey-mode must be on) /client/verb/set_stretch() set name = "IconScaling" - set category = "Options" + set category = "OOC" if(prefs) if(prefs.crt == TRUE) to_chat(src, "CRT mode is on.") @@ -170,7 +171,7 @@ Hotkey-Mode: (hotkey-mode must be on) winset(src, "mapwindow.map", "zoom-mode=normal") /client/verb/crtmode() - set category = "Options" + set category = "OOC" set name = "ToggleCRT" if(!prefs) return @@ -195,7 +196,7 @@ Hotkey-Mode: (hotkey-mode must be on) commendsomeone() /client/verb/changefps() - set category = "Options" + set category = "OOC" set name = "ChangeFPS" if(!prefs) return @@ -208,12 +209,12 @@ Hotkey-Mode: (hotkey-mode must be on) /* /client/verb/set_blur() set name = "AAOn" - set category = "Options" + set category = "OOC" winset(src, "mapwindow.map", "zoom-mode=blur") /client/verb/set_normal() set name = "AAOff" - set category = "Options" + set category = "OOC" winset(src, "mapwindow.map", "zoom-mode=normal")*/