From f883e06c2ea881dfd3d7e02d0e86ec3bdaa4fa00 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 9 Apr 2016 22:27:53 -0400 Subject: [PATCH] Adjustments --- code/modules/surgery/organs_internal.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index 630302edc65..b5e50e8ed1a 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -29,9 +29,9 @@ var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting) if(affected && (affected.status & ORGAN_ROBOT)) return 0 - if((target.get_species() == "Machine")) + if(target.get_species() == "Machine") return 0 - if((target.get_species() == "Diona")) + if(target.get_species() == "Diona") return 0 return 1 @@ -39,9 +39,11 @@ if(istype(target,/mob/living/carbon/human)) var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting) + if(affected && (affected.status & ORGAN_ROBOT)) - return 0 - if(target.get_species() == "Diona") + return 0//no operating on robotic limbs in an organic surgery + + if(!affected.encased)//no bones no problem. return 1 return 0