From b6bf390b28e4a004ec5084d752549b7de26407f2 Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 15 Mar 2018 13:15:34 +1300 Subject: [PATCH 1/2] Merge pull request #36379 from ShizCalev/bot-icon-fixes Fixes broken bot icons --- code/modules/mob/living/simple_animal/bot/bot.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index ac48f9e6d521..91a3eeea7637 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -968,6 +968,8 @@ Pass a positive integer as an argument to override a bot's default speed. if(newpath) for(var/i in 1 to newpath.len) var/turf/T = newpath[i] + if(T == loc) //don't bother putting an image if it's where we already exist. + continue var/direction = NORTH if(i > 1) var/turf/prevT = path[i - 1] @@ -1010,5 +1012,5 @@ Pass a positive integer as an argument to override a bot's default speed. return var/image/I = path[path[1]] if(I) - I.icon = null + I.icon_state = null path.Cut(1, 2) From 53b158e1f32700e05bc2da5f70a73a3d5614a8f3 Mon Sep 17 00:00:00 2001 From: yogstation13-bot Date: Thu, 15 Mar 2018 01:16:10 +0100 Subject: [PATCH 2/2] Fixes broken bot icons