From 77dea70ebf823a2a963099fa587c8683d33e5d8a Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 21 Feb 2016 22:12:00 +0200 Subject: [PATCH] Fixing IPC Hallucinations --- code/modules/mob/living/carbon/human/life.dm | 34 +++++++++++--------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 799475c489c..51f6a9a04f9 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -984,23 +984,27 @@ Paralyse(3) if(hallucination) - if(hallucination >= 20) - if(prob(3)) - fake_attack(src) - if(!handling_hal) - spawn handle_hallucinations() //The not boring kind! - if(client && prob(5)) - client.dir = pick(2,4,8) - var/client/C = client - spawn(rand(20,50)) - if(C) - C.dir = 1 - - if(hallucination<=2) + //Machines do not hallucinate. + if (species.flags & IS_SYNTHETIC) hallucination = 0 - halloss = 0 else - hallucination -= 2 + if(hallucination >= 20) + if(prob(3)) + fake_attack(src) + if(!handling_hal) + spawn handle_hallucinations() //The not boring kind! + if(client && prob(5)) + client.dir = pick(2,4,8) + var/client/C = client + spawn(rand(20,50)) + if(C) + C.dir = 1 + + if(hallucination<=2) + hallucination = 0 + halloss = 0 + else + hallucination -= 2 else for(var/atom/a in hallucinations)