diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index d7b2eacd559..39b665943a2 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -64,9 +64,6 @@ else dat += "

Reconstruction in process, please wait.
" dat += {"
Close"} - - //user << browse(dat, "window=computer;size=400x500") - //onclose(user, "computer") var/datum/browser/popup = new(user, "computer", "AI System Integrity Restorer", 400, 500) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 77d2c81bdfa..2da4add41da 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -138,9 +138,6 @@ dat += "Recharge Power" dat += "" - - //user << browse(dat, "window=arcade") - //onclose(user, "arcade") var/datum/browser/popup = new(user, "arcade", "Space Villian 2000") popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 2363ffef8e3..3b7d8e3b66b 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -317,10 +317,6 @@ var/time_last_changed_position = 0 body += "
Job Management" dat = "[header][body]

" - - //user << browse(dat, "window=id_com;size=900x520") - //onclose(user, "id_com") - var/datum/browser/popup = new(user, "id_com", src.name, 900, 620) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 74539969482..8ec1287bd6d 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -210,8 +210,6 @@ dat += "Cancel" - //user << browse(dat, "window=cloning") - //onclose(user, "cloning") var/datum/browser/popup = new(user, "cloning", "Cloning System Control") popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 13bcc3b1597..ece81b6621e 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -422,9 +422,6 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 var/dat2 = src.interact_ai(user) // give the AI a different interact proc to limit its access if(dat2) dat += dat2 - //user << browse(dat, "window=communications;size=400x500") - //onclose(user, "communications") - popup.set_content(dat) popup.open() return diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 5d5ea0d6a07..bba897a6765 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -189,8 +189,6 @@ else else dat += text("{Log In}", src) - //user << browse(text("Medical Records[]", dat), "window=med_rec") - //onclose(user, "med_rec") var/datum/browser/popup = new(user, "med_rec", "Medical Records Console", 600, 400) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index baef6d41826..0f8d963d8dd 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -217,8 +217,6 @@ dat += "" message = defaultmsg - //user << browse(dat, "window=message;size=700x700") - //onclose(user, "message") var/datum/browser/popup = new(user, "hologram_console", name, 700, 700) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 583b4cf8f14..bf79dc22573 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -64,9 +64,6 @@ dat += "(Message Holder) |
" dat += "********************************
" dat += "
Lock Console" - - //user << browse(dat, "window=computer;size=400x500") - //onclose(user, "computer") var/datum/browser/popup = new(user, "computer", "Prisoner Management Console", 400, 500) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 05c689e7ea7..6a4e3d9f664 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -250,8 +250,6 @@ else else dat += text("{Log In}", src) - //user << browse(text("Security Records[]", dat), "window=secure_rec;size=600x400") - //onclose(user, "secure_rec") var/datum/browser/popup = new(user, "secure_rec", "Security Records Console", 600, 400) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index af93cc9987b..afee8e5b9c8 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -27,8 +27,6 @@ var/on = 1 /obj/machinery/embedded_controller/interact(mob/user) - //user << browse(return_text(), "window=computer") - //onclose(user, "computer") user.set_machine(src) var/datum/browser/popup = new(user, "computer", name) // Set up the popup browser window popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index eb7da71d29b..c7802df8ac1 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -765,8 +765,6 @@ t += text("Turrets [] - []?
\n", src.enabled?"activated":"deactivated", src, src.enabled?"Disable":"Enable") t += text("Currently set for [] - Change to []?
\n", src.lethal?"lethal":"stun repeatedly", src, src.lethal?"Stun repeatedly":"Lethal") - //user << browse(t, "window=turretid") - //onclose(user, "turretid") var/datum/browser/popup = new(user, "turretid", "Turret Control Panel ([area.name])") popup.set_content(t) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index dd75a88c0b2..4187eb01741 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -248,9 +248,6 @@ var/list/obj/machinery/requests_console/allConsoles = list() dat += "Speaker OFF" else dat += "Speaker ON" - - //user << browse("[dat]", "window=request_console") - //onclose(user, "req_console") var/datum/browser/popup = new(user, "req_console", "[department] Requests Console", 450, 440) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index c5e11d9a39f..74a893f89fb 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -420,8 +420,6 @@ if(shock(user, 100)) return - //user << browse(dat, "window=vending") - //onclose(user, "") var/datum/browser/popup = new(user, "vending", (name)) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 001992eb99d..af3326f8828 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -450,7 +450,6 @@ var/list/preferences_datums = list() dat += "Reset Setup" dat += "" - //user << browse(dat, "window=preferences;size=560x560") var/datum/browser/popup = new(user, "preferences", "
Character Setup
", 640, 750) popup.set_content(dat) popup.open(0) @@ -577,7 +576,6 @@ var/list/preferences_datums = list() HTML += "
Reset Preferences
" user << browse(null, "window=preferences") - //user << browse(HTML, "window=mob_occupation;size=[width]x[height]") var/datum/browser/popup = new(user, "mob_occupation", "
Occupation Preferences
", width, height) popup.set_window_options("can_close=0") popup.set_content(HTML) diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 97b26cba54d..01100215160 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -479,8 +479,6 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums dat += " \[Clear Memory\]

