From 360103a4871a3af0c554ef37cb38b427bf06489b Mon Sep 17 00:00:00 2001 From: Neerti Date: Sat, 20 Oct 2018 00:04:22 -0400 Subject: [PATCH 1/2] 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 3af71a74f28..b8f18de5158 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) From 382c6b51525e22e69869023b84fef2db15b61bf9 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 20 Oct 2018 17:28:24 -0400 Subject: [PATCH 2/2] VS edit merge --- code/modules/admin/create_object.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index b8f18de5158..c102126f49e 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -15,11 +15,7 @@ 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 + 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 if(!pathtext) return var path = text2path(pathtext) @@ -30,4 +26,4 @@ quick_create_object_html = file2text('html/create_object.html') quick_create_object_html = replacetext(quick_create_object_html, "null /* object types */", "\"[objectjs]\"") - user << browse(replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "window=quick_create_object;size=425x475") \ No newline at end of file + user << browse(replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "window=quick_create_object;size=425x475")