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/defines/obj/clothing/gimmick.dm

@@ -2,13 +2,13 @@
 	name = "Rabbit Ears"
 	desc = "Wearing these makes you looks useless, and only good for your sex appeal."
 	icon_state = "bunny"
-	flags = FPRINT | TABLEPASS | HEADSPACE
+	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/head/kitty
 	name = "Kitty Ears"
 	desc = "A pair of kitty ears. Meow!"
 	icon_state = "kitty"
-	flags = FPRINT | TABLEPASS | HEADSPACE
+	flags = FPRINT | TABLEPASS
 	var/icon/mob
 	var/icon/mob2
 

code/defines/obj/clothing/head.dm

@@ -261,7 +261,7 @@
 	desc = "An amish looking helmet"
 	icon_state = "tophat"
 	item_state = "that"
-	flags = FPRINT|TABLEPASS|HEADSPACE
+	flags = FPRINT|TABLEPASS
 	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/head/helmet/greenbandana
@@ -269,7 +269,7 @@
 	desc = "A green bandana with some fine nanotech lining."
 	icon_state = "greenbandana"
 	item_state = "greenbandana"
-	flags = FPRINT|TABLEPASS|HEADSPACE
+	flags = FPRINT|TABLEPASS
 	armor = list(melee = 5, bullet = 5, laser = 5,energy = 5, bomb = 15, bio = 15, rad = 15)
 
 /obj/item/clothing/head/helmet/riot
@@ -303,4 +303,4 @@
 	name = "Nurse Hat"
 	desc = "Smokin'"
 	icon_state = "nursehat"
-	flags = FPRINT|TABLEPASS|HEADSPACE
+	flags = FPRINT|TABLEPASS

code/defines/obj/weapon.dm

@@ -1249,6 +1249,7 @@
 	w_class = 3.0
 	flags = FPRINT | TABLEPASS | CONDUCT
 	m_amt = 3000
+	/* // NOPE
 	var/food_total= 0
 	var/burger_amt = 0
 	var/cheese_amt = 0
@@ -1262,6 +1263,11 @@
 	var/meatbreadslice_amt = 0
 	var/salad_amt = 0
 	var/miscfood_amt = 0
+	*/
+	var/list/carrying = list() // List of things on the tray. - Doohl
+	var/max_carry = 10 // w_class = 1 -- takes up 1
+					   // w_class = 2 -- takes up 3
+					   // w_class = 3 -- takes up 5
 
 
 /obj/item/weapon/kitchen/utensil