Merge pull request #2564 from Spamcat/bleeding-edge-freeze

BEF fixes

code/modules/mob/living/carbon/human/whisper.dm

@@ -140,5 +140,5 @@
 	for (var/mob/M in dead_mob_list)
 		if (!(M.client))
 			continue
-		if (M.stat > 1 && !(M in heard_a))
+		if (M.stat > 1 && !(M in heard_a) && (M.client.prefs.toggles & CHAT_GHOSTEARS))
 			M.show_message(rendered, 2)

code/modules/mob/living/simple_animal/friendly/spiderbot.dm

@@ -315,11 +315,16 @@
 
 	var/obj/selection = input("Select an item.", "Pickup") in items
 
+	items.Cut()
 	if(selection)
-		held_item = selection
-		selection.loc = src
-		visible_message("\blue [src] scoops up the [held_item]!", "\blue You grab the [held_item]!", "You hear a skittering noise and a clink.")
-		return held_item
+		for(var/obj/item/I in view(1, src))
+			if(selection == I)
+				held_item = selection
+				selection.loc = src
+				visible_message("\blue [src] scoops up the [held_item]!", "\blue You grab the [held_item]!", "You hear a skittering noise and a clink.")
+				return held_item
+			else
+				src << "\red \The [selection] is too far away."
 
 	src << "\red There is nothing of interest to take."
 	return 0