diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 0cd7eb9c61..4b379f9066 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -50,9 +50,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, req_access = list(access_research) //Data and setting manipulation requires scientist access. - - - /obj/machinery/computer/rdconsole/proc/CallTechName(var/ID) //A simple helper proc to find the name of a tech with a given ID. var/datum/tech/check_tech var/return_name = null @@ -125,7 +122,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, C.files.AddDesign2Known(D) C.files.RefreshResearch() - /obj/machinery/computer/rdconsole/New() ..() files = new /datum/research(src) //Setup the research data holder. @@ -440,7 +436,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, linked_lathe.reagents.clear_reagents() else if(href_list["lathe_ejectsheet"] && linked_lathe) //Causes the protolathe to eject a sheet of material - var/desired_num_sheets = text2num(href_list["lathe_ejectsheet_amt"]) + var/desired_num_sheets = text2num(href_list["amount"]) var/res_amount, type switch(href_list["lathe_ejectsheet"]) if("metal") @@ -474,7 +470,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, else del sheet else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the protolathe to eject a sheet of material - var/desired_num_sheets = text2num(href_list["imprinter_ejectsheet_amt"]) + var/desired_num_sheets = text2num(href_list["amount"]) var/res_amount, type switch(href_list["imprinter_ejectsheet"]) if("glass") @@ -576,22 +572,37 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(1.0) //Main Menu dat += "Main Menu:

" - dat += "Current Research Levels
" - if(t_disk) dat += "Disk Operations
" - else if(d_disk) dat += "Disk Operations
" - else dat += "(Please Insert Disk)
" - if(linked_destroy != null) dat += "Destructive Analyzer Menu
" - if(linked_lathe != null) dat += "Protolathe Construction Menu
" - if(linked_imprinter != null) dat += "Circuit Construction Menu
" - dat += "Settings" + dat += "Loaded disk: " + dat += (t_disk || d_disk) ? (t_disk ? "technology storage disk" : "design storage disk") : "none" + dat += "
" if(1.1) //Research viewer + dat += "Main Menu
" dat += "Current Research Levels:

" + dat += "" if(1.2) //Technology Disk Menu @@ -614,9 +625,11 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "
Main Menu || " dat += "Return to Disk Operations
" dat += "Load Technology to Disk:

" + dat += "" if(1.4) //Design Disk menu. dat += "Main Menu
" @@ -644,13 +657,16 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Main Menu || " dat += "Return to Disk Operations
" dat += "Load Design to Disk:

" + dat += "" if(1.6) //R&D console settings dat += "Main Menu
" - dat += "R&D Console Setting:

" + dat += "R&D Console Setting:
" if(sync) dat += "Sync Database with Network
" dat += "Disconnect from Research Network
" @@ -662,40 +678,44 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(1.7) //R&D device linkage dat += "Main Menu || " - dat += "Settings Menu
" + dat += "Settings Menu
" dat += "R&D Console Device Linkage Menu:

" - dat += "Re-sync with Nearby Devices
" - dat += "Linked Devices:
" + dat += "Re-sync with Nearby Devices
" + dat += "Linked Devices:" + dat += "" ////////////////////DESTRUCTIVE ANALYZER SCREENS//////////////////////////// if(2.0) + dat += "Main Menu
" dat += "NO DESTRUCTIVE ANALYZER LINKED TO CONSOLE

" - dat += "Main Menu" if(2.1) + dat += "Main Menu
" dat += "No Item Loaded. Standing-by...

" - dat += "Main Menu" if(2.2) dat += "Main Menu
" dat += "Deconstruction Menu
" dat += "Name: [linked_destroy.loaded_item.name]
" - dat += "Origin Tech:
" + dat += "Origin Tech:" + dat += "" dat += "
Deconstruct Item || " dat += "Eject Item || " @@ -711,13 +731,14 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Protolathe Menu:

