cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-20 19:57:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Pain fix & addition (#12780)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-05-27 23:34:51 +02:00
committed by GitHub
co-authored by Cameron Lennox Kashargul
parent 403ce96660
commit c130905ee4
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/pain.dm
+7 -11
View File
@@ -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)