Merge pull request #4338 from CHOMPStation2/upstream-merge-13053

[MIRROR] Because we can't have anything fun
This commit is contained in:
Nadyr
2022-06-07 18:36:59 -04:00
committed by GitHub
2 changed files with 3 additions and 1 deletions

View File

@@ -63,6 +63,7 @@
emote_message_3p_target = "boops at TARGET!"
emote_message_3p = "boops."
emote_sound = 'sound/voice/roboboop.ogg'
sound_vary = TRUE
/decl/emote/audible/synth/robochirp
key = "robochirp"
@@ -71,3 +72,4 @@
emote_message_3p_target = "chirps at TARGET!"
emote_message_3p = "chirps."
emote_sound = 'sound/voice/robochirp.ogg'
sound_vary = TRUE

View File

@@ -44,7 +44,7 @@ var/global/list/emotes_by_key
var/emote_range = 0 // If >0, restricts emote visibility to viewers within range.
var/sound_preferences = list(/datum/client_preference/emote_noises) // Default emote sound_preferences is just emote_noises. Belch emote overrides this list for pref-checks.
var/sound_vary = TRUE
var/sound_vary = FALSE
/decl/emote/Initialize()
. = ..()