From 9f6cc85d7a00723dd67880fd9211c9538b6c4bdf Mon Sep 17 00:00:00 2001 From: DZD Date: Sat, 22 Aug 2015 14:02:41 -0400 Subject: [PATCH] Bug fixes - Fixes not being able to put multiple items into a processor. - Fixes monkey recycler design having the same ID as the smartfridge. --- code/game/machinery/kitchen/processor.dm | 9 +-------- code/modules/research/designs/machine_designs.dm | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index 69ae121e838..b90affbcd6c 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -137,10 +137,6 @@ return 0 /obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) - if(!istype(O)) - return - - var/obj/item/what = O if(src.processing) user << "\the [src] is already processing something!" @@ -157,10 +153,7 @@ default_deconstruction_crowbar(O) - if(src.contents.len > 0) //TODO: several items at once? several different items? - user << "Something is already in the processing chamber." - return 1 - + var/obj/item/what = O if (istype(O, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = O diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 7509fc8caec..6693b97a905 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -265,7 +265,7 @@ /datum/design/monkey_recycler name = "Machine Design (Monkey Recycler Board)" desc = "The circuit board for a monkey recycler." - id = "smartfridge" + id = "monkey_recycler" req_tech = list("programming" = 1) build_type = IMPRINTER materials = list("$glass" = 1000, "sacid" = 20)