From 9f488c80a15c99a0dbcffbb4781dfb14cd3ff22b Mon Sep 17 00:00:00 2001
From: ShadeAware <57020074+ShadeAware@users.noreply.github.com>
Date: Mon, 20 Jan 2020 18:49:04 -0500
Subject: [PATCH] Update weaponry.dm
---
code/game/objects/items/weaponry.dm | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index e5df6d4886..e2f00a9d02 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -337,24 +337,13 @@ 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_makeshift
- name = "switchblade"
- icon_state = "switchblade"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+/obj/item/switchblade/makeshift
+ icon_state = "switchblade_ms"
desc = "A concealable spring-loaded knife."
- flags_1 = CONDUCT_1
force = 2
- w_class = WEIGHT_CLASS_SMALL
throwforce = 3
- throw_speed = 3
- throw_range = 6
- materials = list(MAT_METAL=12000)
- hitsound = 'sound/weapons/genhit.ogg'
- attack_verb = list("stubbed", "poked")
- var/extended = 0
-
-/obj/item/switchblade_makeshift/attack_self(mob/user)
+
+/obj/item/switchblade/makeshift/attack_self(mob/user)
extended = !extended
playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1)
if(extended)
@@ -374,10 +363,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
hitsound = 'sound/weapons/genhit.ogg'
sharpness = IS_BLUNT
-/obj/item/switchblade_makeshift/suicide_act(mob/user)
- 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/phone
name = "red phone"
desc = "Should anything ever go wrong..."