From 9cd3d45a4e2a8ce05206153260ce624a408f50bf Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Wed, 30 May 2018 16:33:47 -0700 Subject: [PATCH] Fix cyborg HUD not unhilighting when dropping a module (#38145) * Fix cyborg HUD not unhilighting when dropping a module * Remove redundant dropped call * Strip DROPDEL before dropping rather than after --- code/modules/mob/living/silicon/robot/inventory.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index e1542055a12..8965d0a2b69 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -20,12 +20,6 @@ if(client) client.screen -= O observer_screen_update(O,FALSE) - O.forceMove(module) //Return item to module so it appears in its contents, so it can be taken out again. - - if(O.flags_1 & DROPDEL_1) - O.flags_1 &= ~DROPDEL_1 //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly - - O.dropped(src) if(module_active == O) module_active = null @@ -38,6 +32,12 @@ else if(held_items[3] == O) inv3.icon_state = "inv3" held_items[3] = null + + if(O.flags_1 & DROPDEL_1) + O.flags_1 &= ~DROPDEL_1 //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly + + O.forceMove(module) //Return item to module so it appears in its contents, so it can be taken out again. + hud_used.update_robot_modules_display() return 1