Merge branch 'master' into matContainer

code/modules/research/designs/computer_part_designs.dm

@@ -148,7 +148,7 @@
 	id = "APClink"
 	build_type = PROTOLATHE
 	materials = list(/datum/material/iron = 2000)
-	build_path = /obj/item/computer_hardware/recharger/APC
+	build_path = /obj/item/computer_hardware/recharger/apc_recharger
 	category = list("Computer Parts")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
 

code/modules/research/machinery/_production.dm

@@ -3,7 +3,6 @@
 	desc = "Makes researched and prototype items with materials and energy."
 	layer = BELOW_OBJ_LAYER
 	var/consoleless_interface = TRUE			//Whether it can be used without a console.
-	var/offstation_security_levels = TRUE
 	var/print_cost_coeff = 1				//Materials needed * coeff = actual.
 	var/list/categories = list()
 	var/datum/component/remote_materials/materials
@@ -19,7 +18,11 @@
 	var/screen = RESEARCH_FABRICATOR_SCREEN_MAIN
 	var/selected_category
 
+	var/offstation_security_levels
+
 /obj/machinery/rnd/production/Initialize(mapload)
+	if(mapload && offstation_security_levels)
+		log_mapping("Depricated var named \"offstation_security_levels\" at ([x], [y], [z])!")
 	. = ..()
 	create_reagents(0, OPENCONTAINER)
 	matching_designs = list()

code/modules/research/machinery/circuit_imprinter.dm

@@ -23,14 +23,5 @@
 	linked_console.linked_imprinter = null
 	..()
 
-/obj/machinery/rnd/production/circuit_imprinter/calculate_efficiency()
-	. = ..()
-	var/obj/item/circuitboard/machine/circuit_imprinter/C = circuit
-	offstation_security_levels = C.offstation_security_levels
-
-/obj/machinery/rnd/production/circuit_imprinter/offstation
-	offstation_security_levels = FALSE
-	circuit = /obj/item/circuitboard/machine/circuit_imprinter/offstation
-
 /obj/machinery/rnd/production/circuit_imprinter/AfterMaterialInsert() //doesnt use have an animation like lathes do
 	return

code/modules/research/machinery/protolathe.dm

@@ -23,12 +23,3 @@
 /obj/machinery/rnd/production/protolathe/disconnect_console()
 	linked_console.linked_lathe = null
 	..()
-
-/obj/machinery/rnd/production/protolathe/calculate_efficiency()
-	. = ..()
-	var/obj/item/circuitboard/machine/protolathe/C = circuit
-	offstation_security_levels = C.offstation_security_levels
-
-/obj/machinery/rnd/production/protolathe/offstation
-	offstation_security_levels = FALSE
-	circuit = /obj/item/circuitboard/machine/protolathe/offstation

code/modules/research/server.dm

@@ -3,6 +3,9 @@
 	desc = "A computer system running a deep neural network that processes arbitrary information to produce data useable in the development of new technologies. In layman's terms, it makes research points."
 	icon = 'icons/obj/machines/research.dmi'
 	icon_state = "server"
+	req_access = list(ACCESS_RD) //ONLY THE R&D CAN CHANGE SERVER SETTINGS.
+	circuit = /obj/item/circuitboard/machine/rdserver
+
 	var/datum/techweb/stored_research
 	var/heat_health = 100
 	//Code for point mining here.
@@ -15,14 +18,11 @@
 	var/temp_tolerance_low = 0
 	var/temp_tolerance_high = T20C
 	var/temp_penalty_coefficient = 0.5	//1 = -1 points per degree above high tolerance. 0.5 = -0.5 points per degree above high tolerance.
-	req_access = list(ACCESS_RD) //ONLY THE R&D CAN CHANGE SERVER SETTINGS.
 
 /obj/machinery/rnd/server/Initialize()
 	. = ..()
 	SSresearch.servers |= src
 	stored_research = SSresearch.science_tech
-	var/obj/item/circuitboard/machine/B = new /obj/item/circuitboard/machine/rdserver(null)
-	B.apply_default_parts(src)
 
 /obj/machinery/rnd/server/Destroy()
 	SSresearch.servers -= src