From c46c683664c6ffd0d722593392a7f2d0405b2ee5 Mon Sep 17 00:00:00 2001 From: ShadeAware <57020074+ShadeAware@users.noreply.github.com> Date: Fri, 31 Jan 2020 21:12:08 -0500 Subject: [PATCH] FIXES FANCY SWITCHBLADES ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!! --- code/game/objects/items/weaponry.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 9083783a48..cd6cc5f520 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -315,6 +315,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 var/extended_force = 20 var/extended_throwforce = 23 var/extended_icon_state = "switchblade_ext" + var/retracted_icon_state = "switchblade" /obj/item/switchblade/attack_self(mob/user) extended = !extended @@ -331,7 +332,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 force = initial(force) w_class = WEIGHT_CLASS_SMALL throwforce = initial(throwforce) - icon_state = initial(icon_state) + icon_state = retracted_icon_state attack_verb = list("stubbed", "poked") hitsound = 'sound/weapons/genhit.ogg' sharpness = IS_BLUNT @@ -348,12 +349,14 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 extended_force = 15 extended_throwforce = 18 extended_icon_state = "switchblade_ext_ms" + retracted_icon_state = "switchblade_ms" /obj/item/switchblade/crafted/attackby(obj/item/I, mob/user, params) . = ..() if(istype(I, /obj/item/stack/sheet/mineral/silver)) icon_state = extended ? "switchblade_ext_msf" : "switchblade_msf" extended_icon_state = "switchblade_ext_msf" + retracted_icon_state = "switchblade_msf" icon_state = "switchblade_msf" to_chat(user, "You use part of the silver to improve your Switchblade. Stylish!")