From b6003d6cd032f23fdfee8e7dd618db53347fdf20 Mon Sep 17 00:00:00 2001
From: Kates <24830358+lbnesquik@users.noreply.github.com>
Date: Tue, 14 Jul 2020 04:26:01 +0200
Subject: [PATCH] Quick create improvements

---
 code/modules/admin/create_object.dm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm
index c8243c7dca..dee29b709d 100644
--- a/code/modules/admin/create_object.dm
+++ b/code/modules/admin/create_object.dm
@@ -15,7 +15,24 @@
 	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",
+	"/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",
+	"/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)