From 651909a8efcc436b84a90fb716998d6d7d0ecbe6 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Wed, 23 Mar 2016 21:37:54 -0700 Subject: [PATCH] Fixes organs and cyborg upgrades popping up in your screen --- code/modules/mob/living/carbon/human/update_icons.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 7849deb633b..398345a6d71 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -957,7 +957,7 @@ var/global/list/damage_icon_parts = list() /mob/living/carbon/human/update_hud() //TODO: do away with this if possible if(client) - client.screen |= contents + client.screen |= get_all_slots() // Items only please, no arms allowed if(hud_used) hud_used.hidden_inventory_update() //Updates the screenloc of the items on the 'other' inventory bar update_inv_handcuffed(0) // update handcuff overlay diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 5e65c6d75b8..a753ce862cf 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -261,10 +261,8 @@ /mob/living/silicon/robot/proc/update_items() if (src.client) - src.client.screen -= src.contents - for(var/obj/I in src.contents) - if(I && !(istype(I,/obj/item/weapon/stock_parts/cell) || istype(I,/obj/item/device/radio) || istype(I,/obj/machinery/camera) || istype(I,/obj/item/device/mmi))) - src.client.screen += I + for(var/obj/I in get_all_slots()) + client.screen |= I if(src.module_state_1) src.module_state_1:screen_loc = ui_inv1 if(src.module_state_2)