From b25ed28367e5b1d62a228cf5dcc8ddf4df51d5c2 Mon Sep 17 00:00:00 2001
From: MistakeNot4892 <AGMogett@gmail.com>
Date: Thu, 26 Aug 2021 11:45:21 +1000
Subject: [PATCH] Makes Fumo Un-Huge

---
 code/game/objects/items/toys/toys.dm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index c2d2b171c9..1a2367cae3 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -1258,6 +1258,14 @@
 	icon_state = "therapygreen"
 	item_state = "egg3" // It's the green egg in items_left/righthand
 
+<<<<<<< HEAD
+=======
+/obj/item/toy/plushie/fumo
+	name = "Fumo"
+	desc = "A plushie of a....?."
+	icon_state = "fumoplushie"
+	pokephrase = "I just don't think about losing."
+>>>>>>> ac33af27705... Merge pull request #8239 from Cerebulon/fumo
 
 //Toy cult sword
 /obj/item/toy/cultsword