Merge pull request #9502 from Putnam3145/pandemic-qol2

Makes beaker spawn on pandemic instead of on user when hands full
This commit is contained in:
kevinz000
2019-10-15 22:53:44 -07:00
committed by GitHub

View File

@@ -244,9 +244,9 @@
/obj/machinery/computer/pandemic/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
if(beaker)
beaker.forceMove(drop_location())
if(user && Adjacent(user) && !issiliconoradminghost(user))
user.put_in_hands(beaker)
if(!user.put_in_hands(beaker))
beaker.forceMove(drop_location())
if(new_beaker)
beaker = new_beaker
else