From c3e71c8e6a03d1f2bdf7f35aefafa0d7de563161 Mon Sep 17 00:00:00 2001 From: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com> Date: Fri, 26 Feb 2021 04:25:32 -0500 Subject: [PATCH] Adds cooldown feedback to emotes (#57114) --- code/datums/emotes.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 38da2627287..d6f82c3b6dc 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -82,6 +82,9 @@ if(!intentional) return TRUE if(user.emotes_used && user.emotes_used[src] + cooldown > world.time) + var/datum/emote/default_emote = /datum/emote + if(cooldown > initial(default_emote.cooldown)) // only worry about longer-than-normal emotes + to_chat(user, "You must wait another [DisplayTimeText(user.emotes_used[src] - world.time + cooldown)] before using that emote.") return FALSE if(!user.emotes_used) user.emotes_used = list()