From 170e03d736d17857f4110bb315d3ddf16ed8100d Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 7 Aug 2014 16:49:44 -0400 Subject: [PATCH] Fixes yank out object bloodying the wrong hands --- code/modules/mob/mob.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index bbcfb42b306..d1b5f1c7b1e 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -982,8 +982,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 @@ -994,13 +993,16 @@ mob/proc/yank_out_object() affected.implants -= selection H.shock_stage+=20 - H.bloody_hands(S) affected.take_damage((selection.w_class * 3), 0, 0, 1, "Embedded object extraction") if(prob(selection.w_class * 5)) //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)