diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm index dfd7a898621a0..780391562cae4 100644 --- a/code/game/objects/items/devices/scanners/health.dm +++ b/code/game/objects/items/devices/scanners/health.dm @@ -303,28 +303,24 @@ . = jointext(.,"
") . = jointext(list(header,.),null) -// Calculates severity based on the ratios defined external limbs. -/proc/get_wound_severity(damage_ratio, can_heal_overkill = 0) - var/degree +// Calculates severity based on the ratios defined external limbs. +/proc/get_wound_severity(damage_ratio, can_heal_overkill) switch(damage_ratio) - if(0 to 10) - degree = "minor" - if(10 to 25) - degree = "moderate" - if(25 to 50) - degree = "significant" - if(50 to 75) - degree = "severe" - if(75 to 99) - degree = "extreme" - else - if(can_heal_overkill) - degree = "critical" - else - degree = "irreparable" + if (0 to 10) + return "minor" + if (10 to 25) + return "moderate" + if (25 to 50) + return "significant" + if (50 to 75) + return "severe" + if (75 to 99) + return "extreme" + if (can_heal_overkill) + return "critical" + return "irreparable" - return degree /obj/item/device/scanner/health/verb/toggle_mode() set name = "Switch Verbosity" diff --git a/code/modules/organs/internal/_internal.dm b/code/modules/organs/internal/_internal.dm index 82aa857e1471d..42ebfd2c1186f 100644 --- a/code/modules/organs/internal/_internal.dm +++ b/code/modules/organs/internal/_internal.dm @@ -180,7 +180,8 @@ heal_damage(damage) /obj/item/organ/internal/proc/get_scarring_level() - . = (initial(max_damage) - max_damage)/initial(max_damage) + var/initial_max = initial(max_damage) + return (initial_max - max_damage) * 100 / initial_max /obj/item/organ/internal/get_scan_results(tag = FALSE) . = ..() diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 90b20bde75902..73e8f1419fd97 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -270,7 +270,7 @@ heal_damage(damage) /obj/item/organ/internal/brain/get_scarring_level() - . = (species.total_health - max_damage)/species.total_health + return (species.total_health - max_damage) * 100 / species.total_health /obj/item/organ/internal/brain/get_mechanical_assisted_descriptor() return "machine-interface [name]"