diff --git a/code/modules/research/departmental_circuit_imprinter.dm b/code/modules/research/departmental_circuit_imprinter.dm index 991feccb66..7b06aaa839 100644 --- a/code/modules/research/departmental_circuit_imprinter.dm +++ b/code/modules/research/departmental_circuit_imprinter.dm @@ -4,10 +4,8 @@ icon_state = "circuit_imprinter" container_type = OPENCONTAINER circuit = /obj/item/circuitboard/machine/circuit_imprinter/department - console_link = FALSE requires_console = FALSE - var/list/allowed_department_flags = DEPARTMENTAL_FLAG_ALL var/list/datum/design/cached_designs var/list/datum/design/matching_designs var/department_tag = "Unidentified" //used for material distribution among other things. diff --git a/code/modules/research/departmental_lathe.dm b/code/modules/research/departmental_lathe.dm index 83f543e4cb..4e8d33a3a3 100644 --- a/code/modules/research/departmental_lathe.dm +++ b/code/modules/research/departmental_lathe.dm @@ -4,10 +4,8 @@ icon_state = "protolathe" container_type = OPENCONTAINER circuit = /obj/item/circuitboard/machine/protolathe/department - console_link = FALSE requires_console = FALSE - var/list/allowed_department_flags = DEPARTMENTAL_FLAG_ALL var/list/datum/design/cached_designs var/list/datum/design/matching_designs var/department_tag = "Unidentified" //used for material distribution among other things. 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 += "