From 42eba2a9dc99b305e22bbf175da977e077338448 Mon Sep 17 00:00:00 2001 From: Raeschen Date: Tue, 17 Aug 2021 08:01:06 +0200 Subject: [PATCH] Fix conflict with master --- 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 af0b13e3dd..1b8f929c16 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -127,7 +127,7 @@ var/list/_human_default_emotes = list( /decl/emote/audible/squish, /decl/emote/audible/spiderchitter, /decl/emote/audible/spiderpurr, - + /decl/emote/visible/squeaky, /decl/emote/visible/mlem, /decl/emote/visible/blep, @@ -260,6 +260,7 @@ var/list/_simple_mob_default_emotes = list( /decl/emote/audible/squish, /decl/emote/audible/spiderchitter, /decl/emote/audible/spiderpurr, + /decl/emote/visible/squeaky, /decl/emote/visible/mlem, /decl/emote/visible/blep,