From 83e24e3b0d1ad87f134f4c1fd2f8a4fa8d48b8df Mon Sep 17 00:00:00 2001 From: tattle <66640614+dragomagol@users.noreply.github.com> Date: Tue, 5 Jul 2022 18:53:18 -0700 Subject: [PATCH] Makes pAI screen alert actually work (#68118) Currently, when a pAI personality is submitted, it's supposed to show an alert screen briefly with flick. This doesn't work. So I've changed it to a 5 second overlay instead, and this does work. --- code/game/objects/items/devices/paicard.dm | 11 ++++++++++- icons/obj/aicards.dmi | Bin 4144 -> 4114 bytes 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index e69f101ad5c..b623dd5c63a 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -187,10 +187,19 @@ if(!COOLDOWN_FINISHED(src, alert_cooldown)) return COOLDOWN_START(src, alert_cooldown, 5 SECONDS) - flick("[initial(icon_state)]-alert", src) + add_alert() + addtimer(CALLBACK(src, .proc/remove_alert), 5 SECONDS) playsound(src, 'sound/machines/ping.ogg', 30, TRUE) loc.visible_message(span_info("[src] flashes a message across its screen, \"Additional personalities available for download.\""), blind_message = span_notice("[src] vibrates with an alert.")) +/obj/item/paicard/proc/add_alert() + add_overlay( + list(mutable_appearance(icon, "[initial(icon_state)]-alert"), + emissive_appearance(icon, "[initial(icon_state)]-alert", alpha = src.alpha))) + +/obj/item/paicard/proc/remove_alert() + cut_overlays() + /obj/item/paicard/emp_act(severity) . = ..() if (. & EMP_PROTECT_SELF) diff --git a/icons/obj/aicards.dmi b/icons/obj/aicards.dmi index 892a0adb672fbfb91a7c2872aa9bd9a44ae5e437..86501e4b43b3f52f50a1237be229c8b663c1fcbd 100644 GIT binary patch delta 3374 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