Merge pull request #10947 from Ghommie/Ghommie-cit563

Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
parent c7176b522f 9ee2ede0e7
commit f79148d549
6 changed files with 24 additions and 22 deletions
@@ -71,10 +71,11 @@ All foods are distributed among various categories. Use common sense.
 	if(!eater)
 		return
 	if(!reagents.total_volume)
-		var/obj/item/trash_item = generate_trash(eater)
+		var/mob/living/location = loc
+		var/obj/item/trash_item = generate_trash(location)
 		qdel(src)
-		eater.put_in_hands(trash_item)
-
+		if(istype(location))
+			location.put_in_hands(trash_item)

 /obj/item/reagent_containers/food/snacks/attack_self(mob/user)
 	return