- changes /obj/item/cane/concealed to contain a cane sword instead of a switch blade, as well as adds a subtype of katana for the cane sword

- changes cost of concealed blade in uplink to match the katana and other swords
- adds sprites for the item in game as well as shown on character
This commit is contained in:
DemonPizza
2022-06-13 16:24:08 -07:00
parent edb54f137d
commit b9b7e4e3cf
6 changed files with 11 additions and 4 deletions
+1 -1
View File
@@ -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
+4 -3
View File
@@ -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
@@ -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."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 47 KiB