fixes most things

code/game/objects/items/twohanded.dm

@@ -1025,11 +1025,8 @@
 	righthand_file = 'icons/mob/inhands/weapons/estaff_righthand.dmi'
 	name = "riot suppression electrostaff"
 	desc = "A large quarterstaff, with massive silver electrodes mounted at the end."
-	force = 10
-	damtype = BRUTE
 	w_class = WEIGHT_CLASS_HUGE
 	slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
-	sharpness = FALSE
 	force_unwielded = 5
 	force_wielded = 10
 	throwforce = 15			//if you are a madman and finish someone off with this, power to you.

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -267,7 +267,7 @@
 	new /obj/item/clothing/suit/armor/bulletproof(src)
 
 /obj/structure/closet/secure_closet/lethalshots
-	name = "shotgun lethal rounds"
+	name = "lethal ammunition and riot staves"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "tac"
 /obj/structure/closet/secure_closet/lethalshots/PopulateContents()