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()