diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 116d41d7f8..0c468b184a 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -150,11 +150,9 @@ doesn't have toxins access. return FALSE var/price = TN.get_price(stored_research) if(stored_research.research_points >= price) - investigate_log("[key_name_admin(user)] researched [id]([price]) on techweb id [stored_research.id].") + investigate_log("[key_name(user)] researched [id]([price]) on techweb id [stored_research.id].", INVESTIGATE_RESEARCH) if(stored_research == SSresearch.science_tech) - if(stored_research.researched_nodes.len < 30) - SSblackbox.record_feedback("tally", "science_techweb_unlock_first_thirty", 1, "[id]") - SSblackbox.record_feedback("tally", "science_techweb_unlock", 1, "[id]") + SSblackbox.record_feedback("associative", "science_techweb_unlock", 1, list("id" = "[id]", "price" = "[price]", "time" = "[SQLtime()]")) if(stored_research.research_node(SSresearch.techweb_nodes[id])) say("Sucessfully researched [TN.display_name].") var/logname = "Unknown" @@ -231,11 +229,16 @@ doesn't have toxins access. var/list/l = list() if(research_control) l += "

Technology" - l += "
Design Disk" - l += "
Tech Disk" - l += "
Deconstructive Analyzer" - l += "
Protolathe" - l += "
Circuit Imprinter" + if(d_disk) + l += "
Design Disk" + if(t_disk) + l += "
Tech Disk" + if(linked_destroy) + l += "
Deconstructive Analyzer" + if(linked_lathe) + l += "
Protolathe" + if(linked_imprinter) + l += "
Circuit Imprinter" l += "
Settings

" return l @@ -278,6 +281,8 @@ doesn't have toxins access. var/datum/design/D = stored_research.researched_designs[v] if(!(selected_category in D.category)|| !(D.build_type & PROTOLATHE)) continue + if(!(D.departmental_flags & linked_lathe.allowed_department_flags)) + continue var/temp_material var/c = 50 var/t @@ -328,6 +333,8 @@ doesn't have toxins access. l += ui_protolathe_header() var/coeff = linked_lathe.efficiency_coeff for(var/datum/design/D in matching_designs) + if(!(D.departmental_flags & linked_lathe.allowed_department_flags)) + continue var/temp_material var/c = 50 var/t @@ -416,6 +423,8 @@ doesn't have toxins access. var/datum/design/D = stored_research.researched_designs[v] if(!(selected_category in D.category) || !(D.build_type & IMPRINTER)) continue + if(!(D.departmental_flags & linked_imprinter.allowed_department_flags)) + continue var/temp_materials var/check_materials = TRUE @@ -443,6 +452,8 @@ doesn't have toxins access. var/coeff = linked_imprinter.efficiency_coeff for(var/datum/design/D in matching_designs) + if(!(D.departmental_flags & linked_imprinter.allowed_department_flags)) + continue var/temp_materials var/check_materials = TRUE var/all_materials = D.materials + D.reagents_list