Merge pull request #8236 from phil235/DoughChange

Dough change

code/modules/reagents/Chemistry-Machinery.dm

@@ -922,6 +922,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
 				/obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
 				/obj/item/weapon/reagent_containers/food/snacks/grown/oat = list("flour" = -5),
 				/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
+				/obj/item/weapon/reagent_containers/food/snacks/egg = list("eggyolk" = -5),
 
 				//Grinder stuff, but only if dry
 				/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/arabica = list("coffeepowder" = 0),

code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm

@@ -404,3 +404,9 @@ datum/reagent/consumable/vanilla
 	reagent_state = SOLID
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#FFFACD"
+
+datum/reagent/consumable/eggyolk
+	name = "Egg Yolk"
+	id = "eggyolk"
+	description = "It's full of protein."
+	color = "#FFB500"

code/modules/reagents/reagent_containers.dm

@@ -77,21 +77,3 @@
 
 			return 0
 	return 1
-
-/obj/item/weapon/reagent_containers/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg)) //making dough
-		var/obj/item/weapon/reagent_containers/food/snacks/egg/E = W
-		if(flags & OPENCONTAINER)
-			if(reagents)
-				if(reagents.has_reagent("flour"))
-					if(reagents.get_reagent_amount("flour") >= 15)
-						var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/dough(get_turf(src))
-						user << "<span class='notice'>You mix egg and flour to make some dough.</span>"
-						reagents.remove_reagent("flour", 15)
-						if(E.reagents)
-							E.reagents.trans_to(S,E.reagents.total_volume)
-						qdel(E)
-					else
-						user << "<span class='notice'>Not enough flour to make dough.</span>"
-			return
-	..()

code/modules/reagents/reagent_containers/glass.dm

@@ -102,6 +102,17 @@
 				reagents.handle_reactions()
 			else
 				user << "<span class='warning'>[src] is already hotter than [I].</span>"
+
+	if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/egg)) //breaking eggs
+		var/obj/item/weapon/reagent_containers/food/snacks/egg/E = I
+		if(reagents)
+			if(reagents.total_volume >= reagents.maximum_volume)
+				user << "<span class='notice'>[src] is full.</span>"
+			else
+				user << "<span class='notice'>You break [E] in [src].</span>"
+				reagents.add_reagent("eggyolk", 5)
+				qdel(E)
+			return
 	..()