Conflict fix

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -113,7 +113,9 @@
 	if(panel_open)
 		. += "<span class='notice'>[src]'s maintenance hatch is open!</span>"
 	if(in_range(user, src) || isobserver(user))
-		. += "<span class='notice'>The status display reads: <br>Recharging <b>[recharge_amount]</b> power units per interval.<br>Power efficiency increased by <b>[(powerefficiency*1000)-100]%</b>.<span>"
+		. += "<span class='notice'>The status display reads:\n\
+		Recharging <b>[recharge_amount]</b> power units per interval.\n\
+		Power efficiency increased by <b>[round((powerefficiency*1000)-100, 1)]%</b>.</span>"
 		switch(macrotier)
 			if(1)
 				. += "<span class='notice'>Macro granularity at <b>5u</b>.<span>"

code/modules/reagents/chemistry/machinery/chem_heater.dm

@@ -52,6 +52,11 @@
 	for(var/obj/item/stock_parts/micro_laser/M in component_parts)
 		heater_coefficient *= M.rating
 
+/obj/machinery/chem_heater/examine(mob/user)
+	. = ..()
+	if(in_range(user, src) || isobserver(user))
+		. += "<span class='notice'>The status display reads: Heating reagents at <b>[heater_coefficient*1000]%</b> speed.</span>"
+
 /obj/machinery/chem_heater/process()
 	..()
 	if(stat & NOPOWER)

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -901,7 +901,12 @@
 		M.emote("nya")
 	if(prob(20))
 		to_chat(M, "<span class = 'notice'>[pick("Headpats feel nice.", "Backrubs would be nice.", "Mew")]</span>")
-	M.adjustArousalLoss(5)
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		var/list/adjusted = H.adjust_arousal(5,aphro = TRUE)
+		for(var/g in adjusted)
+			var/obj/item/organ/genital/G = g
+			to_chat(M, "<span class='userlove'>You feel like playing with your [G.name]!</span>")
 	..()
 
 /datum/reagent/consumable/monkey_energy

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

@@ -2127,5 +2127,11 @@
 		M.emote("nya")
 	if(prob(20))
 		to_chat(M, "<span class = 'notice'>[pick("Headpats feel nice.", "The feeling of a hairball...", "Backrubs would be nice.", "Whats behind those doors?")]</span>")
-	M.adjustArousalLoss(2)
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		var/list/adjusted = H.adjust_arousal(2,aphro = TRUE)
+		for(var/g in adjusted)
+			var/obj/item/organ/genital/G = g
+			to_chat(M, "<span class='userlove'>You feel like playing with your [G.name]!</span>")
+
 	..()

code/modules/reagents/chemistry/recipes/others.dm

@@ -222,7 +222,6 @@
 /datum/chemical_reaction/mix_virus
 	name = "Mix Virus"
 	id = "mixvirus"
-	results = list(/datum/reagent/blood = 1)
 	required_reagents = list(/datum/reagent/consumable/virus_food = 1)
 	required_catalysts = list(/datum/reagent/blood = 1)
 	var/level_min = 1
@@ -234,8 +233,8 @@
 	if(B && B.data)
 		var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
 		if(D)
-			D.Evolve(level_min, level_max)
-
+			for(var/i in 1 to min(created_volume, 5))
+				D.Evolve(level_min, level_max)
 
 /datum/chemical_reaction/mix_virus/mix_virus_2
 
@@ -326,19 +325,18 @@
 	level_max = 8
 
 /datum/chemical_reaction/mix_virus/rem_virus
-
 	name = "Devolve Virus"
 	id = "remvirus"
 	required_reagents = list(/datum/reagent/medicine/synaptizine = 1)
 	required_catalysts = list(/datum/reagent/blood = 1)
 
 /datum/chemical_reaction/mix_virus/rem_virus/on_reaction(datum/reagents/holder, created_volume)
-
 	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.Devolve()
+			for(var/i in 1 to min(created_volume, 5))
+				D.Devolve()
 
 /datum/chemical_reaction/mix_virus/neuter_virus
 	name = "Neuter Virus"
@@ -347,14 +345,12 @@
 	required_catalysts = list(/datum/reagent/blood = 1)
 
 /datum/chemical_reaction/mix_virus/neuter_virus/on_reaction(datum/reagents/holder, created_volume)
-
 	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.Neuter()
-
-
+			for(var/i in 1 to min(created_volume, 5))
+				D.Neuter()
 
 ////////////////////////////////// foam and foam precursor ///////////////////////////////////////////////////
 

code/modules/reagents/reagent_containers.dm

@@ -102,9 +102,9 @@
 	reagents.expose_temperature(exposed_temperature)
 	..()
 
-/obj/item/reagent_containers/throw_impact(atom/target)
+/obj/item/reagent_containers/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
 	. = ..()
-	SplashReagents(target, TRUE)
+	SplashReagents(hit_atom, TRUE)
 
 /obj/item/reagent_containers/proc/bartender_check(atom/target)
 	. = FALSE

code/modules/reagents/reagent_dispenser.dm

@@ -125,7 +125,7 @@
 	boom()
 
 /obj/structure/reagent_dispensers/fueltank/bullet_act(obj/item/projectile/P)
-	..()
+	. = ..()
 	if(!QDELETED(src)) //wasn't deleted by the projectile's effects.
 		if(!P.nodamage && ((P.damage_type == BURN) || (P.damage_type == BRUTE)))
 			var/boom_message = "[ADMIN_LOOKUPFLW(P.firer)] triggered a fueltank explosion via projectile."