diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index b7be410e4b1..dec63819493 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -251,24 +251,13 @@ if(!istype(W, /obj/item/weapon/butch/meatcleaver)) organ.implants += W visible_message("\The [W] sticks in the wound!") + src.verbs += /mob/proc/yank_out_object W.add_blood(src) if(ismob(W.loc)) var/mob/living/H = W.loc H.drop_item() W.loc = src - - else if(istype(used_weapon,/obj/item/projectile)) //We don't want to use the actual projectile item, so we spawn some shrapnel. - var/obj/item/projectile/P = used_weapon - if(prob(75) && P.embed) - var/obj/item/weapon/shard/shrapnel/S = new() - S.name = "[P.name] shrapnel" - S.desc = "[S.desc] It looks like it was fired from [P.shot_from]." - S.loc = src - organ.implants += S - visible_message("The projectile sticks in the wound!") - S.add_blood(src) return 1 - // incredibly important stuff follows /mob/living/carbon/human/fall(var/forced) ..() @@ -284,4 +273,4 @@ if(prob(60)) step_rand(H) if(!stat) - src << "Your [H] fell off!" + src << "Your [H] fell off!" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 252c04754d7..8ec602fc0c0 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -102,7 +102,6 @@ emp_act visible_message("The projectile sticks in the wound!") src.verbs += /mob/proc/yank_out_object SP.add_blood(src) - return (..(P , def_zone)) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 69ef0fdd0e3..9e26d94ebe5 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1166,6 +1166,7 @@ mob/proc/yank_out_object() visible_message("[src] rips [selection] out of their body.","You rip [selection] out of your body.") else visible_message("[usr] rips [selection] out of [src]'s body.","[usr] rips [selection] out of your body.") + src.verbs -= /mob/proc/yank_out_object if(istype(src,/mob/living/carbon/human))