Merge branch 'master' into reagentToDefines

code/modules/reagents/reactions/instant/drinks.dm

@@ -82,6 +82,90 @@
 	required_reagents = list("ice" = 1, "coffee" = 2)
 	result_amount = 3
 
+/decl/chemical_reaction/instant/drinks/icecoffee/alt
+	name = "Iced Drip Coffee"
+	id = "icecoffee"
+	result = "icecoffee"
+	required_reagents = list("ice" = 1, "drip_coffee" = 2)
+	result_amount = 3
+
+/decl/chemical_reaction/instant/drinks/blackeye
+	name = "Black Eye Coffee"
+	id = "black_eye"
+	result = "black_eye"
+	required_reagents = list("drip_coffee" = 1, "coffee" = 1)
+	result_amount = 1
+
+/decl/chemical_reaction/instant/drinks/americano
+	name = "Americano"
+	id = "americano"
+	result = "americano"
+	required_reagents = list("water" = 1, "long_black" = 2)
+	result_amount = 3
+
+/decl/chemical_reaction/instant/drinks/long_black
+	name = "Long Black Coffee"
+	id = "long_black"
+	result = "long_black"
+	required_reagents = list("water" = 1, "coffee" = 1)
+	result_amount = 2
+
+/decl/chemical_reaction/instant/drinks/macchiato
+	name = "Macchiato"
+	id = "macchiato"
+	result = "macchiato"
+	required_reagents = list("milk" = 1, "coffee" = 2)
+	result_amount = 3
+
+/decl/chemical_reaction/instant/drinks/cortado
+	name = "Cortado"
+	id = "cortado"
+	result = "cortado"
+	required_reagents = list("macchiato" = 3, "milk_foam" = 1) // 2 coffee, 1 milk, 1 milk foam
+	result_amount = 4
+
+/decl/chemical_reaction/instant/drinks/breve
+	name = "Breve"
+	id = "breve"
+	result = "breve"
+	required_reagents = list("cortado" = 4, "cream" = 1) // 2 coffee, 1 milk, 1 milk foam, 1 cream
+	result_amount = 5
+
+/decl/chemical_reaction/instant/drinks/cappuccino
+	name = "Cappuccino"
+	id = "cappuccino"
+	result = "cappuccino"
+	required_reagents = list("milk" = 1, "milk_foam" = 1, "cortado" = 4) // 2 coffee, 2 milk, 2 milk foam
+	result_amount = 6
+
+/decl/chemical_reaction/instant/drinks/flat_white
+	name = "Flat White Coffee"
+	id = "flat_white"
+	result = "flat_white"
+	required_reagents = list("milk" = 2, "drip_coffee" = 1) // 2 drip coffee, 4 milk I'M SORRY THAT ITS DRIP COFFEE, otherwise it just gets in the way of all other reactions
+	result_amount = 3
+
+/decl/chemical_reaction/instant/drinks/mocha
+	name = "Mocha"
+	id = "mocha"
+	result = "mocha"
+	required_reagents = list("milk" = 1, "cream" = 1, "milk_foam" = 1, "hot_coco" = 2, "breve" = 5) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco
+	result_amount = 10
+
+/decl/chemical_reaction/instant/drinks/mocha/alt //incase they use cream before milk
+	name = "Mocha"
+	id = "mocha"
+	result = "mocha"
+	required_reagents = list("cream" = 2, "hot_coco" = 2, "cappuccino" = 6) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco
+	result_amount = 10
+
+/decl/chemical_reaction/instant/drinks/vienna
+	name = "Vienna"
+	id = "vienna"
+	result = "vienna"
+	required_reagents = list("cream" = 2, "coffee" = 1)
+	result_amount = 3
+
 /decl/chemical_reaction/instant/drinks/nuka_cola
 	name = "Nuclear Cola"
 	id = "nuka_cola"
@@ -499,7 +583,7 @@
 	name = "Cafe Latte"
 	id = "cafe_latte"
 	result = "cafe_latte"
-	required_reagents = list("coffee" = 1, "milk" = 1)
+	required_reagents = list("flat_white" = 1, "milk" = 1)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/drinks/acidspit

code/modules/reagents/reactions/instant/virology.dm

@@ -40,6 +40,13 @@
 	required_reagents = list("inaprovaline" = 1, "mutagenvirusfood" = 1)
 	result_amount = 2
 
+/decl/chemical_reaction/instant/virus_food_size
+	name = "sizeoxadone virus food"
+	id = "sizeoxadonevirusfood"
+	result = "sizevirusfood"
+	required_reagents = list("sizeoxadone" = 1, "phoronvirusfood" = 1)
+	result_amount = 2
+
 /decl/chemical_reaction/instant/mix_virus
 	name = "Mix Virus"
 	id = "mixvirus"
@@ -48,6 +55,9 @@
 	var/level_min = 0
 	var/level_max = 2
 
+/decl/chemical_reaction/instant/mix_virus/picky
+	var/list/datum/symptom/symptoms
+
 /decl/chemical_reaction/instant/mix_virus/on_reaction(datum/reagents/holder)
 	var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
 	if(B && B.data)
@@ -55,6 +65,13 @@
 		if(D)
 			D.Evolve(level_min, level_max)
 
+/decl/chemical_reaction/instant/mix_virus/picky/on_reaction(datum/reagents/holder)
+	var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
+	if(B && B.data)
+		var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
+		if(D)
+			D.PickyEvolve(symptoms)
+
 /decl/chemical_reaction/instant/mix_virus/mix_virus_2
 	name = "Mix Virus 2"
 	id = "mixvirus2"
@@ -111,6 +128,17 @@
 	level_min = 1
 	level_max = 1
 
+/decl/chemical_reaction/instant/mix_virus/picky/size
+	name = "Mix Virus Size"
+	id = "mixvirussize"
+	required_reagents = list("sizevirusfood" = 1)
+	symptoms = list(
+		/datum/symptom/macrophage,
+		/datum/symptom/size,
+		/datum/symptom/size/grow,
+		/datum/symptom/size/shrink
+	)
+
 /decl/chemical_reaction/instant/mix_virus/rem_virus
 	name = "Devolve Virus"
 	id = "remvirus"