Merge with dev.

code/game/objects/items/toys.dm

@@ -47,7 +47,7 @@
 /obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
 	if(!proximity) return
 	if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1)
-		A.reagents.trans_to(src, 10)
+		A.reagents.trans_to_obj(src, 10)
 		user << "\blue You fill the balloon with the contents of [A]."
 		src.desc = "A translucent balloon with some form of liquid sloshing around in it."
 		src.update_icon()
@@ -60,22 +60,22 @@
 				user << "The [O] is empty."
 			else if(O.reagents.total_volume >= 1)
 				if(O.reagents.has_reagent("pacid", 1))
-					user << "The acid chews through the balloon!"
-					O.reagents.reaction(user)
-					qdel(src)
+					user << "The acid chews through the balloon!"
+					O.reagents.splash_mob(user, reagents.total_volume)
+					qdel(src)
 				else
 					src.desc = "A translucent balloon with some form of liquid sloshing around in it."
 					user << "\blue You fill the balloon with the contents of [O]."
-					O.reagents.trans_to(src, 10)
+					O.reagents.trans_to_obj(src, 10)
 	src.update_icon()
 	return
 
 /obj/item/toy/balloon/throw_impact(atom/hit_atom)
 	if(src.reagents.total_volume >= 1)
 		src.visible_message("\red The [src] bursts!","You hear a pop and a splash.")
-		src.reagents.reaction(get_turf(hit_atom))
+		src.reagents.touch_turf(get_turf(hit_atom))
 		for(var/atom/A in get_turf(hit_atom))
-			src.reagents.reaction(A)
+			src.reagents.touch(A)
 		src.icon_state = "burst"
 		spawn(5)
 			if(src)
@@ -456,15 +456,15 @@
 		D.icon = 'icons/obj/chemical.dmi'
 		D.icon_state = "chempuff"
 		D.create_reagents(5)
-		src.reagents.trans_to(D, 1)
+		src.reagents.trans_to_obj(D, 1)
 		playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1, -6)
 
 		spawn(0)
 			for(var/i=0, i<1, i++)
 				step_towards(D,A)
-				D.reagents.reaction(get_turf(D))
+				D.reagents.touch_turf(get_turf(D))
 				for(var/atom/T in get_turf(D))
-					D.reagents.reaction(T)
+					D.reagents.touch(T)
 					if(ismob(T) && T:client)
 						T:client << "\red [user] has sprayed you with water!"
 				sleep(4)

code/game/objects/items/weapons/cigs_lighters.dm

@@ -114,10 +114,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 					if(H.species.flags & IS_SYNTHETIC)
 						return
 
-				reagents.trans_to(C, REAGENTS_METABOLISM, 0.2) // Most of it is not inhaled... balance reasons.
-				reagents.reaction(C)
+				reagents.trans_to_mob(C, REM, CHEM_INGEST, 0.2) // Most of it is not inhaled... balance reasons.
 		else // else just remove some of the reagents
-			reagents.remove_any(REAGENTS_METABOLISM)
+			reagents.remove_any(REM)
 
 /obj/item/clothing/mask/smokable/proc/light(var/flavor_text = "[usr] lights the [name].")
 	if(!src.lit)
@@ -232,7 +231,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(!proximity)
 		return
 	if(istype(glass)) //you can dip cigarettes into beakers
-		var/transfered = glass.reagents.trans_to(src, chem_volume)
+		var/transfered = glass.reagents.trans_to_obj(src, chem_volume)
 		if(transfered)	//if reagents were transfered, show the message
 			user << "<span class='notice'>You dip \the [src] into \the [glass].</span>"
 		else			//if not, either the beaker was empty, or the cigarette was full
@@ -377,7 +376,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			return
 		smoketime = 1000
 		if(G.reagents)
-			G.reagents.trans_to(src, G.reagents.total_volume)
+			G.reagents.trans_to_obj(src, G.reagents.total_volume)
 		name = "[G.name]-packed [initial(name)]"
 		qdel(G)
 

code/game/objects/items/weapons/extinguisher.dm

