Merge branch 'master' into resleeving_sickness

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -730,6 +730,7 @@
 	if(issmall(M))
 		effective_dose *= 2
 
+/* //VOREStation Removal - Assuming all juice has sugar is silly
 	if(alien == IS_UNATHI)
 		if(effective_dose < 2)
 			if(effective_dose == metabolism * 2 || prob(5))
@@ -743,6 +744,7 @@
 		else
 			M.sleeping = max(M.sleeping, 20)
 			M.drowsyness = max(M.drowsyness, 60)
+*/
 
 /datum/reagent/drink/juice/lemon
 	name = "Lemon Juice"
@@ -3524,3 +3526,13 @@
 
 	glass_name = "fusionnaire"
 	glass_desc = "A relatively new cocktail, mostly served in the bars of NanoTrasen owned stations."
+
+/datum/reagent/nutriment/magicdust
+	name = "Magic Dust"
+	id = "magicdust"
+	description = "A dust harvested from gnomes, aptly named by pre-industrial civilizations."
+	taste_description = "something tingly"
+	taste_mult = 2
+	reagent_state = LIQUID
+	nutriment_factor = 40 //very filling
+	color = "#d169b2"

code/modules/reagents/Chemistry-Recipes.dm

@@ -553,6 +553,20 @@
 	required_reagents = list ("ammonia" = 1, "ethanol" = 1)
 	result_amount = 2
 
+/datum/chemical_reaction/left4zed
+	name = "Left4Zed"
+	id = "left4zed"
+	result = "left4zed"
+	required_reagents = list ("diethylamine" = 2, "mutagen" = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/robustharvest
+	name = "RobustHarvest"
+	id = "robustharvest"
+	result = "robustharvest"
+	required_reagents = list ("ammonia" = 1, "calcium" = 1, "neurotoxic_protein" = 1)
+	result_amount = 3
+
 /datum/chemical_reaction/space_cleaner
 	name = "Space cleaner"
 	id = "cleaner"

code/modules/reagents/dispenser/dispenser_presets.dm

@@ -140,6 +140,4 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/lime,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf
-
-
 		)

code/modules/reagents/dispenser/dispenser_presets_vr.dm

@@ -1,7 +1,7 @@
 /obj/machinery/chemical_dispenser/xenoflora
 	name = "xenoflora chem dispenser"
 	dispense_reagents = list(
-		"water", "sugar", "ethanol", "radium", "ammonia", "diethylamine", "plantbgone", "mutagen"
+		"water", "sugar", "ethanol", "radium", "ammonia", "diethylamine", "plantbgone", "mutagen", "calcium"
 		)
 
 /obj/machinery/chemical_dispenser/xenoflora/full
@@ -13,5 +13,6 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/ammonia,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/diethylamine,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/plantbgone,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/mutagen
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/mutagen,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium
 		)

code/modules/reagents/distilling/Distilling-Recipes.dm

@@ -50,12 +50,14 @@
 
 	return 1
 
+/*
 /datum/chemical_reaction/distilling/on_reaction(var/datum/reagents/holder, var/created_volume)
 	if(istype(holder.my_atom, /obj/item/weapon/reagent_containers/glass/distilling))
 		var/obj/item/weapon/reagent_containers/glass/distilling/D = holder.my_atom
 		var/obj/machinery/portable_atmospherics/powered/reagent_distillery/RD = D.Master
 		RD.current_temp += temp_shift
 	return
+*/
 
 // Subtypes //