From cc2af62ee394086781c6ecc4aeef1e42649cb55e Mon Sep 17 00:00:00 2001 From: JoanRisu Date: Mon, 6 Jun 2016 09:23:40 -0700 Subject: [PATCH] rolled back some stat inheritance changes. --- code/modules/vore/fluffstuff/custom_items_vr.dm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 8a14f70cdf..2676e0a25a 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -74,16 +74,27 @@ icon_state = "joanzip" //JoanRisu:Joan Risu -/obj/item/weapon/material/sword/fluff/joanaria +/obj/item/weapon/sword/fluff/joanaria name = "Aria" desc = "A beautifully crafted rapier owned by Joan Risu. It has a thin blade and is used for quick attacks." icon = 'icons/vore/custom_items_vr.dmi' icon_state = "joanaria" origin_tech = "materials=7" + force = 15 + sharp = 1 + edge = 1 + +/obj/item/weapon/sword/fluff/joanaria/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") + + if(default_parry_check(user, attacker, damage_source) && prob(75)) + user.visible_message("\The [user] parries [attack_text] with \the [src]!") + playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) + return 1 + return 0 //For General use -/obj/item/weapon/material/sword/fluff/scisword - name = "Sci Blade" +/obj/item/weapon/sword/fluff/joanaria/scisword + name = "Scissor Blade" desc = "A sword that can not only cut down your enemies, it can also cut fabric really neatly" icon = 'icons/vore/custom_items_vr.dmi' icon_state = "scisword"