diff --git a/code/__DEFINES/_macros.dm b/code/__DEFINES/_macros.dm index b68e5a5c7cb..7d8df104543 100644 --- a/code/__DEFINES/_macros.dm +++ b/code/__DEFINES/_macros.dm @@ -28,7 +28,7 @@ #define to_world(message) to_chat(world, message) #define sound_to(target, sound) to_target(target, sound) #define to_save(handle, value) to_target(handle, value) //semantics postport: what did they mean by this -#define show_browser(target, browser_content, browser_name) to_target(target, browse(place_meta_charset(browser_content), browser_name)) +#define show_browser(target, browser_content, browser_name) to_target(target, browse(browser_content, browser_name)) #define send_rsc(target, content, title) to_target(target, browse_rsc(content, title)) #define send_output(target, msg, control) to_target(target, output(msg, control)) #define send_link(target, url) to_target(target, link(url)) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index c1f00764bc5..e3d3785090d 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -1052,7 +1052,7 @@ GLOBAL_LIST_INIT_TYPED(allCasters, /obj/machinery/newscaster, list()) dat+="
[src.curr_page+1]
" - show_browser(human_user, dat, "window=newspaper_main;size=300x400") + show_browser(human_user, HTML_SKELETON(dat), "window=newspaper_main;size=300x400") onclose(human_user, "newspaper_main") else to_chat(user, "The paper is full of intelligible symbols!") diff --git a/code/game/objects/structures/under_wardrobe.dm b/code/game/objects/structures/under_wardrobe.dm index 473eb4b0048..bc2adb28bc2 100644 --- a/code/game/objects/structures/under_wardrobe.dm +++ b/code/game/objects/structures/under_wardrobe.dm @@ -29,7 +29,7 @@ dat += " (Remove)
" dat = jointext(dat, null) - show_browser(H, dat, "window=wardrobe;size=400x200") + show_browser(H, HTML_SKELETON(dat), "window=wardrobe;size=400x200") /obj/structure/undies_wardrobe/proc/get_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt) var/metadata = H.all_underwear_metadata[underwear_category] diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index a9c63574d8e..edc430bf06d 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -338,7 +338,7 @@ var/global/enabled_spooking = 0 dat += "Add Comment
" dat += "" - show_browser(usr, dat, "window=adminplayerinfo;size=480x480") + show_browser(usr, HTML_SKELETON(dat), "window=adminplayerinfo;size=480x480") else show_notes_sql(key) diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index fdcbc8f48ec..b72d3187251 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -590,7 +590,7 @@ GLOBAL_PROTECT(jobban_keylist) jobs += "" body = "[jobs]" dat = "[header][body]" - usr << browse(dat, "window=jobban_panel;size=800x490") + usr << browse(HTML_SKELETON(dat), "window=jobban_panel;size=800x490") return /** diff --git a/code/modules/admin/player_notes_sql.dm b/code/modules/admin/player_notes_sql.dm index 602032540c6..521da998133 100644 --- a/code/modules/admin/player_notes_sql.dm +++ b/code/modules/admin/player_notes_sql.dm @@ -176,7 +176,7 @@ dat += " " dat += "" - show_browser(usr, dat, "window=lookupnotes;size=900x500") + show_browser(usr, HTML_SKELETON(dat), "window=lookupnotes;size=900x500") /proc/show_player_info_discord(var/ckey) if (!ckey) diff --git a/code/modules/admin/verbs/warning.dm b/code/modules/admin/verbs/warning.dm index c1a54e63afa..b770497f5d0 100644 --- a/code/modules/admin/verbs/warning.dm +++ b/code/modules/admin/verbs/warning.dm @@ -201,7 +201,7 @@ dat += "" dat += "" - show_browser(usr, dat, "window=mywarnings;size=900x500") + show_browser(usr, HTML_SKELETON(dat), "window=mywarnings;size=900x500") /* * A proc for acknowledging a warning @@ -410,7 +410,7 @@ dat +="" - show_browser(usr, dat, "window=lookupwarns;size=900x500") + show_browser(usr, HTML_SKELETON(dat), "window=lookupwarns;size=900x500") feedback_add_details("admin_verb","WARN-LKUP") //Admin Proc to add a new User Notification diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 9371a43e5df..e7937cc7024 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -148,7 +148,7 @@ + "[P.scribble ? "
Written on the back:
[P.scribble]" : null]" \ + "" - show_browser(user, dat, "window=[name]") + show_browser(user, HTML_SKELETON(dat), "window=[name]") /obj/item/paper_bundle/attack_self(mob/user as mob) src.show_content(user) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index b98c99a23b3..a4760b328ef 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -74,7 +74,7 @@ GLOBAL_VAR_INIT(photo_count, 0) + "" \ + "[scribble ? "
Written on the back:
[scribble]" : ""]" \ + "" - show_browser(user, dat, "window=book;size=[64*photo_size]x[scribble ? 400 : 64*photo_size]") + show_browser(user, HTML_SKELETON(dat), "window=book;size=[64*photo_size]x[scribble ? 400 : 64*photo_size]") onclose(user, "[name]") return