From da78abceaf21f2e629da0af432089d0046db86ac Mon Sep 17 00:00:00 2001 From: "musketstgstation@gmail.com" Date: Thu, 11 Nov 2010 19:34:54 +0000 Subject: [PATCH] Kitchen recipe fixes and updates. (Courtesy of K0000) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@409 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/microwave.dm | 6 ++++++ code/game/machinery/processor.dm | 35 +++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/code/game/machinery/microwave.dm b/code/game/machinery/microwave.dm index 40a7ce9e154..a087e523194 100644 --- a/code/game/machinery/microwave.dm +++ b/code/game/machinery/microwave.dm @@ -111,6 +111,11 @@ extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans creates = "/obj/item/weapon/reagent_containers/food/snacks/soylenviridians" +/datum/recipe/soylentgreen + flour_amount = 3 + humanmeat_amount = 2 + creates = "/obj/item/weapon/reagent_containers/food/snacks/soylentgreen" + /datum/recipe/carrotcake flour_amount = 3 egg_amount = 3 @@ -194,6 +199,7 @@ src.available_recipes += new /datum/recipe/muffin (src) src.available_recipes += new /datum/recipe/eggplantparm(src) src.available_recipes += new /datum/recipe/soylenviridians(src) + src.available_recipes += new /datum/recipe/soylentgreen(src) src.available_recipes += new /datum/recipe/carrotcake(src) src.available_recipes += new /datum/recipe/cheesecake(src) src.available_recipes += new /datum/recipe/plaincake(src) diff --git a/code/game/machinery/processor.dm b/code/game/machinery/processor.dm index 628fc7d07cb..34d7d764f9f 100644 --- a/code/game/machinery/processor.dm +++ b/code/game/machinery/processor.dm @@ -3,7 +3,7 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob) user << "Something is already in the processing chamber." return 0 else - if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/chili) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato) || istype(O, /obj/item/weapon/reagent_containers/food/drinks/milk) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/berries) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/humanmeat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper)) + if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/chili) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato) || istype(O, /obj/item/weapon/reagent_containers/food/drinks/milk) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/berries) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/humanmeat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeymeat)) user.drop_item() O.loc = src else if(istype(O,/obj/item/weapon/grab)) @@ -74,17 +74,6 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob) src.processing = 0 return - if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/humanmeat)) - src.processing = 1 - sleep(40) - playsound(src.loc, 'blender.ogg', 50, 1) - for(var/mob/V in viewers(src, null)) - V.show_message(text("\blue [user] turns on \a [src].")) - del(O) - new /obj/item/weapon/reagent_containers/food/snacks/soylentgreen(src.loc) - processing = 0 - return - if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans)) src.processing = 1 sleep(40) @@ -107,6 +96,28 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob) src.processing = 0 return + if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeymeat)) + src.processing = 1 + sleep(40) + playsound(src.loc, 'blender.ogg', 50, 1) + for(var/mob/V in viewers(src, null)) + V.show_message(text("\blue [user] turns on \a [src].")) + del(O) + new /obj/item/weapon/reagent_containers/food/snacks/faggot(src.loc) + src.processing = 0 + return + + if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/humanmeat)) + src.processing = 1 + sleep(40) + playsound(src.loc, 'blender.ogg', 50, 1) + for(var/mob/V in viewers(src, null)) + V.show_message(text("\blue [user] turns on \a [src].")) + del(O) + new /obj/item/weapon/reagent_containers/food/snacks/faggot(src.loc) + processing = 0 + return + for(var/mob/O in src.contents) if(istype(O, /mob/living/carbon/alien/larva/metroid)) src.processing = 1