From 456f68b32be4a77075b9c37d7781cbc0ff8eeb33 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Thu, 16 Sep 2021 01:05:28 -0300 Subject: [PATCH 1/3] 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() From f61c505bbff5394153b811ad1a5bad3cbeab8b7c Mon Sep 17 00:00:00 2001 From: SandPoot Date: Thu, 16 Sep 2021 01:37:05 -0300 Subject: [PATCH 2/3] Glued items too --- 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 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() From 382473eb88287c23759c04b6431572dcf8d5696f Mon Sep 17 00:00:00 2001 From: SandPoot Date: Fri, 17 Sep 2021 14:15:39 -0300 Subject: [PATCH 3/3] Thicc --- code/_onclick/hud/screen_objects.dm | 2 +- code/game/objects/items.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index e8f2da5e4e..2f5f4a3dd4 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -155,7 +155,7 @@ 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()) || !hud?.mymob.canUnEquip(inv_item)) - inv_item.apply_outline(COLOR_RED_GRAY) + inv_item.apply_outline(_size = 3) else inv_item.apply_outline() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c8d71715e4..0d6b1231fc 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -891,7 +891,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb 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()) || !L.canUnEquip(src))) - apply_outline(COLOR_RED_GRAY) + apply_outline(_size = 3) else apply_outline() @@ -905,7 +905,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb closeToolTip(usr) remove_outline() -/obj/item/proc/apply_outline(colour = null) +/obj/item/proc/apply_outline(colour = null, _size=1) if(!(item_flags & IN_INVENTORY || item_flags & IN_STORAGE) || QDELETED(src) || isobserver(usr)) return if(usr.client) @@ -920,7 +920,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb colour = COLOR_BLUE_GRAY if(outline_filter) filters -= outline_filter - outline_filter = filter(type="outline", size=1, color=colour) + outline_filter = filter(type="outline", size=_size, color=colour) filters += outline_filter /obj/item/proc/remove_outline()