From a4422b9d65a31940a7052413962b181cfe8c8f05 Mon Sep 17 00:00:00 2001 From: ItsSelis Date: Wed, 14 Dec 2022 21:39:09 +0100 Subject: [PATCH] Properly fixes object spawner --- code/modules/admin/create_mob.dm | 2 +- code/modules/admin/create_object.dm | 10 ++++-- code/modules/admin/create_turf.dm | 2 +- html/create_object.html | 51 +++++++++++++++-------------- 4 files changed, 35 insertions(+), 30 deletions(-) diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index fdbd4022c8c..a15a465984d 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -6,4 +6,4 @@ create_mob_html = file2text('html/create_object.html') create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"") - user << browse(replacetext(create_mob_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_mob;size=680x600") + user << browse(create_panel_helper(create_mob_html), "window=create_mob;size=680x600") diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 054015b70da..5520e52bf38 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -1,13 +1,17 @@ -/var/create_object_html = null +/datum/admins/proc/create_panel_helper(template) + var/final_html = replacetext(template, "/* ref src */", "\ref[src];[HrefToken()]") + final_html = replacetext(final_html,"/* hreftokenfield */","[HrefTokenFormField()]") + return final_html /datum/admins/proc/create_object(var/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];[HrefToken()]"), "window=create_object;size=680x600") + user << browse(create_panel_helper(create_object_html), "window=create_object;size=680x600") /datum/admins/proc/quick_create_object(var/mob/user) @@ -41,4 +45,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];[HrefToken()]"), "window=quick_create_object;size=680x600") + user << browse(create_panel_helper(quick_create_object_html), "window=quick_create_object;size=680x600") diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index e6389ac9a68..ec7e5955848 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -6,4 +6,4 @@ 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];[HrefToken()]"), "window=create_turf;size=680x600") + user << browse(create_panel_helper(create_turf_html), "window=create_turf;size=680x600") diff --git a/html/create_object.html b/html/create_object.html index 7ed93d98180..47d7faf5ab4 100644 --- a/html/create_object.html +++ b/html/create_object.html @@ -14,8 +14,8 @@ color: #00f; font-family: Georgia, Arial, sans-serif; } - img { - border: 0px; + img { + border: 0px; } p.lic { font-size: 6pt; @@ -26,18 +26,19 @@
+ /* hreftokenfield */ - + Type
Offset: - + A R
- + Number: Dir: - Name:
- Where: + Name:
+ Where:


- -
+ +
- +
- + - \ No newline at end of file +