From 2edeb8172c878f9c57449f670a342f54cb0c5cd9 Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Sat, 28 Jan 2023 20:09:39 +0100 Subject: [PATCH] Sigificantly reduces frequency of pain messages --- code/modules/organs/pain.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index b65b3fc2fbd..0939201e0c3 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -19,7 +19,7 @@ if(force || (message != last_pain_message) || (world.time >= next_pain_time)) last_pain_message = message to_chat(src,message) - next_pain_time = world.time + (100-power) + next_pain_time = world.time + clamp((120 - power) SECONDS, 3 SECONDS, 120 SECONDS) /mob/living/carbon/human/proc/handle_pain() if(stat) @@ -59,7 +59,7 @@ if(91 to 10000) flash_pain() msg = "OH GOD! Your [damaged_organ.name] is [burning ? "on fire" : "hurting terribly"]!" - custom_pain(msg, maxdam, prob(10)) + custom_pain(msg, maxdam, prob(clamp(maxdam/10,0,100))) // Damage to internal organs hurts a lot. for(var/obj/item/organ/I in internal_organs) @@ -77,4 +77,4 @@ if(31 to 60) custom_pain("Your whole body hurts badly.", getToxLoss()) if(61 to INFINITY) - custom_pain("Your body aches all over, it's driving you mad.", getToxLoss()) \ No newline at end of file + custom_pain("Your body aches all over, it's driving you mad.", getToxLoss())