From 10292105adcaabd2b6f5043c4c95fa5a10a5400c Mon Sep 17 00:00:00 2001 From: monster860 Date: Sun, 10 Jul 2016 09:19:14 -0400 Subject: [PATCH 1/2] Makes a bunch of UI's use /datum/browser --- .../components/binary_devices/passive_gate.dm | 4 +- .../components/binary_devices/pump.dm | 4 +- .../components/binary_devices/volume_pump.dm | 4 +- .../components/trinary_devices/filter.dm | 4 +- .../components/trinary_devices/mixer.dm | 4 +- code/game/machinery/atmo_control.dm | 19 ++-- .../atmoalter/area_atmos_computer.dm | 4 +- .../machinery/computer/HolodeckControl.dm | 4 +- code/game/machinery/computer/medical.dm | 6 +- code/game/machinery/computer/security.dm | 88 +++++++++---------- .../machinery/doors/airlock_electronics.dm | 4 +- code/game/machinery/doors/brigdoors.dm | 9 +- code/game/machinery/guestpass.dm | 4 +- code/game/machinery/kitchen/icecream_vat.dm | 4 +- code/game/machinery/kitchen/juicer.dm | 4 +- .../game/machinery/kitchen/kitchen_machine.dm | 8 +- code/game/machinery/newscaster.dm | 26 +++--- code/game/machinery/pipe/pipe_dispenser.dm | 8 +- code/game/machinery/suit_storage_unit.dm | 26 +++--- code/game/mecha/mech_fabricator.dm | 17 ++-- code/game/objects/items/stacks/stack.dm | 7 +- code/modules/assembly/health.dm | 4 +- code/modules/assembly/infrared.dm | 4 +- code/modules/assembly/proximity.dm | 4 +- code/modules/assembly/signaler.dm | 4 +- code/modules/assembly/timer.dm | 4 +- code/modules/economy/ATM.dm | 4 +- code/modules/mining/satchel_ore_boxdm.dm | 4 +- code/modules/paperwork/filingcabinet.dm | 6 +- code/modules/paperwork/photocopier.dm | 4 +- code/modules/reagents/pandemic.dm | 4 +- code/modules/spacepods/pod_fabricator.dm | 17 ++-- 32 files changed, 180 insertions(+), 137 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 3e643565ac6..a1a29b6bebe 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -94,7 +94,9 @@ [round(target_pressure,0.1)]kPa | Change "} - user << browse("[src.name] control[dat]", "window=atmo_pump") + var/datum/browser/popup = new(user, "atmo_pump", name, 400, 400) + popup.set_content(dat) + popup.open() onclose(user, "atmo_pump") /obj/machinery/atmospherics/binary/passive_gate/receive_signal(datum/signal/signal) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index a8d8c453706..13656eaaf3b 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -109,7 +109,9 @@ Thus, the two variables affect pump operation are set in New(): [round(target_pressure,0.1)]kPa | Change "} - user << browse("[src.name] control[dat]", "window=atmo_pump") + var/datum/browser/popup = new(user, "atmo_pump", name, 400, 400) + popup.set_content(dat) + popup.open() onclose(user, "atmo_pump") /obj/machinery/atmospherics/binary/pump/initialize() diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 059cb25f080..59d63a176d7 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -105,7 +105,9 @@ Thus, the two variables affect pump operation are set in New(): [round(transfer_rate,1)]l/s | Change "} - user << browse("[src.name] control[dat]", "window=atmo_pump") + var/datum/browser/popup = new(user, "atmo_pump", name, 400, 400) + popup.set_content(dat) + popup.open() onclose(user, "atmo_pump") diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 698753fa1be..aa1dcb1d383 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -196,7 +196,9 @@ Filter types: //else // src.on != src.on */ - user << browse("[src.name] control[dat]", "window=atmo_filter") + var/datum/browser/popup = new(user, "atmo_filter", name, 400, 400) + popup.set_content(dat) + popup.open() onclose(user, "atmo_filter") return diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index e56e839ef73..51ed85d68b8 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -135,7 +135,9 @@ + "} - user << browse("[src.name] control[dat]", "window=atmo_mixer") + var/datum/browser/popup = new(user, "atmo_mixer", name, 400, 400) + popup.set_content(dat) + popup.open() onclose(user, "atmo_mixer") return diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 80d588179bf..4ce8b09fc12 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -157,8 +157,10 @@ obj/machinery/air_sensor attack_hand(mob/user) if(..(user)) return - var/html=return_text()+"" - user << browse(html,"window=gac") + var/html=return_text() + var/datum/browser/popup = new(user, "gac", name, 400, 400) + popup.set_content(html) + popup.open() user.set_machine(src) onclose(user, "gac") @@ -220,16 +222,12 @@ obj/machinery/air_sensor else sensor_data = "No sensors connected." - var/output = {" - - - [name] + var/output = {" - - -

