[READY]Refactors reagent container types

code/modules/research/circuitprinter.dm

@@ -8,7 +8,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	name = "circuit imprinter"
 	desc = "Manufactures circuit boards for the construction of machines."
 	icon_state = "circuit_imprinter"
-	container_type = OPENCONTAINER_1
+	container_type = OPENCONTAINER
 	circuit = /obj/item/circuitboard/machine/circuit_imprinter
 
 	var/efficiency_coeff

code/modules/research/departmental_circuit_imprinter.dm

@@ -2,7 +2,7 @@
 	name = "Department Circuit Imprinter"
 	desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type. Features a bluespace materials reciever for recieving materials without the hassle of running to mining!"
 	icon_state = "circuit_imprinter"
-	container_type = OPENCONTAINER_1
+	container_type = OPENCONTAINER
 	circuit = /obj/item/circuitboard/machine/circuit_imprinter/department
 	console_link = FALSE
 	requires_console = FALSE

code/modules/research/departmental_lathe.dm

@@ -2,7 +2,7 @@
 	name = "department protolathe"
 	desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type. Features a bluespace materials reciever for recieving materials without the hassle of running to mining!"
 	icon_state = "protolathe"
-	container_type = OPENCONTAINER_1
+	container_type = OPENCONTAINER
 	circuit = /obj/item/circuitboard/machine/protolathe/department
 	console_link = FALSE
 	requires_console = FALSE

code/modules/research/protolathe.dm

@@ -11,7 +11,7 @@ Note: Must be placed west/left of and R&D console to function.
 	name = "protolathe"
 	desc = "Converts raw materials into useful objects."
 	icon_state = "protolathe"
-	container_type = OPENCONTAINER_1
+	container_type = OPENCONTAINER
 	circuit = /obj/item/circuitboard/machine/protolathe
 
 	var/efficiency_coeff

code/modules/research/rdmachines.dm

@@ -59,7 +59,7 @@
 		return
 	if(default_deconstruction_crowbar(O))
 		return
-	if(is_open_container() && O.is_open_container())
+	if(is_refillable() && O.is_drainable())
 		return FALSE //inserting reagents into the machine
 	if(Insert_Item(O, user))
 		return TRUE

code/modules/research/xenobiology/xenobiology.dm

@@ -11,7 +11,7 @@
 	throwforce = 0
 	throw_speed = 3
 	throw_range = 6
-	container_type = INJECTABLE_1
+	container_type = INJECTABLE | DRAWABLE
 	grind_results = list()
 	var/Uses = 1 // uses before it goes inert
 	var/qdel_timer = null // deletion timer, for delayed reactions