diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index cbca69640a7..d751ff4892f 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -6,7 +6,6 @@ return var/total_burn = 0 var/total_brute = 0 - limbpain = 0 for(var/datum/organ/external/O in organs) //hardcoded to streamline things a bit if(O.vital) total_brute += O.brute_dam diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index e00bba6e046..04189211f2f 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -79,7 +79,5 @@ var/frozen = 0 //used for preventing attacks on admin-frozen people - var/limbpain = 0 - fire_dmi = 'icons/mob/OnFire.dmi' fire_sprite = "Standing" diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index af618f2e40d..39378d99583 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -88,7 +88,6 @@ mob/living/carbon/human/proc/handle_pain() return var/maxdam = 0 var/datum/organ/external/damaged_organ = null - limbpain = 0 for(var/datum/organ/external/E in organs) // amputated limbs don't cause pain if(E.amputated) continue @@ -101,8 +100,7 @@ mob/living/carbon/human/proc/handle_pain() maxdam = dam if(damaged_organ) pain(damaged_organ.display_name, maxdam, 0) - if(!E.vital) - limbpain += dam + // Damage to internal organs hurts a lot. for(var/n in internal_organs_by_name)