diff --git a/code/datums/browser.dm b/code/datums/browser.dm index f15363958f..a5e9896d41 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -71,6 +71,14 @@ for (file in stylesheets) head_content += "" + if(user.client?.window_scaling && user.client?.window_scaling != 1 && !user.client?.prefs.read_preference(/datum/preference/toggle/ui_scale) && width && height) + head_content += {" + + "} for (file in scripts) head_content += "" @@ -108,8 +116,12 @@ to_chat(user, span_userdanger("The [title] browser you tried to open failed a sanity check! Please report this on GitHub!")) return var/window_size = "" - if (width && height) - window_size = "size=[width]x[height];" + if(width && height) + if(user.client?.prefs?.read_preference(/datum/preference/toggle/ui_scale)) + var/scaling = user.client.window_scaling + window_size = "size=[width * scaling]x[height * scaling];" + else + window_size = "size=[width]x[height];" var/datum/asset/simple/namespaced/common/common_asset = get_asset_datum(/datum/asset/simple/namespaced/common) common_asset.send(user) if (stylesheets.len) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 04fe4c0c6d..00c32d540d 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -30,10 +30,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept //Linked bluespace radios var/list/linked_radios_weakrefs = list() -/obj/machinery/telecomms/processor/Initialize(mapload) - . = ..() - default_apply_parts() - /obj/machinery/telecomms/broadcaster/proc/link_radio(var/obj/item/radio/R) if(!istype(R)) return diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 8f8db066b3..0f1e7f62c6 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -2,12 +2,14 @@ /datum/admins/proc/player_panel_new()//The new one if (!usr.client.holder) return + var/ui_scale = owner.prefs.read_preference(/datum/preference/toggle/ui_scale) var/dat = "