From 98f6cf208bfd1fad83f66559d96e830a1d864bec Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 11 Sep 2017 18:26:36 -0500 Subject: [PATCH] Update create_object.dm --- code/modules/admin/create_object.dm | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index cddadb4082..cb947355b1 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -1,31 +1,3 @@ -<<<<<<< HEAD -/datum/admins/proc/create_object(mob/user) - var/static/create_object_html = null - if (!create_object_html) - var/objectjs = null - objectjs = jointext(typesof(/obj), ";") - create_object_html = file2text('html/create_object.html') - create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"") - - user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=425x475") - -/datum/admins/proc/quick_create_object(mob/user) - var/static/list/create_object_forms = list( - /obj, /obj/structure, /obj/machinery, /obj/effect, - /obj/item, /obj/item/clothing, /obj/item/stack, /obj/item/device, - /obj/item/weapon, /obj/item/reagent_containers, /obj/item/gun) - - var/path = input("Select the path of the object you wish to create.", "Path", /obj) in create_object_forms - var/html_form = create_object_forms[path] - - if (!html_form) - var/objectjs = jointext(typesof(path), ";") - html_form = file2text('html/create_object.html') - html_form = replacetext(html_form, "null /* object types */", "\"[objectjs]\"") - create_object_forms[path] = html_form - - user << browse(replacetext(html_form, "/* ref src */", "\ref[src]"), "window=qco[path];size=425x475") -======= /datum/admins/proc/create_object(mob/user) var/static/create_object_html = null if (!create_object_html) @@ -52,4 +24,3 @@ create_object_forms[path] = html_form user << browse(replacetext(html_form, "/* ref src */", "\ref[src];[HrefToken()]"), "window=qco[path];size=425x475") ->>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839)