From ede8934f19ca699c781fdc651918c92e6e6f99ba Mon Sep 17 00:00:00 2001 From: Alan Date: Sat, 1 Aug 2026 02:15:49 -0400 Subject: [PATCH] Add sound to brain scream, beep, boop. (#32324) * Add sound to brain scream, beep, boop. * Add the coveted trailing newline. * Add brain scream keybind. --- code/datums/keybindings/emote_keybinds.dm | 4 +++ code/modules/mob/living/brain/brain_emote.dm | 28 +++++++++++++++++++ .../mob/living/carbon/human/human_emote.dm | 3 +- code/modules/mob/living/living_emote.dm | 3 +- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/code/datums/keybindings/emote_keybinds.dm b/code/datums/keybindings/emote_keybinds.dm index aaec2da996c..65e0387012b 100644 --- a/code/datums/keybindings/emote_keybinds.dm +++ b/code/datums/keybindings/emote_keybinds.dm @@ -331,6 +331,10 @@ linked_emote = /datum/emote/living/brain/boop name = "Boop" +/datum/keybinding/emote/carbon/brain/scream + linked_emote = /datum/emote/living/brain/scream + name = "Scream" + /datum/keybinding/emote/carbon/human category = KB_CATEGORY_EMOTE_HUMAN diff --git a/code/modules/mob/living/brain/brain_emote.dm b/code/modules/mob/living/brain/brain_emote.dm index 68e61de98ef..05c77868dbd 100644 --- a/code/modules/mob/living/brain/brain_emote.dm +++ b/code/modules/mob/living/brain/brain_emote.dm @@ -58,9 +58,37 @@ key_third_person = "beeps" message = "beeps." self_message = "You beep." + emote_type = EMOTE_AUDIBLE + sound = "sound/machines/twobeep.ogg" /datum/emote/living/brain/boop key = "boop" key_third_person = "boops" message = "boops." self_message = "You boop." + emote_type = EMOTE_AUDIBLE + sound = "sound/machines/boop.ogg" + +/datum/emote/living/brain/scream + key = "scream" + key_third_person = "screams" + message = "screams!" + self_message = "You scream!" + emote_type = EMOTE_AUDIBLE + +/datum/emote/living/brain/scream/select_message_type(mob/user, msg, intentional) + . = ..() + var/mob/living/carbon/human/H = user + if(H.dna.species?.scream_verb) + if(H.mind?.miming) + return "[H.dna.species?.scream_verb] silently!" + else + return "[H.dna.species?.scream_verb]!" + +/datum/emote/living/brain/scream/get_sound(mob/living/brain/user) + if(user.mind?.miming || !istype(user)) + return + if(user.gender == FEMALE) + return user.dna.species.female_scream_sound + else + return user.dna.species.male_scream_sound diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm index 3d06d3455e3..ee5f73d4c3b 100644 --- a/code/modules/mob/living/carbon/human/human_emote.dm +++ b/code/modules/mob/living/carbon/human/human_emote.dm @@ -173,7 +173,8 @@ unintentional_audio_cooldown = 3.5 SECONDS mob_type_blacklist_typecache = list( /mob/living/carbon/human/monkey, // screech instead - /mob/living/silicon // Robot sounds + /mob/living/silicon, // Robot sounds + /mob/living/brain ) /datum/emote/living/carbon/human/scream/select_message_type(mob/user, msg, intentional) diff --git a/code/modules/mob/living/living_emote.dm b/code/modules/mob/living/living_emote.dm index 23f8fef9904..aaa5f3a0a46 100644 --- a/code/modules/mob/living/living_emote.dm +++ b/code/modules/mob/living/living_emote.dm @@ -226,7 +226,8 @@ mob_type_blacklist_typecache = list( // Humans and silicons get specialized scream. /mob/living/carbon/human, - /mob/living/silicon + /mob/living/silicon, + /mob/living/brain ) volume = 80