From b4adb1a432f65a0a1624860bda5969c61e4837dd Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 27 May 2015 01:34:50 -0400 Subject: [PATCH] Updates species checks --- 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 4f19115bdc..e4e024be10 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -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)