mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-30 08:39:12 +01:00
[MIRROR] handle emote spam (#12135)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
c7ff1b4fd9
commit
7e396f1cc8
@@ -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)
|
||||
. = ..()
|
||||
@@ -47,7 +45,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,
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user