fixed simple animal butchering....

This commit is contained in:
Aurorablade
2016-03-24 23:44:10 -04:00
parent 40a1086f14
commit 4557d17730
2 changed files with 7 additions and 2 deletions
+3 -2
View File
@@ -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 << "<span class='notice'>You begin to butcher [src]...</span>"
playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
if(do_mob(user, src, 80))
@@ -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)