From fb1f32a427215da438bfc40f15d539ba5792a08a Mon Sep 17 00:00:00 2001 From: comma Date: Sat, 3 Aug 2013 23:05:04 +0400 Subject: [PATCH] Painkillers stop regular pain messages too, not only custom ones. --- code/modules/organs/pain.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index 7919381c0f7..d894d0f0815 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -9,6 +9,12 @@ mob/var/next_pain_time = 0 // amount is a num from 1 to 100 mob/proc/pain(var/partname, var/amount, var/force, var/burning = 0) if(stat >= 2) return + if(reagents.has_reagent("tramadol")) + return + if(reagents.has_reagent("oxycodone")) + return + if(analgesic) + return if(world.time < next_pain_time && !force) return if(amount > 10 && istype(src,/mob/living/carbon/human))