From d259d7b5b4d196729680d6a6c493fdff9851d52b Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Fri, 19 Dec 2025 03:44:32 +0100
Subject: [PATCH] handle emote spam (#18913)

* handle emote spam

* .
---
 code/modules/emotes/definitions/visible_animated.dm | 3 ---
 code/modules/emotes/emote_mob.dm                    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/modules/emotes/definitions/visible_animated.dm b/code/modules/emotes/definitions/visible_animated.dm
index dda87a5b80c..97f05bfd6ad 100644
--- a/code/modules/emotes/definitions/visible_animated.dm
+++ b/code/modules/emotes/definitions/visible_animated.dm
@@ -12,7 +12,6 @@
 	key = "sidestep"
 	check_restraints = TRUE
 	emote_message_3p = "steps rhythmically and moves side to side."
-	//emote_delay = 1.2 SECONDS //VOREStation Edit - Delay moved to parent
 
 /decl/emote/visible/sidestep/do_extra(mob/user)
 	if(istype(user))
@@ -26,7 +25,6 @@
 	emote_message_1p = "You do a flip!"
 	emote_message_3p = "does a flip!"
 	emote_sound = 'sound/effects/bodyfall4.ogg'
-	//emote_delay = 1.2 SECONDS //VOREStation Edit - Delay moved to parent
 
 /decl/emote/visible/flip/do_extra(mob/user)
 	. = ..()
@@ -42,7 +40,6 @@
 	key = "floorspin"
 	emote_message_1p = "You spin around on the floor!"
 	emote_message_3p = "spins around on the floor!"
-	//emote_delay = 1.2 SECONDS //VOREStation Edit - Delay moved to parent
 	var/static/list/spin_dirs = list(
 		NORTH,
 		SOUTH,
diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
index 71aff192519..97c983fe3a9 100644
--- a/code/modules/emotes/emote_mob.dm
+++ b/code/modules/emotes/emote_mob.dm
@@ -92,12 +92,12 @@
 	if(m_type != use_emote.message_type && use_emote.conscious && stat != CONSCIOUS)
 		return
 
+	next_emote = world.time + use_emote.emote_delay
 	if(use_emote.message_type == AUDIBLE_MESSAGE && is_muzzled())
 		var/muffle_message = use_emote.emote_message_muffled || "makes a muffled sound."
 		audible_message(span_bold("\The [src]") + " [muffle_message]", runemessage = "[muffle_message]")
 		return
 
-	next_emote = world.time + use_emote.emote_delay
 	use_emote.do_emote(src, message)
 	for (var/obj/item/implant/I in src)
 		if (I.implanted)