Fixed embedding.

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
This commit is contained in:
Zuhayr
2014-07-13 06:11:20 -04:00
committed by ZomgPonies
parent 3f7a6286b8
commit 5c6cfffaf8
@@ -310,7 +310,7 @@ This function restores all organs.
//Embedded object code.
if(!organ) return
if(istype(used_weapon,/obj/item) && !istype(used_weapon.loc,/mob/living/silicon/robot))
if(istype(used_weapon,/obj/item))
var/obj/item/W = used_weapon //Sharp objects will always embed if they do enough damage.
if((damage > (10*W.w_class)) || ((sharp && !ismob(W.loc)) || prob(damage/W.w_class)))
organ.embed(W)