From c58f30564f712456e568015c77534f18a3d2aa2b Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Sun, 9 Feb 2014 14:56:16 +1300 Subject: [PATCH] Fixed shrapnel embedding Conflicts: code/modules/mob/living/carbon/human/human_defense.dm --- .../mob/living/carbon/human/human_defense.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 11d84414f38..252c04754d7 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -89,6 +89,20 @@ emp_act //END TASER NERF + var/datum/organ/external/organ = get_organ(check_zone(def_zone)) + + var/armor = checkarmor(organ, "bullet") + + if((P.embed && prob(20 + max(P.damage - armor, -10))) && P.damage_type == BRUTE) + var/obj/item/weapon/shard/shrapnel/SP = new() + (SP.name) = "[P.name] shrapnel" + (SP.desc) = "[SP.desc] It looks like it was fired from [P.shot_from]." + (SP.loc) = organ + organ.implants += SP + visible_message("The projectile sticks in the wound!") + src.verbs += /mob/proc/yank_out_object + SP.add_blood(src) + return (..(P , def_zone))