From 74f08c191fe346a6fec66441eb7f7b0b2c5a6df2 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Wed, 26 May 2021 10:17:57 -0400 Subject: [PATCH] Merge pull request #10435 from Very-Soft/tchirp Seperates chirp and teshchirp --- code/modules/emotes/definitions/audible.dm | 2 +- code/modules/emotes/definitions/audible_furry_vr.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm index 15f547b9e8..679b2dd0b3 100644 --- a/code/modules/emotes/definitions/audible.dm +++ b/code/modules/emotes/definitions/audible.dm @@ -213,7 +213,7 @@ emote_sound = 'sound/voice/teshsqueak.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio. /decl/emote/audible/teshchirp - key = "chirp" + key = "tchirp" // VOREStation Edit emote_message_1p = "You chirp!" emote_message_3p = "chirps!" emote_message_1p_target = "You chirp at TARGET!" diff --git a/code/modules/emotes/definitions/audible_furry_vr.dm b/code/modules/emotes/definitions/audible_furry_vr.dm index 681e9101a2..c4afd79989 100644 --- a/code/modules/emotes/definitions/audible_furry_vr.dm +++ b/code/modules/emotes/definitions/audible_furry_vr.dm @@ -59,9 +59,11 @@ emote_message_3p = "lets out a bork." emote_sound = 'sound/voice/bork.ogg' /decl/emote/audible/mrow + key = "mrow" emote_message_3p = "lets out a mrow." emote_sound = 'sound/voice/mrow.ogg' /decl/emote/audible/hypno + key = "hypno" emote_message_3p = "lets out a mystifying tone." emote_sound = 'sound/voice/hypno.ogg' /decl/emote/audible/hiss