Fixes - 2017/09/05 (#3399)

Fixes #2663.
Fixes #2677.
Fixes #3185.
Fixes #1716.
Fixes #1004.
Fixes a minor grammar error.

code/game/objects/items/weapons/trays.dm

@@ -23,13 +23,15 @@
 
 	var/safedrop = 0//Used to tell when we should or shouldn't spill if the tray is dropped.
 	//Safedrop is set true when throwing, because it will spill on impact. And when placing on a table
-	var/list/valid = list( /obj/item/weapon/reagent_containers,
+	var/list/valid = list(
+		/obj/item/weapon/reagent_containers,
 		/obj/item/weapon/material/kitchen/utensil,
 		/obj/item/weapon/storage/fancy/cigarettes,
 		/obj/item/clothing/mask/smokable,
 		/obj/item/weapon/storage/box/matches,
 		/obj/item/weapon/flame/match,
-		/obj/item/weapon/material/ashtray)
+		/obj/item/weapon/material/ashtray
+	)
 
 /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob, var/target_zone)
 
@@ -38,7 +40,6 @@
 	// Drop all the things. All of them.
 	spill(user, M.loc)
 
-
 	//Note: Added a robot check to all stun/weaken procs, beccause weakening a robot causes its active modules to bug out
 	if((CLUMSY in user.mutations) && prob(50))              //What if he's a clown?
 		M << "<span class='warning'>You accidentally slam yourself with the [src]!</span>"
@@ -236,10 +237,12 @@
 
 /obj/item/weapon/tray/proc/load_item(var/obj/item/I, var/mob/user)
 	user.remove_from_mob(I)
-	I.loc = src
+	I.forceMove(src)
 	current_weight += I.w_class
 	carrying += I
-	add_overlay(image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer, "pixel_x" = I.pixel_x, "pixel_y" = I.pixel_y))
+	var/mutable_appearance/MA = new(I)
+	MA.layer = FLOAT_LAYER
+	add_overlay(MA)
 	//rand(0, (max_offset_y*2)-3)-(max_offset_y)-3
 
 /obj/item/weapon/tray/verb/unload()