The great verb retabbening.

Assigned categories to assorted verbs that lacked them. Commands tab is now more or less gone. Instead, things are in "IC" for things like say, whisper, me, that are inherent to you, "OOC" for things like OOC chat, and "Objects" for verbs originating from the world around you. I suppose for those non-admins in the audience, you now also get an "Admin" tab, because I stuffed adminhelp and adminwho in there.

This change was only to verbs defined as verbs in the code, procs that are assigned to things as verbs are far more numerous and harder to isolate, but also mostly admin-related.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1234 316c924e-a436-60f5-8080-3fe189b3f50e

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)

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**************************/
 

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)

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

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

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)
 

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)

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

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)

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)

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
 

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)
 

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)])

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))

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)

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."

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

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() )

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

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

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))

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() )))

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)

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)

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)

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)

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)

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)

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

code/game/verbs/who.dm

@@ -1,5 +1,6 @@
 /mob/verb/who()
 	set name = "Who"
+	set category = "OOC"
 
 	usr << "<b>Current Players:</b>"
 
@@ -34,7 +35,7 @@
 	usr << "<b>Total Players: [length(peeps)]</b>"
 
 /client/verb/adminwho()
-	set category = "Commands"
+	set category = "Admin"
 	set name = "Adminwho"
 
 	usr << "<b>Current Admins:</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."

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

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

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. <One use only>"
 	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

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

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
 

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)

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 ))

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)