A Big Kitchen Update.

A new powerful microwave code allows completely new recipes.
All cooked food all have transferred in all the reagents which ingredients had (except of nutriments).
A new neat food sprites from Farart.
New/changed recipes for cooking with microwave:
- Berry Pie was replaced with Berry Clafoutis with new sprite. Recipe: 2 flour, 1 egg, 2 berries (not berryjuice);
- Fortune cookies: 1 flour, 1 egg, piece of paper with prophecy;
- Meat stake: 1 unit of salt, 1 unit of black pepper, 1 slab of meat;
- Pizza "Margherita": 2 flour, 4 wedges of cheese, 1 tomato;
- Meat Pizza: 2 flour, 2 slabs of meat, 1 wedge of cheese, 1 tomato;
- Mushroom Pizza: 2 flour, 5 any mushrooms;
- Vegetable Pizza: 2 flour, 1 eggplant, 1 carrot, 1 corn, 1 tomato;
- Spacy Liberty Duff: 10 units of water, 5 units of vodka, 3 Liberty Caps;
- Amanita Jelly: 5 units of water, 10 units of vodka, 3 Amanitas;
- Meatball Soup: 20 units of water, 1 meatball (aka faggot), 1 carrot, 1 potato;
- Vegetable Soup: 20 units of water, 1 carrot, 1 corn, 1 eggplant, 1 potato;
- Meatball Soup: 20 units of water, 1 meatball (aka faggot), 1 carrot, 1 potato;
- Nettle Soup: 20 units of water, 1 nettle, 1 egg, 1 potato;
- Hot Chili stew: 1 slab of meat, 1 chili pepper, 1 tomato;
- Cold Chili stew: 1 slab of meat, 1 ice pepper, 1 tomato;
Other bugfixes:
Fixed items showing under vendomats/microwaves.
Activated item_state for anesthetic tank.
Runes are under tables and doors now.
Fixed runtime errors caused by some reagents.


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

code/game/objects/closets/kitchen.dm

@@ -42,12 +42,12 @@
 	sleep(2)
 	new /obj/item/kitchen/egg_box(src)
 	new /obj/item/kitchen/egg_box(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/monkeymeat(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/monkeymeat(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
 	new /obj/item/weapon/kitchenknife(src)
 	if(prob(95))
-		new /obj/item/weapon/reagent_containers/food/snacks/monkeymeat(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/monkeymeat(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
 	else
 		new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src)
 		new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src)

code/game/objects/items/helper_procs.dm

@@ -67,8 +67,6 @@
 
 /proc/is_type_in_list(var/atom/A, var/list/L)
 	for(var/type in L)
-		if(isnull(type))
-			continue
 		if(istype(A, type))
 			return 1
 	return 0
@@ -89,36 +87,36 @@ var/global/list/common_tools = list(
 	return 0
 
 /proc/iswrench(O)
-	if(O && istype(O, /obj/item/weapon/wrench))
+	if(istype(O, /obj/item/weapon/wrench))
 		return 1
 	return 0
 
 /proc/iswelder(O)
-	if(O && istype(O, /obj/item/weapon/weldingtool))
+	if(istype(O, /obj/item/weapon/weldingtool))
 		return 1
 	return 0
 
 /proc/iscoil(O)
-	if(O && istype(O, /obj/item/weapon/cable_coil))
+	if(istype(O, /obj/item/weapon/cable_coil))
 		return 1
 	return 0
 
 /proc/iswirecutter(O)
-	if(O && istype(O, /obj/item/weapon/wirecutters))
+	if(istype(O, /obj/item/weapon/wirecutters))
 		return 1
 	return 0
 
 /proc/isscrewdriver(O)
-	if(O && istype(O, /obj/item/weapon/screwdriver))
+	if(istype(O, /obj/item/weapon/screwdriver))
 		return 1
 	return 0
 
 /proc/ismultitool(O)
-	if(O && istype(O, /obj/item/device/multitool))
+	if(istype(O, /obj/item/device/multitool))
 		return 1
 	return 0
 
 /proc/iscrowbar(O)
-	if(O && istype(O, /obj/item/weapon/crowbar))
+	if(istype(O, /obj/item/weapon/crowbar))
 		return 1
 	return 0

code/game/objects/kitchen.dm

@@ -58,11 +58,11 @@
 			if(src.meattype == 1)
 				if(src.meat > 1)
 					src.meat--
-					new /obj/item/weapon/reagent_containers/food/snacks/monkeymeat( src.loc )
+					new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey( src.loc )
 					usr << "You remove some meat from the monkey."
 				else if(src.meat == 1)
 					src.meat--
-					new /obj/item/weapon/reagent_containers/food/snacks/monkeymeat(src.loc)
+					new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src.loc)
 					usr << "You remove the last piece of meat from the monkey!"
 					src.icon_state = "spike"
 					src.occupied = 0