From c130905ee49713064d4ea575cd0bcfba99a148f5 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Wed, 27 May 2026 14:34:51 -0700 Subject: [PATCH] [MIRROR] Pain fix & addition (#12780) Co-authored-by: Cameron Lennox Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/modules/organs/pain.dm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index 29836cc0f6..bf48ee4991 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -29,29 +29,25 @@ switch(power) if(0 to 5) next_pain_time = world.time + 300 SECONDS - multilimb_pain_time = world.time + 45 SECONDS + multilimb_pain_time = world.time + 1 MINUTE if(6 to 20) - next_pain_time = world.time + clamp((30 - power) SECONDS, 10 SECONDS, 30 SECONDS) - multilimb_pain_time = world.time + clamp((30 - power) SECONDS, 10 SECONDS, 30 SECONDS) + next_pain_time = world.time + clamp((100 - power) SECONDS, 80 SECONDS, 95 SECONDS) + multilimb_pain_time = world.time + clamp((100 - power) SECONDS, 80 SECONDS, 95 SECONDS) if(21 to INFINITY) - next_pain_time = world.time + (100 - power) - multilimb_pain_time = world.time + (100 - power) + next_pain_time = world.time + clamp((200 - power) SECONDS, 100 SECONDS, 3 MINUTES) + multilimb_pain_time = world.time + clamp((200 - power) SECONDS, 100 SECONDS, 3 MINUTES) last_pain_message = message to_chat(src,message) - // CHOMPAdd: Emote in pain for custom pain, too if(prob(power / 10) && !isbelly(loc)) // No pain noises inside bellies. emote("pain") - // CHOMPAdd End else 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) - multilimb_pain_time = world.time + (100 - power) - // CHOMPAdd: Emote in pain for custom pain, too + next_pain_time = world.time + clamp((200 - power) SECONDS, 100 SECONDS, 3 MINUTES) + multilimb_pain_time = clamp(world.time + (200 - power) SECONDS, 100 SECONDS, 3 MINUTES) if(prob(power / 10) && !isbelly(loc)) // No pain noises inside bellies. emote("pain") - // CHOMPAdd End /mob/living/carbon/human/proc/handle_pain() if(stat)