From 7f9f5c48466fc059437090ebe2f1fdd15a72c3dc Mon Sep 17 00:00:00 2001
From: Razgriz <razgriz1032@gmail.com>
Date: Tue, 1 Mar 2022 01:18:06 -0700
Subject: [PATCH] powder that makes you say yes

---
 code/modules/emotes/definitions/audible_furry_vr.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/emotes/definitions/audible_furry_vr.dm b/code/modules/emotes/definitions/audible_furry_vr.dm
index a0e31ccf5d..531b525453 100644
--- a/code/modules/emotes/definitions/audible_furry_vr.dm
+++ b/code/modules/emotes/definitions/audible_furry_vr.dm
@@ -140,9 +140,6 @@
 /decl/emote/audible/squeaky
     key = "squeaky"
     emote_message_3p = "squeaks."
-<<<<<<< HEAD
-    emote_sound = 'sound/items/drop/plushie.ogg'
-=======
     emote_sound = 'sound/items/drop/plushie.ogg'
 
 /decl/emote/audible/gyoh
@@ -182,4 +179,3 @@
     else
         emote_sound = pick(smolsound)
     . = ..()
->>>>>>> c45c332549f... Merge pull request #12354 from Very-Soft/itstimetogyoh