From 8666a36b1e04c7e3b6642ed6416aa987d03e68e7 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 18 Feb 2020 02:24:31 -0700
Subject: [PATCH] fixes most things

---
 code/game/objects/items/twohanded.dm                           | 3 ---
 .../structures/crates_lockers/closets/secure/security.dm       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index bce9e47554..bcf74d2164 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/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.
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 7a087f8583..bec1c893ae 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/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()