Committing Malkevin's fix for syndie cakes not having doctor delight in them.

I added a warning log message when a non-existing reagent is trying to be added, to avoid this in the future.

Committing SuperSayu's fix for conveyor belts moving items that were just taken off the belt.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5269 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/reagents/Chemistry-Holder.dm

@@ -393,6 +393,8 @@ datum
 					my_atom.on_reagent_change()
 					handle_reactions()
 					return 0
+				else
+					warning("[my_atom] attempted to add a reagent called '[reagent]' which doesn't exist. ([usr])")
 
 				handle_reactions()
 

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1022,7 +1022,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 4)
-		reagents.add_reagent("doctor_delight", 2)
+		reagents.add_reagent("doctorsdelight", 5)
 		bitesize = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
@@ -1754,7 +1754,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 8)
-		reagents.add_reagent("doctor_delight", 5)
+		reagents.add_reagent("doctorsdelight", 5)
 		bitesize = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/appletart

code/modules/recycling/conveyor2.dm

@@ -85,7 +85,7 @@
 		var/items_moved = 0
 		for(var/atom/movable/A in affecting)
 			if(!A.anchored)
-				if(isturf(A.loc)) // this is to prevent an ugly bug that forces a player to drop what they're holding if they recently pick it up from the conveyer belt
+				if(A.loc == src.loc) // prevents the object from being affected if it's not currently here.
 					step(A,movedir)
 					items_moved++
 			if(items_moved >= 10)