From ceb220f7055dea16a5253b1068467a54fa13d52d Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Tue, 25 Feb 2014 00:21:41 -0600 Subject: [PATCH] Runtime fix: OH GOD NOT THE BEEs WON'T SOMEONE CALM THEM DOWN? Other then NULL? runtime error: Cannot read null.type proc name: Life (/mob/living/simple_animal/bee/Life) source file: bees.dm,91 runtime error: Cannot read null.type proc name: Life (/mob/living/simple_animal/bee/Life) source file: bees.dm,91 runtime error: Cannot read null.type proc name: Life (/mob/living/simple_animal/bee/Life) source file: bees.dm,91 runtime error: Cannot read null.type proc name: Life (/mob/living/simple_animal/bee/Life) source file: bees.dm,91 runtime error: Cannot read null.type proc name: Life (/mob/living/simple_animal/bee/Life) source file: bees.dm,91 runtime error: Cannot read null.type proc name: Life (/mob/living/simple_animal/bee/Life) source file: bees.dm,91 runtime error: Cannot read null.type proc name: Life (/mob/living/simple_animal/bee/Life) source file: bees.dm,91 runtime error: Cannot read null.type proc name: Life (/mob/living/simple_animal/bee/Life) source file: bees.dm,91 --- code/modules/mob/living/simple_animal/bees.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm index e78e818ecc..1fa531070c 100644 --- a/code/modules/mob/living/simple_animal/bees.dm +++ b/code/modules/mob/living/simple_animal/bees.dm @@ -88,9 +88,10 @@ for(var/this_type in calmers) var/mob/living/simple_animal/check_effect = locate() in src.loc - if(check_effect.type == this_type) - calming = 1 - break + if(istype(check_effect)) + if(check_effect.type == this_type) + calming = 1 + break if(calming) if(feral > 0)