[name]

[show_sensors ? "

Sensor Data:

" + sensor_data : ""] "} diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 0b1be444c7c..f2b1ee44f30 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -85,7 +85,9 @@ [zone] "} - user << browse("[dat]", "window=miningshuttle;size=400x400") + var/datum/browser/popup = new(user, "area_atmos", name, 400, 400) + popup.set_content(dat) + popup.open() status = "" Topic(href, href_list) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index b29d178efec..90e1bc3f60d 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -58,7 +58,9 @@ dat += "
" dat += "Safety Protocols are ENABLED
" - user << browse(dat, "window=computer;size=400x500") + var/datum/browser/popup = new(user, "holodeck_computer", name, 400, 500) + popup.set_content(dat) + popup.open() onclose(user, "computer") return diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 6e331d46cf3..1c27ece0548 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -48,7 +48,7 @@ dat += "Record List:
" if(!isnull(data_core.general)) for(var/datum/data/record/R in sortRecord(data_core.general)) - dat += text("[]: []
", src, R, R.fields["id"], R.fields["name"]) + dat += text("[]: []
", src, R, R.fields["id"], R.fields["name"]) //Foreach goto(132) dat += text("
Back", src) if(3.0) @@ -115,7 +115,9 @@ else else dat += text("{Log In}", src) - user << browse(text("Medical Records[]", dat), "window=med_rec") + var/datum/browser/popup = new(user, "med_rec", name, 400, 400) + popup.set_content(dat) + popup.open() onclose(user, "med_rec") return diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 6f285930ab7..14cd34cca38 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -45,6 +45,39 @@ to_chat(user, "Unable to establish a connection: You're too far away from the station!") return var/dat + + // search javascript + var/head_content = {" + + +"} if (temp) dat = text("[]

Clear Screen", temp, src) @@ -56,43 +89,7 @@ //body tag start + onload and onkeypress (onkeyup) javascript event calls dat += "" - //search bar javascript - dat += {" - - - - - - - - "} + dat += {"

"} dat += text("New Record
", src) @@ -132,17 +129,17 @@ var/background switch(crimstat) if("*Arrest*") - background = "'background-color:#DC143C;'" + background = "'background-color:#890E26'" if("Incarcerated") - background = "'background-color:#CD853F;'" + background = "'background-color:#743B03'" if("Parolled") - background = "'background-color:#CD853F;'" + background = "'background-color:#743B03'" if("Released") - background = "'background-color:#3BB9FF;'" + background = "'background-color:#216489'" if("None") - background = "'background-color:#00FF7F;'" + background = "'background-color:#007f47'" if("") - background = "'background-color:#FFFFFF;'" + background = "''" crimstat = "No Record." dat += "" dat += text("[]", R.fields["name"], R.fields["id"], R.fields["rank"], R.fields["fingerprint"], src, R, R.fields["name"]) @@ -203,7 +200,10 @@ else else dat += text("{Log In}", src) - user << browse(text("Security Records[]", dat), "window=secure_rec;size=600x400") + var/datum/browser/popup = new(user, "secure_rec", name, 600, 400) + popup.set_content(dat) + popup.add_head_content(head_content) + popup.open() onclose(user, "secure_rec") return diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 6113d1cf377..b8698896aa9 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -53,7 +53,9 @@ t1 += text("

Close

\n", src) - user << browse(t1, "window=airlock_electronics") + var/datum/browser/popup = new(user, "airlock_electronics", name, 400, 400) + popup.set_content(t1) + popup.open() onclose(user, "airlock") Topic(href, href_list) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 3e611b8dea4..c244fa5ed7d 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -188,9 +188,7 @@ user.set_machine(src) // dat - var/dat = "" - - dat += "
Timer System:" + var/dat = "
Timer System:" dat += " Door [src.id] controls
" // Start/Stop timer @@ -220,9 +218,10 @@ dat += "
Activate Flash" dat += "