\[Remove Book\]" else dat += "
" - //user << browse(dat, "window=scanner") - //onclose(user, "scanner") var/datum/browser/popup = new(user, "scanner", name, 600, 400) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index d2357687489..0ffe9ae3a7e 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -124,7 +124,7 @@ dat+="---No Materials Loaded---" - user << browse("[dat]", "window=console_processing_unit") + user << browse(dat, "window=console_processing_unit") diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 9d63e3de4de..ae49a6a8b04 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -33,7 +33,7 @@ dat += text("
Stacking: [machine.stack_amt]

") - user << browse("[dat]", "window=console_stacking_machine") + user << browse(dat, "window=console_stacking_machine") return diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index c02ea810ad1..f75f95dde70 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -60,7 +60,7 @@ dat += "

In total this machine produced [newCoins] coins." dat += "
Make coins" - user << browse("[dat]", "window=mint") + user << browse(dat, "window=mint") /obj/machinery/mineral/mint/Topic(href, href_list) if(..()) diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index bc5016ae24d..5d7fb39a662 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -46,7 +46,7 @@ var/obj/item/weapon/ore/T = locate(i) in contents dat += "[capitalize(T.name)]: [count_by_type(contents, T.type)]
" dat += text("

Empty box") - user << browse("[dat]", "window=orebox") + user << browse(dat, "window=orebox") /obj/structure/ore_box/proc/dump_box_contents() for(var/obj/item/weapon/ore/O in contents) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index b076e8860a4..a27f6f9bf5e 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -173,10 +173,6 @@ /obj/machinery/power/generator/interact(mob/user) user.set_machine(src) - - //user << browse(t, "window=teg;size=460x300") - //onclose(user, "teg") - var/datum/browser/popup = new(user, "teg", "Thermo-Electric Generator", 460, 300) popup.set_content(get_menu()) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 2d9fa7036d5..e6214771ca6 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -290,7 +290,7 @@ display round(lastgen) and plasmatank amount dat += text("Power current: [(powernet == null ? "Unconnected" : "[avail()]")]
") dat += text("Heat: [current_heat]
") dat += "
Close" - user << browse("[dat]", "window=port_gen") + user << browse(dat, "window=port_gen") onclose(user, "port_gen") /obj/machinery/power/port_gen/pacman/Topic(href, href_list) diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index ac2ef7fdf4f..4e453bbeb90 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -249,8 +249,6 @@ dat += "Particle Strength: [strength] " dat += "--|++

" - //user << browse(dat, "window=pacontrol;size=420x500") - //onclose(user, "pacontrol") var/datum/browser/popup = new(user, "pacontrol", name, 420, 300) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(icon, icon_state))