Removed some more stuff from weapons.dmi:

swordchain
warhammer
pepperspray_old
thickcane
browncane
thickbrowncane
stick
chainofcommand
electric

Also removed obj/item/weapon/cane/brown, as it was unused and the sprite was indistinguishable from the normal cane.

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

code/defines/obj/weapon.dm

@@ -631,7 +631,7 @@
 	w_class = 2.0
 	m_amt = 50
 	origin_tech = "engineering=1"
-	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "thrashed", "whacked")
+	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
 
 /obj/item/weapon/crowbar/red
 	icon = 'icons/obj/items.dmi'
@@ -643,17 +643,13 @@
 	desc = "A cane used by a true gentlemen. Or a clown."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "cane"
+	item_state = "cane"
 	flags = FPRINT | TABLEPASS| CONDUCT
 	force = 5.0
 	throwforce = 7.0
-	item_state = "cane"
 	w_class = 2.0
 	m_amt = 50
-	attack_verb = list("bludgeoned", "whacked", "disciplined")
-
-/obj/item/weapon/cane/browncane
-	name = " browncane"
-	icon_state = "browncane"
+	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
 
 /obj/item/weapon/disk
 	name = "disk"