Merge pull request #12494 from Anonus/timestop

Fixes untoggled switchblade force
This commit is contained in:
Cheridan
2015-10-19 20:54:47 -05:00
+5 -5
View File
@@ -166,16 +166,16 @@
icon_state = "switchblade"
desc = "A sharp, concealable, spring-loaded knife."
flags = CONDUCT
force = 20
force = 3
w_class = 2
throwforce = 15
throwforce = 5
throw_speed = 3
throw_range = 6
materials = list(MAT_METAL=12000)
origin_tech = "materials=1"
hitsound = 'sound/weapons/Genhit.ogg'
attack_verb = list("stubbed", "poked")
var/extended
var/extended = 0
/obj/item/weapon/switchblade/attack_self(mob/user)
extended = !extended
@@ -183,12 +183,12 @@
if(extended)
force = 20
w_class = 3
throwforce = 15
throwforce = 23
icon_state = "switchblade_ext"
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
else
force = 1
force = 3
w_class = 2
throwforce = 5
icon_state = "switchblade"