Bugfixes:

◦ Some head gear (nurse masks, kitty ears...) no longer block CPR. (Issue 167)
     ◦ DNA Scanners no longer attempt to empty their contents whenever something enters them. This fixes the issue with constructed scanners puking out the circuitry they were made with. (Issue 169)
     ◦ You can longer /me emote when you've been paralyzed by Zombie Powder. (Issue 168)
     ◦ Fixed some problems with MMIs / Robots / pAIs being able to understand eachother.


◦ You can put items, that are not clothing/under or clothing/suit, on food trays. How it works is it loops through all acceptable items in the location and adds them to its overlays and a special list variable. I had to change the way mob/drop_item() works a bit. Trays have a maximum capacity, and items of a larger w_class take up more capacity.

◦ Slippery items like banana peels and soap have been nerfed significantly.


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

code/game/objects/storage/storage.dm

@@ -129,6 +129,20 @@
 		user << "\red This [W] is too big for this [src]"
 		return
 
+	if(istype(W, /obj/item/weapon/tray))
+		var/obj/item/weapon/tray/T = W
+		if(T.calc_carry() > 0)
+			if(prob(85))
+				user << "\red The tray won't fit in [src]."
+				return
+			else
+
+				W.loc = user.loc
+				if ((user.client && user.s_active != src))
+					user.client.screen -= W
+				W.dropped(user)
+				user << "\red God damnit!"
+
 	var/sum_w_class = W.w_class
 	for(var/obj/item/I in contents)
 		sum_w_class += I.w_class //Adds up the combined w_classes which will be in the storage item if the item is added to it.
@@ -138,7 +152,7 @@
 		return
 
 	if ( W.w_class >= src.w_class && (istype(W, /obj/item/weapon/storage)))
-		user << "\red The [src] cannot hold  [W] as it's a storage item of the same size."
+		user << "\red The [src] cannot hold [W] as it's a storage item of the same size."
 		return //To prevent the stacking of the same sized items.
 
 	user.u_equip(W)