From 46f57054f6988211aa59a87947d1fc542bc384b3 Mon Sep 17 00:00:00 2001 From: SidVeld Date: Wed, 30 Aug 2023 18:04:58 +0300 Subject: [PATCH] feature: window flash from tegustation Taken from vlggms/tegustation-bay12/pull/412 Thank you, EgorDinamit --- baystation12.dme | 1 + code/modules/admin/verbs/adminhelp.dm | 2 ++ code/modules/admin/verbs/adminpm.dm | 1 + proxima/code/_helpers/window_flash.dm | 6 ++++++ 4 files changed, 10 insertions(+) create mode 100644 proxima/code/_helpers/window_flash.dm diff --git a/baystation12.dme b/baystation12.dme index f92b385c7ad54..3e8f70115c3c4 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -3239,6 +3239,7 @@ #include "interface\skin.dmf" #include "maps\_maps.dm" #include "proxima\code\_helpers\colors.dm" +#include "proxima\code\_helpers\window_flash.dm" #include "proxima\code\_helpers\_onclick\hud\_defines_ai.dm" #include "proxima\code\_helpers\_onclick\hud\ai_hud.dm" #include "proxima\code\_helpers\_onclick\hud\ai_screen_object.dm" diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index ee76c1633320e..b272ec602a5d5 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -128,6 +128,8 @@ var/global/list/adminhelp_ignored_words = list("unknown","the","a","an","of","mo T = emoji_parse(msg, X) to_chat(X, T) + + window_flash(X) // PRX original_msg = emoji_parse(original_msg, src) //show it to the person adminhelping too to_chat(src, "PM to-Staff (CLOSE): [original_msg]") diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index d7b8f51a8854b..6bc2eb9df0900 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -126,6 +126,7 @@ receiver_message += ": [msg_r]" receiver_message += "" to_chat(C, receiver_message) + window_flash(C) // PRX //play the receiving admin the adminhelp sound (if they have them enabled) //non-admins shouldn't be able to disable this diff --git a/proxima/code/_helpers/window_flash.dm b/proxima/code/_helpers/window_flash.dm new file mode 100644 index 0000000000000..037758aea1048 --- /dev/null +++ b/proxima/code/_helpers/window_flash.dm @@ -0,0 +1,6 @@ +// Taken from vlggms/tegustation-bay12/pull/412 + +/proc/window_flash(client_or_user) + if (!client_or_user) + return + winset(client_or_user, "mainwindow", "flash=5")