diff --git a/code/WorkInProgress/cloning.dm b/code/WorkInProgress/cloning.dm
index 4c69c9f2c12..cf8590606a1 100644
--- a/code/WorkInProgress/cloning.dm
+++ b/code/WorkInProgress/cloning.dm
@@ -602,6 +602,8 @@
return 1
/obj/machinery/clonepod/verb/eject()
+ set name = "Eject Cloner"
+ set category = "Object"
set src in oview(1)
if (usr.stat != 0)
diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm
index b0909133880..63902df9d05 100644
--- a/code/WorkInProgress/mining.dm
+++ b/code/WorkInProgress/mining.dm
@@ -1041,13 +1041,17 @@ proc/move_mining_shuttle()
src.contents += O;
return
-/obj/item/weapon/satchel/verb/all_on_tile()
- mode = 1
- return
+/obj/item/weapon/satchel/verb/toggle_mode()
+ set name = "Switch Satchel Method"
+ set category = "Object"
+
+ mode = !mode
+ switch (mode)
+ if(1)
+ usr << "The satchel now picks up all ore in a tile at once."
+ if(0)
+ usr << "The satchel now picks up ore one at a time."
-/obj/item/weapon/satchel/verb/one_at_a_time()
- mode = 0
- return
/**********************Ore box**************************/
diff --git a/code/defines/procs/forum_activation.dm b/code/defines/procs/forum_activation.dm
index 0a9e2f75ac6..80ce4799d72 100644
--- a/code/defines/procs/forum_activation.dm
+++ b/code/defines/procs/forum_activation.dm
@@ -97,5 +97,6 @@
/client/verb/activate_forum_account(var/a as text)
set name = "Activate Forum Account"
+ set category = "Special Verbs"
set desc = "Associate a tgstation forum account with your BYOND key to enable posting."
associate_key_with_forum(a, src.key)
\ No newline at end of file
diff --git a/code/game/cellautomata.dm b/code/game/cellautomata.dm
index 7d67acbb4c0..6a56e220fe7 100644
--- a/code/game/cellautomata.dm
+++ b/code/game/cellautomata.dm
@@ -161,6 +161,7 @@
/atom/verb/point()
set name = "Point To"
+ set category = "Object"
set src in oview()
var/atom/this = src//detach proc from src
src = null
diff --git a/code/game/dna.dm b/code/game/dna.dm
index 288623edf9d..632ab136f25 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -490,6 +490,8 @@
/obj/machinery/dna_scannernew/verb/eject()
set src in oview(1)
+ set category = "Object"
+ set name = "Eject DNA Scanner"
if (usr.stat != 0)
return
@@ -499,6 +501,8 @@
/obj/machinery/dna_scannernew/verb/move_inside()
set src in oview(1)
+ set category = "Object"
+ set name = "Enter DNA Scanner"
if (usr.stat != 0)
return
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 2a9ca136d59..6843200fcac 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -42,6 +42,7 @@
return
/obj/machinery/nuclearbomb/verb/make_deployable()
+ set category = "Object"
set name = "Make Deployable"
set src in oview(1)
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 7eee613541d..abc1d03f6af 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -277,7 +277,8 @@
return
/obj/machinery/sleeper/verb/eject()
- set name = "Eject"
+ set name = "Eject Sleeper"
+ set category = "Object"
set src in oview(1)
if (usr.stat != 0)
@@ -289,7 +290,8 @@
return
/obj/machinery/sleeper/verb/move_inside()
- set name = "Move Inside"
+ set name = "Enter Sleeper"
+ set category = "Object"
set src in oview(1)
if (usr.stat != 0)
diff --git a/code/game/machinery/blender.dm b/code/game/machinery/blender.dm
index f2486670132..761e2e73427 100644
--- a/code/game/machinery/blender.dm
+++ b/code/game/machinery/blender.dm
@@ -70,6 +70,8 @@ the blender or the processor: Processor items are solid objects and Blender resu
return 0
/obj/machinery/blender/verb/blend() //Blend shit. Note: In the actual blending loop, make sure it can't include the jug.
+ set category = "Object"
+ set name = "Turn Blender On"
set src in oview(1) // Otherwise, it'll try to blend it too.
if (usr.stat != 0)
return
@@ -101,6 +103,8 @@ the blender or the processor: Processor items are solid objects and Blender resu
return
/obj/machinery/blender/verb/detach() //Transfers the contents of the Blender to the Blender Jug and then ejects the jug.
+ set category = "Object"
+ set name = "Detach Blender Jug"
set src in oview(1)
if (usr.stat != 0)
return
@@ -121,6 +125,8 @@ the blender or the processor: Processor items are solid objects and Blender resu
return
/obj/machinery/blender/verb/eject() //Ejects the non-reagent contents of the blender besides the jug.
+ set category = "Object"
+ set name = "Empty Blender Jug"
set src in oview(1)
if (usr.stat != 0)
return
diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm
index 0b9e94cb365..5bd988f4913 100644
--- a/code/game/machinery/computer/shuttle.dm
+++ b/code/game/machinery/computer/shuttle.dm
@@ -133,6 +133,8 @@
*/
/obj/machinery/computer/prison_shuttle/verb/take_off()
+ set category = "Object"
+ set name = "Launch Prison Shuttle"
set src in oview(1)
if (usr.stat || usr.restrained())
@@ -174,6 +176,8 @@
return
/obj/machinery/computer/prison_shuttle/verb/restabalize()
+ set category = "Object"
+ set name = "Restabilize Prison Shuttle"
set src in oview(1)
src.add_fingerprint(usr)
diff --git a/code/game/machinery/gibber.dm b/code/game/machinery/gibber.dm
index b3cf286b0ca..0a63a183d25 100644
--- a/code/game/machinery/gibber.dm
+++ b/code/game/machinery/gibber.dm
@@ -42,6 +42,8 @@
del(G)
/obj/machinery/gibber/verb/eject()
+ set category = "Object"
+ set name = "Empty Gibber"
set src in oview(1)
if (usr.stat != 0)
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index 04efd125fb8..1163ab31f47 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -2,6 +2,7 @@
/obj/machinery/computer/security/verb/station_map()
set name = ".map"
+ set category = "Object"
set src in view(1)
usr.machine = src
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 760478f849f..6dc3344df4e 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -109,6 +109,7 @@ Buildable meters
// rotate the pipe item clockwise
/obj/item/pipe/verb/rotate()
+ set category = "Object"
set name = "Rotate Pipe"
set src in view(1)
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index a4aa56e376f..0ba593e8fe3 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -77,6 +77,8 @@
return
/obj/machinery/computer/teleporter/verb/set_id(t as text)
+ set category = "Object"
+ set name = "Set teleporter ID"
set src in oview(1)
set desc = "ID Tag:"
@@ -278,6 +280,8 @@
return
/obj/machinery/teleport/station/verb/testfire()
+ set name = "Test Fire Teleporter"
+ set category = "Object"
set src in oview(1)
if(stat & (BROKEN|NOPOWER) || !istype(usr,/mob/living))
@@ -372,6 +376,8 @@
return
/obj/machinery/computer/data/verb/display()
+ set name = "Display"
+ set category = "Object"
set src in oview(1)
for(var/x in src.topics)
@@ -382,6 +388,7 @@
/obj/machinery/computer/data/verb/read(topic as text)
set name = "Read"
+ set category = "Object"
set src in oview(1)
if (src.topics[text("[]", topic)])
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index f6a02c64da5..a2a2191029f 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -583,7 +583,8 @@
/obj/mecha/verb/move_inside()
- set name = "Move Inside"
+ set category = "Object"
+ set name = "Enter Mecha"
set src in oview(1)
if (usr.stat || !ishuman(usr))
diff --git a/code/game/objects/devices/infra_sensor.dm b/code/game/objects/devices/infra_sensor.dm
index 4fcb3c638dc..a01650b1b93 100644
--- a/code/game/objects/devices/infra_sensor.dm
+++ b/code/game/objects/devices/infra_sensor.dm
@@ -206,6 +206,8 @@
return
/obj/item/device/infra/verb/rotate()
+ set name = "Rotate Infrared Laser"
+ set category = "Object"
set src in usr
src.dir = turn(src.dir, 90)
diff --git a/code/game/objects/devices/taperecorder.dm b/code/game/objects/devices/taperecorder.dm
index b4af470d4f4..b5a6492915f 100644
--- a/code/game/objects/devices/taperecorder.dm
+++ b/code/game/objects/devices/taperecorder.dm
@@ -57,7 +57,8 @@
return
/obj/item/device/taperecorder/verb/record()
- set name = "record"
+ set name = "Start Recording"
+ set category = "Object"
if(usr.stat)
usr << "Not when you're incapicated."
return
@@ -80,7 +81,8 @@
/obj/item/device/taperecorder/verb/stop_recording()
- set name = "stop"
+ set name = "Stop Recording"
+ set category = "Object"
if(usr.stat)
usr << "Not when you're incapicated."
@@ -97,7 +99,8 @@
/obj/item/device/taperecorder/verb/clear_memory()
- set name = "clear memory"
+ set name = "Clear Memory"
+ set category = "Object"
if(usr.stat)
usr << "Not when you're incapicated."
@@ -116,7 +119,8 @@
/obj/item/device/taperecorder/verb/playback_memory()
- set name = "playback memory"
+ set name = "Playback Memory"
+ set category = "Object"
if(usr.stat)
usr << "Not when you're incapicated."
diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm
index af0ed99ef64..e26277597ea 100644
--- a/code/game/objects/items/clothing.dm
+++ b/code/game/objects/items/clothing.dm
@@ -139,7 +139,8 @@ THERMAL GLASSES
user << "\red Pattern absorbed by the suit."
/obj/item/clothing/under/chameleon/verb/change()
- set name = "Change"
+ set name = "Change Color"
+ set category = "Object"
set src in usr
if(icon_state == "psyche")
@@ -191,6 +192,7 @@ THERMAL GLASSES
/obj/item/clothing/under/verb/toggle()
set name = "Toggle Suit Sensors"
+ set category = "Object"
var/mob/M = usr
if (istype(M, /mob/dead/)) return
if (usr.stat) return
@@ -228,6 +230,7 @@ THERMAL GLASSES
/obj/item/clothing/head/helmet/welding/verb/toggle()
+ set category = "Object"
set name = "Adjust welding mask"
if(src.up)
src.up = !src.up
@@ -244,6 +247,7 @@ THERMAL GLASSES
/obj/item/clothing/shoes/magboots/verb/toggle()
set name = "Toggle Magboots"
+ set category = "Object"
if(src.magpulse)
src.flags &= ~NOSLIP
src.slowdown = SHOES_SLOWDOWN
diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm
index ade8bd6ed9e..b5a4b695fac 100644
--- a/code/game/objects/items/item.dm
+++ b/code/game/objects/items/item.dm
@@ -60,6 +60,7 @@
/obj/item/verb/move_to_top()
set name = "Move To Top"
+ set category = "Object"
set src in oview(1)
if(!istype(src.loc, /turf) || usr.stat || usr.restrained() )
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 5ada3a22e4b..e83b652d017 100644
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -21,6 +21,8 @@ AI MODULES
origin_tech = "programming=3"
/obj/machinery/computer/aiupload/verb/AccessInternals()
+ set category = "Object"
+ set name = "Access Computer's Internals"
set src in oview(1)
if(get_dist(src, usr) > 1 || usr.restrained() || usr.lying || usr.stat || istype(usr, /mob/living/silicon))
return
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 12607670124..d609f5580b9 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -13,6 +13,8 @@ FINGERPRINT CARD
// DATA CARDS
/obj/item/weapon/card/data/verb/label(t as text)
+ set name = "Label Disk"
+ set category = "Object"
set src in usr
if (t)
@@ -36,6 +38,7 @@ FINGERPRINT CARD
/obj/item/weapon/card/id/verb/read()
set name = "Read ID Card"
+ set category = "Object"
set src in usr
usr << text("\icon[] []: The current assignment on the card is [].", src, src.name, src.assignment)
@@ -69,7 +72,8 @@ FINGERPRINT CARD
//PHOTO.loc = locate(0,0,0)
/obj/item/weapon/card/id/verb/removePhoto()
- set name = "Remove Photo"
+ set name = "Remove Photo From ID"
+ set category = "Object"
if(PHOTO)
contents -= PHOTO
diff --git a/code/game/objects/items/weapons/guns_ammo.dm b/code/game/objects/items/weapons/guns_ammo.dm
index 2fa0025c78c..e8bf9f2252c 100644
--- a/code/game/objects/items/weapons/guns_ammo.dm
+++ b/code/game/objects/items/weapons/guns_ammo.dm
@@ -1170,6 +1170,8 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
return
/obj/item/weapon/gun/c96/verb/eject()
+ set name = "Eject Clip"
+ set category = "Object"
set src in usr
if (src.magazine)
if (istype(src.magazine, /obj/item/weapon/ammo/a763m))
@@ -1260,6 +1262,8 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
return
/obj/item/weapon/gun/p08/verb/eject()
+ set name = "Eject Clip"
+ set category = "Object"
set src in usr
if (src.magazine)
if (istype(src.magazine, /obj/item/weapon/ammo/a9x19p))
@@ -1350,6 +1354,8 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
return
/obj/item/weapon/gun/glock/verb/eject()
+ set name = "Eject Clip"
+ set category = "Object"
set src in usr
if (src.magazine)
if (istype(src.magazine, /obj/item/weapon/ammo/a45))
@@ -1441,6 +1447,8 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
return
/obj/item/weapon/gun/m1911/verb/eject()
+ set name = "Eject Clip"
+ set category = "Object"
set src in usr
if (src.magazine)
if (istype(src.magazine, /obj/item/weapon/ammo/a45))
@@ -1520,6 +1528,8 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
return
/obj/item/weapon/gun/carbine/verb/eject()
+ set name = "Eject Clip"
+ set category = "Object"
set src in usr
if (src.magazine)
if (istype(src.magazine, /obj/item/weapon/ammo/assaultmag))
@@ -1602,6 +1612,8 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
return
/obj/item/weapon/gun/ak331/verb/eject()
+ set name = "Eject Clip"
+ set category = "Object"
set src in usr
if (src.magazine)
if (istype(src.magazine, /obj/item/weapon/ammo/assaultmag))
diff --git a/code/game/objects/radio/beacon.dm b/code/game/objects/radio/beacon.dm
index 9d783da4326..f25886a5820 100644
--- a/code/game/objects/radio/beacon.dm
+++ b/code/game/objects/radio/beacon.dm
@@ -5,6 +5,8 @@
return null
/obj/item/device/radio/beacon/verb/alter_signal(t as text)
+ set name = "Alter Beacon's Signal"
+ set category = "Object"
set src in usr
if ((usr.canmove && !( usr.restrained() )))
diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm
index d3d73179037..d88e592fc49 100644
--- a/code/game/objects/stool.dm
+++ b/code/game/objects/stool.dm
@@ -158,6 +158,8 @@
return
/obj/stool/chair/e_chair/verb/toggle_power()
+ set name = "Toggle Electric Chair"
+ set category = "Object"
set src in oview(1)
if ((usr.stat || usr.restrained() || !( usr.canmove ) || usr.lying))
@@ -234,6 +236,7 @@
/obj/stool/chair/verb/rotate()
set name = "Rotate Chair"
+ set category = "Object"
set src in oview(1)
src.dir = turn(src.dir, 90)
diff --git a/code/game/objects/tank.dm b/code/game/objects/tank.dm
index 96b696e4502..45025372a61 100644
--- a/code/game/objects/tank.dm
+++ b/code/game/objects/tank.dm
@@ -279,6 +279,7 @@
/obj/item/weapon/tank/jetpack/verb/toggle()
set name = "Toggle Jetpack"
+ set category = "Object"
src.on = !( src.on )
src.icon_state = text("jetpack[]", src.on)
if(src.on)
diff --git a/code/game/objects/traps.dm b/code/game/objects/traps.dm
index cb07593cd94..5fd918c6e56 100644
--- a/code/game/objects/traps.dm
+++ b/code/game/objects/traps.dm
@@ -12,6 +12,8 @@
refresh()
/obj/pressure_plate/verb/refresh()
+ set name = "Refresh Pressure Plate Links"
+ set category = "Object"
set src in view()
connected_traps = list() //emptying the list first
for(var/trap_name in connected_traps_names)
diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm
index 27b143e5d57..1e6d504fffd 100644
--- a/code/game/objects/weapons.dm
+++ b/code/game/objects/weapons.dm
@@ -438,6 +438,8 @@
return
/obj/item/assembly/rad_infra/verb/rotate()
+ set name = "Rotate Assembly"
+ set category = "Object"
set src in usr
src.dir = turn(src.dir, 90)
diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm
index a77a8f68b66..f239ff23e8a 100644
--- a/code/game/objects/window.dm
+++ b/code/game/objects/window.dm
@@ -195,6 +195,7 @@
/obj/window/verb/rotate()
set name = "Rotate Window Counter-Clockwise"
+ set category = "Object"
set src in oview(1)
if (src.anchored)
@@ -212,6 +213,7 @@
/obj/window/verb/revrotate()
set name = "Rotate Window Clockwise"
+ set category = "Object"
set src in oview(1)
if (src.anchored)
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 50502d7ab3c..3df16d0c94e 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -51,6 +51,7 @@
src << S
client/verb/Toggle_Soundscape()
+ set category = "OOC"
set name = "Toggle Ambience"
usr:client:no_ambi = !usr:client:no_ambi
if(usr:client:no_ambi)
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index ba6e169590f..d6b977c9e31 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -1,5 +1,6 @@
/mob/verb/listen_ooc()
set name = "Un/Mute OOC"
+ set category = "OOC"
if (src.client)
src.client.listen_ooc = !src.client.listen_ooc
@@ -10,6 +11,7 @@
/mob/verb/ooc(msg as text)
set name = "OOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite
+ set category = "OOC"
if (!src.client.authenticated || IsGuestKey(src.key))
src << "You are not authorized to communicate over these channels."
return
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index de1b8f62256..27544f4b9b4 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -1,5 +1,6 @@
/mob/verb/who()
set name = "Who"
+ set category = "OOC"
usr << "Current Players:"
@@ -34,7 +35,7 @@
usr << "Total Players: [length(peeps)]"
/client/verb/adminwho()
- set category = "Commands"
+ set category = "Admin"
set name = "Adminwho"
usr << "Current Admins:"
diff --git a/code/game/vote.dm b/code/game/vote.dm
index d9bd31159c7..222797c115b 100644
--- a/code/game/vote.dm
+++ b/code/game/vote.dm
@@ -157,6 +157,7 @@
/mob/verb/vote()
+ set category = "OOC"
set name = "Vote"
if(!usr.client.authenticated)
usr << "You're not authenticated, you can't vote."
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 0ff1de98951..42eb2bb21bf 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -1,6 +1,6 @@
/mob/verb/adminhelp(msg as text)
- set category = "Commands"
- set name = "-Adminhelp"
+ set category = "Admin"
+ set name = "Adminhelp"
if(!usr.client.authenticated)
src << "Please authorize before sending these messages."
return
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index aa4e321cd88..9fb57c2ed04 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -1,6 +1,6 @@
/mob/verb/pray(msg as text)
- set category = "Commands"
- set name = "-Pray"
+ set category = "IC"
+ set name = "Pray"
if(!usr.client.authenticated)
src << "Please authorize before sending these messages."
return
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 97506f9a2dc..bda1865c8c3 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -107,6 +107,7 @@ var/list/karma_spenders = list()
/mob/dead/observer/verb/spend_karma(var/mob/M in world) // Karma system -- TLE
set name = "Spend Karma"
+ set category = "Special Verbs"
set desc = "Let the gods know whether someone's been naughty or nice. "
if(!istype(M, /mob))
usr << "\red That's not a mob. You shouldn't have even been able to specify that. Please inform your server administrator post haste."
@@ -154,6 +155,7 @@ var/list/karma_spenders = list()
/mob/dead/observer/verb/toggle_alien_candidate()
set name = "Toggle Be Alien Candidate"
+ set category = "OOC"
set desc = "Determines whether you will or will not be an alien candidate when someone bursts."
if(src.client.be_alien)
src.client.be_alien = 0
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
index 39a157bdd4b..7ffba2b3af4 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -143,6 +143,7 @@ I kind of like the right click only--the window version can get a little confusi
/mob/living/carbon/alien/humanoid/verb/corrode(obj/O as anything in oview(1)) //If they right click to corrode, an error will flash if its an invalid target./N
set name = "Corrode with Acid (200)"
set desc = "Drench an object in acid, destroying it over time."
+ set category = "Alien"
if(!istype(O, /obj))
return
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 0a5ddbc7c5e..9e8c86aa5fa 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -487,6 +487,8 @@
return
/mob/living/carbon/monkey/verb/removeinternal()
+ set name = "Remove Internals"
+ set category = "IC"
src.internal = null
return
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index f1701f4234f..b62624f2059 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -250,7 +250,7 @@
else if (flag == PROJECTILE_TASER)
if (src.stat != 2)
- src.bruteloss += rand(1,10)
+ src.fireloss += rand(0,10)
src.stunned += rand(0,3)
return
else if (flag == PROJECTILE_DART)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 3b81d1f1ba3..3302e5c00f7 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1242,7 +1242,8 @@
return
/mob/verb/mode()
- set name = "Equipment Mode"
+ set name = "Activate Held Object"
+ set category = "IC"
set src = usr
@@ -1264,6 +1265,7 @@
/mob/verb/memory()
set name = "Notes"
+ set category = "OOC"
if(mind)
mind.show_memory(src)
else
@@ -1271,6 +1273,7 @@
/mob/verb/add_memory(msg as message)
set name = "Add Note"
+ set category = "OOC"
msg = copytext(msg, 1, MAX_MESSAGE_LEN)
msg = sanitize(msg)
@@ -1291,13 +1294,16 @@
if (popup)
src.memory()
+/*
/mob/verb/help()
set name = "Help"
src << browse('help.html', "window=help")
return
+*/
/mob/verb/abandon_mob()
set name = "Respawn"
+ set category = "OOC"
if (!( abandon_allowed ))
return
@@ -1338,10 +1344,12 @@
/mob/verb/cmd_rules()
set name = "Rules"
+ set category = "OOC"
src << browse(rules, "window=rules;size=480x320")
/mob/verb/changes()
set name = "Changelog"
+ set category = "OOC"
if (src.client)
src << browse_rsc('postcardsmall.jpg')
src << browse_rsc('somerights20.png')
@@ -1359,6 +1367,7 @@
/mob/verb/observe()
set name = "Observe"
+ set category = "OOC"
var/is_admin = 0
if (src.client.holder && src.client.holder.level >= 1 && ( src.client.holder.state == 2 || src.client.holder.level > 3 ))
@@ -1463,6 +1472,7 @@
/mob/verb/cancel_camera()
set name = "Cancel Camera View"
+ set category = "OOC"
src.reset_view(null)
src.machine = null
if(istype(src, /mob/living))
@@ -1636,6 +1646,8 @@
return
/atom/movable/verb/pull()
+ set name = "Pull"
+ set category = "IC"
set src in oview(1)
if (!( usr ))
@@ -1645,6 +1657,8 @@
return
/atom/verb/examine()
+ set name = "Examine"
+ set category = "IC"
set src in oview(12) //make it work from farther away
if (!( usr ))
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index a94e98c4da5..c16278c233d 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -3,14 +3,17 @@
/mob/verb/whisper()
set name = "Whisper"
+ set category = "IC"
return
/mob/verb/say_verb(message as text)
set name = "Say"
+ set category = "IC"
usr.say(message)
/mob/verb/me_verb(message as text)
set name = "Me"
+ set category = "IC"
usr.emote("me",1,message)
/mob/proc/say_dead(var/message)