diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index fabeeea603..e8f2da5e4e 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() || (slot_id in hud?.mymob.check_obscured_slots())) + if(hud?.mymob.incapacitated() || (slot_id in hud?.mymob.check_obscured_slots()) || !hud?.mymob.canUnEquip(inv_item)) 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 0e6e607c90..c8d71715e4 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() || (current_equipped_slot in L.check_obscured_slots()))) + if(istype(L) && (L.incapacitated() || (current_equipped_slot in L.check_obscured_slots()) || !L.canUnEquip(src))) apply_outline(COLOR_RED_GRAY) else apply_outline()