From c8aa3083aa2df5ee89ef444406eedccacca15964 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 24 Feb 2016 01:31:58 -0500 Subject: [PATCH] fixed you can now rip an implant out of someones chest... --- code/modules/surgery/implant.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index da573c13574..b6ac40f2f38 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -242,16 +242,14 @@ /datum/surgery_step/cavity/implant_removal/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) I = locate(/obj/item/weapon/implant) in target - if(I) - user.visible_message("[user] begins to extract [I] from [target]'s [target_zone].", "You begin to extract [I] from [target]'s [target_zone]...") - else - user.visible_message("[user] starts poking around inside [target]'s [affected.name] with \the [tool].", \ + user.visible_message("[user] starts poking around inside [target]'s [affected.name] with \the [tool].", \ "You start poking around inside [target]'s [affected.name] with \the [tool]." ) target.custom_pain("The pain in your [affected.name] is living hell!",1) ..() /datum/surgery_step/cavity/implant_removal/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) + I = locate(/obj/item/weapon/implant) in target if (affected.implants.len) var/obj/item/obj = affected.implants[1] @@ -270,7 +268,7 @@ obj.loc = get_turf(target) return 1 - else if(I && target_zone == "chest") //implant removal only works on the chest. + else if(I && (target_zone == "chest")) //implant removal only works on the chest. user.visible_message("[user] takes something out of [target]'s [affected.name] with \the [tool].", \ "You take [I] out of [target]'s [affected.name]s with \the [tool]." )