From b2522daa5d4d53c53adc05a7674940c5d5024f29 Mon Sep 17 00:00:00 2001 From: comma Date: Sun, 29 Jul 2012 08:21:37 +0400 Subject: [PATCH] Surgery bugs. Stopped attacking patient during head surgery with hemostat. Was caused by try_bone_surgery called twice in code. Removed one redunant call. Fixed runtimes during face surgery. Null organ was caused by not being 'mouth' organ there. Made it select 'head' as affected organ. --- code/game/objects/items/weapons/surgery_tools.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 716d7bdc141..87cbd2b806e 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -304,6 +304,8 @@ CIRCULAR SAW var/mob/living/carbon/human/H = M var/datum/organ/external/S = H.organs[user.zone_sel.selecting] + if(user.zone_sel.selecting == "mouth" || user.zone_sel.selecting == "eyes") + S = H.organs["head"] if(((user.zone_sel.selecting == "l_arm") || (user.zone_sel.selecting == "r_arm") || (user.zone_sel.selecting == "l_leg") || (user.zone_sel.selecting == "r_leg")) & (istype(M, /mob/living/carbon/human))) if(S.status & DESTROYED) @@ -447,8 +449,6 @@ CIRCULAR SAW return ..() M:brain_op_stage = 0 S.open = 1 - if(!try_bone_surgery(M, user)) - return ..() else return ..()