From 3b6040771b676469dda29222aaf5f2d68ef5dbca Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 13 Jul 2020 22:37:36 -0400
Subject: [PATCH] Update create_object.dm

---
 code/modules/admin/create_object.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm
index dee29b709d..0bebbc80f9 100644
--- a/code/modules/admin/create_object.dm
+++ b/code/modules/admin/create_object.dm
@@ -14,10 +14,6 @@
 
 	var/quick_create_object_html = null
 	var/pathtext = null
-
-<<<<<<< HEAD
-	pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item/device","/obj/item/weapon","/obj/item/weapon/gun","/obj/item/weapon/reagent_containers","/obj/item/weapon/reagent_containers/food","/obj/item/clothing","/obj/machinery","/obj/mecha","/obj/item/mecha_parts/part","/obj/mecha_parts/mecha_equipement","/obj/item/weapon/storage/box/fluff") //VOREStation Edit - Added fluff boxes
-=======
 	pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj",
 	"/obj/structure",
 	"/obj/item",
@@ -27,12 +23,12 @@
 	"/obj/item/weapon/reagent_containers",
 	"/obj/item/weapon/reagent_containers/food",
 	"/obj/item/clothing",
+	"/obj/item/weapon/storage/box/fluff", //VOREStation Edit,
 	"/obj/machinery",
 	"/obj/mecha",
 	"/obj/item/mecha_parts",
 	"/obj/item/mecha_parts/mecha_equipment")
 
->>>>>>> 124ac24... Make the quick create less less ugly & re-add proper mecha after their last item path change. (#7327)
 	if(!pathtext)
 		return
 	var path = text2path(pathtext)