diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index b7b25f0b5a..24bb3a10e3 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -312,23 +312,26 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
attack_verb = list("stubbed", "poked")
resistance_flags = FIRE_PROOF
var/extended = 0
+ var/extended_force = 20
+ var/extended_throwforce = 23
+ var/extended_icon_state = "switchblade_ext"
/obj/item/switchblade/attack_self(mob/user)
extended = !extended
playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1)
if(extended)
- force = 20
+ force = extended_force
w_class = WEIGHT_CLASS_NORMAL
- throwforce = 23
- icon_state = "switchblade_ext"
+ throwforce = extended_throwforce
+ icon_state = extended_icon_state
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
else
- force = 3
+ force = initial(force)
w_class = WEIGHT_CLASS_SMALL
- throwforce = 5
- icon_state = "switchblade"
+ throwforce = initial(throwforce)
+ icon_state = initial(icon_state)
attack_verb = list("stubbed", "poked")
hitsound = 'sound/weapons/genhit.ogg'
sharpness = IS_BLUNT
@@ -337,6 +340,23 @@ 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/crafted //It took me so fucking long to make this not shitcode holy FUCK.
+ icon_state = "switchblade_ms"
+ desc = "A concealable spring-loaded knife."
+ force = 2
+ throwforce = 3
+ extended_force = 15
+ extended_throwforce = 18
+ extended_icon_state = "switchblade_ext_ms"
+
+/obj/item/switchblade/makeshift/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"
+ icon_state = "switchblade_msf"
+ to_chat(user, "You use part of the silver to improve your Switchblade. Stylish!")
+
/obj/item/phone
name = "red phone"
desc = "Should anything ever go wrong..."
diff --git a/code/modules/crafting/recipes/recipes_weapon_and_ammo.dm b/code/modules/crafting/recipes/recipes_weapon_and_ammo.dm
index bc3a3dcf05..b44df31b3b 100644
--- a/code/modules/crafting/recipes/recipes_weapon_and_ammo.dm
+++ b/code/modules/crafting/recipes/recipes_weapon_and_ammo.dm
@@ -109,6 +109,18 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
+/datum/crafting_recipe/switchblade_ms
+ name = "Switchblade"
+ result = /obj/item/switchblade/crafted
+ reqs = list(/obj/item/weaponcrafting/stock = 1,
+ /obj/item/weaponcrafting/receiver = 1,
+ /obj/item/kitchen/knife = 1,
+ /obj/item/stack/cable_coil = 2)
+ tools = list(TOOL_WELDER)
+ time = 45
+ category = CAT_WEAPONRY
+ subcategory = CAT_WEAPONRY
+
//////////////////
///BOMB CRAFTING//
//////////////////
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index 2169b87580..b74fa16e6a 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index f054d8f744..8c60c52e76 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index e3540a782b..561b1890e8 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