shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update create_turf.dm

Browse Source
This commit is contained in:
LetterJay
2017-09-11 18:26:50 -05:00
committed by GitHub
parent 98f6cf208b
commit 15c4d34b55
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/create_turf.dm
-12
View File
@@ -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)