Close" - dat += "" - user << browse(dat, "window=computer;size=400x500") + var/datum/browser/popup = new(user, "door_timer", name, 400, 500) + popup.set_content(dat) + popup.open() onclose(user, "computer") return diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index bf1d69e7437..c56f52ca96b 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -94,7 +94,9 @@ dat += "[area]
" dat += "
Issue pass
" - user << browse(dat, "window=guestpass;size=400x520") + var/datum/browser/popup = new(user, "guestpass", name, 400, 520) + popup.set_content(dat) + popup.open() onclose(user, "guestpass") diff --git a/code/game/machinery/kitchen/icecream_vat.dm b/code/game/machinery/kitchen/icecream_vat.dm index 07dfeb6f29c..d685cbf390f 100644 --- a/code/game/machinery/kitchen/icecream_vat.dm +++ b/code/game/machinery/kitchen/icecream_vat.dm @@ -87,7 +87,9 @@ var/list/ingredients_source = list( dat += "No beaker inserted. " dat += "Refresh Close" - user << browse(dat,"window=icecreamvat;size=600x400") + var/datum/browser/popup = new(user, "icecreamvat", name, 600, 400) + popup.set_content(dat) + popup.open() /obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/weapon/reagent_containers)) diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index 7b25e683941..795e8e1ba9f 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -102,7 +102,9 @@ dat += "Turn on!
" if (beaker) dat += "Detach a beaker!
" - user << browse("Juicer[dat]", "window=juicer") + var/datum/browser/popup = new(user, "juicer", name, 400, 400) + popup.set_content(dat) + popup.open() onclose(user, "juicer") return diff --git a/code/game/machinery/kitchen/kitchen_machine.dm b/code/game/machinery/kitchen/kitchen_machine.dm index 5c584d0468b..c9161b2ccc7 100644 --- a/code/game/machinery/kitchen/kitchen_machine.dm +++ b/code/game/machinery/kitchen/kitchen_machine.dm @@ -230,11 +230,13 @@ else dat = {"Ingredients:
[dat]"} dat += {"

\ -Turn on!
\ -Eject ingredients!
\ +Turn on!
\ +Eject ingredients!
\ "} - user << browse("[src] Controls[dat]", "window=[src.name]") + var/datum/browser/popup = new(user, name, name, 400, 400) + popup.set_content(dat) + popup.open() onclose(user, "[src.name]") return diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index d991e7c5235..da156d83d4a 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -254,11 +254,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(6) dat+="ERROR: Could not submit Feed story to Network.

" if(src.channel_name=="") - dat+="•Invalid receiving channel name.
" + dat+="�Invalid receiving channel name.
" if(src.scanned_user=="Unknown") - dat+="•Channel author unverified.
" + dat+="�Channel author unverified.
" if(src.msg == "" || src.msg == "\[REDACTED\]") - dat+="•Invalid message body.
" + dat+="�Invalid message body.
" dat+="
Return
" if(7) @@ -272,18 +272,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else existing_authors += FC.author if(src.scanned_user in existing_authors) - dat+="•There already exists a Feed channel under your name.
" + dat+="�There already exists a Feed channel under your name.
" if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") - dat+="•Invalid channel name.
" + dat+="�Invalid channel name.
" var/check = 0 for(var/datum/feed_channel/FC in news_network.network_channels) if(FC.channel_name == src.channel_name) check = 1 break if(check) - dat+="•Channel name already in use.
" + dat+="�Channel name already in use.
" if(src.scanned_user=="Unknown") - dat+="•Channel author unverified.
" + dat+="�Channel author unverified.
" dat+="
Return
" if(8) var/total_num=length(news_network.network_channels) @@ -394,11 +394,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(16) dat+="ERROR: Wanted Issue rejected by Network.

