From f3180fed6d60a7cddf715a4c2144887712559b27 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Thu, 2 Aug 2012 18:47:14 +1000 Subject: [PATCH] possible fix for recent crash /shrug Signed-off-by: Cael_Aislinn --- code/modules/mob/simple_animal/simple_animal_life.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/simple_animal/simple_animal_life.dm b/code/modules/mob/simple_animal/simple_animal_life.dm index 5e3ea94cd98..67af09099c0 100644 --- a/code/modules/mob/simple_animal/simple_animal_life.dm +++ b/code/modules/mob/simple_animal/simple_animal_life.dm @@ -23,12 +23,12 @@ //Speaking if(prob(speak_chance)) - var/length = speak.len + emote_hear.len + emote_see.len - if(speak.len && prob((speak.len / length) * 100)) + var/length = (speak ? speak.len : 0) + (emote_see ? emote_see.len : 0) + (emote_hear ? emote_hear.len : 0) + if(speak && speak.len && prob((speak.len / length) * 100)) say(pick(speak)) - else if(emote_see.len && prob((emote_see.len / length) * 100)) + else if(emote_see && emote_see.len && prob((emote_see.len / length) * 100)) emote("auto",1,pick(emote_see)) - else if(emote_hear.len) + else if(emote_hear && emote_hear.len) emote("auto",2,pick(emote_hear)) //var/act,var/m_type=1,var/message = null