From 5df83792ac39df1e75cd300e4992d69eb8786379 Mon Sep 17 00:00:00 2001 From: Schnayy Date: Tue, 9 Mar 2021 08:46:59 -0600 Subject: [PATCH 1/3] Merge pull request #7954 from PrismaticGynoid/chirpchirp Chirp chirp --- code/modules/mob/living/carbon/human/emote.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 23e88cdf089..9b723dd4534 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -91,6 +91,15 @@ message = "squishes." m_type = 1 + if("chirp") + if ((species.bump_flag != SLIME) && (species.name != SPECIES_DIONA)) + to_chat(src, "You are not a diona or slime!") + return + + playsound(src, 'sound/misc/nymphchirp.ogg', 50, 0) + message = "chirps." + m_type = 2 + //Skrell-only emotes if("warble") if(species.name != SPECIES_SKRELL) From 1c886a605fa448603fd361d3c5c1b640b3ad5182 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Tue, 9 Mar 2021 11:24:25 -0500 Subject: [PATCH 3/3] Update emote.dm --- code/modules/mob/living/carbon/human/emote.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 9b723dd4534..8b6bdeb599f 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -92,10 +92,11 @@ m_type = 1 if("chirp") + /* VOREStation Removal Start - Eh. People can chirp maybe. if ((species.bump_flag != SLIME) && (species.name != SPECIES_DIONA)) to_chat(src, "You are not a diona or slime!") return - + */ //VOREStation Removal End playsound(src, 'sound/misc/nymphchirp.ogg', 50, 0) message = "chirps." m_type = 2