From 7e740208f97ea6d11ccf1307a07930819f904f34 Mon Sep 17 00:00:00 2001 From: YPOQ <30683121+YPOQ@users.noreply.github.com> Date: Thu, 11 Jan 2018 20:34:01 -0700 Subject: [PATCH 1/2] Makes bot emagging more consistent (#34274) --- code/modules/mob/living/simple_animal/bot/ed209bot.dm | 2 +- code/modules/mob/living/simple_animal/bot/honkbot.dm | 2 +- code/modules/mob/living/simple_animal/bot/secbot.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 463082adda..a57e8493f0 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -161,7 +161,7 @@ Auto Patrol[]"}, final = final|JUDGE_RECORDCHECK if(weaponscheck) final = final|JUDGE_WEAPONCHECK - if(emagged) + if(emagged == 2) final = final|JUDGE_EMAGGED //ED209's ignore monkeys final = final|JUDGE_IGNOREMONKEYS diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 1052542f5a..690abb6a84 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -102,7 +102,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, var/final = NONE if(check_records) final = final|JUDGE_RECORDCHECK - if(emagged) + if(emagged == 2) final = final|JUDGE_EMAGGED return final diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index b8b2621875..63b8cd4b8b 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -163,7 +163,7 @@ Auto Patrol: []"}, final = final|JUDGE_RECORDCHECK if(weaponscheck) final = final|JUDGE_WEAPONCHECK - if(emagged) + if(emagged == 2) final = final|JUDGE_EMAGGED return final