Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-02-19 19:12:27 -07:00
parent 9289ca8873 7151f3d2ea
commit c7273c03be
73 changed files with 384 additions and 123 deletions
@@ -319,7 +319,7 @@
 /obj/machinery/icecream_vat/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
 	if(beaker)
 		beaker.forceMove(drop_location())
-		if(user && Adjacent(user) && !issiliconoradminghost(user))
+		if(user && Adjacent(user) && user.can_hold_items())
 			user.put_in_hands(beaker)
 	if(new_beaker)
 		beaker = new_beaker