From 85c2af3871f9e5ee4d39267c435216efc30ac60f Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sat, 1 Dec 2012 09:04:20 +0400 Subject: [PATCH] Started cleanup of medical stacks code. Removed silly way to get targeted organ. Removed child organs being affected sometimes. --- code/game/objects/items/stacks/medical.dm | 30 +---------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 5df2b005bc6..559d8255d36 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -23,40 +23,12 @@ if (istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M - var/datum/organ/external/affecting = H.get_organ("chest") + var/datum/organ/external/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) if(affecting.status & ORGAN_ROBOT) user << "\red This isn't useful at all on a robotic limb.." return 1 - if(istype(user, /mob/living/carbon/human)) - var/mob/living/carbon/human/user2 = user - affecting = H.get_organ(check_zone(user2.zone_sel.selecting)) - else - if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0) - affecting = H.get_organ("head") - - // If we're targetting arms or legs, also heal the respective hand/foot - if(affecting.name in list("l_arm","r_arm","l_leg","r_leg")) - var/datum/organ/external/child - if(affecting.name == "l_arm") - child = H.get_organ("l_hand") - else if(affecting.name == "r_arm") - child = H.get_organ("r_hand") - else if(affecting.name == "r_leg") - child = H.get_organ("r_foot") - else if(affecting.name == "l_leg") - child = H.get_organ("l_foot") - - if(src.heal_brute) - if(!affecting.bandage() && !child.bandage()) - user << "\red The wounds on this limb have already been bandaged." - return 1 - else if(src.heal_burn) - if(!affecting.salve() && !child.salve()) - user << "\red The wounds on this limb have already been salved." - return 1 - else if(src.heal_brute) if(!affecting.bandage()) user << "\red The wounds on this limb have already been bandaged."