Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

code/game/machinery/kitchen/smartfridge.dm

@@ -23,6 +23,7 @@
 		return 1
 	return 0
 
+
 /obj/machinery/smartfridge/seeds
 	name = "\improper MegaSeed Servitor"
 	desc = "When you need seeds fast!"
@@ -36,6 +37,7 @@
 		return 1
 	return 0
 
+
 /obj/machinery/smartfridge/extract
 	name = "\improper Slime Extract Storage"
 	desc = "A refrigerated storage unit for slime extracts"
@@ -46,6 +48,29 @@
 	return 0
 
 
+/obj/machinery/smartfridge/chemistry
+	name = "\improper Smart Chemical Storage"
+	desc = "A refrigerated storage unit for medicine and chemical storage."
+
+/obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj)
+	if(istype(O,/obj/item/weapon/storage/pill_bottle) || istype(O,/obj/item/weapon/reagent_containers))
+		return 1
+	return 0
+
+/obj/machinery/smartfridge/chemistry/virology
+	name = "\improper Smart Virus Storage"
+	desc = "A refrigerated storage unit for volatile sample storage."
+
+
+/obj/machinery/smartfridge/drinks
+	name = "\improper Drink Showcase"
+	desc = "A refrigerated storage unit for tasty tasty alcohol."
+
+/obj/machinery/smartfridge/drinks/accept_check(var/obj/item/O as obj)
+	if(istype(O,/obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks) || istype(O,/obj/item/weapon/reagent_containers/food/condiment))
+		return 1
+
+
 /obj/machinery/smartfridge/power_change()
 	if( powered() )
 		src.ispowered = 1

code/modules/reagents/Chemistry-Holder.dm

@@ -121,6 +121,56 @@ datum
 				src.handle_reactions()
 				return amount
 
+			trans_to_ingest(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//For items ingested. A delay is added between ingestion and addition of the reagents
+				if (!target )
+					return
+				if (!target.reagents || src.total_volume<=0)
+					return
+
+				/*var/datum/reagents/R = target.reagents
+
+				var/obj/item/weapon/reagent_containers/glass/beaker/noreact/B = new /obj/item/weapon/reagent_containers/glass/beaker/noreact //temporary holder
+
+				amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
+				var/part = amount / src.total_volume
+				var/trans_data = null
+				for (var/datum/reagent/current_reagent in src.reagent_list)
+					if (!current_reagent)
+						continue
+					//if (current_reagent.id == "blood" && ishuman(target))
+					//	var/mob/living/carbon/human/H = target
+					//	H.inject_blood(my_atom, amount)
+					//	continue
+					var/current_reagent_transfer = current_reagent.volume * part
+					if(preserve_data)
+						trans_data = current_reagent.data
+
+					B.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data, safety = 1)	//safety checks on these so all chemicals are transferred
+					src.remove_reagent(current_reagent.id, current_reagent_transfer, safety = 1)							// to the target container before handling reactions
+
+				src.update_total()
+				B.update_total()
+				B.handle_reactions()
+				src.handle_reactions()*/
+
+				var/obj/item/weapon/reagent_containers/glass/beaker/noreact/B = new /obj/item/weapon/reagent_containers/glass/beaker/noreact //temporary holder
+				B.volume = 1000
+
+				var/datum/reagents/BR = B.reagents
+				var/datum/reagents/R = target.reagents
+
+				amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
+
+				src.trans_to(B, amount)
+
+				spawn(95)
+					BR.reaction(target, INGEST)
+					spawn(5)
+						BR.trans_to(target, BR.total_volume)
+						del(B)
+
+				return amount
+
 			copy_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1, var/safety = 0)
 				if(!target)
 					return

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

@@ -23,9 +23,7 @@
 		if(M == user)
 			M << "\blue You swallow a gulp of [src]."
 			if(reagents.total_volume)
-				reagents.reaction(M, INGEST)
-				spawn(5)
-					reagents.trans_to(M, gulp_size)
+				reagents.trans_to_ingest(M, gulp_size)
 
 			playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
 			return 1
