From fc99f3da81601cbb0efdfe88e33298966cf5a59a Mon Sep 17 00:00:00 2001 From: "mport2004@gmail.com" Date: Thu, 27 Oct 2011 09:59:09 +0000 Subject: [PATCH] Meteors have been updated to the slightlynewer health system git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2432 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/carbon/human/human.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 50494ff0641..7be092257a1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -618,13 +618,12 @@ if ((M.client && !( M.blinded ))) M.show_message(text("\red [] has been hit by []", src, O), 1) if (health > 0) - var/dam_zone = pick("chest", "chest", "chest", "head", "groin") - if (istype(organs[dam_zone], /datum/organ/external)) - var/datum/organ/external/temp = organs[dam_zone] - if (istype(O, /obj/effect/immovablerod)) - temp.take_damage(101, 0) - else - temp.take_damage((istype(O, /obj/effect/meteor/small) ? 10 : 25), 30) + var/datum/organ/external/affecting = get_organ(pick("chest", "chest", "chest", "head")) + if(!affecting) return + if (istype(O, /obj/effect/immovablerod)) + affecting.take_damage(101, 0) + else + affecting.take_damage((istype(O, /obj/effect/meteor/small) ? 10 : 25), 30) UpdateDamageIcon() updatehealth() return