diff --git a/code/modules/mob/living/carbon/alien/emote.dm b/code/modules/mob/living/carbon/alien/emote.dm index e1b6ab0cc9c..570697d9344 100644 --- a/code/modules/mob/living/carbon/alien/emote.dm +++ b/code/modules/mob/living/carbon/alien/emote.dm @@ -11,6 +11,7 @@ key_third_person = "hisses" message_alien = "hisses." message_larva = "hisses softly." + emote_type = EMOTE_AUDIBLE /datum/emote/living/alien/hiss/get_sound(mob/living/user) if(isalienadult(user)) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 53325bec5bd..d6f8359c0ea 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -37,7 +37,6 @@ message = "hugs themself." message_param = "hugs %t." hands_use_check = TRUE - emote_type = EMOTE_AUDIBLE /datum/emote/living/carbon/human/mumble key = "mumble" @@ -223,6 +222,7 @@ key = "roar" key_third_person = "roars" message = "roars." + emote_type = EMOTE_AUDIBLE /datum/emote/living/carbon/human/monkey/tail key = "tail" diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 313b4ca742c..312f0b1348f 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -173,7 +173,6 @@ key_third_person = "glares" message = "glares." message_param = "glares at %t." - emote_type = EMOTE_AUDIBLE /datum/emote/living/grin key = "grin" @@ -185,6 +184,7 @@ key_third_person = "groans" message = "groans!" message_mime = "appears to groan!" + emote_type = EMOTE_AUDIBLE /datum/emote/living/grimace key = "grimace" @@ -202,7 +202,6 @@ key_third_person = "kisses" message = "blows a kiss." message_param = "blows a kiss to %t." - emote_type = EMOTE_AUDIBLE /* SKYRAT EDIT REMOVAL - EMOTES - MOVED TO EMOTES.DM MODULAR /datum/emote/living/laugh @@ -266,7 +265,6 @@ key = "pout" key_third_person = "pouts" message = "pouts." - emote_type = EMOTE_AUDIBLE /datum/emote/living/scream key = "scream" @@ -285,19 +283,16 @@ key = "scowl" key_third_person = "scowls" message = "scowls." - emote_type = EMOTE_AUDIBLE /datum/emote/living/shake key = "shake" key_third_person = "shakes" message = "shakes their head." - emote_type = EMOTE_AUDIBLE /datum/emote/living/shiver key = "shiver" key_third_person = "shiver" message = "shivers." - emote_type = EMOTE_AUDIBLE /datum/emote/living/sigh key = "sigh" @@ -398,6 +393,7 @@ key_third_person = "whimpers" message = "whimpers." message_mime = "appears hurt." + emote_type = EMOTE_AUDIBLE /datum/emote/living/wsmile key = "wsmile" @@ -505,13 +501,16 @@ message_param = "beeps at %t." sound = 'sound/machines/twobeep.ogg' mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon) + emote_type = EMOTE_AUDIBLE /datum/emote/inhale key = "inhale" key_third_person = "inhales" message = "breathes in." + emote_type = EMOTE_AUDIBLE /datum/emote/exhale key = "exhale" key_third_person = "exhales" message = "breathes out." + emote_type = EMOTE_AUDIBLE diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 44413137451..363e6d88201 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -12,23 +12,28 @@ key_third_person = "buzzes" message = "buzzes." message_param = "buzzes at %t." + emote_type = EMOTE_AUDIBLE sound = 'sound/machines/buzz-sigh.ogg' + /datum/emote/silicon/buzz2 key = "buzz2" message = "buzzes twice." + emote_type = EMOTE_AUDIBLE sound = 'sound/machines/buzz-two.ogg' /datum/emote/silicon/chime key = "chime" key_third_person = "chimes" message = "chimes." + emote_type = EMOTE_AUDIBLE sound = 'sound/machines/chime.ogg' /datum/emote/silicon/honk key = "honk" key_third_person = "honks" message = "honks." + emote_type = EMOTE_AUDIBLE vary = TRUE sound = 'sound/items/bikehorn.ogg' @@ -37,14 +42,17 @@ key_third_person = "pings" message = "pings." message_param = "pings at %t." + emote_type = EMOTE_AUDIBLE sound = 'sound/machines/ping.ogg' /datum/emote/silicon/sad key = "sad" message = "plays a sad trombone..." + emote_type = EMOTE_AUDIBLE sound = 'sound/misc/sadtrombone.ogg' /datum/emote/silicon/warn key = "warn" message = "blares an alarm!" + emote_type = EMOTE_AUDIBLE sound = 'sound/machines/warning-buzzer.ogg' diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/emotes.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/emotes.dm index d64406a6149..eb8ee27a367 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/emotes.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/emotes.dm @@ -7,5 +7,6 @@ key_third_person = "oogas" message = "oogas." message_param = "oogas at %t." + emote_type = EMOTE_AUDIBLE sound = 'sound/creatures/gorilla.ogg'