From 00879a6e281dd9a4ed695f740aaf0953d608b99e Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sat, 6 Jul 2019 03:46:01 +0200 Subject: [PATCH] Holographic PDA Quickfix! --- code/game/objects/items/devices/PDA/PDA.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 15c88d168f..a40677d27b 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_EMPTY(PDAs) inserted_item = new inserted_item(src) else inserted_item = new /obj/item/pen(src) - update_icon() + update_icon(FALSE, TRUE) /obj/item/pda/CtrlShiftClick(mob/living/user) . = ..() @@ -144,8 +144,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(QDELETED(src) || isnull(new_icon) || new_icon == icon || M.incapacitated() || !in_range(M,src)) return icon = new_icon - set_new_overlays() - update_icon() + update_icon(FALSE, TRUE) to_chat(M, "[src] is now skinned as '[choice]'.") /obj/item/pda/proc/set_new_overlays() @@ -187,8 +186,7 @@ GLOBAL_LIST_EMPTY(PDAs) var/pref_skin = GLOB.pda_reskins[user.client.prefs.pda_skin] if(icon != pref_skin) icon = pref_skin - set_new_overlays() - update_icon() + update_icon(FALSE, TRUE) equipped = TRUE /obj/item/pda/proc/update_label() @@ -203,7 +201,9 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/pda/GetID() return id -/obj/item/pda/update_icon(alert = FALSE) +/obj/item/pda/update_icon(alert = FALSE, new_overlays = FALSE) + if(new_overlays) + set_new_overlays() cut_overlays() add_overlay(alert ? current_overlays[PDA_OVERLAY_ALERT] : current_overlays[PDA_OVERLAY_SCREEN]) var/mutable_appearance/overlay = new()