diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index a182ab6bc1f..04562fe73b4 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -121,7 +121,7 @@ qdel(I) qdel(src) - else if(istype(I, /obj/item/weapon/wirecutters)) + else if(istype(I, /obj/item/weapon/wirecutters) && !(I.flags & NODROP)) var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod if(!remove_item_from_storage(user)) @@ -221,7 +221,7 @@ /obj/item/weapon/cane name = "cane" - desc = "A cane used by a true gentlemen. Or a clown." + desc = "A cane used by a true gentleman. Or a clown." icon = 'icons/obj/weapons.dmi' icon_state = "cane" item_state = "stick" @@ -232,7 +232,7 @@ attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") /obj/item/weapon/staff - name = "wizards staff" + name = "wizard staff" desc = "Apparently a staff used by the wizard." icon = 'icons/obj/wizard.dmi' icon_state = "staff"