From 14484a2d830191e3964ad90a46d52cf0b7db16ce Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 5 Jul 2020 11:03:23 -0700 Subject: [PATCH 1/2] Makes mob/obj/turf spawn windows pop up in proper size --- code/modules/admin/create_mob.dm | 2 +- code/modules/admin/create_object.dm | 6 +++++- code/modules/admin/create_turf.dm | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 4a892d893da..fc04317ef2c 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]"), "window=create_mob;size=425x475") + user << browse(replacetext(create_mob_html, "/* ref src */", "\ref[src]"), "window=create_mob;size=680x600") diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index c102126f49e..1479a40a1d7 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -7,7 +7,7 @@ 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") + user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=680x600") /datum/admins/proc/quick_create_object(var/mob/user) @@ -26,4 +26,8 @@ quick_create_object_html = file2text('html/create_object.html') quick_create_object_html = replacetext(quick_create_object_html, "null /* object types */", "\"[objectjs]\"") +<<<<<<< HEAD user << browse(replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "window=quick_create_object;size=425x475") +======= + user << browse(replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "window=quick_create_object;size=680x600") +>>>>>>> 65a0d26... Merge pull request #7307 from Verkister/patch-40 diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index fdaa103b5d5..f3de693055a 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]"), "window=create_turf;size=425x475") + user << browse(replacetext(create_turf_html, "/* ref src */", "\ref[src]"), "window=create_turf;size=680x600") From a82c815a4fb354914955283f3dadc73464decc62 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 5 Jul 2020 15:20:08 -0400 Subject: [PATCH 2/2] Update create_object.dm --- code/modules/admin/create_object.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 1479a40a1d7..c8243c7dcaa 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -26,8 +26,4 @@ quick_create_object_html = file2text('html/create_object.html') quick_create_object_html = replacetext(quick_create_object_html, "null /* object types */", "\"[objectjs]\"") -<<<<<<< HEAD - user << browse(replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "window=quick_create_object;size=425x475") -======= user << browse(replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "window=quick_create_object;size=680x600") ->>>>>>> 65a0d26... Merge pull request #7307 from Verkister/patch-40