From 9b7ed4fbcc0b8dd8ac0a8444ad8efdfb8ee879ce Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sat, 30 Sep 2017 17:35:11 -0400 Subject: [PATCH] Katana was defined twice --- code/game/objects/items/toys.dm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 385351da97d..2c27e350101 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -287,6 +287,7 @@ desc = "Woefully underpowered in D20." icon = 'icons/obj/weapons.dmi' icon_state = "katana" + item_state = "katana" item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi', slot_r_hand_str = 'icons/mob/items/righthand_material.dmi', @@ -697,19 +698,6 @@ desc = "A \"Space Life\" brand Emergency Response Team Commander action figure." icon_state = "ert" -/obj/item/toy/katana - name = "replica katana" - desc = "Woefully underpowered in D20." - icon = 'icons/obj/weapons.dmi' - icon_state = "katana" - item_state = "katana" - flags = CONDUCT - slot_flags = SLOT_BELT | SLOT_BACK - force = 5 - throwforce = 5 - w_class = ITEMSIZE_NORMAL - attack_verb = list("attacked", "slashed", "stabbed", "sliced") - /obj/item/toy/therapy_red name = "red therapy doll" desc = "A toy for therapeutic and recreational purposes. This one is red." @@ -898,4 +886,4 @@ icon_state = "tinyxmastree" w_class = ITEMSIZE_TINY force = 1 - throwforce = 1 \ No newline at end of file + throwforce = 1