From 82dc6ce32ff65feec68f568e1a7f0620e17ba304 Mon Sep 17 00:00:00 2001 From: Gwydion Brain Date: Sat, 6 Oct 2018 22:09:09 -0700 Subject: [PATCH] Item Revamp --- code/modules/customitems/item_defines.dm | 47 +++++++++++------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index e36c3839133..b254d9f829a 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -135,6 +135,27 @@ /obj/item/claymore/fluff/hit_reaction() return 0 +/obj/item/fluff/rsik_katana //Xydonus: Rsik Ugsharki + name = "Ceremonial Katana" + desc = "A shimmering ceremonial golden katana, for the most discerning class of ninja. Looks expensive, and fragile." + icon = 'icons/obj/custom_items.dmi' + icon_state = "rsik_katana" + item_state = "rsik_katana" + lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' + righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' + force = 5 + sharp = 0 + flags = CONDUCT + slot_flags = SLOT_BELT | SLOT_BELT + throwforce = 5 + w_class = WEIGHT_CLASS_NORMAL + attack_verb = list("attacked", "slashed", "stabbed", "sliced") + hitsound = 'sound/weapons/bladeslice.ogg' + +/obj/item/fluff/rsik_katana/suicide_act(mob/user) + user.visible_message("[user] tries to stab [src] into [user.p_their()] stomach! Except [src] shatters! [user.p_they(TRUE)] look[user.p_s()] as if [user.p_they()] might die from the shame.") + return(BRUTELOSS) + /obj/item/crowbar/fluff/zelda_creedy_1 // Zomgponies: Griffin Rowley name = "Zelda's Crowbar" desc = "A pink crow bar that has an engraving that reads, 'To Zelda. Love always, Dawn'" @@ -1485,29 +1506,3 @@ item_color = "Xann_necklace" slot_flags = SLOT_TIE -/obj/item/fluff/rsik_katana_kit //Xydonus: Rsik Ugsharki - name = "ceremonial katana nanowrap" - desc = "An ornate box, containing ceremonial golden nanowrap, for the most distinguished class of ninja." - icon = 'icons/obj/custom_items.dmi' - icon_state = "rsik_katana_kit" - w_class = WEIGHT_CLASS_SMALL - -/obj/item/fluff/rsik_katana_kit/afterattack(atom/target, mob/user, proximity) - if(!proximity || !ishuman(user) || user.incapacitated()) - return - - if(istype(target, /obj/item/katana) || (istype(target, /obj/item/toy/katana) && (!istype(target, /obj/item/katana/energy)))) - to_chat(user, "You apply the wrap to [target].") - var/obj/item/katana/K = target - K.desc = "A katana coated in golden nanowrap, it doesn't seem any sharper than usual." - K.item_state = "rsik_katana" - K.icon = 'icons/obj/custom_items.dmi' - K.icon_state = "rsik_katana" - K.lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' - K.righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - K.update_icon() - user.update_icons() - qdel(src) - return - - to_chat(user, "The wrap isn't compatible with [target]!")