From 831f3dd99d4b81666a6e9d4e1d1559acef9d3225 Mon Sep 17 00:00:00 2001 From: IK3I Date: Wed, 17 May 2017 16:02:21 -0500 Subject: [PATCH] Fixes #7316 --- code/game/dna/genes/goon_powers.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index 0c56c3330cd..33f632b490a 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -554,7 +554,8 @@ return to_chat(user, "Mind Reading of [M.name]:") - var/pain_condition = M.health + + var/pain_condition = M.health / M.maxHealth // lower health means more pain var/list/randomthoughts = list("what to have for lunch","the future","the past","money", "their hair","what to do next","their job","space","amusing things","sad things", @@ -562,20 +563,20 @@ var/thoughts = "thinking about [pick(randomthoughts)]" if(M.fire_stacks) - pain_condition -= 50 + pain_condition -= 0.5 thoughts = "preoccupied with the fire" if(M.radiation) - pain_condition -= 25 + pain_condition -= 0.25 switch(pain_condition) - if(81 to INFINITY) + if(0.81 to INFINITY) to_chat(user, "Condition: [M.name] feels good.") - if(61 to 80) + if(0.61 to 0.8) to_chat(user, "Condition: [M.name] is suffering mild pain.") - if(41 to 60) + if(0.41 to 0.6) to_chat(user, "Condition: [M.name] is suffering significant pain.") - if(21 to 40) + if(0.21 to 0.4) to_chat(user, "Condition: [M.name] is suffering severe pain.") else to_chat(user, "Condition: [M.name] is suffering excruciating pain.")