@@ -42,9 +40,7 @@
 			msg_admin_attack("[key_name(user)] fed [key_name(M)] with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
 			if(reagents.total_volume)
-				reagents.reaction(M, INGEST)
-				spawn(5)
-					reagents.trans_to(M, gulp_size)
+				reagents.trans_to_ingest(M, gulp_size)
 
 			if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
 				var/mob/living/silicon/robot/bro = user

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

@@ -29,9 +29,7 @@
 		if(M == user)
 			M << "\blue You swallow some of contents of the [src]."
 			if(reagents.total_volume)
-				reagents.reaction(M, INGEST)
-				spawn(5)
-					reagents.trans_to(M, 10)
+				reagents.trans_to_ingest(M, 10)
 
 			playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
 			return 1
@@ -48,9 +46,7 @@
 			msg_admin_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
 			if(reagents.total_volume)
-				reagents.reaction(M, INGEST)
-				spawn(5)
-					reagents.trans_to(M, 10)
+				reagents.trans_to_ingest(M, 10)
 
 			playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
 			return 1

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

@@ -29,9 +29,7 @@
 		if(M == user)
 			M << "\blue You swallow a gulp of [src]."
 			if(reagents.total_volume)
-				reagents.reaction(M, INGEST)
-				spawn(5)
-					reagents.trans_to(M, gulp_size)
+				reagents.trans_to_ingest(M, gulp_size)
 
 			playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
 			return 1
@@ -48,9 +46,7 @@
 			msg_admin_attack("[key_name(user)] fed [key_name(M)] with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
 			if(reagents.total_volume)
-				reagents.reaction(M, INGEST)
-				spawn(5)
-					reagents.trans_to(M, gulp_size)
+				reagents.trans_to_ingest(M, gulp_size)
 
 			if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
 				var/mob/living/silicon/robot/bro = user

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

@@ -78,20 +78,18 @@
 		if(reagents)								//Handle ingestion of the reagent.
 			playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
 			if(reagents.total_volume)
-				reagents.reaction(M, INGEST)
-				spawn(5)
-					if(reagents.total_volume > bitesize)
-						/*
-						 * I totally cannot understand what this code supposed to do.
-						 * Right now every snack consumes in 2 bites, my popcorn does not work right, so I simplify it. -- rastaf0
-						var/temp_bitesize =  max(reagents.total_volume /2, bitesize)
-						reagents.trans_to(M, temp_bitesize)
-						*/
-						reagents.trans_to(M, bitesize)
-					else
-						reagents.trans_to(M, reagents.total_volume)
-					bitecount++
-					On_Consume(M)
+				if(reagents.total_volume > bitesize)
+					/*
+					 * I totally cannot understand what this code supposed to do.
+					 * Right now every snack consumes in 2 bites, my popcorn does not work right, so I simplify it. -- rastaf0
+					var/temp_bitesize =  max(reagents.total_volume /2, bitesize)
+					reagents.trans_to(M, temp_bitesize)
+					*/
+					reagents.trans_to_ingest(M, bitesize)
+				else
+					reagents.trans_to_ingest(M, reagents.total_volume)
+				bitecount++
+				On_Consume(M)
 			return 1
 
 	return 0

code/modules/reagents/reagent_containers/glass.dm

@@ -122,6 +122,9 @@
 		else if(istype(target, /obj/machinery/bunsen_burner))
 			return
 
+		else if(istype(target, /obj/machinery/smartfridge))
+			return
+
 		else if(istype(target, /obj/machinery/radiocarbon_spectrometer))
 			return
 

code/modules/reagents/reagent_containers/pill.dm

@@ -22,10 +22,8 @@
 			M << "\blue You swallow [src]."
 			M.drop_from_inventory(src) //icon update
 			if(reagents.total_volume)
-				reagents.reaction(M, INGEST)
-				spawn(5)
-					reagents.trans_to(M, reagents.total_volume)
-					del(src)
+				reagents.trans_to_ingest(M, reagents.total_volume)
+				del(src)
 			else
 				del(src)
 			return 1
@@ -46,10 +44,8 @@
 			msg_admin_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
 			if(reagents.total_volume)
-				reagents.reaction(M, INGEST)
-				spawn(5)
-					reagents.trans_to(M, reagents.total_volume)
-					del(src)
+				reagents.trans_to_ingest(M, reagents.total_volume)
+				del(src)
 			else
 				del(src)