From ffef7cd4db770c6a4a7b4418758435779f85f87b Mon Sep 17 00:00:00 2001 From: ShadeAware <57020074+ShadeAware@users.noreply.github.com> Date: Mon, 20 Jan 2020 17:33:18 -0500 Subject: [PATCH] Update weaponry.dm --- code/game/objects/items/weaponry.dm | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index b7b25f0b5a..2fbb6e0c0d 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -337,6 +337,48 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 user.visible_message("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!") return (BRUTELOSS) +/obj/item/switchblade_makeshift + name = "switchblade" + icon_state = "switchblade" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + desc = "A concealable spring-loaded knife." + flags_1 = CONDUCT_1 + force = 3 + w_class = WEIGHT_CLASS_SMALL + throwforce = 5 + throw_speed = 3 + throw_range = 6 + materials = list(MAT_METAL=12000) + hitsound = 'sound/weapons/genhit.ogg' + attack_verb = list("stubbed", "poked") + resistance_flags = FIRE_PROOF + var/extended = 0 + +/obj/item/switchblade_makeshift/attack_self(mob/user) + extended = !extended + playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) + if(extended) + force = 12 + w_class = WEIGHT_CLASS_NORMAL + throwforce = 12 + icon_state = "switchblade_ext_ms" + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + hitsound = 'sound/weapons/bladeslice.ogg' + sharpness = IS_SHARP + else + force = 1 + w_class = WEIGHT_CLASS_SMALL + throwforce = 2 + icon_state = "switchblade_ms" + attack_verb = list("stubbed", "poked") + hitsound = 'sound/weapons/genhit.ogg' + sharpness = IS_BLUNT + +/obj/item/switchblade_makeshift/suicide_act(mob/user) + user.visible_message("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + return (BRUTELOSS) + /obj/item/phone name = "red phone" desc = "Should anything ever go wrong..."