From eb9b3da5815bab6cf429c6934183b2c6c9c1a3cc Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Fri, 17 Jul 2020 16:13:18 +1200 Subject: [PATCH] Blacklist logic fix --- code/game/objects/items/robot/robot_items.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index ce13e3f24c..564f08b14d 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -814,14 +814,12 @@ for(var/typepath in can_hold) if(istype(I,typepath)) + grab = 1 for(var/badpath in cannot_hold) if(istype(I,badpath)) - if(user.emagged) - grab = 1 - break - else - grab = 1 - break + if(!user.emagged) + grab = 0 + continue //We can grab the item, finally. if(grab)