From 360103a4871a3af0c554ef37cb38b427bf06489b Mon Sep 17 00:00:00 2001 From: Neerti Date: Sat, 20 Oct 2018 00:04:22 -0400 Subject: [PATCH] More paths to Quick_Create --- code/modules/admin/create_object.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 3af71a74f2..b8f18de515 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -15,7 +15,11 @@ 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/weapon","/obj/item/clothing","/obj/machinery","/obj/mecha","/obj/item/weapon/storage/box/fluff") //VOREStation Edit +======= + 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") +>>>>>>> 32b5a4a... Merge pull request #5663 from lbnesquik/Kates-Admin-Tweak if(!pathtext) return var path = text2path(pathtext)