From cb010f7c568d6ff86dd77ff37378531663a00e84 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:19:48 +0100 Subject: [PATCH] [MIRROR] You now see the vibebot do its thing [MDB IGNORE] (#18938) You now see the vibebot do its thing (#72885) ## About The Pull Request Fixes #72847 You now see the vibes and not just feel them ## Changelog :cl: fix: vibebot being invisible /:cl: Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> --- code/modules/mob/living/simple_animal/bot/bot.dm | 2 +- code/modules/mob/living/simple_animal/bot/vibebot.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index dee375cf5ac..39fa893e59c 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -942,7 +942,7 @@ Pass a positive integer as an argument to override a bot's default speed. ejectpai(usr) /mob/living/simple_animal/bot/update_icon_state() - icon_state = "[initial(icon_state)][get_bot_flag(bot_mode_flags, BOT_MODE_ON)]" + icon_state = "[isnull(base_icon_state) ? initial(icon_state) : base_icon_state][get_bot_flag(bot_mode_flags, BOT_MODE_ON)]" return ..() /mob/living/simple_animal/bot/proc/topic_denied(mob/user) //Access check proc for bot topics! Remember to place in a bot's individual Topic if desired. diff --git a/code/modules/mob/living/simple_animal/bot/vibebot.dm b/code/modules/mob/living/simple_animal/bot/vibebot.dm index 5519a9ea3b3..2a63c8571b8 100644 --- a/code/modules/mob/living/simple_animal/bot/vibebot.dm +++ b/code/modules/mob/living/simple_animal/bot/vibebot.dm @@ -3,6 +3,7 @@ desc = "A little robot. It's just vibing, doing its thing." icon = 'icons/mob/silicon/aibots.dmi' icon_state = "vibebot1" + base_icon_state = "vibebot" density = FALSE anchored = FALSE health = 25 @@ -24,9 +25,9 @@ /mob/living/simple_animal/bot/vibebot/Initialize(mapload) . = ..() - update_appearance() vibe_ability = new(src) vibe_ability.Grant(src) + update_appearance(UPDATE_ICON) /mob/living/simple_animal/bot/vibebot/Destroy() QDEL_NULL(vibe_ability)