From 92ce115054935b80efff65d72aebfb52c6f87c1c Mon Sep 17 00:00:00 2001 From: ExusA <67055922+ExusA@users.noreply.github.com> Date: Thu, 6 Mar 2025 04:43:28 +0800 Subject: [PATCH] Adds the *chirp emote from nymphs to Diona (#28464) * Add chirp to diona * Make chirps have age-based pitch --- code/datums/keybindings/emote_keybinds.dm | 4 ++++ code/modules/mob/living/carbon/human/human_emote.dm | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/code/datums/keybindings/emote_keybinds.dm b/code/datums/keybindings/emote_keybinds.dm index a021b95995f..52546e86ca5 100644 --- a/code/datums/keybindings/emote_keybinds.dm +++ b/code/datums/keybindings/emote_keybinds.dm @@ -509,6 +509,10 @@ linked_emote = /datum/emote/living/carbon/human/creak name = "Creak" +/datum/keybinding/emote/carbon/human/diona_chirp + linked_emote = /datum/emote/living/carbon/human/diona_chirp + name = "Chirp (Diona)" + /datum/keybinding/emote/carbon/human/squish linked_emote = /datum/emote/living/carbon/human/slime/squish name = "Squish" diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm index 8d85ec81844..d11d16cc635 100644 --- a/code/modules/mob/living/carbon/human/human_emote.dm +++ b/code/modules/mob/living/carbon/human/human_emote.dm @@ -743,6 +743,16 @@ species_type_whitelist_typecache = list(/datum/species/diona) sound = "sound/voice/dionatalk1.ogg" +/datum/emote/living/carbon/human/diona_chirp + key = "chirp" + key_third_person = "chirps" + message = "chirps!" + message_param = "chirps at %t." + emote_type = EMOTE_AUDIBLE + age_based = TRUE + species_type_whitelist_typecache = list(/datum/species/diona) + sound = "sound/creatures/nymphchirp.ogg" + /datum/emote/living/carbon/human/slime