From dcb2e22e613e68e7a3d07db46b88ff4f5d12827d Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 10 Feb 2015 22:05:32 +0100 Subject: [PATCH] Adds a concealed cane sword for 2 TC. --- code/defines/obj/weapon.dm | 18 ++++++++++++++++++ code/game/gamemodes/game_mode.dm | 1 + 2 files changed, 19 insertions(+) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 634121b08c..0addd22a3c 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -98,6 +98,24 @@ matter = list("metal" = 50) attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") +/obj/item/weapon/cane/concealed/attack_self(mob/user) + user.visible_message("[user] has unsheathed a blade from \his [src]!", "You unsheathe the blade from \the [src].") + var/blade = new/obj/item/weapon/butterfly/concealed + user.drop_from_inventory(src) + user.put_in_hands(blade) + del(src) + +/obj/item/weapon/kitchenknife/concealed + name = "cane blade" + desc = "A now less than concealed cane blade." + +/obj/item/weapon/kitchenknife/concealed/attack_self(mob/user) + var/cane = new/obj/item/weapon/cane/concealed + user.drop_from_inventory(src) + user.put_in_hands(cane) + del(src) + user.visible_message("[user] has sheathed a blade into \his [cane]!", "You sheathe the blade into \the [cane].") + /obj/item/weapon/disk name = "disk" icon = 'icons/obj/items.dmi' diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 0b2526851a..db90cc9795 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -43,6 +43,7 @@ ), "Stealthy and Inconspicuous Weapons" = list( new/datum/uplink_item(/obj/item/weapon/soap/syndie, 1, "Subversive Soap", "SP"), + new/datum/uplink_item(/obj/item/weapon/cane/concealed, 2, "Concealed Cane Sword", "CC"), new/datum/uplink_item(/obj/item/weapon/cartridge/syndicate, 3, "Detomatix PDA Cartridge", "DC"), new/datum/uplink_item(/obj/item/weapon/pen/paralysis, 3, "Paralysis Pen", "PP"), ),