diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm index e45a6a15014..70f41d37cb6 100644 --- a/code/datums/organs/organ_external.dm +++ b/code/datums/organs/organ_external.dm @@ -208,6 +208,7 @@ if(BURN) size_names = typesof(/datum/wound/burn/) - /datum/wound/burn/ + size = min(size,size_names.len) var/wound_type = size_names[size] W = new wound_type(damage) diff --git a/code/datums/organs/wound.dm b/code/datums/organs/wound.dm index 4e4c5d73a9d..b90ddfca81a 100644 --- a/code/datums/organs/wound.dm +++ b/code/datums/organs/wound.dm @@ -172,24 +172,25 @@ datum/wound/cut/massive /datum/wound/bruise/monumental // implement sub-paths by starting at a later stage -/datum/wound/bruise/huge - current_stage = 1 -/datum/wound/bruise/large - current_stage = 2 - -/datum/wound/bruise/moderate - current_stage = 3 +/datum/wound/bruise/tiny + current_stage = 5 needs_treatment = 0 /datum/wound/bruise/small current_stage = 4 needs_treatment = 0 -/datum/wound/bruise/tiny - current_stage = 5 +/datum/wound/bruise/moderate + current_stage = 3 needs_treatment = 0 +/datum/wound/bruise/large + current_stage = 2 + +/datum/wound/bruise/huge + current_stage = 1 + /** BURNS **/ /datum/wound/burn/moderate stages = list("ripped burn" = 10, "moderate burn" = 5, "moderate salved burn" = 2, "fresh skin" = 0)