Runechats emotes with sound effects. (#23255)

* Remove emote_sound from the codebase

* quick cleanups

* Update code/datums/emote.dm

oops

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* gnarg

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Luc
2023-11-29 13:18:20 -05:00
committed by GitHub
parent 7ff488fd22
commit 2d6545a291
9 changed files with 45 additions and 47 deletions
@@ -9,7 +9,7 @@
key_third_person = "roars"
message = "roars!"
message_param = "roars at %t!"
emote_type = EMOTE_SOUND | EMOTE_MOUTH
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
sound = "sound/voice/hiss5.ogg"
volume = 80
@@ -18,7 +18,7 @@
key_third_person = "hisses"
message = "hisses!"
message_param = "hisses at %t!"
emote_type = EMOTE_SOUND | EMOTE_MOUTH
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
sound = "sound/voice/hiss1.ogg"
volume = 30
@@ -28,5 +28,5 @@
message = "gnarls and shows its teeth."
message_param = "gnarls and flashes its teeth at %t."
sound = "sound/voice/hiss4.ogg"
emote_type = EMOTE_SOUND | EMOTE_MOUTH
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
volume = 30
@@ -30,7 +30,7 @@
key_third_person = "coughs"
message = "coughs!"
message_mime = "appears to cough!"
emote_type = EMOTE_SOUND | EMOTE_MOUTH
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
vary = TRUE
age_based = TRUE
volume = 120
@@ -44,7 +44,7 @@
message = "claps."
message_mime = "claps silently."
message_param = "claps at %t."
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
vary = TRUE
/datum/emote/living/carbon/human/clap/run_emote(mob/user, params, type_override, intentional)
@@ -79,7 +79,7 @@
key = "crack"
key_third_person = "cracks"
message = "cracks their knuckles."
emote_type = EMOTE_AUDIBLE | EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
// knuckles.ogg by CGEffex. Shortened and cut.
// https://freesound.org/people/CGEffex/sounds/93981/
sound = "sound/effects/mob_effects/knuckles.ogg"
@@ -116,7 +116,7 @@
message = "facepalms."
hands_use_check = TRUE
sound = 'sound/weapons/slap.ogg'
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
volume = 50
/datum/emote/living/carbon/human/palm
@@ -161,7 +161,7 @@
message_mime = "acts out a scream!"
message_postfix = "at %t!"
muzzled_noises = list("very loud")
emote_type = EMOTE_SOUND | EMOTE_MOUTH
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
only_forced_audio = FALSE
vary = TRUE
age_based = TRUE
@@ -195,7 +195,7 @@
key_third_person = "gasps"
message = "gasps!"
message_mime = "appears to be gasping!"
emote_type = EMOTE_SOUND // Don't make this one a mouth emote since we don't want it to be caught by nobreath
emote_type = EMOTE_AUDIBLE // Don't make this one a mouth emote since we don't want it to be caught by nobreath
age_based = TRUE
unintentional_stat_allowed = UNCONSCIOUS
volume = 100
@@ -333,7 +333,7 @@
key_third_person = "sneezes"
message = "sneezes."
muzzled_noises = list("strange", "sharp")
emote_type = EMOTE_SOUND | EMOTE_MOUTH
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
volume = 70
/datum/emote/living/carbon/human/sneeze/get_sound(mob/user)
@@ -407,7 +407,7 @@
message = "snaps their fingers."
message_param = "snaps their fingers at %t."
sound = "sound/effects/fingersnap.ogg"
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/snap/run_emote(mob/user, params, type_override, intentional)
@@ -589,7 +589,7 @@
key_third_person = "quills"
message = "rustles their quills."
message_param = "rustles their quills at %t."
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
age_based = TRUE
// Credit to sound-ideas (freesfx.co.uk) for the sound.
sound = "sound/effects/voxrustle.ogg"
@@ -600,7 +600,7 @@
key_third_person = "warbles"
message = "warbles."
message_param = "warbles at %t."
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
age_based = TRUE
// Copyright CC BY 3.0 alienistcog (freesound.org) for the sound.
sound = "sound/effects/warble.ogg"
@@ -612,7 +612,7 @@
message = "clacks their mandibles."
message_param = "clacks their mandibles at %t."
species_type_whitelist_typecache = list(/datum/species/kidan)
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
audio_cooldown = 3 SECONDS
age_based = TRUE
// Credit to DrMinky (freesound.org) for the sound.
@@ -634,7 +634,7 @@
/datum/emote/living/carbon/human/drask_talk
species_type_whitelist_typecache = list(/datum/species/drask)
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
age_based = TRUE
sound = "sound/voice/drasktalk.ogg"
@@ -662,7 +662,7 @@
message = "hisses."
message_param = "hisses at %t."
species_type_whitelist_typecache = list(/datum/species/unathi)
emote_type = EMOTE_SOUND | EMOTE_MOUTH
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
age_based = TRUE
// Credit to Jamius (freesound.org) for the sound.
sound = "sound/effects/unathihiss.ogg"
@@ -673,7 +673,7 @@
key_third_person = "creaks"
message = "creaks."
message_param = "creaks at %t."
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
age_based = TRUE
species_type_whitelist_typecache = list(/datum/species/diona)
sound = "sound/voice/dionatalk1.ogg"
@@ -699,7 +699,7 @@
key_third_person = "squishes"
message = "squishes."
message_param = "squishes at %t."
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
age_based = TRUE
// Credit to DrMinky (freesound.org) for the sound.
sound = "sound/effects/slime_squish.ogg"
@@ -709,7 +709,7 @@
key_third_person = "bubbles"
message = "bubbles."
message_param = "bubbles at %t."
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
age_based = TRUE
// Sound is CC-4.0 by Audiolarx
// Effect is cut out of original clip
@@ -722,7 +722,7 @@
message = "makes a popping sound."
message_param = "makes a popping sound at %t."
message_mime = "makes a silent pop."
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
age_based = TRUE
// CC0
// https://freesound.org/people/greenvwbeetle/sounds/244653/
@@ -736,7 +736,7 @@
message_mime = "acts out a howl."
message_param = "howls at %t."
species_type_whitelist_typecache = list(/datum/species/vulpkanin)
emote_type = EMOTE_SOUND | EMOTE_MOUTH
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
age_based = TRUE
sound = "sound/goonstation/voice/howl.ogg"
muzzled_noises = list("very loud")
@@ -753,7 +753,7 @@
sound = "growls" // what the fuck why is this just top level
volume = 80
muzzled_noises = list("annoyed")
emote_type = EMOTE_SOUND | EMOTE_MOUTH
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
/datum/emote/living/carbon/human/hiss/tajaran
message_mime = "hisses silently."
+1 -1
View File
@@ -224,7 +224,7 @@
message_mime = "acts out a scream!"
message_simple = "whimpers."
message_alien = "roars!"
emote_type = EMOTE_SOUND | EMOTE_MOUTH
emote_type = EMOTE_MOUTH | EMOTE_AUDIBLE
mob_type_blacklist_typecache = list(
// Humans and silicons get specialized scream.
/mob/living/carbon/human,
@@ -20,7 +20,7 @@
key_third_person = "screams"
message = "screams!"
message_param = "screams at %t!"
emote_type = EMOTE_SOUND | EMOTE_AUDIBLE
emote_type = EMOTE_AUDIBLE
vary = TRUE
sound = "sound/goonstation/voice/robot_scream.ogg"
volume = 80
@@ -30,7 +30,7 @@
key_third_person = "pings"
message = "pings."
message_param = "pings at %t."
emote_type = EMOTE_SOUND | EMOTE_AUDIBLE
emote_type = EMOTE_AUDIBLE
sound = "sound/machines/ping.ogg"
/datum/emote/living/silicon/buzz
@@ -38,14 +38,14 @@
key_third_person = "buzzes"
message = "buzzes."
message_param = "buzzes at %t."
emote_type = EMOTE_SOUND | EMOTE_AUDIBLE
emote_type = EMOTE_AUDIBLE
sound = "sound/machines/buzz-sigh.ogg"
/datum/emote/living/silicon/buzz2
key = "buzz2"
message = "emits an irritated buzzing sound."
message_param = "emits an irritated buzzing sound at %t."
emote_type = EMOTE_SOUND | EMOTE_AUDIBLE
emote_type = EMOTE_AUDIBLE
sound = "sound/machines/buzz-two.ogg"
/datum/emote/living/silicon/beep
@@ -53,7 +53,7 @@
key_third_person = "beeps"
message = "beeps."
message_param = "beeps at %t."
emote_type = EMOTE_SOUND | EMOTE_AUDIBLE
emote_type = EMOTE_AUDIBLE
sound = "sound/machines/twobeep.ogg"
/datum/emote/living/silicon/boop
@@ -61,28 +61,28 @@
key_third_person = "boops"
message = "boops."
message_param = "boops at %t."
emote_type = EMOTE_SOUND | EMOTE_AUDIBLE
emote_type = EMOTE_AUDIBLE
sound = "sound/machines/boop.ogg"
/datum/emote/living/silicon/yes
key = "yes"
message = "emits an affirmative blip."
message_param = "emits an affirmative blip at %t."
emote_type = EMOTE_SOUND | EMOTE_AUDIBLE
emote_type = EMOTE_AUDIBLE
sound = "sound/machines/synth_yes.ogg"
/datum/emote/living/silicon/no
key = "no"
message = "emits a negative blip."
message_param = "emits a negative blip at %t."
emote_type = EMOTE_SOUND | EMOTE_AUDIBLE
emote_type = EMOTE_AUDIBLE
sound = "sound/machines/synth_no.ogg"
/datum/emote/living/silicon/law
key = "law"
message = "shows its legal authorization barcode."
message_param = "shows %t its legal authorization barcode."
emote_type = EMOTE_SOUND | EMOTE_AUDIBLE
emote_type = EMOTE_AUDIBLE
sound = "sound/voice/biamthelaw.ogg"
/datum/emote/living/silicon/law/can_run_emote(mob/user, status_check, intentional)
@@ -95,7 +95,7 @@
key = "halt"
message = "screeches \"HALT! SECURITY!\" from its speakers."
message_param = "instructs %t to HALT."
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
sound = "sound/voice/halt.ogg"
/datum/emote/living/silicon/halt/can_run_emote(mob/user, status_check, intentional)
@@ -6,7 +6,7 @@
key_third_person = "chirps"
message = "chirps!"
sound = "sound/creatures/nymphchirp.ogg"
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
mob_type_allowed_typecache = list(/mob/living/simple_animal/diona)
// Dog emotes
@@ -19,7 +19,7 @@
key_third_person = "barks"
message = "barks."
message_param = "barks at %t."
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
/datum/emote/living/simple_animal/pet/dog/bark/get_sound(mob/living/user)
. = ..()
@@ -33,7 +33,7 @@
key_third_person = "yelps"
message = "yelps!"
message_param = "yelps at %t!"
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
/datum/emote/living/simple_animal/pet/dog/yelp/get_sound(mob/living/user)
var/mob/living/simple_animal/pet/dog/D = user
@@ -44,7 +44,7 @@
key_third_person = "growls"
message = "growls!"
message_param = "growls at %t!"
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
sound = "growl"
// Mouse
@@ -57,7 +57,7 @@
key_third_person = "squeaks"
message = "squeaks!"
message_param = "squeaks at %t!"
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
/datum/emote/living/simple_animal/mouse/squeak/get_sound(mob/living/user)
var/mob/living/simple_animal/mouse/M = user
@@ -74,7 +74,7 @@
message = "meows."
message_param = "meows at %t."
sound = "sound/creatures/cat_meow.ogg"
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
/datum/emote/living/simple_animal/pet/cat/meow/run_emote(mob/user, params, type_override, intentional)
var/mob/living/simple_animal/pet/cat/C = user
@@ -6,5 +6,5 @@
key_third_person = "oogas"
message = "oogas."
message_param = "oogas at %t."
emote_type = EMOTE_SOUND
emote_type = EMOTE_AUDIBLE
sound = 'sound/creatures/gorilla.ogg'