From 4557d1773001e6910ff3ff7862bb6ef6f0a0cf69 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 24 Mar 2016 23:44:10 -0400 Subject: [PATCH] fixed simple animal butchering.... --- code/_onclick/item_attack.dm | 5 +++-- code/modules/mob/living/simple_animal/simple_animal.dm | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index d82d5636a96..c8527bc7c74 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -16,8 +16,9 @@ /mob/living/attackby(obj/item/I, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) - if(user.a_intent == I_HARM && stat == DEAD && butcher_results) //can we butcher it? - if(is_sharp(I)) + if(user.a_intent == I_HARM && stat == DEAD && !isnull(butcher_results)) //can we butcher it? + if(istype(I, /obj/item/weapon/kitchen/knife)) + world << "living" user << "You begin to butcher [src]..." playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) if(do_mob(user, src, 80)) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index da0c58a4d80..33dad643895 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -447,6 +447,10 @@ name = C.tagname real_name = C.tagname return + else if(butcher_results && (stat == DEAD)) //if the animal has a meat, and if it is dead. + if(istype(O, /obj/item/weapon/kitchen/knife)) + world << "Simple" + harvest(user) else user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src)