From ee15d86e6a34761e9dafc5d56e0e2f423ece54de Mon Sep 17 00:00:00 2001 From: JoanRisu Date: Mon, 6 Jun 2016 10:31:25 -0700 Subject: [PATCH] Assassin's kit --- .../vore/fluffstuff/custom_boxes_vr.dm | 24 +++++++++++++++++++ .../vore/fluffstuff/custom_items_vr.dm | 13 ++++++++++ 2 files changed, 37 insertions(+) diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index a8fb8324d4..db72c89ba0 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -76,6 +76,30 @@ new /obj/item/weapon/gun/energy/gun/fluff/dominator(src) new /obj/item/clothing/suit/armor/det_suit(src) new /obj/item/fluff/permit/joanrisu(src) + new /obj/item/clothing/accessory/storage/black_vest(src) + new /obj/item/weapon/sword/fluff/joanaria(src) + new /obj/item/weapon/flame/lighter/zippo/fluff/joan(src) + new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src) + +//joanrisu:Katarina Eine +/obj/item/weapon/storage/backpack/dufflebag/sec/fluff/Katarina + name = "Katarina's Workbag" + desc = "A duffle bag Katarina uses to carry her tools." + + New() + ..() + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/clothing/suit/storage/fluff/fedcoat(src) + new /obj/item/weapon/gun/energy/gun/fluff/dominator(src) + new /obj/item/clothing/suit/armor/det_suit(src) + new /obj/item/clothing/accessory/storage/black_vest(src) + new /obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina(src) + new /obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina(src) + new /obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina(src) + new /obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina(src) + new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src) + + //Razerwing:Archer Maximus /obj/item/weapon/storage/box/fluff/archermaximus diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 2676e0a25a..3c2143eb8c 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -92,6 +92,19 @@ return 1 return 0 +//joanrisu:Katarina Eine +/obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina + name = "tactical Knife" + desc = "A tactical knife with a small butterly engraved on the blade." + +obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/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/sword/fluff/joanaria/scisword name = "Scissor Blade"