From 61ea7b328b8b90015eaa87cb41ae349d6942191a Mon Sep 17 00:00:00 2001 From: uporotiy Date: Tue, 19 Oct 2010 10:08:06 +0000 Subject: [PATCH] Fixed the food processor. It also can't be abused to make tons of food now. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@322 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/machinery.dm | 1 + code/game/machinery/processor.dm | 35 +++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index 808f95c2948..7a9b9c5ad01 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -671,6 +671,7 @@ density = 1 anchored = 1 var/broken = 0 + var/processing = 0 /obj/machinery/gibber name = "Gibber" diff --git a/code/game/machinery/processor.dm b/code/game/machinery/processor.dm index 160afb9a989..6324e28dab6 100644 --- a/code/game/machinery/processor.dm +++ b/code/game/machinery/processor.dm @@ -6,6 +6,11 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob) 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)) user.drop_item() O.loc = src + else if(istype(O,/obj/item/weapon/grab)) + var/obj/item/weapon/grab/G = O + if(istype(G.affecting, /mob/living/carbon/alien/larva/metroid)) + G.affecting.loc = src + user.drop_item() else user << "That probably won't blend." return 0 @@ -13,41 +18,68 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob) /obj/machinery/processor/attack_hand(user as mob) + if(src.processing) + user << "The processor is in the process of processing." + return for(var/obj/O in src.contents) if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat)) + 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/flour(src.loc) + src.processing = 0 return if(istype(O, /obj/item/weapon/reagent_containers/food/drinks/milk)) + 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/cheesewheel(src.loc) + src.processing = 0 return if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/chili)) + 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/hotsauce(src.loc) + src.processing = 0 return if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato)) + 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/ketchup(src.loc) + src.processing = 0 + return + for(var/mob/O in src.contents) + if(istype(O, /mob/living/carbon/alien/larva/metroid)) + 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].")) + var/mob/dead/observer/newmob + if (O.client) + newmob = new/mob/dead/observer(O) + O:client:mob = newmob + newmob:client:eye = newmob + del(O) + new /obj/item/weapon/reagent_containers/food/drinks/jar(src.loc) + src.processing = 0 return user << "There doesn't appear to be anything in the processing chamber." - +/* /obj/machinery/processor/attackby(obj/item/weapon/grab/G as obj, mob/user as mob) if(istype(G.affecting, /mob/living/carbon/alien/larva/metroid)) sleep(40) @@ -62,6 +94,7 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob) del(G.affecting) del(G) new /obj/item/weapon/reagent_containers/food/drinks/jar(src.loc) +*/ /* /obj/item/weapon/reagent_containers/food/snacks/grown/berries