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