From 0feb73835c00c7cb557e9d00fd8145b4a91c521c Mon Sep 17 00:00:00 2001
From: Casey <a.roaming.shadow@gmail.com>
Date: Sun, 13 Nov 2022 15:49:17 -0500
Subject: [PATCH] Makes some species specific emotes general

---
 code/modules/mob/living/carbon/human/emote.dm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 6e0db885bb..94f42c27da 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -158,6 +158,19 @@ var/list/_human_default_emotes = list(
 	/decl/emote/audible/mothscream,
 	/decl/emote/audible/mothchitter,
 	/decl/emote/audible/mothlaugh,
+<<<<<<< HEAD
+=======
+	/decl/emote/audible/multichirp,
+	/decl/emote/audible/gnarl,
+	/decl/emote/audible/teshsqueak,
+	/decl/emote/audible/teshchirp,
+	/decl/emote/audible/teshtrill,
+	/decl/emote/visible/bounce,
+	/decl/emote/visible/jiggle,
+	/decl/emote/visible/lightup,
+	/decl/emote/visible/vibrate
+
+>>>>>>> 0f7edb4589... Merge pull request #14077 from TankTheBirb/lemme-chirp
 	//VOREStation Add End
 	//CHOMP Add start
 	/decl/emote/audible/prbt2