From 4488ea1bf1d393d89395fb14d171b240efae48a5 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 4 Aug 2014 12:56:31 -0400 Subject: [PATCH 1/2] Fixes #5893 --- icons/mob/belt.dmi | Bin 6038 -> 6392 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index d2b6ba4aef1c6a355bd8b194d65166a8605b702f..73ddaaf49f56f380bb13f4d39a8fa09182f3bc5a 100644 GIT binary patch literal 6392 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 Date: Mon, 4 Aug 2014 13:04:34 -0400 Subject: [PATCH 2/2] Fixes #5881 --- code/modules/mob/living/silicon/robot/robot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 754c1b5dc6..9e16fd0aa2 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1112,7 +1112,7 @@ if (href_list["act"]) var/obj/item/O = locate(href_list["act"]) - if (!istype(O) || !(O.loc == src || O.loc == src.module)) + if (!istype(O) || !(O in src.module.modules)) return if(activated(O))