From 15c4d34b5592ee52e5106bbd9bec4c7ddb848ff0 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 11 Sep 2017 18:26:50 -0500 Subject: [PATCH] Update create_turf.dm --- code/modules/admin/create_turf.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index 62e26d89d5..f38b86a7b9 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -1,14 +1,3 @@ -<<<<<<< HEAD -/datum/admins/proc/create_turf(mob/user) - var/static/create_turf_html - if (!create_turf_html) - var/turfjs = null - turfjs = jointext(typesof(/turf), ";") - create_turf_html = file2text('html/create_object.html') - create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"") - - user << browse(replacetext(create_turf_html, "/* ref src */", "\ref[src]"), "window=create_turf;size=425x475") -======= /datum/admins/proc/create_turf(mob/user) var/static/create_turf_html if (!create_turf_html) @@ -18,4 +7,3 @@ create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"") user << browse(replacetext(create_turf_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_turf;size=425x475") ->>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839)