" if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") - dat+="•Invalid name for person wanted.
" + dat+="�Invalid name for person wanted.
" if(src.scanned_user=="Unknown") - dat+="•Issue author unverified.
" + dat+="�Issue author unverified.
" if(src.msg == "" || src.msg == "\[REDACTED\]") - dat+="•Invalid description.
" + dat+="�Invalid description.
" dat+="
Return
" if(17) dat+="Wanted Issue successfully deleted from Circulation
" @@ -427,7 +427,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" - human_or_robot_user << browse(dat, "window=newscaster_main;size=400x600") + var/datum/browser/popup = new(user, "newscaster_main", name, 400, 600) + popup.set_content(dat) + popup.open() onclose(human_or_robot_user, "newscaster_main") /*if(src.isbroken) //debugging shit @@ -794,7 +796,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co switch(screen) if(0) //Cover dat+="
The Griffon
" - dat+="
Nanotrasen-standard newspaper, for use on Nanotrasen© Space Facilities
" + dat+="
Nanotrasen-standard newspaper, for use on Nanotrasen� Space Facilities
" if(isemptylist(src.news_content)) if(src.important_message) dat+="Contents:
" diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 9214178e9e4..f86a35fe6c9 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -61,7 +61,9 @@ //What number the make points to is in the define # at the top of construction.dm in same folder //which for some reason couldn't just be left defined, so it could be used here, top kek - user << browse("[src][dat]", "window=pipedispenser") + var/datum/browser/popup = new(user, "pipedispenser", name, 400, 400) + popup.set_content(dat) + popup.open() onclose(user, "pipedispenser") return @@ -178,7 +180,9 @@ Nah Chute
"} - user << browse("[src][dat]", "window=pipedispenser") + var/datum/browser/popup = new(user, "pipedispenser", name, 400, 400) + popup.set_content(dat) + popup.open() return // 0=straight, 1=bent, 2=junction-j1, 3=junction-j2, 4=junction-y, 5=trunk diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 9cb2c7db4d6..9fa690660fd 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -134,10 +134,10 @@ return 0 if(src.panelopen) //The maintenance panel is open. Time for some shady stuff dat+= "Suit storage unit: Maintenance panel" - dat+= "Maintenance panel controls
" + dat+= "Maintenance panel controls
" dat+= "The panel is ridden with controls, button and meters, labeled in strange signs and symbols that
you cannot understand. Probably the manufactoring world's language.
Among other things, a few controls catch your eye.

" - dat+= text("A small dial with a \"ë\" symbol embroidded on it. It's pointing towards a gauge that reads [].
Turn towards []
",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") ) - dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
Press button",(src.safetieson? "GREEN" : "RED"),src) + dat+= text("A small dial with a \"�\" symbol embroidded on it. It's pointing towards a gauge that reads [].
Turn towards []
",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") ) + dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
Press button",(src.safetieson? "GREEN" : "RED"),src) dat+= text("

Close panel", user) //user << browse(dat, "window=ssu_m_panel;size=400x500") //onclose(user, "ssu_m_panel") @@ -150,26 +150,24 @@ else if(!src.isbroken) - dat+= "Suit storage unit" - dat+= "U-Stor-It Suit Storage Unit, model DS1900
" dat+= "Welcome to the Unit control panel.
" - dat+= text("Helmet storage compartment: []
",(src.HELMET ? HELMET.name : "No helmet detected.") ) + dat+= text("Helmet storage compartment: []
",(src.HELMET ? HELMET.name : "No helmet detected.") ) if(HELMET && src.isopen) dat+=text("Dispense helmet
",src) - dat+= text("Suit storage compartment: []
",(src.SUIT ? SUIT.name : "No exosuit detected.") ) + dat+= text("Suit storage compartment: []
",(src.SUIT ? SUIT.name : "No exosuit detected.") ) if(SUIT && src.isopen) dat+=text("Dispense suit
",src) - dat+= text("Breathmask storage compartment: []
",(src.MASK ? MASK.name : "No breathmask detected.") ) + dat+= text("Breathmask storage compartment: []
",(src.MASK ? MASK.name : "No breathmask detected.") ) if(MASK && src.isopen) dat+=text("Dispense mask
",src) if(src.OCCUPANT) dat+= "
WARNING: Biological entity detected inside the Unit's storage. Please remove.
" dat+= "Eject extra load" - dat+= text("
Unit is: [] - [] Unit ",(src.isopen ? "Open" : "Closed"),src,(src.isopen ? "Close" : "Open")) + dat+= text("
Unit is: [] - [] Unit ",(src.isopen ? "Open" : "Closed"),src,(src.isopen ? "Close" : "Open")) if(src.isopen) dat+="
" else - dat+= text(" - *[] Unit*
",src,(src.islocked ? "Unlock" : "Lock") ) + dat+= text(" - *[] Unit*
",src,(src.islocked ? "Unlock" : "Lock") ) dat+= text("Unit status: []",(src.islocked? "**LOCKED**
" : "**UNLOCKED**
") ) dat+= text("Start Disinfection cycle
",src) dat += text("

Close control panel", user) @@ -182,7 +180,9 @@ //user << browse(dat, "window=suit_storage_unit;size=400x500") //onclose(user, "suit_storage_unit") - user << browse(dat, "window=suit_storage_unit;size=400x500") + var/datum/browser/popup = new(user, "suit_storage_unit", name, 400, 500) + popup.set_content(dat) + popup.open() onclose(user, "suit_storage_unit") return @@ -838,7 +838,9 @@ dat += "The red light is [safeties ? "blinking" : "off"].
" dat += "The yellow light is [locked ? "on" : "off"].
" */ - user << browse(dat, "window=suit_cycler") + var/datum/browser/popup = new(user, "suit_cycler", name, 400, 400) + popup.set_content(dat) + popup.open() onclose(user, "suit_cycler") return diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index d0bf82e4a92..6a790c48915 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -289,9 +289,8 @@ if("parts") left_part += output_parts_list(part_set) left_part += "
Return" - dat = {" - - [name] + dat = {" + [name]