sync with master

code/citadel/cit_vendors.dm

@@ -20,7 +20,7 @@
 				/obj/item/clothing/under/mankini = 1,
 				/obj/item/dildo/flared/huge = 1
 					)
-	premium = list()
+	premium = list(/obj/item/device/electropack/shockcollar = 1)
 	refill_canister = /obj/item/vending_refill/kink
 /*
 /obj/machinery/vending/nazivend
@@ -84,6 +84,7 @@
 
 /obj/item/vending_refill/kink
 	machine_name 	= "KinkMate"
+	icon			= 'modular_citadel/icons/vending_restock.dmi'
 	icon_state 		= "refill_kink"
 	charges 		= list(8, 5, 0)// of 20 standard, 12 contraband, 0 premium
 	init_charges 	= list(8, 5, 0)
@@ -98,4 +99,4 @@
 	machine_name 	= "sovietvend"
 	icon_state 		= "refill_soviet"
 	charges 		= list(47, 7, 0)
-	init_charges 	= list(47, 7, 0)
+	init_charges 	= list(47, 7, 0)

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]