From c344d6345f7d86ef080fcb8159ba0441e07eb7f7 Mon Sep 17 00:00:00 2001 From: Techhead Date: Tue, 11 Oct 2016 15:09:48 -0400 Subject: [PATCH] NO_POISON or IS_PLANT now grant hallucination immunity Also stops hallucinations from preventing passing out from halloss. Resolves #14395 Resolves #12425 --- code/modules/mob/living/carbon/human/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e98568c1fa..4769eda183 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -902,7 +902,7 @@ Paralyse(3) if(hallucination) - if(hallucination >= 20) + if(hallucination >= 20 && !(species.flags & (NO_POISON|IS_PLANT)) ) if(prob(3)) fake_attack(src) if(!handling_hal)