diff --git a/code/datums/uplink/stealthy_weapons.dm b/code/datums/uplink/stealthy_weapons.dm index a785df2afe..29c8009211 100644 --- a/code/datums/uplink/stealthy_weapons.dm +++ b/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 diff --git a/code/game/objects/items/weapons/canes.dm b/code/game/objects/items/weapons/canes.dm index b15b80c0e7..5b83f8b9d2 100644 --- a/code/game/objects/items/weapons/canes.dm +++ b/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("[user] has sheathed \a [W] into [T.his] [src]!", "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 diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm index 3c975a382d..a2f3e63e67 100644 --- a/code/game/objects/items/weapons/material/swords.dm +++ b/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." diff --git a/icons/mob/items/lefthand_material.dmi b/icons/mob/items/lefthand_material.dmi index c53503d35e..9574cf86c6 100644 Binary files a/icons/mob/items/lefthand_material.dmi and b/icons/mob/items/lefthand_material.dmi differ diff --git a/icons/mob/items/righthand_material.dmi b/icons/mob/items/righthand_material.dmi index 6795871981..9c917e85a9 100644 Binary files a/icons/mob/items/righthand_material.dmi and b/icons/mob/items/righthand_material.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 4018755519..e294b1c59c 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