diff --git a/code/__DEFINES/_macros.dm b/code/__DEFINES/_macros.dm index 93e84651ca0..c83fb38f4ff 100644 --- a/code/__DEFINES/_macros.dm +++ b/code/__DEFINES/_macros.dm @@ -131,11 +131,13 @@ #define from_target(target, receiver) target >> (receiver) #define to_file(file_entry, file_content) file_entry << file_content +#define place_meta_charset(content) (istext(content) ? "" + (content) : (content)) + #define legacy_chat(target, message) to_target(target, message) #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(browser_content, browser_name)) +#define show_browser(target, browser_content, browser_name) to_target(target, browse(place_meta_charset(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/datums/browser.dm b/code/datums/browser.dm index 11bc72cf538..f63bb234565 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -78,7 +78,7 @@ return {" - + [head_content] diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 93e3327c116..63e95e23970 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -988,7 +988,7 @@ var/list/obj/machinery/newscaster/allCasters = list() dat+="
[src.curr_page+1]
" - human_user << browse(dat, "window=newspaper_main;size=300x400") + show_browser(human_user, 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/modules/admin/admin.dm b/code/modules/admin/admin.dm index fa28e599165..afa02c7d9be 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -339,7 +339,7 @@ var/global/enabled_spooking = 0 dat += "Add Comment
" dat += "" - usr << browse(dat, "window=adminplayerinfo;size=480x480") + show_browser(usr, dat, "window=adminplayerinfo;size=480x480") else show_notes_sql(key) diff --git a/code/modules/admin/player_notes_sql.dm b/code/modules/admin/player_notes_sql.dm index 6e5e36bcd9a..587ab9e5a59 100644 --- a/code/modules/admin/player_notes_sql.dm +++ b/code/modules/admin/player_notes_sql.dm @@ -176,7 +176,7 @@ dat += " " dat += "" - usr << browse(dat,"window=lookupnotes;size=900x500") + show_browser(usr, 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 64b8023ccb5..5e6022c3150 100644 --- a/code/modules/admin/verbs/warning.dm +++ b/code/modules/admin/verbs/warning.dm @@ -201,7 +201,7 @@ dat += "" dat += "" - usr << browse(dat, "window=mywarnings;size=900x500") + show_browser(usr, dat, "window=mywarnings;size=900x500") /* * A proc for acknowledging a warning @@ -410,7 +410,7 @@ dat +="" - usr << browse(dat, "window=lookupwarns;size=900x500") + show_browser(usr, 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/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 6950ca06aee..938f923f1fb 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -367,7 +367,7 @@ nanoui is used to open and update nano browser uis return {" - +