cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2540 from CIB/feature

Browse Source 
Fixed toxloss messages.
This commit is contained in:
Chinsky
2013-03-16 10:13:24 -07:00
parent 14a96f77ab 57955dbf6a
commit 0f6475c108
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/organs/pain.dm
View File

@@ -56,7 +56,12 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
var/msg = "\red <b>[message]</b>"
if(flash_strength >= 1)
msg = "\red <font size=3><b>[message]</b></font>"
src << msg
// Anti message spam checks
if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time)))
last_pain_message = msg
src << msg
next_pain_time = world.time + 100
mob/living/carbon/human/proc/handle_pain()
// not when sleeping
@@ -101,7 +106,10 @@ mob/living/carbon/human/proc/handle_pain()
if(11 to 15)
toxMessageProb = 2
toxDamageMessage = "Your whole body hurts."
if(91 to 10000)
if(15 to 25)
toxMessageProb = 3
toxDamageMessage = "Your whole body hurts badly."
if(26 to INFINITY)
toxMessageProb = 5
toxDamageMessage = "Your body aches all over, it's driving you mad."