From 7db4226cd3b720c22e8599430f85ba782be916c3 Mon Sep 17 00:00:00 2001 From: "rastaf.zero@gmail.com" Date: Sat, 2 Apr 2011 21:09:26 +0000 Subject: [PATCH] Fixed bug with healing when organ gets burn damage equal to brute damage. Fixed bug with cyborgs death logging to database. They got logged every cycle producing thousands of fake deaths it statistics. Attention, statistics of deaths now requires to delete erroneous records, we need some sql-experienced programmer to do that correctly. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1348 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/silicon/robot/life.dm | 2 +- code/modules/mob/organs.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 46823ee58a1..8634d39efe3 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -87,7 +87,7 @@ // else // src.overlays -= "emag" - if(health < 0) + if(health < 0 && src.stat != 2) //die only once death() if (src.stat != 2) //Alive. diff --git a/code/modules/mob/organs.dm b/code/modules/mob/organs.dm index 13953727ed2..c2b20a9c80f 100644 --- a/code/modules/mob/organs.dm +++ b/code/modules/mob/organs.dm @@ -35,7 +35,7 @@ /datum/organ/external/proc/heal_damage(brute, burn) src.brute_dam = max(0, src.brute_dam - brute) - src.burn_dam = max(0, src.brute_dam - burn) + src.burn_dam = max(0, src.burn_dam - burn) return update_icon() /datum/organ/external/proc/get_damage() //returns total damage