Merge remote-tracking branch 'upstream/master' into kk-misc3

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm

@@ -376,6 +376,22 @@
 	name = "Robust Harvest"
 	id = "robustharvest"
 
+/datum/reagent/toxin/fertilizer/tannin
+	name = "tannin"
+	id = "tannin"
+	description = "A chemical found in some plants as a natural pesticide. It may also aid in regulating growth."
+	taste_description = "puckering"
+	taste_mult = 1.2
+	reagent_state = LIQUID
+	strength = 1.5
+	color = "#e67819"
+
+/datum/reagent/toxin/fertilizer/tannin/touch_obj(var/obj/O, var/volume)
+	if(istype(O, /obj/item/stack/hairlesshide))
+		var/obj/item/stack/hairlesshide/HH = O
+		HH.rapidcure(round(volume))
+	..()
+
 /datum/reagent/toxin/plantbgone
 	name = "Plant-B-Gone"
 	id = "plantbgone"

code/modules/reagents/dispenser/dispenser_presets_vr.dm

@@ -65,3 +65,9 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/nutriment,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/protein
 		)
+
+/obj/machinery/chemical_dispenser/ert/specialops/abductor
+	name = "chemical dispenser"
+	icon = 'icons/obj/abductor_vr.dmi'
+	icon_state = "dispenser_2way"
+	desc = "A mysterious machine which can fabricate many chemicals."