cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10498 from VOREStation/Arokha/emotedelay

Browse Source 
Emote Delay Strikes Back
This commit is contained in:
Aronai Sieyes
2021-05-30 19:09:06 -04:00
committed by Chompstation Bot
parent 1c3e965b5c
commit af504ff33b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/emotes/definitions/visible_animated.dm
View File

@@ -12,7 +12,7 @@
key = "sidestep" key = "sidestep"
check_restraints = TRUE check_restraints = TRUE
emote_message_3p = "steps rhythmically and moves side to side." emote_message_3p = "steps rhythmically and moves side to side."
emote_delay = 1.2 SECONDS //emote_delay = 1.2 SECONDS //VOREStation Edit - Delay moved to parent
/decl/emote/visible/sidestep/do_extra(mob/user) /decl/emote/visible/sidestep/do_extra(mob/user)
if(istype(user)) if(istype(user))
@@ -26,7 +26,7 @@
emote_message_1p = "You do a flip!" emote_message_1p = "You do a flip!"
emote_message_3p = "does a flip!" emote_message_3p = "does a flip!"
emote_sound = 'sound/effects/bodyfall4.ogg' emote_sound = 'sound/effects/bodyfall4.ogg'
emote_delay = 1.2 SECONDS //emote_delay = 1.2 SECONDS //VOREStation Edit - Delay moved to parent
/decl/emote/visible/flip/do_extra(mob/user) /decl/emote/visible/flip/do_extra(mob/user)
. = ..() . = ..()
@@ -42,7 +42,7 @@
key = "floorspin" key = "floorspin"
emote_message_1p = "You spin around on the floor!" emote_message_1p = "You spin around on the floor!"
emote_message_3p = "spins around on the floor!" emote_message_3p = "spins around on the floor!"
emote_delay = 1.2 SECONDS //emote_delay = 1.2 SECONDS //VOREStation Edit - Delay moved to parent
var/static/list/spin_dirs = list( var/static/list/spin_dirs = list(
NORTH, NORTH,
SOUTH, SOUTH,

2
code/modules/emotes/emote_define.dm
View File

@@ -35,7 +35,7 @@ var/global/list/emotes_by_key
var/list/emote_sound_synthetic // As above, but used when check_synthetic() is true. var/list/emote_sound_synthetic // As above, but used when check_synthetic() is true.
var/emote_volume = 50 // Volume of sound to play. var/emote_volume = 50 // Volume of sound to play.
var/emote_volume_synthetic = 50 // As above, but used when check_synthetic() is true. var/emote_volume_synthetic = 50 // As above, but used when check_synthetic() is true.
var/emote_delay = 0 // Time in ds that this emote will block further emote use (spam prevention). var/emote_delay = 1.2 SECONDS // Time in ds that this emote will block further emote use (spam prevention). // VOREStation Edit
var/message_type = VISIBLE_MESSAGE // Audible/visual flag var/message_type = VISIBLE_MESSAGE // Audible/visual flag
var/check_restraints // Can this emote be used while restrained? var/check_restraints // Can this emote be used while restrained?