From cb879c31aa9f8fc7828f7abf9925458c769e4a17 Mon Sep 17 00:00:00 2001 From: Raeschen Date: Tue, 17 Aug 2021 08:12:43 +0200 Subject: [PATCH] Revert "Fix conflict with master" This reverts commit 42eba2a9dc99b305e22bbf175da977e077338448. --- code/modules/mob/living/carbon/human/emote.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 1b8f929c16..af0b13e3dd 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,7 +260,6 @@ 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,