Puts beakers in your hand on eject from chemistry machines

This commit is contained in:
Arkatos1
2019-04-25 11:41:27 +02:00
parent 1544756ce6
commit 4424eb732f
3 changed files with 8 additions and 2 deletions
@@ -184,6 +184,8 @@
if(href_list["ejectBeaker"])
if(beaker)
beaker.forceMove(loc)
if(Adjacent(usr) && !issilicon(usr))
usr.put_in_hands(beaker)
beaker = null
overlays.Cut()
@@ -38,9 +38,11 @@
if(state_change)
SSnanoui.update_uis(src)
/obj/machinery/chem_heater/proc/eject_beaker()
/obj/machinery/chem_heater/proc/eject_beaker(mob/user)
if(beaker)
beaker.forceMove(get_turf(src))
if(Adjacent(user) && !issilicon(user))
user.put_in_hands(beaker)
beaker = null
icon_state = "mixer0b"
on = FALSE
@@ -118,7 +120,7 @@
. = 1
if(href_list["eject_beaker"])
eject_beaker()
eject_beaker(usr)
. = 0 //updated in eject_beaker() already
/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null)
@@ -229,6 +229,8 @@
else if(href_list["eject"])
if(beaker)
beaker.forceMove(get_turf(src))
if(Adjacent(usr) && !issilicon(usr))
usr.put_in_hands(beaker)
beaker = null
reagents.clear_reagents()
update_icon()