From ef78be0595e00c24618f0aa96be26ab53d3f6b06 Mon Sep 17 00:00:00 2001 From: Miauw Date: Sat, 8 Nov 2014 15:28:32 +0100 Subject: [PATCH] Fixes grinders opening their menus on range. Fixed #4088 --- code/datums/browser.dm | 2 +- code/modules/reagents/Chemistry-Machinery.dm | 40 +++++++++++--------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 2b1fbfe8ccea..0285f2be06c9 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -78,7 +78,7 @@ [title ? "
[title]
" : ""]
"} - +//" This is here because else the rest of the file looks like a string in notepad++. /datum/browser/proc/get_footer() return {"
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 175f1e916fdb..b9ed92e6af0f 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -1015,26 +1015,26 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) dat += "Detach the beaker
" else dat += "Please wait..." - user << browse("All-In-One Grinder[dat]", "window=reagentgrinder") - onclose(user, "reagentgrinder") - return + var/datum/browser/popup = new(user, "reagentgrinder", "All-In-One Grinder") + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open(1) + return /obj/machinery/reagentgrinder/Topic(href, href_list) - if(..()) - return - usr.set_machine(src) - switch(href_list["action"]) - if ("grind") - grind() - if("juice") - juice() - if("eject") - eject() - if ("detach") - detach() - src.updateUsrDialog() + if(..()) return + usr.set_machine(src) + switch(href_list["action"]) + if ("grind") + grind() + if("juice") + juice() + if("eject") + eject() + if ("detach") + detach() /obj/machinery/reagentgrinder/proc/detach() @@ -1045,6 +1045,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) beaker.loc = src.loc beaker = null update_icon() + updateUsrDialog() /obj/machinery/reagentgrinder/proc/eject() @@ -1057,6 +1058,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) O.loc = src.loc holdingitems -= O holdingitems = list() + updateUsrDialog() /obj/machinery/reagentgrinder/proc/is_allowed(var/obj/item/weapon/reagent_containers/O) for (var/i in blend_items) @@ -1109,7 +1111,8 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) inuse = 1 spawn(50) inuse = 0 - interact(usr) + updateUsrDialog() + //Snacks for (var/obj/item/weapon/reagent_containers/food/snacks/O in holdingitems) if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) @@ -1142,7 +1145,8 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) inuse = 1 spawn(60) inuse = 0 - interact(usr) + updateUsrDialog() + //Snacks and Plants for (var/obj/item/weapon/reagent_containers/food/snacks/O in holdingitems) if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)