From b06eb66ca4eebeb396b996c9f0dcc81c9bdb2529 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Sat, 16 Aug 2014 20:58:37 -0400 Subject: [PATCH] Fix for bloody hands yanking shit --- code/modules/mob/mob.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 701fef237be..a953a3ccdd9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1171,7 +1171,7 @@ mob/proc/yank_out_object() if(valid_objects.len == 1) //Yanking out last object - removing verb. src.verbs -= /mob/proc/yank_out_object - if(istype(src,/mob/living/carbon/human)) + if(ishuman(src)) var/mob/living/carbon/human/H = src var/datum/organ/external/affected @@ -1183,13 +1183,16 @@ mob/proc/yank_out_object() affected.implants -= selection H.shock_stage+=10 - H.bloody_hands(S) if(prob(10)) //I'M SO ANEMIC I COULD JUST -DIE-. var/datum/wound/internal_bleeding/I = new (15) affected.wounds += I H.custom_pain("Something tears wetly in your [affected] as [selection] is pulled free!", 1) + if (ishuman(U)) + var/mob/living/carbon/human/human_user = U + human_user.bloody_hands(H) + selection.loc = get_turf(src) for(var/obj/item/weapon/O in pinned)