diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index c132d8106d..49d78907d3 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -119,18 +119,6 @@ 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_WEAPON - ////////////////// ///BOMB CRAFTING// ////////////////// diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 7499d9de09..62e7ffcf0a 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -346,25 +346,6 @@ 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 - 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" - 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!") - /obj/item/phone name = "red phone" desc = "Should anything ever go wrong..." diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index b74fa16e6a..2169b87580 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 8c60c52e76..f054d8f744 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 bdad12b0b6..04e2c27caf 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