SUCCESFUL MERGE IS A GO

•Added east+west sprites for the lit hardhat. They were missing.
•Removed silly extra lines of code in the new foodstuffs, also changed the muffins recipe a bit since it's conflicting for some reason, and is producing donuts.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@76 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/Chemistry-Tools.dm

@@ -1450,6 +1450,13 @@
 		R.my_atom = src
 		R.add_reagent("beer", 30)
 
+/obj/item/weapon/reagent_containers/food/drinks/milk
+	name = "Space Milk"
+	desc = "It's milk. White and nutritious goodness!"
+	icon_state = "milk"
+	heal_amt = 2
+
+
 //Pills
 /obj/item/weapon/reagent_containers/pill/antitox
 	name = "Anti-toxins pill"
@@ -1541,31 +1548,3 @@
 		reagents.add_reagent("beer",1000)
 
 
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//Meatbread slicing RIGHT BELOW*************
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-/obj/item/weapon/reagent_containers/food/snacks/meatbread/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
-		W.visible_message(" <B>[usr] slices the meatbread! </B>", 1)
-		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
-		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
-		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
-		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
-		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
-		del(src)
-		return
-
-
-/obj/item/weapon/reagent_containers/food/snacks/cheesewheel/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/kitchenknife /* || /obj/item/weapon/scalpel*/))
-		W.visible_message(" <B>[usr] slices the cheese! </B>", 1)
-		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
-		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
-		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
-		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
-		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
-		del(src)
-		return

code/game/machinery/microwave.dm

@@ -2,6 +2,7 @@
 	var/egg_amount = 0
 	var/flour_amount = 0
 	var/water_amount = 0
+	var/cheese_amount = 0
 	var/monkeymeat_amount = 0
 	var/xenomeat_amount = 0
 	var/humanmeat_amount = 0
@@ -65,6 +66,30 @@
 	xenomeat_amount = 1
 	creates = "/obj/item/weapon/reagent_containers/food/snacks/xenoburger"
 
+/datum/recipe/meatbread
+	flour_amount = 3
+	monkeymeat_amount = 3
+	cheese_amount = 3
+	creates = "/obj/item/weapon/reagent_containers/food/snacks/meatbread"
+
+/datum/recipe/meatbreadhuman
+	flour_amount = 3
+	humanmeat_amount = 3
+	cheese_amount = 3
+	creates = "/obj/item/weapon/reagent_containers/food/snacks/meatbread"
+
+/datum/recipe/omelette
+	egg_amount = 2
+	cheese_amount = 2
+	creates = "/obj/item/weapon/reagent_containers/food/snacks/omelette"
+
+/datum/recipe/muffin
+	egg_amount = 2
+	flour_amount = 1
+	extra_item = /obj/item/weapon/reagent_containers/food/drinks/milk
+	creates = "/obj/item/weapon/reagent_containers/food/snacks/muffin"
+
+
 /obj/machinery/microwave/New() // *** After making the recipe in defines\obj\food.dmi, add it in here! ***
 	..()
 	src.available_recipes += new /datum/recipe/donut(src)
@@ -78,6 +103,10 @@
 	src.available_recipes += new /datum/recipe/donkpocket_warm(src)
 	src.available_recipes += new /datum/recipe/pie(src)
 	src.available_recipes += new /datum/recipe/xenoburger(src)
+	src.available_recipes += new /datum/recipe/meatbread(src)
+	src.available_recipes += new /datum/recipe/meatbreadhuman(src)
+	src.available_recipes += new /datum/recipe/omelette (src)
+	src.available_recipes += new /datum/recipe/muffin (src)
 
 
 /*******************
@@ -126,6 +155,12 @@ obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob)
 				V.show_message(text("\blue [user] adds some flour to the microwave."))
 			src.flour_amount++
 			del(O)
+	else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge)) // If cheese is used, add it
+		if(src.cheese_amount < 5)
+			for(var/mob/V in viewers(src, null))
+				V.show_message(text("\blue [user] adds some cheese to the microwave."))
+			src.cheese_amount++
+			del(O)
 	else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeymeat))
 		if(src.monkeymeat_amount < 5)
 			for(var/mob/V in viewers(src, null))
@@ -197,6 +232,7 @@ Please clean it before use!</TT><BR>
 		dat = {"
 <B>Eggs:</B>[src.egg_amount] eggs<BR>
 <B>Flour:</B>[src.flour_amount] cups of flour<BR>
+<B>Cheese:</B>[src.cheese_amount] cheese wedges<BR>
 <B>Monkey Meat:</B>[src.monkeymeat_amount] slabs of meat<BR>
 <B>Meat Turnovers:</B>[src.donkpocket_amount] turnovers<BR>
 <B>Other Meat:</B>[src.humanmeat_amount] slabs of meat<BR>
@@ -240,6 +276,7 @@ Please clean it before use!</TT><BR>
 							src.egg_amount = 0 // If so remove all the eggs
 							src.flour_amount = 0 // And the flour
 							src.water_amount = 0 //And the water
+							src.cheese_amount = 0 //And the cheese
 							src.monkeymeat_amount = 0
 							src.humanmeat_amount = 0
 							src.donkpocket_amount = 0
@@ -253,6 +290,7 @@ Please clean it before use!</TT><BR>
 						src.updateUsrDialog()
 						src.egg_amount = 0 //Clear all the values as this crap is what makes the mess inside!!
 						src.flour_amount = 0
+						src.cheese_amount = 0
 						src.water_amount = 0
 						src.humanmeat_amount = 0
 						src.monkeymeat_amount = 0
@@ -276,6 +314,7 @@ Please clean it before use!</TT><BR>
 						src.updateUsrDialog()
 						src.egg_amount = 0 //Clear all the values as this crap is gone when it breaks!!
 						src.flour_amount = 0
+						src.cheese_amount = 0
 						src.water_amount = 0
 						src.humanmeat_amount = 0
 						src.monkeymeat_amount = 0
@@ -304,6 +343,7 @@ Please clean it before use!</TT><BR>
 			if(operation == 2) // If dispose was pressed, empty the microwave
 				src.egg_amount = 0
 				src.flour_amount = 0
+				src.cheese_amount = 0
 				src.water_amount = 0
 				src.humanmeat_amount = 0
 				src.monkeymeat_amount = 0
@@ -339,3 +379,34 @@ Please clean it before use!</TT><BR>
 					src.icon_state = "mw"
 			else
 				return
+
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//Meatbread slicing RIGHT BELOW*************
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+/obj/item/weapon/reagent_containers/food/snacks/meatbread/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
+		W.visible_message(" <B>[usr] slices the meatbread! </B>", 1)
+		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
+		del(src)
+		return
+
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesewheel/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/kitchenknife /* || /obj/item/weapon/scalpel*/))
+		W.visible_message(" <B>[usr] slices the cheese! </B>", 1)
+		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
+		del(src)
+		return
+