From 8a2a1b58ca078a03a97eaa9114f24449311b87c8 Mon Sep 17 00:00:00 2001 From: cib Date: Mon, 6 Aug 2012 23:17:07 -0700 Subject: [PATCH] Two fixes to joint wounds. --- code/modules/mob/living/carbon/human/examine.dm | 4 ++-- code/modules/mob/living/carbon/monkey/examine.dm | 2 +- code/modules/mob/organ/organ.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 39558df4912..fbf7a07f3b9 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -287,9 +287,9 @@ var/list/wound_descriptors = list() for(var/datum/wound/W in temp.wounds) if(W.desc in wound_descriptors) - wound_descriptors[W.desc]++ + wound_descriptors[W.desc] += W.amount continue - wound_descriptors[W.desc] = 1 + wound_descriptors[W.desc] = W.amount var/list/flavor_text = list() var/list/no_exclude = list("gaping wound", "big gaping wound", "massive wound", "large bruise",\ "huge bruise", "massive bruise", "severe burn", "large burn", "deep burn", "carbonised area") diff --git a/code/modules/mob/living/carbon/monkey/examine.dm b/code/modules/mob/living/carbon/monkey/examine.dm index 96a7af70981..f147d3b6f9b 100644 --- a/code/modules/mob/living/carbon/monkey/examine.dm +++ b/code/modules/mob/living/carbon/monkey/examine.dm @@ -56,7 +56,7 @@ if(W.desc in wound_descriptors) wound_descriptors[W.desc] += W.amount continue - wound_descriptors[W.desc] = 1 + wound_descriptors[W.desc] = W.amount var/list/flavor_text = list() var/list/no_exclude = list("gaping wound", "big gaping wound", "massive wound", "large bruise",\ "huge bruise", "massive bruise", "severe burn", "large burn", "deep burn", "carbonised area") diff --git a/code/modules/mob/organ/organ.dm b/code/modules/mob/organ/organ.dm index 0ab4af3078b..7d718d15131 100644 --- a/code/modules/mob/organ/organ.dm +++ b/code/modules/mob/organ/organ.dm @@ -121,7 +121,7 @@ amount -= healed_damage src.damage -= healed_damage - while(src.damage / amount < damage_list[current_stage] && current_stage < src.desc_list.len) + while(src.damage / src.amount < damage_list[current_stage] && current_stage < src.desc_list.len) current_stage++ desc = desc_list[current_stage]