Puts beakers in your hand on eject (#34787)

This commit is contained in:
Dax Dupont
2018-01-24 07:28:23 +01:00
committed by CitadelStationBot
parent f4a817be01
commit e47e31ff1d
4 changed files with 14 additions and 5 deletions
@@ -182,6 +182,8 @@
if("eject")
if(beaker)
beaker.forceMove(drop_location())
if(Adjacent(usr) && !issilicon(usr))
usr.put_in_hands(beaker)
beaker = null
cut_overlays()
. = TRUE
@@ -29,9 +29,11 @@
else
icon_state = "mixer0b"
/obj/machinery/chem_heater/proc/eject_beaker()
/obj/machinery/chem_heater/proc/eject_beaker(mob/user)
if(beaker)
beaker.forceMove(drop_location())
if(Adjacent(user) && !issilicon(user))
user.put_in_hands(beaker)
beaker = null
update_icon()
@@ -129,5 +131,5 @@
target_temperature = CLAMP(target, 0, 1000)
if("eject")
on = FALSE
eject_beaker()
eject_beaker(usr)
. = TRUE
@@ -59,10 +59,13 @@
else
icon_state = "mixer0"
/obj/machinery/chem_master/proc/eject_beaker()
/obj/machinery/chem_master/proc/eject_beaker(mob/user)
if(beaker)
beaker.forceMove(drop_location())
adjust_item_drop_location(beaker)
if(Adjacent(user) && !issilicon(user))
user.put_in_hands(beaker)
else
adjust_item_drop_location(beaker)
beaker = null
update_icon()
@@ -169,7 +172,7 @@
return
switch(action)
if("eject")
eject_beaker()
eject_beaker(usr)
. = TRUE
if("ejectp")
@@ -201,6 +201,8 @@
if(!beaker)
return
beaker.forceMove(drop_location())
if(Adjacent(user) && !issilicon(user))
user.put_in_hands(beaker)
beaker = null
update_icon()
updateUsrDialog()