From 7517b6ba1916ef3c33bab1b13c32d48d97a3ceef Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 19 Oct 2017 22:06:58 +1300 Subject: [PATCH 1/2] Merge pull request #31852 from Mercenaryblue/tweak_honkbot You will no longer trip on inactive Honkbots. [Tweak] --- code/modules/mob/living/simple_animal/bot/honkbot.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index be41ba791d..04a83647ed 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -348,7 +348,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, mode = BOT_HUNT /mob/living/simple_animal/bot/honkbot/Crossed(atom/movable/AM) - if(ismob(AM)) + if(ismob(AM) && (on)) //only if its online if(prob(30)) //you're far more likely to trip on a honkbot var/mob/living/carbon/C = AM if(!istype(C) || !C || in_range(src, target)) @@ -362,7 +362,8 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, "[C] leaps out of [src]'s way!")]") C.Knockdown(10) playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 1, -1) - speak("Honk!") + if(!client) + speak("Honk!") sensor_blink() return ..()