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

BEF fixes

code/game/objects/items/stacks/nanopaste.dm

@@ -1,7 +1,7 @@
 /obj/item/stack/nanopaste
 	name = "nanopaste"
 	singular_name = "nanite swarm"
-	desc = "A tube of paste containing swarms of repair nanties. Very effective in repairing robotic machinery."
+	desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
 	icon = 'icons/obj/nanopaste.dmi'
 	icon_state = "tube"
 	origin_tech = "materials=4;engineering=3"
@@ -18,8 +18,8 @@
 			R.adjustFireLoss(-60)
 			R.updatehealth()
 			use(1)
-			user.visible_message("<span class='notice'>You apply some [src] at [R]'s damaged areas.</span>",\
-				"<span class='notice'>\The [user] applied some [src] at [R]'s damaged areas.</span>")
+			user.visible_message("<span class='notice'>\The [user] applied some [src] at [R]'s damaged areas.</span>",\
+				"<span class='notice'>You apply some [src] at [R]'s damaged areas.</span>")
 		else
 			user << "<span class='notice'>All [R]'s systems are nominal.</span>"
 
@@ -31,7 +31,7 @@
 				S.heal_damage(30, 30, robo_repair = 1)
 				H.updatehealth()
 				use(1)
-				user.visible_message("<span class='notice'>You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.display_name]</span>",\
-				"<span class='notice'>\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.display_name] with \the [src]</span>")
+				user.visible_message("<span class='notice'>\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.display_name] with \the [src].</span>",\
+				"<span class='notice'>You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.display_name].</span>")
 			else
 				user << "<span class='notice'>Nothing to fix here.</span>"

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

code/modules/reagents/reagent_containers/syringes.dm

@@ -158,7 +158,7 @@
 	update_icon()
 		if(mode == SYRINGE_BROKEN)
 			icon_state = "broken"
-			overlays = null //dirty fix
+			overlays.Cut()
 			return
 		var/rounded_vol = round(reagents.total_volume,5)
 		overlays.Cut()

code/modules/research/designs.dm

@@ -1323,7 +1323,7 @@ datum/design/synthetic_flash
 
 datum/design/nanopaste
 	name = "nanopaste"
-	desc = "A tube of paste containing swarms of repair nanties. Very effective in repairing robotic machinery."
+	desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
 	id = "nanopaste"
 	req_tech = list("materials" = 4, "engineering" = 3)
 	build_type = PROTOLATHE

code/modules/research/xenoarchaeology/misc.dm

@@ -82,6 +82,9 @@
 /obj/structure/closet/excavation
 	name = "Excavation tools"
 	icon_state = "toolcloset"
+	icon_closed = "toolcloset"
+	icon_opened = "toolclosetopen"
+
 
 	New()
 		..()