From 456f68b32be4a77075b9c37d7781cbc0ff8eeb33 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Thu, 16 Sep 2021 01:05:28 -0300 Subject: [PATCH] Upload files --- code/_onclick/hud/screen_objects.dm | 2 +- code/game/objects/items.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 56db868a21..fabeeea603 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -154,7 +154,7 @@ if(hud?.mymob && slot_id) var/obj/item/inv_item = hud.mymob.get_item_by_slot(slot_id) if(inv_item) - if(hud?.mymob.incapacitated()) + if(hud?.mymob.incapacitated() || (slot_id in hud?.mymob.check_obscured_slots())) inv_item.apply_outline(COLOR_RED_GRAY) else inv_item.apply_outline() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 7177249dbc..0e6e607c90 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -890,7 +890,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb var/user = usr tip_timer = addtimer(CALLBACK(src, .proc/openTip, location, control, params, user), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it. var/mob/living/L = usr - if(istype(L) && L.incapacitated()) + if(istype(L) && (L.incapacitated() || (current_equipped_slot in L.check_obscured_slots()))) apply_outline(COLOR_RED_GRAY) else apply_outline()