From d58a33dbaa40bed9dda645c9b37e656d22f10ec1 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 21 Aug 2024 05:59:00 +0200 Subject: [PATCH] [MIRROR] Beepsky no longer salutes itself like a total narcissist (#29495) * Beepsky no longer salutes itself like a total narcissist (#85960) ## About The Pull Request When encountering a commissioned bot, Beepsky will salute it instead of itself. What a narcissist. Also removes single char var because why not. ## Why It's Good For The Game Closes #85186. ## Changelog :cl: Rhials fix: Beepsky will now salute commissioned bots, instead of himself, when encountering one. /:cl: * Beepsky no longer salutes itself like a total narcissist --------- Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com> --- code/modules/mob/living/simple_animal/bot/bot.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index e2bb112e156..f48d542ba19 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -378,9 +378,9 @@ if(HAS_TRAIT(src, TRAIT_COMMISSIONED) && COOLDOWN_FINISHED(src, next_salute_check)) COOLDOWN_START(src, next_salute_check, BOT_COMMISSIONED_SALUTE_DELAY) - for(var/mob/living/simple_animal/bot/B in view(5, src)) - if(!HAS_TRAIT(B, TRAIT_COMMISSIONED) && B.bot_mode_flags & BOT_MODE_ON) - manual_emote("performs an elaborate salute for [src]!") + for(var/mob/living/simple_animal/bot/nearby_bot in view(5, src)) + if(!HAS_TRAIT(nearby_bot, TRAIT_COMMISSIONED) && nearby_bot.bot_mode_flags & BOT_MODE_ON) + manual_emote("performs an elaborate salute for [nearby_bot]!") break switch(mode) //High-priority overrides are processed first. Bots can do nothing else while under direct command.