sync with master

code/modules/cargo/exports/research.dm

@@ -1,22 +0,0 @@
-// Sell tech levels
-/datum/export/tech
-	cost = 500
-	unit_name = "technology data disk"
-	export_types = list(/obj/item/disk/tech_disk)
-	var/list/datum/techweb_node/sold_nodes = list()
-
-/datum/export/tech/get_cost(obj/O)
-	var/obj/item/disk/tech_disk/D = O
-	var/cost = 0
-	for(var/V in D.stored_research.researched_nodes)
-		if(sold_nodes[V])		//Already sold before, don't want it.
-			continue
-		var/datum/techweb_node/TWN = D.stored_research.researched_nodes[V]
-		cost += TWN.export_price
-	return cost
-
-/datum/export/tech/sell_object(obj/O)
-	..()
-	var/obj/item/disk/tech_disk/D = O
-	for(var/V in D.stored_research.researched_nodes)
-		sold_nodes[V] = D.stored_research.researched_nodes[V]

code/modules/vore/eating/simple_animal_vr.dm

@@ -10,7 +10,7 @@
 /mob/living/simple_animal/verb/toggle_digestion()
 	set name = "Toggle Animal's Digestion"
 	set desc = "Enables digestion on this mob for 20 minutes."
-	set category = "Vore"
+	set category = "Object"
 	set src in oview(1)
 
 	var/datum/belly/B = vore_organs[vore_selected]