Merge remote-tracking branch 'citadel/master' into combat_patches_1

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -287,7 +287,9 @@
 
 /datum/reagent/water/reaction_obj(obj/O, reac_volume)
 	O.extinguish()
-	O.acid_level = 0
+	var/datum/component/acid/acid = O.GetComponent(/datum/component/acid)
+	if(acid)
+		acid.level = 0
 	// cubes
 	if(istype(O, /obj/item/reagent_containers/food/snacks/cube))
 		var/obj/item/reagent_containers/food/snacks/cube/cube = O

code/modules/reagents/chemistry/recipes.dm

@@ -40,6 +40,7 @@
 
 
 /datum/chemical_reaction/proc/on_reaction(datum/reagents/holder, multiplier, specialreact)
+	set waitfor = FALSE
 	return
 	//I recommend you set the result amount to the total volume of all components.