@@ -31,15 +31,11 @@
 	w_class = 2.0
 	force = 3.0
 	max_water = 60
-	spray_particles = 6
-	spray_amount = 2
 	sprite_name = "miniFE"
 
 /obj/item/weapon/extinguisher/New()
-	var/datum/reagents/R = new/datum/reagents(max_water)
-	reagents = R
-	R.my_atom = src
-	R.add_reagent("water", max_water)
+	create_reagents(max_water)
+	reagents.add_reagent("water", max_water)
 
 /obj/item/weapon/extinguisher/examine(mob/user)
 	if(..(user, 0))
@@ -53,19 +49,19 @@
 	user << "The safety is [safety ? "on" : "off"]."
 	return
 
-/obj/item/weapon/extinguisher/afterattack(atom/target, mob/user , flag)
+/obj/item/weapon/extinguisher/afterattack(var/atom/target, var/mob/user, var/flag)
 	//TODO; Add support for reagents in water.
 
-	if( istype(target, /obj/structure/reagent_dispensers/watertank) && get_dist(src,target) <= 1)
+	if( istype(target, /obj/structure/reagent_dispensers/watertank) && flag)
 		var/obj/o = target
-		var/amount = o.reagents.trans_to(src, 50)
-		user << "\blue You fill [src] with [amount] units of the contents of [target]."
+		var/amount = o.reagents.trans_to_obj(src, 50)
+		user << "<span class='notice'>You fill [src] with [amount] units of the contents of [target].</span>"
 		playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
 		return
 
 	if (!safety)
 		if (src.reagents.total_volume < 1)
-			usr << "\red \The [src] is empty."
+			usr << "<span class='notice'>\The [src] is empty.</span>"
 			return
 
 		if (world.time < src.last_use + 20)
@@ -77,35 +73,35 @@
 
 		var/direction = get_dir(src,target)
 
-		if(usr.buckled && isobj(usr.buckled) && !usr.buckled.anchored )
+		if(user.buckled && isobj(user.buckled) && !user.buckled.anchored )
 			spawn(0)
 				var/obj/structure/bed/chair/C = null
-				if(istype(usr.buckled, /obj/structure/bed/chair))
-					C = usr.buckled
-				var/obj/B = usr.buckled
+				if(istype(user.buckled, /obj/structure/bed/chair))
+					C = user.buckled
+				var/obj/B = user.buckled
 				var/movementdirection = turn(direction,180)
 				if(C)	C.propelled = 4
-				B.Move(get_step(usr,movementdirection), movementdirection)
+				B.Move(get_step(user,movementdirection), movementdirection)
 				sleep(1)
-				B.Move(get_step(usr,movementdirection), movementdirection)
+				B.Move(get_step(user,movementdirection), movementdirection)
 				if(C)	C.propelled = 3
 				sleep(1)
-				B.Move(get_step(usr,movementdirection), movementdirection)
+				B.Move(get_step(user,movementdirection), movementdirection)
 				sleep(1)
-				B.Move(get_step(usr,movementdirection), movementdirection)
+				B.Move(get_step(user,movementdirection), movementdirection)
 				if(C)	C.propelled = 2
 				sleep(2)
-				B.Move(get_step(usr,movementdirection), movementdirection)
+				B.Move(get_step(user,movementdirection), movementdirection)
 				if(C)	C.propelled = 1
 				sleep(2)
-				B.Move(get_step(usr,movementdirection), movementdirection)
+				B.Move(get_step(user,movementdirection), movementdirection)
 				if(C)	C.propelled = 0
 				sleep(3)
-				B.Move(get_step(usr,movementdirection), movementdirection)
+				B.Move(get_step(user,movementdirection), movementdirection)
 				sleep(3)
-				B.Move(get_step(usr,movementdirection), movementdirection)
+				B.Move(get_step(user,movementdirection), movementdirection)
 				sleep(3)
-				B.Move(get_step(usr,movementdirection), movementdirection)
+				B.Move(get_step(user,movementdirection), movementdirection)
 
 		var/turf/T = get_turf(target)
 		var/turf/T1 = get_step(T,turn(direction, 90))
