alt click to remove containers from reagent grinder and biogenerator

This commit is contained in:
coldud13
2020-06-02 19:10:41 +10:00
parent 9fda4052b4
commit 17d4c99b25
2 changed files with 13 additions and 3 deletions

View File

@@ -205,6 +205,11 @@
popup.set_content(dat) popup.set_content(dat)
popup.open() popup.open()
/obj/machinery/biogenerator/AltClick(mob/living/user)
. = ..()
if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
detach(user)
/obj/machinery/biogenerator/proc/activate() /obj/machinery/biogenerator/proc/activate()
if (usr.stat != CONSCIOUS) if (usr.stat != CONSCIOUS)
return return
@@ -293,9 +298,9 @@
update_icon() update_icon()
return . return .
/obj/machinery/biogenerator/proc/detach() /obj/machinery/biogenerator/proc/detach(mob/living/user)
if(beaker) if(beaker)
beaker.forceMove(drop_location()) user.put_in_hands(beaker)
beaker = null beaker = null
update_icon() update_icon()
@@ -310,7 +315,7 @@
updateUsrDialog() updateUsrDialog()
else if(href_list["detach"]) else if(href_list["detach"])
detach() detach(usr)
updateUsrDialog() updateUsrDialog()
else if(href_list["create"]) else if(href_list["create"])

View File

@@ -213,6 +213,11 @@
for(var/datum/reagent/R in beaker.reagents.reagent_list) for(var/datum/reagent/R in beaker.reagents.reagent_list)
. += "<span class='notice'>- [R.volume] units of [R.name].</span>" . += "<span class='notice'>- [R.volume] units of [R.name].</span>"
/obj/machinery/reagentgrinder/AltClick(mob/user)
. = ..()
if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
replace_beaker(user)
/obj/machinery/reagentgrinder/proc/eject(mob/user) /obj/machinery/reagentgrinder/proc/eject(mob/user)
for(var/i in holdingitems) for(var/i in holdingitems)
var/obj/item/O = i var/obj/item/O = i