Merge pull request #8652 from DemonPizza/Caneblade

Concealed Cane Sword

code/datums/uplink/stealthy_weapons.dm

@@ -11,7 +11,7 @@
 
 /datum/uplink_item/item/stealthy_weapons/concealed_cane
 	name = "Concealed Cane Sword"
-	item_cost = 10
+	item_cost = 40
 	path = /obj/item/cane/concealed
 
 /datum/uplink_item/item/stealthy_weapons/detomatix

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

@@ -24,7 +24,7 @@
 
 /obj/item/cane/concealed/Initialize()
 	. = ..()
-	var/obj/item/material/butterfly/switchblade/temp_blade = new(src)
+	var/obj/item/material/sword/katana/caneblade/temp_blade = new(src)
 	concealed_blade = temp_blade
 	temp_blade.attack_self()
 
@@ -40,10 +40,11 @@
 		user.update_inv_l_hand(0)
 		user.update_inv_r_hand()
 		concealed_blade = null
+		update_icon()
 	else
 		..()
 
-/obj/item/cane/concealed/attackby(var/obj/item/material/butterfly/W, var/mob/user)
+/obj/item/cane/concealed/attackby(var/obj/item/material/sword/katana/caneblade/W, var/mob/user)
 	if(!src.concealed_blade && istype(W))
 		var/datum/gender/T = gender_datums[user.get_visible_gender()]
 		user.visible_message("<span class='warning'>[user] has sheathed \a [W] into [T.his] [src]!</span>", "You sheathe \the [W] into \the [src].")
@@ -62,7 +63,7 @@
 		item_state = initial(icon_state)
 	else
 		name = "cane shaft"
-		icon_state = "nullrod"
+		icon_state = "caneshaft"
 		item_state = "foldcane"
 
 /obj/item/cane/white

code/game/objects/items/weapons/material/swords.dm

@@ -25,6 +25,12 @@
 	icon_state = "katana"
 	slot_flags = SLOT_BELT | SLOT_BACK
 
+/obj/item/material/sword/katana/caneblade
+	name = "cane blade"
+	desc = "Used for making people fall over instead of helping them stand up."
+	icon_state = "caneblade"
+	item_state = "caneblade"
+
 /obj/item/material/sword/rapier
 	name = "rapier"
 	desc = "A slender, fancy and sharply pointed sword."