shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update weaponry.dm

Browse Source
This commit is contained in:
ShadeAware
2020-01-20 18:08:05 -05:00
committed by GitHub
parent cd001411e1
commit 6f243f9c44
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weaponry.dm
+4 -5
View File
@@ -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' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
desc = "A concealable spring-loaded knife." desc = "A concealable spring-loaded knife."
flags_1 = CONDUCT_1 flags_1 = CONDUCT_1
force = 3 force = 2
w_class = WEIGHT_CLASS_SMALL w_class = WEIGHT_CLASS_SMALL
throwforce = 5 throwforce = 3
throw_speed = 3 throw_speed = 3
throw_range = 6 throw_range = 6
materials = list(MAT_METAL=12000) materials = list(MAT_METAL=12000)
hitsound = 'sound/weapons/genhit.ogg' hitsound = 'sound/weapons/genhit.ogg'
attack_verb = list("stubbed", "poked") attack_verb = list("stubbed", "poked")
resistance_flags = FIRE_PROOF
var/extended = 0 var/extended = 0
/obj/item/switchblade_makeshift/attack_self(mob/user) /obj/item/switchblade_makeshift/attack_self(mob/user)
extended = !extended extended = !extended
playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1)
if(extended) if(extended)
force = 12 force = 15
w_class = WEIGHT_CLASS_NORMAL w_class = WEIGHT_CLASS_NORMAL
throwforce = 12 throwforce = 15
icon_state = "switchblade_ext_ms" icon_state = "switchblade_ext_ms"
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg' hitsound = 'sound/weapons/bladeslice.ogg'