Chemistry commit

I messed something in the git

code/modules/reagents/reagent_containers.dm

@@ -13,39 +13,134 @@
 	set category = "Object"
 	set src in range(0)
 	var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
-	if (N)
+	if(N)
 		amount_per_transfer_from_this = N
 
 /obj/item/weapon/reagent_containers/New()
 	..()
-	if (!possible_transfer_amounts)
+	if(!possible_transfer_amounts)
 		src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT
-	var/datum/reagents/R = new/datum/reagents(volume)
-	reagents = R
-	R.my_atom = src
+	create_reagents(volume)
 
 /obj/item/weapon/reagent_containers/attack_self(mob/user as mob)
 	return
 
-/obj/item/weapon/reagent_containers/attack(mob/M as mob, mob/user as mob, def_zone)
-	if(can_operate(M))        //Checks if mob is lying down on table for surgery
-		if(do_surgery(M,user,src))
+/obj/item/weapon/reagent_containers/attack(mob/M as mob, mob/user as mob, def_zone)
+	if(can_operate(M))//Checks if mob is lying down on table for surgery
+		if(do_surgery(M, user, src))
 			return
 
-// this prevented pills, food, and other things from being picked up by bags.
-// possibly intentional, but removing it allows us to not duplicate functionality.
-// -Sayu (storage conslidation)
-/*
-/obj/item/weapon/reagent_containers/attackby(obj/item/I as obj, mob/user as mob)
-	return
-*/
-/obj/item/weapon/reagent_containers/afterattack(obj/target, mob/user , flag)
+/obj/item/weapon/reagent_containers/afterattack(obj/target, mob/user, flag)
 	return
 
-/obj/item/weapon/reagent_containers/proc/reagentlist(var/obj/item/weapon/reagent_containers/snack) //Attack logs for regents in pills
-	var/data
-	if(snack.reagents.reagent_list && snack.reagents.reagent_list.len) //find a reagent list if there is and check if it has entries
-		for (var/datum/reagent/R in snack.reagents.reagent_list) //no reagents will be left behind
-			data += "[R.id]([R.volume] units); " //Using IDs because SOME chemicals(I'm looking at you, chlorhydrate-beer) have the same names as other chemicals.
-		return data
-	else return "No reagents"
+/obj/item/weapon/reagent_containers/proc/reagentlist() // For attack logs
+	if(reagents)
+		return reagents.get_reagents()
+	return "No reagent holder"
+
+/obj/item/weapon/reagent_containers/proc/standard_dispenser_refill(var/mob/user, var/obj/structure/reagent_dispensers/target) // This goes into afterattack
+	if(!istype(target))
+		return 0
+
+	if(!target.reagents || !target.reagents.total_volume)
+		user << "<span class='notice'>[target] is empty.</span>"
+		return 1
+
+	if(reagents && !reagents.get_free_space())
+		user << "<span class='notice'>[src] is full.</span>"
+		return 1
+
+	var/trans = target.reagents.trans_to_obj(src, target:amount_per_transfer_from_this)
+	user << "<span class='notice'>You fill [src] with [trans] units of the contents of [target].</span>"
+	return 1
+
+/obj/item/weapon/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack
+	if(!istype(target))
+		return
+
+	if(!reagents || !reagents.total_volume)
+		user << "<span class='notice'>[src] is empty.</span>"
+		return 1
+
+	if(target.reagents && !target.reagents.get_free_space())
+		user << "<span class='notice'>[target] is full.</span>"
+		return 1
+
+	var/contained = reagentlist()
+	target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been splashed with [name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
+	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to splash [target.name] ([target.key]). Reagents: [contained]</font>")
+	msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+
+	user.visible_message("<span class='danger'>[target] has been splashed with something by [user]!", "<span class = 'notice'>You splash the solution onto [target].</span>")
+	reagents.splash_mob(target, reagents.total_volume)
+	return 1
+
+/obj/item/weapon/reagent_containers/proc/self_feed_message(var/mob/user)
+	user << "<span class='notice'>You eat \the [src]</span>"
+
+/obj/item/weapon/reagent_containers/proc/other_feed_message_start(var/mob/user, var/mob/target)
+	user.visible_message("<span class='warning'>[user] is trying to feed [target] \the [src]!")
+
+/obj/item/weapon/reagent_containers/proc/other_feed_message_finish(var/mob/user, var/mob/target)
+	user.visible_message("<span class='warning'>[user] has fed [target] \the [src]!")
+
+/obj/item/weapon/reagent_containers/proc/feed_sound(var/mob/user)
+	return
+
+/obj/item/weapon/reagent_containers/proc/standard_feed_mob(var/mob/user, var/mob/target) // This goes into attack
+	if(!istype(target))
+		return 0
+
+	if(!reagents || !reagents.total_volume)
+		user << "<span class='notice'>\The [src] is empty.</span>"
+		return 1
+
+	if(target == user)
+		if(istype(user, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = user
+			if(H.species.flags & IS_SYNTHETIC)
+				H << "<span class='notice'>You have a monitor for a head, where do you think you're going to put that?</span>"
+				return 1
+
+		self_feed_message(user)
+		reagents.trans_to_mob(user, amount_per_transfer_from_this, CHEM_INGEST)
+		feed_sound(user)
+		return 1
+	else
+		if(istype(user, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = target
+			if(H.species.flags & IS_SYNTHETIC)
+				H << "<span class='notice'>They have a monitor for a head, where do you think you're going to put that?</span>"
+				return
+
+		other_feed_message_start(user, target)
+
+		if(!do_mob(user, target))
+			return
+
+		other_feed_message_finish(user, target)
+
+		var/contained = reagentlist()
+		target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
+		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [name] by [target.name] ([target.ckey]). Reagents: [contained]</font>")
+		msg_admin_attack("[key_name(user)] fed [key_name(target)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+
+		reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_INGEST)
+		feed_sound(user)
+		return 1
+
+/obj/item/weapon/reagent_containers/proc/standard_pour_into(var/mob/user, var/atom/target) // This goes into afterattack and yes, it's atom-level
+	if(!target.is_open_container() || !target.reagents)
+		return 0
+
+	if(!reagents || !reagents.total_volume)
+		user << "<span class='notice'>[src] is empty.</span>"
+		return 1
+
+	if(!target.reagents.get_free_space())
+		user << "<span class='notice'>[target] is full.</span>"
+		return 1
+
+	var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
+	user << "<span class='notice'>You transfer [trans] units of the solution to [target].</span>"
+	return 1