Merge pull request #8018 from phil235/BugFixA

A bundle of fixes

code/game/objects/structures/morgue.dm

@@ -246,17 +246,20 @@ Crematorium Switch
 		user << "That's not connected to anything."
 
 /obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
-	if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
+	if(!istype(O, /atom/movable) || O.anchored || !Adjacent(user) || !user.Adjacent(O) || O.loc == user)
 		return
-	if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag))
-		return
-	if (!ismob(user) || user.stat || user.lying || user.stunned)
+	if(!ismob(O))
+		if(!istype(O, /obj/structure/closet/body_bag))
+			return
+	else
+		var/mob/M = O
+		if(M.buckled)
+			return
+	if(!ismob(user) || user.lying || user.incapacitated())
 		return
 	O.loc = src.loc
 	if (user != O)
-		for(var/mob/B in viewers(user, 3))
-			B.show_message("<span class='danger'>[user] stuffs [O] into [src]!</span>", 1)
-			//Foreach goto(99)
+		visible_message("<span class='warning'>[user] stuffs [O] into [src]!</span>")
 	return
 
 /*

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -70,10 +70,9 @@
 	else
 		density = 0
 		icon_state = "down"
-		if(buckled_mob)
-			buckled_mob.pixel_y = initial(buckled_mob.pixel_y)
-			if(buckled_mob.lying)
-				buckled_mob.pixel_y -= buckled_pixel_y_offset
+		M.pixel_y = initial(M.pixel_y)
+		if(M.lying)
+			M.pixel_y -= buckled_pixel_y_offset
 
 
 /obj/item/roller