@@ -113,33 +109,24 @@
 
 		var/list/the_targets = list(T,T1,T2)
 
-		for(var/a=0, a < spray_particles, a++)
-			spawn(0)
-				var/obj/effect/effect/water/W = PoolOrNew(/obj/effect/effect/water, get_turf(src))
-				var/turf/my_target = pick(the_targets)
-				var/datum/reagents/R = new/datum/reagents(spray_amount)
-				if(!W) return
-				W.reagents = R
-				R.my_atom = W
-				if(!W || !src) return
-				src.reagents.trans_to(W, spray_amount)
-
-				for(var/b=0, b<5, b++)
-					step_towards(W,my_target)
-					if(!W || !W.reagents) return
-					W.reagents.reaction(get_turf(W))
-					for(var/atom/atm in get_turf(W))
-						if(!W)
-							return
-						if(!W.reagents)
-							break
-						W.reagents.reaction(atm)
-						if(isliving(atm)) //For extinguishing mobs on fire
-							var/mob/living/M = atm
-							M.ExtinguishMob()
-					if(W.loc == my_target) break
-					sleep(2)
-				qdel(W)
+		for(var/a = 1 to spray_particles)
+			spawn(0)
+				var/obj/effect/effect/water/W = PoolOrNew(new /obj/effect/effect/water, get_turf(src))
+				var/turf/my_target
+				if(a == 1)
+					my_target = T
+				else if(a == 2)
+					my_target = T1
+				else if(a == 3)
+					my_target = T2
+				else
+					my_target = pick(the_targets)
+				W.create_reagents(spray_amount)
+				if(!src)
+					return
+				reagents.trans_to_obj(W, spray_amount)
+				W.set_color()
+				W.set_up(my_target)
 
 		if((istype(usr.loc, /turf/space)) || (usr.lastarea.has_gravity == 0))
 			user.inertia_dir = get_dir(target, user)

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -158,7 +158,7 @@
 
 			for(var/atom/A in view(affected_area, src.loc))
 				if( A == src ) continue
-				src.reagents.reaction(A, 1, 10)
+				src.reagents.touch(A)
 
 		if(istype(loc, /mob/living/carbon))		//drop dat grenade if it goes off in your hand
 			var/mob/living/carbon/C = loc

code/game/objects/items/weapons/implants/implant.dm

@@ -291,7 +291,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	activate(var/cause)
 		if((!cause) || (!src.imp_in))	return 0
 		var/mob/living/carbon/R = src.imp_in
-		src.reagents.trans_to(R, cause)
+		src.reagents.trans_to_mob(R, cause, CHEM_BLOOD)
 		R << "You hear a faint *beep*."
 		if(!src.reagents.total_volume)
 			R << "You hear a faint click from your chest."

code/game/objects/items/weapons/implants/implantcase.dm

@@ -38,7 +38,7 @@
 			user << "\red [src] is full."
 		else
 			spawn(5)
-				I.reagents.trans_to(src.imp, 5)
+				I.reagents.trans_to_mob(src.imp, 5)
 				user << "\blue You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units."
 	else if (istype(I, /obj/item/weapon/implanter))
 		var/obj/item/weapon/implanter/M = I

code/game/objects/items/weapons/kitchen.dm

@@ -49,7 +49,7 @@
 			return ..()
 
 	if (reagents.total_volume > 0)
-		reagents.trans_to_ingest(M, reagents.total_volume)
+		reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
 		if(M == user)
 			for(var/mob/O in viewers(M, null))
 				O.show_message(text("\blue [] eats some [] from \the [].", user, loaded, src), 1)

code/game/objects/items/weapons/mop.dm

@@ -25,9 +25,7 @@
 		for(var/obj/effect/O in src)
 			if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
 				qdel(O)
-	source.reagents.reaction(src, TOUCH, 10)	//10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
-	source.reagents.remove_any(1)				//reaction() doesn't use up the reagents
-
+	source.reagents.trans_to_turf(src, 1, 10)	//10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
 
 /obj/item/weapon/mop/afterattack(atom/A, mob/user, proximity)
 	if(!proximity) return

