Merge pull request #4966 from Fox-McCloud/ntrep-cane

Nanotrasen Rep Cane Tweak

code/game/objects/items/weapons/stunbaton.dm

@@ -187,13 +187,6 @@
 /obj/item/weapon/melee/baton/loaded/robot
 	hitcost = 1000
 
-
-/obj/item/weapon/melee/baton/loaded/ntcane
-	name = "fancy cane"
-	desc = "A cane with special engraving on it. It has a strange button on the handle..."
-	icon_state = "cane_nt"
-	item_state = "cane_nt"
-
 //Makeshift stun baton. Replacement for stun gloves.
 /obj/item/weapon/melee/baton/cattleprod
 	name = "stunprod"

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -72,6 +72,13 @@
 	else
 		return ..()
 
+/obj/item/weapon/melee/classic_baton/ntcane
+	name = "fancy cane"
+	desc = "A cane with special engraving on it. It seems well suited for fending off assailants..."
+	icon_state = "cane_nt"
+	item_state = "cane_nt"
+	needs_permit = 0
+
 //Telescopic baton
 /obj/item/weapon/melee/classic_baton/telescopic
 	name = "telescopic baton"