From 024d1b074a9d9f953543b4f4ceaea69d72a6cd2f Mon Sep 17 00:00:00 2001 From: rockdtben Date: Tue, 13 Dec 2011 12:38:05 +0000 Subject: [PATCH] -Removed a proc that does nothing anymore. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2675 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/doors/airlock.dm | 1 - code/game/objects/items/weapons/medical.dm | 2 -- code/game/objects/storage/bible.dm | 2 -- code/modules/chemical/Chemistry-Reagents.dm | 3 --- .../modules/mob/living/carbon/human/human_damage.dm | 13 ------------- 5 files changed, 21 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 078d7b5d120..97fba6cab90 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -609,7 +609,6 @@ About the new airlock wires panel: affecting.take_damage(10, 0) H.stunned = 8 H.weakened = 5 - H.UpdateDamage() H.UpdateDamageIcon() else for(var/mob/M in viewers(src, null)) diff --git a/code/game/objects/items/weapons/medical.dm b/code/game/objects/items/weapons/medical.dm index 5fbd4257a9e..cbf794b33a4 100644 --- a/code/game/objects/items/weapons/medical.dm +++ b/code/game/objects/items/weapons/medical.dm @@ -57,8 +57,6 @@ MEDICAL if (affecting.heal_damage(src.heal_brute, src.heal_burn)) H.UpdateDamageIcon() - else - H.UpdateDamage() M.updatehealth() else M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2)) diff --git a/code/game/objects/storage/bible.dm b/code/game/objects/storage/bible.dm index 4920cfb3e9f..4d2a37e6aba 100644 --- a/code/game/objects/storage/bible.dm +++ b/code/game/objects/storage/bible.dm @@ -13,8 +13,6 @@ for(var/datum/organ/external/affecting in H.organs) if(affecting.heal_damage(heal_amt, heal_amt)) H.UpdateDamageIcon() - else - H.UpdateDamage() return /obj/item/weapon/storage/bible/attack(mob/M as mob, mob/living/user as mob) diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index c514f2252f6..db93d03e114 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -674,7 +674,6 @@ datum var/datum/organ/external/affecting = M:get_organ("head") if(affecting) affecting.take_damage(25, 0) - M:UpdateDamage() M:UpdateDamageIcon() M:emote("scream") M << "\red Your face has become disfigured!" @@ -720,7 +719,6 @@ datum return var/datum/organ/external/affecting = M:get_organ("head") affecting.take_damage(35, 0) - M:UpdateDamage() M:UpdateDamageIcon() M:emote("scream") M << "\red Your face has become disfigured!" @@ -735,7 +733,6 @@ datum if(istype(M, /mob/living/carbon/human)) var/datum/organ/external/affecting = M:get_organ("head") affecting.take_damage(30, 0) - M:UpdateDamage() M:UpdateDamageIcon() M:emote("scream") M << "\red Your face has become disfigured!" diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 8bce9ab45aa..0cc56c0070b 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -3,23 +3,10 @@ if(istype(E, /datum/organ/external)) if (E.heal_damage(brute, burn)) UpdateDamageIcon() - else - UpdateDamage() else return 0 return - -/mob/living/carbon/human/proc/UpdateDamage() -// Rockdtben - remove this soon. -// adjustBruteLoss(-getBruteLoss()) -// adjustFireLoss(-getFireLoss()) -// for(var/datum/organ/external/O in organs) -// if(istype(O, /datum/organ/external)) -// adjustBruteLoss(O.brute_dam) -// adjustFireLoss(O.burn_dam) - return - // new damage icon system // now constructs damage icon for each organ from mask * damage field