" dat += "Material Amount: [linked_lathe.TotalMaterials()] cm3 (MAX: [linked_lathe.max_material_storage])
" dat += "Chemical Volume: [linked_lathe.reagents.total_volume] (MAX: [linked_lathe.reagents.maximum_volume])
" + dat += "" if(3.2) //Protolathe Material Storage Sub-menu dat += "Main Menu || " dat += "Protolathe Menu
" dat += "Material Storage

" - //Metal - dat += "* [linked_lathe.m_amount] cm3 of Metal || " - dat += "Eject: " - if(linked_lathe.m_amount >= 3750) dat += "(1 Sheet) " - if(linked_lathe.m_amount >= 18750) dat += "(5 Sheets) " - if(linked_lathe.m_amount >= 3750) dat += "(Max Sheets)" - dat += "
" - //Glass - dat += "* [linked_lathe.g_amount] cm3 of Glass || " - dat += "Eject: " - if(linked_lathe.g_amount >= 3750) dat += "(1 Sheet) " - if(linked_lathe.g_amount >= 18750) dat += "(5 Sheets) " - if(linked_lathe.g_amount >= 3750) dat += "(Max Sheets)" - dat += "
" - //Gold - dat += "* [linked_lathe.gold_amount] cm3 of Gold || " - dat += "Eject: " - if(linked_lathe.gold_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.gold_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.gold_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Silver - dat += "* [linked_lathe.silver_amount] cm3 of Silver || " - dat += "Eject: " - if(linked_lathe.silver_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.silver_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.silver_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Phoron - dat += "* [linked_lathe.phoron_amount] cm3 of Solid Phoron || " - dat += "Eject: " - if(linked_lathe.phoron_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.phoron_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.phoron_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Uranium - dat += "* [linked_lathe.uranium_amount] cm3 of Uranium || " - dat += "Eject: " - if(linked_lathe.uranium_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.uranium_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.uranium_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Diamond - dat += "* [linked_lathe.diamond_amount] cm3 of Diamond || " - dat += "Eject: " - if(linked_lathe.diamond_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.diamond_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.diamond_amount >= 2000) dat += "(Max Sheets)" - dat += "
" + dat += "" if(3.3) //Protolathe Chemical Storage Submenu dat += "Main Menu || " @@ -816,14 +825,14 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Circuit Imprinter Menu:

" dat += "Material Amount: [linked_imprinter.TotalMaterials()] cm3
" dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
" - + dat += "" if(4.2) dat += "Main Menu || " @@ -854,35 +866,34 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Main Menu || " dat += "Circuit Imprinter Menu
" dat += "Material Storage

" - //Glass - dat += "* [linked_imprinter.g_amount] cm3 of Glass || " - dat += "Eject: " - if(linked_imprinter.g_amount >= 3750) dat += "(1 Sheet) " - if(linked_imprinter.g_amount >= 18750) dat += "(5 Sheets) " - if(linked_imprinter.g_amount >= 3750) dat += "(Max Sheets)" - dat += "
" - //Gold - dat += "* [linked_imprinter.gold_amount] cm3 of Gold || " - dat += "Eject: " - if(linked_imprinter.gold_amount >= 2000) dat += "(1 Sheet) " - if(linked_imprinter.gold_amount >= 10000) dat += "(5 Sheets) " - if(linked_imprinter.gold_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Diamond - dat += "* [linked_imprinter.diamond_amount] cm3 of Diamond || " - dat += "Eject: " - if(linked_imprinter.diamond_amount >= 2000) dat += "(1 Sheet) " - if(linked_imprinter.diamond_amount >= 10000) dat += "(5 Sheets) " - if(linked_imprinter.diamond_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Uranium - dat += "* [linked_imprinter.uranium_amount] cm3 of Uranium || " - dat += "Eject: " - if(linked_imprinter.uranium_amount >= 2000) dat += "(1 Sheet) " - if(linked_imprinter.uranium_amount >= 10000) dat += "(5 Sheets) " - if(linked_imprinter.uranium_amount >= 2000) dat += "(Max Sheets)" + dat += "" + + + user << browse("Research and Development Console
[dat]", "window=rdconsole;size=850x600") onclose(user, "rdconsole") /obj/machinery/computer/rdconsole/robotics