code/game/objects/items/weapons/paint.dm

@@ -20,11 +20,8 @@ var/global/list/cached_icons = list()
 	afterattack(turf/simulated/target, mob/user, proximity)
 		if(!proximity) return
 		if(istype(target) && reagents.total_volume > 5)
-			for(var/mob/O in viewers(user))
-				O.show_message("\red \The [target] has been splashed with something by [user]!", 1)
-			spawn(5)
-				reagents.reaction(target, TOUCH)
-				reagents.remove_any(5)
+			user.visible_message("<span class='warning'>\The [target] has been splashed with something by [user]!</span>")
+			reagents.trans_to_turf(target, 5)
 		else
 			return ..()
 

code/game/objects/items/weapons/storage/fancy.dm

@@ -158,7 +158,7 @@
 /obj/item/weapon/storage/fancy/cigarettes/remove_from_storage(obj/item/W as obj, atom/new_location)
 		var/obj/item/clothing/mask/smokable/cigarette/C = W
 		if(!istype(C)) return // what
-		reagents.trans_to(C, (reagents.total_volume/contents.len))
+		reagents.trans_to_obj(C, (reagents.total_volume/contents.len))
 		..()
 
 /obj/item/weapon/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -167,7 +167,7 @@
 
 	if(M == user && user.zone_sel.selecting == "mouth" && contents.len > 0 && !user.wear_mask)
 		var/obj/item/clothing/mask/smokable/cigarette/W = new /obj/item/clothing/mask/smokable/cigarette(user)
-		reagents.trans_to(W, (reagents.total_volume/contents.len))
+		reagents.trans_to_obj(W, (reagents.total_volume/contents.len))
 		user.equip_to_slot_if_possible(W, slot_wear_mask)
 		reagents.maximum_volume = 15 * contents.len
 		contents.len--
@@ -213,7 +213,7 @@
 /obj/item/weapon/storage/fancy/cigar/remove_from_storage(obj/item/W as obj, atom/new_location)
 		var/obj/item/clothing/mask/smokable/cigarette/cigar/C = W
 		if(!istype(C)) return
-		reagents.trans_to(C, (reagents.total_volume/contents.len))
+		reagents.trans_to_obj(C, (reagents.total_volume/contents.len))
 		..()
 
 /obj/item/weapon/storage/fancy/cigar/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -222,7 +222,7 @@
 
 	if(M == user && user.zone_sel.selecting == "mouth" && contents.len > 0 && !user.wear_mask)
 		var/obj/item/clothing/mask/smokable/cigarette/cigar/W = new /obj/item/clothing/mask/smokable/cigarette/cigar(user)
-		reagents.trans_to(W, (reagents.total_volume/contents.len))
+		reagents.trans_to_obj(W, (reagents.total_volume/contents.len))
 		user.equip_to_slot_if_possible(W, slot_wear_mask)
 		reagents.maximum_volume = 15 * contents.len
 		contents.len--

code/game/objects/items/weapons/tools.dm

@@ -247,7 +247,7 @@
 /obj/item/weapon/weldingtool/afterattack(obj/O as obj, mob/user as mob, proximity)
 	if(!proximity) return
 	if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && !src.welding)
-		O.reagents.trans_to(src, max_fuel)
+		O.reagents.trans_to_obj(src, max_fuel)
 		user << "\blue Welder refueled"
 		playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
 		return

code/game/objects/items/weapons/weldbackpack.dm

@@ -27,7 +27,7 @@
 		else
 			if(T.welding)
 				user << "\red That was close!"
-			src.reagents.trans_to(W, T.max_fuel)
+			src.reagents.trans_to_obj(W, T.max_fuel)
 			user << "\blue Welder refilled!"
 			playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
 			return
@@ -38,7 +38,7 @@
 	if(!proximity) // this replaces and improves the get_dist(src,O) <= 1 checks used previously
 		return
 	if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel)
-		O.reagents.trans_to(src, max_fuel)
+		O.reagents.trans_to_obj(src, max_fuel)
 		user << "\blue You crack the cap off the top of the pack and fill it back up again from the tank."
 		playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
 		return