From 6f243f9c441fc33e883dd372c786532dfe80f4bb Mon Sep 17 00:00:00 2001 From: ShadeAware <57020074+ShadeAware@users.noreply.github.com> Date: Mon, 20 Jan 2020 18:08:05 -0500 Subject: [PATCH] Update weaponry.dm --- code/game/objects/items/weaponry.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 2fbb6e0c0d..e5df6d4886 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -344,24 +344,23 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' desc = "A concealable spring-loaded knife." flags_1 = CONDUCT_1 - force = 3 + force = 2 w_class = WEIGHT_CLASS_SMALL - throwforce = 5 + throwforce = 3 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 + force = 15 w_class = WEIGHT_CLASS_NORMAL - throwforce = 12 + throwforce = 15 icon_state = "switchblade_ext_ms" attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg'