From 550aef34ba802a1475c210673957ef67bb128c77 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 4 Jan 2016 21:54:47 -0500 Subject: [PATCH] less copy-paste --- code/modules/reagents/Chemistry-Machinery.dm | 32 ++------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index e306157bb81..f9c8dead1b8 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -794,36 +794,8 @@ else user << "You can't use the [src.name] while it's panel is opened!" return 1 - - if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass)) - - if(beaker) - user << "A beaker is already loaded into the machine." - return - if(!user.drop_item()) - user << "\The [B] is stuck to you!" - return - beaker = B - B.forceMove(src) - user << "You add the beaker to the machine!" - src.updateUsrDialog() - icon_state = "mixer1" - - else if(istype(B, /obj/item/weapon/storage/pill_bottle)) - - if(loaded_pill_bottle) - user << "A pill bottle is already loaded into the machine." - return - - if(!user.drop_item()) - user << "\The [B] is stuck to you!" - return - loaded_pill_bottle = B - B.forceMove(src) - user << "You add the pill bottle into the dispenser slot!" - src.updateUsrDialog() - - return + else + ..() /obj/machinery/reagentgrinder