diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm
index 008da629c37..9256e18d765 100644
--- a/code/controllers/subsystems/vote.dm
+++ b/code/controllers/subsystems/vote.dm
@@ -369,7 +369,7 @@ SUBSYSTEM_DEF(vote)
/// Mob level verb that allows players to vote on the current vote.
/mob/verb/vote()
- set category = "OOC"
+ set category = "OOC.Round"
set name = "Vote"
SSvote.ui_interact(usr)
diff --git a/code/game/antagonist/antagonist_factions.dm b/code/game/antagonist/antagonist_factions.dm
index c12cd5c542b..adfaceefd67 100644
--- a/code/game/antagonist/antagonist_factions.dm
+++ b/code/game/antagonist/antagonist_factions.dm
@@ -1,6 +1,6 @@
/mob/living/proc/convert_to_rev()
set name = "Invite to the Revolutionaries"
- set category = "IC"
+ set category = "IC.Antag"
var/list/mobs_to_convert = list()
for(var/mob/A in orange(world.view, src))
@@ -55,7 +55,7 @@
/mob/living/proc/convert_to_loyalist()
set name = "Invite to the Loyalists"
- set category = "IC"
+ set category = "IC.Antag"
var/list/mobs_to_convert = list()
for(var/mob/A in orange(world.view, src))
diff --git a/code/game/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm
index f6d5d0c5111..20f2c017d3b 100644
--- a/code/game/antagonist/antagonist_objectives.dm
+++ b/code/game/antagonist/antagonist_objectives.dm
@@ -37,7 +37,7 @@
*/
/mob/living/proc/write_ambition()
set name = "Set Ambition"
- set category = "IC"
+ set category = "IC.Antag"
if(!(usr?.mind))
return
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 6d65a97e87f..284abcc54af 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -596,7 +596,7 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
/mob/verb/check_round_info()
set name = "Check Round Info"
- set category = "OOC"
+ set category = "OOC.Round"
if(!SSticker.mode)
to_chat(usr, "Something is terribly wrong; there is no gametype.")
@@ -614,7 +614,7 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
/mob/verb/check_gamemode_probability()
set name = "Check Gamemode Probability"
- set category = "OOC"
+ set category = "OOC.Round"
if(GLOB.config.show_game_type_odd)
to_chat(src, "Secret Mode Odds:")
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index a8107d8c3df..8738d04ff07 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -150,7 +150,7 @@
AddOverlays("pinonfar")
/obj/item/pinpointer/advpinpointer/verb/toggle_mode()
- set category = "Object"
+ set category = "Object.Held"
set name = "Toggle Pinpointer Mode"
set src in view(1)
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 86331987a50..74a99ffa908 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -639,7 +639,7 @@
update_icon()
/obj/machinery/iv_drip/verb/toggle_mode()
- set category = "Object"
+ set category = "Object.IV Drip"
set name = "Toggle Mode"
set src in view(1)
@@ -651,7 +651,7 @@
update_icon()
/obj/machinery/iv_drip/verb/toggle_stop()
- set category = "Object"
+ set category = "Object.IV Drip"
set name = "Toggle Stop"
set src in view(1)
@@ -662,7 +662,7 @@
playsound(usr, 'sound/machines/click.ogg', 50, extrarange = SILENCED_SOUND_EXTRARANGE)
/obj/machinery/iv_drip/verb/toggle_valve()
- set category = "Object"
+ set category = "Object.IV Drip"
set name = "Toggle Valve"
set src in view(1)
@@ -690,7 +690,7 @@
return
/obj/machinery/iv_drip/verb/toggle_epp()
- set category = "Object"
+ set category = "Object.IV Drip"
set name = "Toggle EPP"
set src in view(1)
@@ -707,7 +707,7 @@
playsound(usr, 'sound/machines/click.ogg', 50, extrarange = SILENCED_SOUND_EXTRARANGE)
/obj/machinery/iv_drip/verb/transfer_rate()
- set category = "Object"
+ set category = "Object.IV Drip"
set name = "Set Transfer Rate"
set src in view(1)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index d8fb3fa2ad7..de673ea70fa 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -902,7 +902,7 @@ GLOBAL_LIST_INIT(slot_flags_enumeration, list(
/mob/living/carbon/verb/showoff()
set name = "Show Held Item"
- set category = "Object"
+ set category = "Object.Held"
var/obj/item/I = get_active_hand()
if(I && !I.abstract)
diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm
index 47a0f7dfea5..3f3f444672e 100644
--- a/code/game/objects/items/devices/lighting/flashlight.dm
+++ b/code/game/objects/items/devices/lighting/flashlight.dm
@@ -293,7 +293,7 @@
/obj/item/device/flashlight/verb/toggle_brightness()
set name = "Toggle Flashlight Brightness"
- set category = "Object"
+ set category = "Object.Held"
set src in usr
set_brightness(usr)
diff --git a/code/game/objects/items/devices/lightmeter.dm b/code/game/objects/items/devices/lightmeter.dm
index 85d5f5f9e2a..c5acc8eee86 100644
--- a/code/game/objects/items/devices/lightmeter.dm
+++ b/code/game/objects/items/devices/lightmeter.dm
@@ -33,7 +33,7 @@
to_chat(usr, SPAN_NOTICE(reading))
/obj/item/device/light_meter/verb/set_low_bound()
- set category = "Object"
+ set category = "Object.Held"
set name = "Set Detector Low-Bound"
set src in usr
@@ -44,7 +44,7 @@
low = num
/obj/item/device/light_meter/verb/set_high_bound()
- set category = "Object"
+ set category = "Object.Held"
set name = "Set Detector High-Bound"
set src in usr
diff --git a/code/game/objects/items/devices/paint_sprayer.dm b/code/game/objects/items/devices/paint_sprayer.dm
index 56f00727e2f..6a8cb9a3d7f 100644
--- a/code/game/objects/items/devices/paint_sprayer.dm
+++ b/code/game/objects/items/devices/paint_sprayer.dm
@@ -312,7 +312,7 @@
/obj/item/device/paint_sprayer/verb/choose_colour()
set name = "Choose Colour"
set desc = "Choose a paintgun colour."
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if(usr.incapacitated())
@@ -323,7 +323,7 @@
/obj/item/device/paint_sprayer/verb/choose_preset_colour()
set name = "Choose Preset Colour"
set desc = "Choose a paintgun colour."
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if(usr.incapacitated())
@@ -337,7 +337,7 @@
/obj/item/device/paint_sprayer/verb/choose_decal()
set name = "Choose Decal"
set desc = "Choose a paintgun decal."
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if(usr.incapacitated())
@@ -351,7 +351,7 @@
/obj/item/device/paint_sprayer/verb/choose_direction()
set name = "Choose Direction"
set desc = "Choose a paintgun direction."
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if(usr.incapacitated())
diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index 469c23f45f2..8d815679736 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -42,7 +42,7 @@ GLOBAL_LIST_EMPTY(teleportbeacons)
/obj/item/device/radio/beacon/verb/alter_signal(t as text)
set name = "Alter Beacon's Signal"
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if ((usr.canmove && !( usr.restrained() )))
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 28d696dd6db..556851c7380 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -227,7 +227,7 @@
. += "This radio can be heard by people standing next to the one wearing it."
/obj/item/device/radio/headset/wrist/verb/change_layer()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Change Wrist Layer"
set src in usr
@@ -255,7 +255,7 @@
slot_flags = SLOT_WRISTS | SLOT_EARS
/obj/item/device/radio/headset/wrist/clip/verb/flip_radio()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Flip Radio"
set src in usr
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 95228e4401b..69c8a621869 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -361,7 +361,7 @@ BREATH ANALYZER
/obj/item/device/healthanalyzer/verb/toggle_mode()
set name = "Switch Verbosity"
- set category = "Object"
+ set category = "Object.Held"
set src in usr
mode = !mode
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 7c6a66f6d22..e3d2093fa95 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -88,7 +88,7 @@
/obj/item/device/taperecorder/verb/record()
set name = "Start Recording"
- set category = "Object"
+ set category = "Object.Tape Recorder"
set src in usr
if(use_check_and_message(usr))
@@ -116,7 +116,7 @@
/obj/item/device/taperecorder/verb/stop()
set name = "Stop Recording"
- set category = "Object"
+ set category = "Object.Tape Recorder"
set src in usr
if(use_check_and_message(usr))
@@ -140,7 +140,7 @@
/obj/item/device/taperecorder/verb/clear_memory()
set name = "Clear Memory"
- set category = "Object"
+ set category = "Object.Tape Recorder"
set src in usr
if(use_check_and_message(usr))
@@ -163,7 +163,7 @@
/obj/item/device/taperecorder/verb/playback_memory()
set name = "Playback Memory"
- set category = "Object"
+ set category = "Object.Tape Recorder"
set src in usr
if(use_check_and_message(usr))
@@ -214,7 +214,7 @@
/obj/item/device/taperecorder/verb/print_transcript()
set name = "Print Transcript"
- set category = "Object"
+ set category = "Object.Tape Recorder"
set src in usr
if(use_check_and_message(usr))
@@ -248,7 +248,7 @@
/obj/item/device/taperecorder/verb/eject_usb()
set name = "Eject Portable Storage"
- set category = "Object"
+ set category = "Object.Tape Recorder"
set src in usr
if(use_check_and_message(usr))
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index 15de5b79cc2..cac9b65412c 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -13,7 +13,7 @@
/obj/item/device/hailer/verb/set_message()
set name = "Set Hailer Message"
- set category = "Object"
+ set category = "Object.Held"
set desc = "Alter the message shouted by your hailer."
set src in usr
diff --git a/code/game/objects/items/tajara.dm b/code/game/objects/items/tajara.dm
index 5e960c76333..be01b6aa802 100644
--- a/code/game/objects/items/tajara.dm
+++ b/code/game/objects/items/tajara.dm
@@ -144,7 +144,7 @@
return "around [user.get_pronoun("his")] neck"
/obj/item/clothing/wrists/watch/pocketwatch/adhomai/checktime(mob/user)
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Check Time"
set src in usr
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 0de304aae2b..e563fda4003 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -334,8 +334,8 @@
M.update_inv_wear_id()
/obj/item/card/id/verb/flip_side()
- set name = "Flip ID card"
- set category = "Object"
+ set name = "Flip ID Card"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr, use_flags = USE_DISALLOW_SILICONS))
return
@@ -350,7 +350,7 @@
/obj/item/card/id/verb/toggle_icon_layer()
set name = "Switch ID Layer"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr, use_flags = USE_DISALLOW_SILICONS))
diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm
index 27ee5b35249..63dae3ac5b9 100644
--- a/code/game/objects/items/weapons/material/kitchen.dm
+++ b/code/game/objects/items/weapons/material/kitchen.dm
@@ -76,8 +76,8 @@
return
/obj/item/material/kitchen/utensil/verb/bite_size()
- set name = "Change bite size"
- set category = "Object"
+ set name = "Change Bite Size"
+ set category = "Object.Held"
set src in usr
var/nsize = tgui_input_list(usr, "Select the amount of reagents to pick up.", "Bite Size", bite_sizes, transfer_amt)
diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm
index 93c4f3cd6a8..3d5c334d871 100644
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -160,8 +160,8 @@
attack_self(usr)
/obj/item/material/twohanded/verb/wield_twohanded()
- set name = "Wield two-handed weapon"
- set category = "Object"
+ set name = "Wield Two-Handed Weapon"
+ set category = "Object.Held"
set src in usr
attack_self(usr)
@@ -539,8 +539,8 @@
// Just an override.
/obj/item/material/twohanded/chainsaw/verb/toggle_power()
- set name = "Toggle power"
- set category = "Object"
+ set name = "Toggle Chainsaw Power"
+ set category = "Object.Held"
set src in usr
AltClick(usr)
@@ -607,7 +607,7 @@
/obj/item/material/twohanded/pike/flag/verb/plant()
set name = "Plant Flag"
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if(ishuman(usr))
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 3a1f711d0ce..6ff2f9662f8 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -49,7 +49,7 @@
/obj/item/storage/backpack/proc/adjust_backpack_straps()
set name = "Adjust Bag Straps"
set desc = "Adjust your bag straps."
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
return 0
@@ -974,7 +974,7 @@
/obj/item/storage/backpack/cloak/verb/toggle_cloak_hood()
set name = "Toggle Cloak Hood"
set desc = "Toggle your cloak hood."
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
return 0
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 5f492973211..cd3c3f4af8e 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -49,7 +49,7 @@
/obj/item/storage/belt/verb/toggle_layer()
set name = "Switch Belt Layer"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(show_above_suit == -1)
@@ -71,7 +71,7 @@
verbs += /obj/item/storage/belt/proc/flipbelt
/obj/item/storage/belt/proc/flipbelt(mob/user, var/self = TRUE)
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Flip Belt"
set src in usr
diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm
index 4797f45b007..5109b6297cf 100644
--- a/code/game/objects/items/weapons/storage/wallets.dm
+++ b/code/game/objects/items/weapons/storage/wallets.dm
@@ -184,7 +184,7 @@
/obj/item/storage/wallet/lanyard/verb/toggle_icon_layer()
set name = "Switch Lanyard Layer"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr, use_flags = USE_DISALLOW_SILICONS))
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index df7a3f08cf5..1ccdf6b8996 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -54,7 +54,7 @@
/obj/item/tank/jetpack/verb/toggle_rockets()
set name = "Toggle Jetpack Stabilization"
- set category = "Object"
+ set category = "Object.Jetpack"
set src in usr
toggle_rockets_stabilization(usr)
@@ -67,7 +67,7 @@
/obj/item/tank/jetpack/verb/toggle()
set name = "Toggle Jetpack"
- set category = "Object"
+ set category = "Object.Jetpack"
set src in usr
toggle_jetpack(usr)
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 067ddfe2741..67822c536af 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -25,7 +25,7 @@
/obj/item/watertank/verb/toggle_mister()
set name = "Toggle Mister"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
var/mob/living/carbon/human/user
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index bc5f300585b..a5b391ebaab 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -88,8 +88,8 @@
/obj/structure/proc/climb_on()
- set name = "Climb structure"
- set desc = "Climbs onto a structure."
+ set name = "Climb Structure"
+ set desc = "Climbs onto a structure. Shortcut middle-mouse click."
set category = "Object"
set src in oview(1)
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index b3573d019c0..972aa5519d3 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -5,7 +5,7 @@
/client/verb/ooc(msg as text)
set name = "OOC"
- set category = "OOC"
+ set category = "OOC.Chat"
if(say_disabled) //This is here to try to identify lag problems
to_chat(usr, SPAN_WARNING("Speech is currently admin-disabled."))
@@ -73,7 +73,7 @@
/client/verb/looc(msg as text)
set name = "LOOC"
set desc = "Local OOC, seen only by those in view."
- set category = "OOC"
+ set category = "OOC.Chat"
if(say_disabled) //This is here to try to identify lag problems
to_chat(usr, SPAN_DANGER("Speech is currently admin-disabled."))
@@ -187,7 +187,7 @@
/client/verb/fit_viewport()
set name = "Fit Viewport"
- set category = "OOC"
+ set category = "OOC.Debug"
set desc = "Fit the width of the map window to match the viewport"
// Fetch aspect ratio
@@ -267,7 +267,7 @@
/client/verb/refresh_tgui()
set name = "Refresh TGUI"
- set category = "OOC"
+ set category = "OOC.Debug"
for(var/window_id in tgui_windows)
var/datum/tgui_window/window = tgui_windows[window_id]
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index e4531078984..b23ba1f78cf 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -41,7 +41,7 @@
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_dev_say(msg as text)
- set category = "Special Verbs"
+ set category = "OOC.Chat"
set name = "Devsay"
set hidden = 1
diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm
index bea9b89ceaa..4ed13102ee7 100644
--- a/code/modules/admin/verbs/antag-ooc.dm
+++ b/code/modules/admin/verbs/antag-ooc.dm
@@ -1,5 +1,5 @@
/client/proc/aooc(msg as text)
- set category = "OOC"
+ set category = "OOC.Chat"
set name = "AOOC"
set desc = "Antagonist OOC"
diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm
index 75f83ec5aef..beb20a7b0eb 100644
--- a/code/modules/admin/verbs/custom_event.dm
+++ b/code/modules/admin/verbs/custom_event.dm
@@ -26,7 +26,7 @@
// normal verb for players to view info
/client/verb/cmd_view_custom_event()
- set category = "OOC"
+ set category = "OOC.Round"
set name = "Custom Event Info"
if(!GLOB.custom_event_msg || GLOB.custom_event_msg == "")
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index 2f0dc4f0e85..c3cc3167464 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 = "OOC.Chat"
set name = "Dsay" //Gave this shit a shorter name so you only have to time out "dsay" rather than "dead say" to use it --NeoFite
set hidden = 1
if(!src.holder)
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index e1d104bba23..9fdc3e58ff9 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -232,7 +232,7 @@
/obj/item/device/assembly_holder/timer_igniter/verb/configure()
set name = "Set Timer"
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if(!(usr.stat || usr.restrained()))
diff --git a/code/modules/cciaa/cciaa_items.dm b/code/modules/cciaa/cciaa_items.dm
index 48ead6e710f..30c3d2bd275 100644
--- a/code/modules/cciaa/cciaa_items.dm
+++ b/code/modules/cciaa/cciaa_items.dm
@@ -46,7 +46,7 @@
/obj/item/device/taperecorder/cciaa/record()
set name = "Start Recording"
- set category = "Recorder"
+ set category = "Object.Tape Recorder"
if(!check_rights(R_CCIAA,FALSE))
to_chat(usr, SPAN_NOTICE("The device beeps and flashes \"Unauthorised user.\"."))
@@ -131,7 +131,7 @@
/obj/item/device/taperecorder/cciaa/stop()
set name = "Stop Recording"
- set category = "Recorder"
+ set category = "Object.Tape Recorder"
if(use_check_and_message(usr))
return
@@ -192,7 +192,7 @@
/obj/item/device/taperecorder/cciaa/verb/reset_recorder()
set name = "Reset Recorder"
- set category = "Recorder"
+ set category = "Object.Tape Recorder"
if(!check_rights(R_CCIAA,FALSE))
to_chat(usr, SPAN_NOTICE("The device beeps and flashes \"Unauthorised user.\"."))
@@ -232,7 +232,7 @@
/obj/item/device/taperecorder/cciaa/print_transcript()
set name = "Print Transcript"
- set category = "Recorder"
+ set category = "Object.Tape Recorder"
if(use_check_and_message(usr))
return
@@ -250,7 +250,7 @@
/obj/item/device/taperecorder/cciaa/verb/pause_recording()
set name = "Pause Recording"
- set category = "Recorder"
+ set category = "Object.Tape Recorder"
if(use_check_and_message(usr))
return
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 1f8aa8c8540..85a198dfc79 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -624,7 +624,7 @@
/obj/item/clothing/head/proc/toggle_block_hair()
set name = "Toggle Hair Coverage"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(allow_hair_covering)
@@ -838,7 +838,7 @@
/obj/item/clothing/mask/proc/adjust_mask(mob/user, var/self = TRUE)
set name = "Adjust Mask"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(!adjustable)
@@ -922,7 +922,7 @@
/obj/item/clothing/shoes/proc/draw_knife()
set name = "Draw Boot Knife"
set desc = "Pull out your boot knife."
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if(use_check_and_message(usr))
@@ -962,7 +962,7 @@
/obj/item/clothing/shoes/verb/toggle_layer()
set name = "Switch Shoe Layer"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
@@ -1332,13 +1332,13 @@
/obj/item/clothing/under/proc/toggle()
set name = "Toggle Suit Sensors"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
set_sensors(usr)
/obj/item/clothing/under/proc/rollsuit()
set name = "Roll Up/Down Jumpsuit"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(!istype(usr, /mob/living)) return
if(usr.stat) return
@@ -1379,7 +1379,7 @@
/obj/item/clothing/under/proc/rollsleeves()
set name = "Roll Up/Down Sleeves"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(!istype(usr, /mob/living)) return
if(usr.stat) return
diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm
index b62173fe712..8d3ed7f977e 100644
--- a/code/modules/clothing/clothing_accessories.dm
+++ b/code/modules/clothing/clothing_accessories.dm
@@ -152,7 +152,7 @@
/obj/item/clothing/proc/remove_accessory_verb()
set name = "Remove Accessory"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
remove_accessory_handler(usr, FALSE)
diff --git a/code/modules/clothing/ears/antennae.dm b/code/modules/clothing/ears/antennae.dm
index e8288b59e9f..4a6e4cde122 100644
--- a/code/modules/clothing/ears/antennae.dm
+++ b/code/modules/clothing/ears/antennae.dm
@@ -9,9 +9,9 @@
pickup_sound = 'sound/items/pickup/component.ogg'
/obj/item/clothing/ears/antenna/verb/lock_antennas()
- set name = "Lock Antenna(s)"
- set desc = "Lock your antenna(s) in place."
- set category = "Object"
+ set name = "Lock Antenna(e)"
+ set desc = "Lock your antenna(e) in place."
+ set category = "Object.Equipped"
set src in usr
if(!ishuman(usr))
diff --git a/code/modules/clothing/ears/earphones.dm b/code/modules/clothing/ears/earphones.dm
index 37b5afad5d7..57f9c2efa9a 100644
--- a/code/modules/clothing/ears/earphones.dm
+++ b/code/modules/clothing/ears/earphones.dm
@@ -188,8 +188,8 @@
*/
/obj/item/clothing/ears/earphones/verb/play_stop()
- set name = "Earphones - Play/Stop"
- set category = "Object"
+ set name = "Play/Stop"
+ set category = "Object.Earphones"
set src in usr
if(use_check_and_message(usr))
@@ -208,8 +208,8 @@
StartPlaying(usr)
/obj/item/clothing/ears/earphones/verb/change_volume()
- set name = "Earphones - Change Volume"
- set category = "Object"
+ set name = "Change Volume"
+ set category = "Object.Earphones"
set src in usr
if(use_check_and_message(usr))
@@ -234,8 +234,8 @@
soundplayer_token.SetVolume(volume)
/obj/item/clothing/ears/earphones/verb/pause_unpause()
- set name = "Earphones - Pause/Unpause"
- set category = "Object"
+ set name = "Pause/Unpause"
+ set category = "Object.Earphones"
set src in usr
if(use_check_and_message(usr))
@@ -267,8 +267,8 @@
play_stop() //No soundtoken? They probably meant to use the other verb instead.
/obj/item/clothing/ears/earphones/verb/next_song_verb()
- set name = "Earphones - Next Song"
- set category = "Object"
+ set name = "Next Song"
+ set category = "Object.Earphones"
set src in usr
usr.visible_message(SPAN_NOTICE("[usr] clicks a button on [usr.get_pronoun("his")] [src]."))
@@ -276,8 +276,8 @@
next_song(usr)
/obj/item/clothing/ears/earphones/verb/previous_song_verb()
- set name = "Earphones - Previous Song"
- set category = "Object"
+ set name = "Previous Song"
+ set category = "Object.Earphones"
set src in usr
usr.visible_message(SPAN_NOTICE("[usr] clicks a button on [usr.get_pronoun("his")] [src]."))
@@ -285,8 +285,8 @@
previous_song(usr)
/obj/item/clothing/ears/earphones/verb/eject_music_cartridge_verb()
- set name = "Earphones - Eject Music Cartridge"
- set category = "Object"
+ set name = "Eject Music Cartridge"
+ set category = "Object.Earphones"
set src in usr
eject_music_cartridge(usr)
diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm
index 4db331d1ac9..35ad06a5126 100644
--- a/code/modules/clothing/factions/dominia.dm
+++ b/code/modules/clothing/factions/dominia.dm
@@ -401,7 +401,7 @@
/obj/item/clothing/under/dominia/lyodsuit/hoodie/proc/toggle_mask()
set name = "Toggle Lyodsuit Mask"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
@@ -564,7 +564,7 @@
/obj/item/clothing/accessory/poncho/dominia/red/verb/roll_up_mantle()
set name = "Roll Up Cape Mantle"
set desc = "Roll up your cape's mantle. Doesn't work with some capes."
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
diff --git a/code/modules/clothing/factions/elyra.dm b/code/modules/clothing/factions/elyra.dm
index 77a258ebeec..cd0c28f9c53 100644
--- a/code/modules/clothing/factions/elyra.dm
+++ b/code/modules/clothing/factions/elyra.dm
@@ -51,7 +51,7 @@
/obj/item/clothing/under/elyra_holo/verb/transform_holoclothing()
set name = "Transform Holoclothing"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
select_appearance(usr)
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index aade35c7cbe..2cde7080e5a 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -48,7 +48,7 @@ BLIND // can't see anything
return 0 // return 1 to cancel attack_hand/RangedAttack()
/obj/item/clothing/glasses/verb/change_layer()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Change Glasses Layer"
set src in usr
@@ -143,8 +143,8 @@ BLIND // can't see anything
prescription = 7
/obj/item/clothing/glasses/meson/aviator/verb/toggle()
- set category = "Object"
- set name = "Toggle Aviators"
+ set category = "Object.Equipped"
+ set name = "Toggle Meson Mode"
set src in usr
attack_self(usr)
@@ -154,14 +154,14 @@ BLIND // can't see anything
desc = "Modified aviator glasses with a toggled health HUD. Comes with bonus prescription overlay."
icon_state = "aviator_med"
item_state = "aviator_med"
- action_button_name = "Toggle Mode"
+ action_button_name = "Toggle HUD"
toggleable = 1
activation_sound = 'sound/effects/pop.ogg'
prescription = 7
/obj/item/clothing/glasses/hud/health/aviator/verb/toggle()
- set category = "Object"
- set name = "Toggle Aviators"
+ set category = "Object.Equipped"
+ set name = "Toggle HUD mode"
set src in usr
attack_self(usr)
@@ -243,8 +243,8 @@ BLIND // can't see anything
prescription = 7
/obj/item/clothing/glasses/night/aviator/verb/toggle()
- set category = "Object"
- set name = "Toggle Aviators"
+ set category = "Object.Equipped"
+ set name = "Toggle Nightvision Mode"
set src in usr
attack_self(usr)
@@ -286,8 +286,8 @@ BLIND // can't see anything
toggle()
/obj/item/clothing/glasses/safety/goggles/verb/toggle()
- set category = "Object"
- set name = "Adjust goggles"
+ set category = "Object.Equipped"
+ set name = "Adjust Goggles"
set src in usr
if(use_check_and_message(usr))
@@ -315,7 +315,7 @@ BLIND // can't see anything
return
/obj/item/clothing/glasses/safety/goggles/change_layer()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Change Glasses Layer"
set src in usr
@@ -489,8 +489,8 @@ BLIND // can't see anything
pickup_sound = 'sound/items/pickup/gloves.ogg'
/obj/item/clothing/glasses/eyepatch/verb/flip_patch()
- set name = "Flip Patch"
- set category = "Object"
+ set name = "Flip Eyepatch"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
@@ -537,7 +537,7 @@ BLIND // can't see anything
prescription = 7
/obj/item/clothing/glasses/material/aviator/verb/toggle()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Toggle Aviators"
set src in usr
@@ -753,8 +753,8 @@ BLIND // can't see anything
toggle()
/obj/item/clothing/glasses/welding/verb/toggle()
- set category = "Object"
- set name = "Adjust welding goggles"
+ set category = "Object.Equipped"
+ set name = "Adjust Welding Goggles"
set src in usr
if(usr.canmove && !usr.stat && !usr.restrained())
@@ -990,7 +990,7 @@ BLIND // can't see anything
item_state = "[initial(item_state)]_off"
/obj/item/clothing/glasses/sunglasses/sechud/aviator/verb/toggle()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Toggle Aviators"
set src in usr
@@ -1118,7 +1118,7 @@ BLIND // can't see anything
. += "Modified aviator glasses with a toggled thermal-vision mode."
/obj/item/clothing/glasses/thermal/aviator/verb/toggle()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Toggle Aviators"
set src in usr
@@ -1293,9 +1293,8 @@ BLIND // can't see anything
/obj/item/clothing/glasses/spiffygogs/attack_self()
toggle()
-
/obj/item/clothing/glasses/spiffygogs/verb/toggle()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Adjust Goggles"
set src in usr
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 8ce09c48d3b..9c4af5e6984 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -81,7 +81,7 @@
/obj/item/clothing/head/helmet/proc/toggle_camera()
set name = "Toggle Helmet Camera"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(ispath(camera))
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 2ecd2d8674d..c8fedef8bfc 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -47,8 +47,8 @@
/obj/item/clothing/head/welding/verb/toggle()
- set category = "Object"
- set name = "Adjust welding mask"
+ set category = "Object.Equipped"
+ set name = "Adjust Welding Mask"
set src in usr
if(!base_state)
diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm
index 8488d425404..a5af008fd61 100644
--- a/code/modules/clothing/head/pilot_helmet.dm
+++ b/code/modules/clothing/head/pilot_helmet.dm
@@ -65,7 +65,7 @@
/obj/item/clothing/head/helmet/pilot/verb/visor_toggled()
set name = "Toggle Visor"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
var/mob/living/carbon/human/user = usr
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index e312386f39e..a5bd71af7d8 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -17,7 +17,7 @@
/obj/item/clothing/head/softcap/verb/ToggleHat()
set name = "Flip Hat"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
diff --git a/code/modules/clothing/head/xenos/vaurca.dm b/code/modules/clothing/head/xenos/vaurca.dm
index 2240ea7ba8e..31626e64ab1 100644
--- a/code/modules/clothing/head/xenos/vaurca.dm
+++ b/code/modules/clothing/head/xenos/vaurca.dm
@@ -12,7 +12,7 @@
/obj/item/clothing/head/vaurca_breeder/verb/raise_shroud()
set name = "Raise Shroud"
set desc = "Raise your shroud."
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr) || !ishuman(usr))
diff --git a/code/modules/clothing/pants/pants.dm b/code/modules/clothing/pants/pants.dm
index 34d6fd308d2..61a9c5a6cc9 100644
--- a/code/modules/clothing/pants/pants.dm
+++ b/code/modules/clothing/pants/pants.dm
@@ -41,7 +41,7 @@ ABSTRACT_TYPE(/obj/item/clothing/pants)
M.update_inv_pants()
/obj/item/clothing/pants/verb/change_layer()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Change Pants Layer"
set src in usr
diff --git a/code/modules/clothing/sets/captain.dm b/code/modules/clothing/sets/captain.dm
index 1d7cd78b842..6480bad6409 100644
--- a/code/modules/clothing/sets/captain.dm
+++ b/code/modules/clothing/sets/captain.dm
@@ -41,7 +41,7 @@
/obj/item/clothing/under/rank/captain/verb/fold_open()
set name = "Fold Collar"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
@@ -75,7 +75,7 @@
/obj/item/clothing/under/dress/dress_cap/verb/fold_open()
set name = "Fold Collar"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index 51f51572195..2c81d7891ac 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -176,7 +176,7 @@
/obj/item/clothing/suit/space/void/verb/toggle_helmet()
set name = "Toggle Helmet"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(!istype(src.loc,/mob/living)) return
@@ -209,7 +209,7 @@
/obj/item/clothing/suit/space/void/verb/eject_tank()
set name = "Eject Voidsuit Tank"
- set category = "Object"
+ set category = "Object.Equipped"
set src in view(1)
var/mob/living/user = usr
@@ -233,7 +233,7 @@
/obj/item/clothing/suit/space/void/verb/eject_cooler()
set name = "Eject Suit Cooler"
- set category = "Object"
+ set category = "Object.Equipped"
set src in view(1)
var/mob/living/user = usr
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index b86c4f6381e..f0fbfd31754 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -229,7 +229,7 @@
/obj/item/clothing/suit/armor/tactical/verb/holster()
set name = "Holster"
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if(!istype(usr, /mob/living)) return
if(usr.stat) return
diff --git a/code/modules/clothing/suits/hazardvests.dm b/code/modules/clothing/suits/hazardvests.dm
index 9c52f3dd920..fc212bc5944 100644
--- a/code/modules/clothing/suits/hazardvests.dm
+++ b/code/modules/clothing/suits/hazardvests.dm
@@ -14,7 +14,7 @@
/obj/item/clothing/suit/storage/hazardvest/verb/Toggle() //copied from storage toggle
set name = "Toggle Hazard Vest"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm
index 80ccb995bb8..d1550546324 100644
--- a/code/modules/clothing/suits/hoodies.dm
+++ b/code/modules/clothing/suits/hoodies.dm
@@ -21,7 +21,7 @@
/obj/item/clothing/suit/storage/hooded/verb/ToggleHood()
set name = "Toggle Coat Hood"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
@@ -287,7 +287,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/verb/Toggle()
set name = "Toggle Coat Zipper"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
return 0
diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
index a35e8f90131..c4cf04d538a 100644
--- a/code/modules/clothing/suits/storage.dm
+++ b/code/modules/clothing/suits/storage.dm
@@ -48,7 +48,7 @@
/obj/item/clothing/suit/storage/toggle/verb/toggle()
set name = "Toggle Coat Buttons"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
@@ -84,7 +84,7 @@
/obj/item/clothing/suit/storage/vest/verb/toggle()
set name ="Adjust Badge"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(!usr.canmove || usr.stat || usr.restrained())
return 0
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index cbcd6b2c5bd..b7ed310dbc3 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -425,8 +425,8 @@
protects_against_weather = TRUE
/obj/item/clothing/accessory/poncho/verb/toggle_hide_tail()
- set name = "Toggle Tail Coverage"
- set category = "Object"
+ set name = "Toggle Poncho Tail Coverage"
+ set category = "Object.Equipped"
set src in usr
if(allow_tail_hiding)
diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm
index 27013fbfecc..c0371c5f4b3 100644
--- a/code/modules/clothing/under/accessories/badges.dm
+++ b/code/modules/clothing/under/accessories/badges.dm
@@ -85,8 +85,8 @@
SPAN_DANGER("You invade [target_mob]'s personal space, thrusting [src] into their face insistently."))
/obj/item/clothing/accessory/badge/verb/flip_side()
- set category = "Object"
- set name = "Flip badge"
+ set category = "Object.Equipped"
+ set name = "Flip Badge"
set src in usr
if (use_check_and_message(usr))
diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
index ef1c546d64b..6d48eebd17b 100644
--- a/code/modules/clothing/under/accessories/holster.dm
+++ b/code/modules/clothing/under/accessories/holster.dm
@@ -122,7 +122,7 @@
/obj/item/clothing/accessory/holster/verb/holster_verb() //For the holster hotkey.
set name = "Holster"
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if(!istype(usr, /mob/living))
diff --git a/code/modules/clothing/under/accessories/shirts.dm b/code/modules/clothing/under/accessories/shirts.dm
index 631ca57a359..1fd50bd406b 100644
--- a/code/modules/clothing/under/accessories/shirts.dm
+++ b/code/modules/clothing/under/accessories/shirts.dm
@@ -127,7 +127,7 @@
/obj/item/clothing/accessory/wcoat_rec/det_vest/verb/unbutton()
set name = "Unbutton Waistcoat"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(!istype(usr, /mob/living))
diff --git a/code/modules/clothing/under/accessories/xeno/unathi.dm b/code/modules/clothing/under/accessories/xeno/unathi.dm
index 50837b3f174..ab614b08c4f 100644
--- a/code/modules/clothing/under/accessories/xeno/unathi.dm
+++ b/code/modules/clothing/under/accessories/xeno/unathi.dm
@@ -19,8 +19,8 @@
toggle()
/obj/item/clothing/accessory/sinta_hood/verb/toggle()
- set category = "Object"
- set name = "Adjust Hood"
+ set category = "Object.Equipped"
+ set name = "Toggle Hood"
set src in usr
if(use_check_and_message(usr))
diff --git a/code/modules/clothing/under/shirts/shirts.dm b/code/modules/clothing/under/shirts/shirts.dm
index e3c5aa695bb..f09e4c2ab9c 100644
--- a/code/modules/clothing/under/shirts/shirts.dm
+++ b/code/modules/clothing/under/shirts/shirts.dm
@@ -18,9 +18,9 @@
M.update_inv_wear_suit()
/obj/item/clothing/under/dressshirt/verb/roll_up_shirt_sleeves()
- set name = "Roll Up Shirt Sleeves"
+ set name = "Roll Up Sleeves"
set desc = "Roll up your shirt sleeves. Doesn't work with some shirts."
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
@@ -201,8 +201,8 @@
var/open = FALSE
/obj/item/clothing/under/dressshirt/silversun/verb/unbutton()
- set name = "Unbutton Shirt"
- set category = "Object"
+ set name = "Toggle Shirt Buttons"
+ set category = "Object.Equipped"
set src in usr
if(!istype(usr, /mob/living))
diff --git a/code/modules/clothing/under/xenos/skrell.dm b/code/modules/clothing/under/xenos/skrell.dm
index 6a6d3fa1a45..98e1c1a1f67 100644
--- a/code/modules/clothing/under/xenos/skrell.dm
+++ b/code/modules/clothing/under/xenos/skrell.dm
@@ -27,7 +27,7 @@
/obj/item/clothing/under/skrell/qeblak/verb/toggle_lights()
set name = "Toggle Ceremonial Garment Lights"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if (use_check_and_message(usr))
diff --git a/code/modules/clothing/wrists/watches.dm b/code/modules/clothing/wrists/watches.dm
index a4c5b5cd04e..c0c658992e2 100644
--- a/code/modules/clothing/wrists/watches.dm
+++ b/code/modules/clothing/wrists/watches.dm
@@ -88,7 +88,7 @@
usr.visible_message(SPAN_NOTICE("[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes."), SPAN_NOTICE("You point down at the [src], an arrogant look about your eyes."))
/obj/item/clothing/wrists/watch/verb/checktime()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Check Time"
set src in usr
@@ -102,7 +102,7 @@
to_chat(usr, "You check your watch as it dawns on you that it's broken.")
/obj/item/clothing/wrists/watch/verb/pointatwatch()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Point At Watch"
set src in usr
diff --git a/code/modules/clothing/wrists/wrists.dm b/code/modules/clothing/wrists/wrists.dm
index 6d69fef3b9f..6f49e51dcaf 100644
--- a/code/modules/clothing/wrists/wrists.dm
+++ b/code/modules/clothing/wrists/wrists.dm
@@ -29,7 +29,7 @@
verbs += /obj/item/clothing/wrists/watch/proc/swapwrists
/obj/item/clothing/wrists/verb/change_layer()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Change Wristwear Layer"
set src in usr
@@ -41,7 +41,7 @@
update_clothing_icon()
/obj/item/clothing/wrists/watch/proc/swapwrists()
- set category = "Object"
+ set category = "Object.Equipped"
set name = "Flip Wristwear"
set src in usr
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index ea1a79a3ef7..b84402a3646 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -1491,7 +1491,7 @@ All custom items with worn sprites must follow the contained sprite system: http
/obj/item/clothing/accessory/poncho/tajarancloak/fluff/dekel_smock/verb/change_hood()
set name = "Toggle Hood"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
if(use_check_and_message(usr))
diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
index ab161cdabd0..8f95c685140 100644
--- a/code/modules/emotes/emote_mob.dm
+++ b/code/modules/emotes/emote_mob.dm
@@ -5,14 +5,14 @@
return (..() && !(silent && emote_type == AUDIBLE_MESSAGE))
/mob/verb/custom_audible_emote()
- set name = "Audible Emote"
+ set name = "Emote (Audible)"
set category = "IC"
set desc = "Type in an emote message that will be received by mobs that can hear you."
custom_emote(m_type = AUDIBLE_MESSAGE, message = sanitize(input(src,"Choose an emote to display.") as text|null))
/mob/verb/custom_visible_emote()
- set name = "Visible Emote"
+ set name = "Emote (Visible)"
set category = "IC"
set desc = "Type in an emote message that will be received by mobs that can see you."
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 637f5ab12a1..67749930cbf 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -78,8 +78,8 @@
..()
/obj/item/deck/verb/drawcard()
- set category = "Object"
- set name = "Draw"
+ set category = "Object.Cards"
+ set name = "Deck - Draw"
set desc = "Draw a card from the deck."
set src in view(1)
@@ -117,8 +117,8 @@
qdel(src)
/obj/item/deck/verb/pickcard()
- set category = "Object"
- set name = "Pick"
+ set category = "Object.Cards"
+ set name = "Deck - Pick"
set desc = "Pick a card from the deck."
set src in view(1)
@@ -161,8 +161,8 @@
qdel(src)
/obj/item/deck/verb/dealcard()
- set category = "Object"
- set name = "Deal"
+ set category = "Object.Cards"
+ set name = "Deck - Deal"
set desc = "Deal a card from the deck."
set src in view(1)
@@ -310,8 +310,8 @@
closeToolTip(usr)
/obj/item/hand/verb/pickcard()
- set category = "Object"
- set name = "Pick"
+ set category = "Object.Cards"
+ set name = "Hand - Pick"
set desc = "Pick a card from your hand in front of you."
set src in usr
@@ -434,8 +434,8 @@
update_icon()
/obj/item/hand/verb/deck_card()
- set category = "Object"
- set name = "Deck"
+ set category = "Object.Cards"
+ set name = "Turn Hand Into Deck"
set desc = "Turn this hand of cards into a deck."
set src in usr
diff --git a/code/modules/hydroponics/beekeeping/net.dm b/code/modules/hydroponics/beekeeping/net.dm
index aac7aafe502..ad611fd2941 100644
--- a/code/modules/hydroponics/beekeeping/net.dm
+++ b/code/modules/hydroponics/beekeeping/net.dm
@@ -104,8 +104,8 @@
/obj/item/bee_net/verb/empty_bees()
set src in usr
- set name = "Empty bee net"
- set category = "Object"
+ set name = "Empty Bee Net"
+ set category = "Object.Held"
var/mob/living/carbon/M
if(iscarbon(usr))
diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm
index 675adeac60a..ee0963a2a2f 100644
--- a/code/modules/hydroponics/trays/tray_tools.dm
+++ b/code/modules/hydroponics/trays/tray_tools.dm
@@ -35,7 +35,7 @@
/obj/item/device/analyzer/plant_analyzer/proc/print_report_verb()
set name = "Print Plant Report"
- set category = "Object"
+ set category = "Object.Held"
set src = usr
if(usr.stat || usr.restrained() || usr.lying)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 79b87f21795..b6f61c4c5a1 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -142,8 +142,8 @@
/obj/item/pickaxe/verb/wield_pick()
if(can_wield)
- set name = "Wield pick/drill"
- set category = "Object"
+ set name = "Wield Pick/Drill"
+ set category = "Object.Held"
set src in usr
attack_self(usr)
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index e097025427e..d9aac9fdded 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -258,7 +258,7 @@
/obj/item/holder/verb/change_animal_name()
set name = "Name Animal"
- set category = "IC"
+ set category = "IC.Critters"
set src in usr
if(isanimal(contained))
@@ -375,7 +375,7 @@
/obj/item/holder/carp/baby/verb/toggle_block_hair()
set name = "Toggle Hair Coverage"
- set category = "Object"
+ set category = "Object.Equipped"
set src in usr
flags_inv ^= BLOCKHEADHAIR
diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm
index b5a1110a146..33a2ee7ae5c 100644
--- a/code/modules/mob/language/language.dm
+++ b/code/modules/mob/language/language.dm
@@ -376,10 +376,9 @@
return prefix in GLOB.config.language_prefixes
-//TBD
/mob/verb/check_languages()
set name = "Check Known Languages"
- set category = "IC"
+ set category = "IC.Language"
set src = usr
var/dat = "Known Languages
"
diff --git a/code/modules/mob/living/carbon/human/exercise.dm b/code/modules/mob/living/carbon/human/exercise.dm
index d97d6643430..fee7f5b0bf1 100644
--- a/code/modules/mob/living/carbon/human/exercise.dm
+++ b/code/modules/mob/living/carbon/human/exercise.dm
@@ -5,7 +5,7 @@ Exercise Verbs
/mob/living/carbon/human/verb/pushup()
set name = "Do Pushup"
set desc = "Makes you do a pushup."
- set category = "IC"
+ set category = "IC.Maneuver"
do_pushups()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index faa63599f60..fcc9d706c82 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1916,7 +1916,7 @@
/mob/living/carbon/human/verb/toggle_underwear()
set name = "Toggle Underwear"
set desc = "Shows/hides selected parts of your underwear."
- set category = "Object"
+ set category = "Object.Equipped"
if(stat)
return
@@ -2264,7 +2264,7 @@
/mob/living/carbon/human/verb/lookup()
set name = "Look Up"
set desc = "If you want to know what's above."
- set category = "IC"
+ set category = "IC.Maneuver"
look_up_open_space(get_turf(src))
@@ -2287,7 +2287,7 @@
/mob/living/verb/lookdown()
set name = "Look Down"
set desc = "If you want to know what's below."
- set category = "IC"
+ set category = "IC.Maneuver"
look_down_open_space(get_turf(src))
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index 3ce4c999eae..2eb7f87c842 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -1261,7 +1261,7 @@
/mob/living/carbon/human/proc/change_animal_name()
set name = "Name Animal"
set desc = "Name a monkeylike animal."
- set category = "IC"
+ set category = "IC.Critters"
set src in view(1)
var/mob/living/carbon/M = usr
diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm
index 541f641c587..f44357ea871 100644
--- a/code/modules/mob/living/default_language.dm
+++ b/code/modules/mob/living/default_language.dm
@@ -3,7 +3,7 @@
/mob/living/verb/set_default_language_verb()
set name = "Set Default Language"
- set category = "IC"
+ set category = "IC.Language"
var/datum/language/language = input(src, "Choose a language.", "Set Default Language") as null|anything in languages
if(!language)
@@ -19,7 +19,7 @@
/mob/living/verb/check_default_language()
set name = "Check Default Language"
- set category = "IC"
+ set category = "IC.Language"
if(default_language)
to_chat(src, SPAN_NOTICE("You are currently speaking [default_language] by default."))
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index f6d26783236..33ec6dec0ae 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -785,7 +785,7 @@ default behaviour is:
/mob/living/verb/lay_down()
set name = "Rest"
- set category = "IC"
+ set category = "IC.Maneuver"
if(last_special + 1 SECOND > world.time)
to_chat(src, SPAN_WARNING("You're too tired to do this now!"))
diff --git a/code/modules/mob/living/living_maneuvers.dm b/code/modules/mob/living/living_maneuvers.dm
index 19931029cbf..75bc69d6bfb 100644
--- a/code/modules/mob/living/living_maneuvers.dm
+++ b/code/modules/mob/living/living_maneuvers.dm
@@ -28,7 +28,7 @@
/mob/living/verb/prepare_maneuver()
set name = "Prepare To Maneuver"
set desc = "Select a maneuver to perform."
- set category = "IC"
+ set category = "IC.Maneuver"
if(!length(available_maneuvers))
to_chat(src, SPAN_WARNING("You are unable to perform any maneuvers."))
diff --git a/code/modules/mob/living/living_powers.dm b/code/modules/mob/living/living_powers.dm
index 4cd62cbb941..fa6d664207c 100644
--- a/code/modules/mob/living/living_powers.dm
+++ b/code/modules/mob/living/living_powers.dm
@@ -14,7 +14,7 @@
to_chat(src, SPAN_NOTICE("You have stopped hiding."))
/mob/living/verb/set_walk_speed()
- set category = "IC"
+ set category = "IC.Maneuver"
set name = "Adjust walk speed"
set desc = "Allows you to adjust your walking speed to a slower value than normal, or reset it. Does not make you faster."
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index ff54cf301ee..84af28fb4fd 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -923,7 +923,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
/// Pass lying down or getting up to our pet human, if we're in a rig.
/mob/living/silicon/ai/lay_down()
set name = "Rest"
- set category = "IC"
+ set category = "IC.Maneuver"
resting = 0
var/obj/item/rig/rig = src.get_rig()
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 4223842188e..3ce068fc9ea 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -416,7 +416,7 @@
/mob/living/silicon/pai/lay_down()
set name = "Rest"
- set category = "IC"
+ set category = "IC.Maneuver"
// Pass lying down or getting up to our pet human, if we're in a rig.
if(istype(src.loc,/obj/item/device/paicard))
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index e4342b230db..1a9fbcccfc6 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1031,7 +1031,7 @@
/mob/living/silicon/robot/mode()
set name = "Activate Held Object"
- set category = "IC"
+ set category = "Object.Held"
set src = usr
var/obj/item/W = get_active_hand()
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 16cade30444..95b2ff3c750 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -212,7 +212,7 @@
/mob/living/silicon/check_languages()
set name = "Check Known Languages"
- set category = "IC"
+ set category = "IC.Language"
set src = usr
var/dat = "Known Languages
"
diff --git a/code/modules/mob/living/simple_animal/friendly/carp.dm b/code/modules/mob/living/simple_animal/friendly/carp.dm
index 16a1989efed..1bcb14b6cb5 100644
--- a/code/modules/mob/living/simple_animal/friendly/carp.dm
+++ b/code/modules/mob/living/simple_animal/friendly/carp.dm
@@ -112,8 +112,8 @@
say("Glub!")
/mob/living/simple_animal/carp/fluff/verb/friend(var/mob/user)
- set name = "Become Friends"
- set category = "IC"
+ set name = "Befriend Carp"
+ set category = "IC.Critters"
set src in view(1)
if(friend && usr == friend)
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 30bac69f959..e313e0cdb80 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -263,8 +263,8 @@
audible_emote("[verb] anxiously.")
/mob/living/simple_animal/cat/fluff/verb/friend()
- set name = "Become Friends"
- set category = "IC"
+ set name = "Befriend Cat"
+ set category = "IC.Critters"
set src in view(1)
if(friend && usr == friend)
diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm
index c9c4ac3d7a5..8ec4a03625e 100644
--- a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm
+++ b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm
@@ -50,7 +50,7 @@
/mob/living/simple_animal/hostile/commanded/dog/verb/befriend()
set name = "Befriend Dog"
- set category = "IC"
+ set category = "IC.Critters"
set src in view(1)
if(!master)
diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/ives.dm b/code/modules/mob/living/simple_animal/hostile/commanded/ives.dm
index 014627f5d67..88da155a7d8 100644
--- a/code/modules/mob/living/simple_animal/hostile/commanded/ives.dm
+++ b/code/modules/mob/living/simple_animal/hostile/commanded/ives.dm
@@ -68,7 +68,7 @@
/mob/living/simple_animal/hostile/commanded/baby_harvester/verb/befriend()
set name = "Befriend Ives"
- set category = "IC"
+ set category = "IC.Critters"
set src in view(1)
if(!master)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm
index 1f205f81a96..dcf92c8b670 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm
@@ -26,7 +26,7 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile/retaliate)
/mob/living/simple_animal/proc/name_species()
set name = "Name Alien Species"
- set category = "Object"
+ set category = "IC.Critters"
set src in view()
if(!SSatlas.current_map.use_overmap)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 6270a705e82..a57f77542ae 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -835,7 +835,7 @@
/mob/living/simple_animal/verb/change_name()
set name = "Name Animal"
set desc = "Rename an animal."
- set category = "IC"
+ set category = "IC.Critters"
set src in view(1)
var/mob/living/carbon/M = usr
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index d9687a602d7..9f6a47f603e 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -446,7 +446,7 @@
/mob/verb/mode()
set name = "Activate Held Object"
- set category = "Object"
+ set category = "Object.Held"
set src = usr
DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(execute_mode)))
@@ -1246,7 +1246,7 @@
/mob/verb/face_direction()
set name = "Face Direction"
- set category = "IC"
+ set category = "IC.Maneuver"
set src = usr
set_face_dir(dir)
diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index c28c1145f3e..5a052199e1e 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -7,7 +7,7 @@
*/
/mob/verb/up()
set name = "Move Upwards"
- set category = "IC"
+ set category = "IC.Maneuver"
if(zMove(UP))
visible_message(SPAN_NOTICE("[src] has moved upwards."), SPAN_NOTICE("You move upwards."))
@@ -16,8 +16,8 @@
* Verb for the mob to move down a z-level if possible.
*/
/mob/verb/down()
- set name = "Move Down"
- set category = "IC"
+ set name = "Move Downwards"
+ set category = "IC.Maneuver"
if(zMove(DOWN))
visible_message(SPAN_NOTICE("[src] has moved downwards."), SPAN_NOTICE("You move downwards."))
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index b14cf17ab64..51453ac13be 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -262,7 +262,7 @@
/obj/item/pen/chameleon/verb/set_colour()
set name = "Change Pen Colour"
- set category = "Object"
+ set category = "Object.Held"
set src in usr
var/list/possible_colours = list ("Yellow", "Green", "Pink", "Blue", "Orange", "Cyan", "Red", "Invisible", "Black")
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 060b1d3740a..186d925ebbd 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -718,7 +718,8 @@
/obj/item/gun/verb/toggle_safety_verb()
set src in usr
- set category = "Object"
+ set category = "Object.Held"
+ set desc = "Shortcut is Ctrl-click."
set name = "Toggle Gun Safety"
if(has_safety && usr == loc)
toggle_safety(usr)
diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm
index 05ad3ff4b57..5f962718e77 100644
--- a/code/modules/projectiles/guns/energy/blaster.dm
+++ b/code/modules/projectiles/guns/energy/blaster.dm
@@ -100,7 +100,7 @@
is_wieldable = TRUE
/obj/item/gun/energy/blaster/rifle/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index e9ff387d7d1..24ef135f760 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -170,7 +170,7 @@
. += "To use the scope, use the appropriate verb in the object tab."
/obj/item/gun/energy/sniperrifle/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
diff --git a/code/modules/projectiles/guns/energy/modular.dm b/code/modules/projectiles/guns/energy/modular.dm
index 9bc427941cd..1a969a7e6e9 100644
--- a/code/modules/projectiles/guns/energy/modular.dm
+++ b/code/modules/projectiles/guns/energy/modular.dm
@@ -253,7 +253,7 @@
toggle_wield(usr)
/obj/item/gun/energy/laser/prototype/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
@@ -293,7 +293,7 @@
/obj/item/gun/energy/laser/prototype/verb/rename_gun()
set name = "Name Prototype"
- set category = "Object"
+ set category = "Object.Held"
set desc = "Name your invention so that its glory might be eternal"
set src in usr
@@ -311,7 +311,7 @@
/obj/item/gun/energy/laser/prototype/verb/describe_gun()
set name = "Describe Prototype"
- set category = "Object"
+ set category = "Object.Held"
set desc = "Describe your invention so that its glory might be eternal"
set src in usr
diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm
index ea8bc4e9f6b..69fc447fd3d 100644
--- a/code/modules/projectiles/guns/energy/rifle.dm
+++ b/code/modules/projectiles/guns/energy/rifle.dm
@@ -190,7 +190,7 @@
var/atom/movable/screen/overlay = null
/obj/item/gun/energy/rifle/laser/tachyon/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
diff --git a/code/modules/projectiles/guns/energy/scythe.dm b/code/modules/projectiles/guns/energy/scythe.dm
index 170b083e323..0d79f405ae7 100644
--- a/code/modules/projectiles/guns/energy/scythe.dm
+++ b/code/modules/projectiles/guns/energy/scythe.dm
@@ -52,7 +52,7 @@
. = ..()
/obj/item/gun/energy/scythe/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm
index 90d3f3a33b6..fb873479ac2 100644
--- a/code/modules/projectiles/guns/launcher/pneumatic.dm
+++ b/code/modules/projectiles/guns/launcher/pneumatic.dm
@@ -44,7 +44,7 @@
/obj/item/gun/launcher/pneumatic/verb/set_pressure() //set amount of tank pressure.
set name = "Set Valve Pressure"
- set category = "Object"
+ set category = "Object.Held"
set src in range(0)
var/N = input("Percentage of tank used per shot:","[src]") as null|anything in possible_pressure_amounts
if (N)
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index eba434a6a30..a4fbff45e18 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -754,7 +754,7 @@
scoped_accuracy = 2
/obj/item/gun/projectile/automatic/terminator/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 218bf68710a..39eba1d4102 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -28,7 +28,7 @@
/obj/item/gun/projectile/colt/detective/verb/rename_gun()
set name = "Name Gun"
- set category = "Object"
+ set category = "Object.Held"
set desc = "Rename your gun. If you're the detective."
set src in usr
@@ -332,7 +332,7 @@
/obj/item/gun/projectile/pistol/detective/verb/rename_gun()
set name = "Name Gun"
- set category = "Object"
+ set category = "Object.Held"
set desc = "Rename your gun."
set src in usr
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 3b21064fd29..962a33fd5dc 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -18,9 +18,9 @@
var/chamber_offset = 0 //how many empty chambers in the cylinder until you hit a round
/obj/item/gun/projectile/revolver/verb/spin_cylinder()
- set name = "Spin cylinder"
+ set name = "Spin Cylinder"
set desc = "Fun when you're bored out of your skull."
- set category = "Object"
+ set category = "Object.Held"
set src in usr
chamber_offset = 0
@@ -110,7 +110,7 @@
/obj/item/gun/projectile/revolver/detective/verb/rename_gun()
set name = "Name Gun"
- set category = "Object"
+ set category = "Object.Held"
set desc = "Click to rename your gun. If you're the detective."
set src in usr
@@ -241,9 +241,9 @@
flipped_firing = 0
/obj/item/gun/projectile/revolver/lemat/spin_cylinder()
- set name = "Spin cylinder"
+ set name = "Spin Cylinder"
set desc = "Fun when you're bored out of your skull."
- set category = "Object"
+ set category = "Object.Held"
set src in usr
chamber_offset = 0
diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm
index 4e6ce55b8be..d85c8f482f3 100644
--- a/code/modules/projectiles/guns/projectile/rifle.dm
+++ b/code/modules/projectiles/guns/projectile/rifle.dm
@@ -45,7 +45,7 @@
icon = 'icons/obj/guns/bolt_scope.dmi'
/obj/item/gun/projectile/shotgun/pump/rifle/scope/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
@@ -148,7 +148,7 @@
load_method = SPEEDLOADER
/obj/item/gun/projectile/shotgun/pump/rifle/dominia/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index 97640024aed..d523ba00d80 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -84,7 +84,7 @@
..()
/obj/item/gun/projectile/heavysniper/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
@@ -221,7 +221,7 @@
return ..()
/obj/item/gun/projectile/dragunov/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
@@ -271,7 +271,7 @@
icon_state = "w556rifle-empty"
/obj/item/gun/projectile/automatic/rifle/w556/verb/scope()
- set category = "Object"
+ set category = "Object.Held"
set name = "Use Scope"
set src in usr
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index be172f630af..674ddc8c5b0 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -471,7 +471,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
return ..()
/obj/item/reagent_containers/food/drinks/shaker/verb/toggle_twist()
- set category = "Object"
+ set category = "Object.Held"
set name = "Twist Cap"
set src in usr
@@ -483,7 +483,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
update_icon()
/obj/item/reagent_containers/food/drinks/shaker/verb/toggle_top()
- set category = "Object"
+ set category = "Object.Held"
set name = "Remove Top"
set src in usr
diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
index 08fded6caaf..61c959d604a 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm
@@ -348,7 +348,7 @@
/obj/item/reagent_containers/food/snacks/ricetub/verb/remove_sticks()
set name = "Remove Chopsticks"
- set category = "Object"
+ set category = "Object.Held"
set src in usr
var/obj/item/material/kitchen/utensil/fork/chopsticks/bamboo/S = new()
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index d8826e2ae85..3e7c0dc357e 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -121,7 +121,7 @@
/obj/item/reagent_containers/spray/verb/empty()
set name = "Empty Spray Bottle"
- set category = "Object"
+ set category = "Object.Held"
set src in usr
if (alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
diff --git a/code/modules/tgui_panel/external.dm b/code/modules/tgui_panel/external.dm
index 5c57aef66f9..5ab90b3d61b 100644
--- a/code/modules/tgui_panel/external.dm
+++ b/code/modules/tgui_panel/external.dm
@@ -10,7 +10,7 @@
*/
/client/verb/fix_tgui_panel()
set name = "Fix chat"
- set category = "OOC"
+ set category = "OOC.Debug"
var/action
log_tgui(src, "Started fixing.", context = "verb/fix_tgui_panel")
diff --git a/html/changelogs/Bat-verbs.yml b/html/changelogs/Bat-verbs.yml
new file mode 100644
index 00000000000..4ac549d4a10
--- /dev/null
+++ b/html/changelogs/Bat-verbs.yml
@@ -0,0 +1,13 @@
+# Your name.
+author: Batrachophrenoboocosmomachia
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - qol: "Verb organization improvements."