From 3b8018b4be0435bcc3b2f154413d5ad16bf6c4bf Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 15 May 2021 10:50:30 -0400 Subject: [PATCH] Readd emote cooldown --- code/modules/emotes/definitions/_mob.dm | 1 + code/modules/emotes/emote_mob.dm | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/code/modules/emotes/definitions/_mob.dm b/code/modules/emotes/definitions/_mob.dm index 8c10b4cde2f..46a2bf94da3 100644 --- a/code/modules/emotes/definitions/_mob.dm +++ b/code/modules/emotes/definitions/_mob.dm @@ -27,6 +27,7 @@ var/list/_default_mob_emotes = list( /mob var/list/usable_emotes + var/nextemote = 1 //VOREStation Add /mob/proc/update_emotes(var/skip_sort) usable_emotes = list() diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index 3e45f05091e..546ee4c7aec 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -1,4 +1,9 @@ /mob/proc/can_emote(var/emote_type) + //VOREStation Add + if(src.nextemote >= world.time) + return FALSE + src.nextemote = world.time + 12 + //VOREStation Add End return (stat == CONSCIOUS) /mob/living/can_emote(var/emote_type)