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

Updates species checks

Browse Source
This commit is contained in:
mwerezak
2015-05-27 01:34:50 -04:00
parent 7dcc98e1a4
commit b4adb1a432
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ mob/var/next_pain_time = 0
mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0)
if(stat >= 1)
return
if(species && species.flags & NO_PAIN)
if(species && (species.flags & NO_PAIN))
return
if(analgesic > 40)
return
@@ -53,7 +53,7 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0
mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
if(stat >= 1)
return
if(species && species.flags & NO_PAIN)
if(species.flags & NO_PAIN)
return
if(reagents.has_reagent("tramadol"))
return
@@ -74,7 +74,7 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
mob/living/carbon/human/proc/handle_pain()
// not when sleeping
if(species && species.flags & NO_PAIN) return
if(species.flags & NO_PAIN) return
if(stat >= 2) return
if(analgesic > 70)