Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -229,6 +229,8 @@
 	if(href_list["ejectBeaker"])
 		if(beaker)
 			beaker.forceMove(loc)
+			if(Adjacent(usr) && !issilicon(usr))
+				usr.put_in_hands(beaker)
 			beaker = null
 			overlays.Cut()
 

code/modules/reagents/chemistry/machinery/chem_heater.dm

@@ -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)

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -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()