Merge remote-tracking branch 'origin/dev' into ofBotsAndMobs

code/modules/reagents/Chemistry-Machinery.dm

@@ -406,7 +406,7 @@
 				if(type in diseases) // Make sure this is a disease
 					D = new type(0, null)
 			var/list/data = list("viruses"=list(D))
-			var/name = sanitizeSafe(input(usr,"Name:","Name the culture",D.name))
+			var/name = sanitizeSafe(input(usr,"Name:","Name the culture",D.name), MAX_NAME_LEN)
 			if(!name || name == " ") name = D.name
 			B.name = "[name] culture bottle"
 			B.desc = "A small bottle. Contains [D.agent] culture in synthblood medium."

code/modules/reagents/Chemistry-Reagents.dm

@@ -156,6 +156,8 @@ datum
 				else if(istype(self.data["donor"], /mob/living/carbon/alien))
 					var/obj/effect/decal/cleanable/blood/B = blood_splatter(T,self,1)
 					if(B) B.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*"
+				if(volume >= 5 && !istype(T.loc, /area/chapel)) //blood desanctifies non-chapel tiles
+					T.holy = 0
 				return
 
 /* Must check the transfering of reagents and their data first. They all can point to one disease datum.
@@ -289,6 +291,12 @@ datum
 				holder.remove_reagent(src.id, 10 * REAGENTS_METABOLISM) //high metabolism to prevent extended uncult rolls.
 				return
 
+			reaction_turf(var/turf/T, var/volume)
+				src = null
+				if(volume >= 5)
+					T.holy = 1
+				return
+
 		lube
 			name = "Space Lube"
 			id = "lube"

code/modules/reagents/Chemistry-Recipes.dm

@@ -213,13 +213,6 @@ datum
 			required_catalysts = list("phoron" = 5)
 			result_amount = 2
 
-		virus_food
-			name = "Virus Food"
-			id = "virusfood"
-			result = "virusfood"
-			required_reagents = list("water" = 1, "milk" = 1)
-			result_amount = 5
-
 		leporazine
 			name = "Leporazine"
 			id = "leporazine"
@@ -538,8 +531,8 @@ datum
 			name = "Virus Food"
 			id = "virusfood"
 			result = "virusfood"
-			required_reagents = list("water" = 5, "milk" = 5, "oxygen" = 5)
-			result_amount = 15
+			required_reagents = list("water" = 1, "milk" = 1, "oxygen" = 1)
+			result_amount = 3
 /*
 		mix_virus
 			name = "Mix Virus"
@@ -1629,7 +1622,9 @@ datum
 			required_reagents = list("egg" = 3, "flour" = 10)
 			result_amount = 1
 			on_reaction(var/datum/reagents/holder, var/created_volume)
-				new /obj/item/weapon/reagent_containers/food/snacks/dough(get_turf(holder.my_atom))
+				var/turf/T = get_turf(holder.my_atom)
+				for(var/i = 1 to created_volume)
+					new /obj/item/weapon/reagent_containers/food/snacks/dough(T)
 				return
 
 		syntiflesh
@@ -1639,8 +1634,9 @@ datum
 			required_reagents = list("blood" = 5, "clonexadone" = 1)
 			result_amount = 1
 			on_reaction(var/datum/reagents/holder, var/created_volume)
-				var/location = get_turf(holder.my_atom)
-				new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location)
+				var/turf/T = get_turf(holder.my_atom)
+				for(var/i = 1 to created_volume)
+					new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(T)
 				return
 
 		hot_ramen

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -83,7 +83,7 @@
 			user << "\blue You transfer [trans] units of the condiment to [target]."
 
 	on_reagent_change()
-		if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall")
+		if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "flour")
 			return
 		if(reagents.reagent_list.len > 0)
 			switch(reagents.get_master_reagent_id())
@@ -179,4 +179,16 @@
 	volume = 20
 	New()
 		..()
-		reagents.add_reagent("blackpepper", 20)
+		reagents.add_reagent("blackpepper", 20)
+
+/obj/item/weapon/reagent_containers/food/condiment/flour
+	name = "flour sack"
+	desc = "A big bag of flour. Good for baking!"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "flour"
+	item_state = "flour"
+	New()
+		..()
+		reagents.add_reagent("flour", 30)
+		src.pixel_x = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -556,18 +556,6 @@
 		..()
 		reagents.add_reagent("protein", 2)
 
-/obj/item/weapon/reagent_containers/food/snacks/flour
-	name = "flour sack"
-	desc = "A big bag of flour. Good for baking!"
-	icon = 'icons/obj/food.dmi'
-	icon_state = "flour"
-	item_state = "flour"
-	New()
-		..()
-		reagents.add_reagent("flour", 30)
-		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
-
 /obj/item/weapon/reagent_containers/food/snacks/organ
 	name = "organ"
 	desc = "It's good for you."

code/modules/reagents/reagent_containers/spray.dm

@@ -26,7 +26,7 @@
 	|| istype(A, /obj/item/weapon/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart))
 		return
 
-	if(istype(A, /obj/effect/proc_holder/spell))
+	if(istype(A, /spell))
 		return
 
 	if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) //this block copypasted from reagent_containers/glass, for lack of a better solution