Merge remote-tracking branch 'upstream/master' into universal-damage

# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -17,7 +17,8 @@
 /obj/item/encryptionkey/attackby(obj/item/W as obj, mob/user as mob, params)
 
 /obj/item/encryptionkey/syndicate
-	icon_state = "cypherkey"
+	name = "syndicate encryption key"
+	icon_state = "syn_cypherkey"
 	channels = list("Syndicate" = 1)
 	origin_tech = "syndicate=1;engineering=3;bluespace=2"
 	syndie = TRUE //Signifies that it de-crypts Syndicate transmissions
@@ -36,7 +37,8 @@
 	change_voice = FALSE
 
 /obj/item/encryptionkey/syndteam
-	icon_state = "cypherkey"
+	name = "syndicate encryption key"
+	icon_state = "syn_cypherkey"
 	channels = list("SyndTeam" = 1, "Syndicate" = 1)
 	origin_tech = "syndicate=4"
 	syndie = TRUE //Signifies that it de-crypts Syndicate transmissions
@@ -44,7 +46,7 @@
 /obj/item/encryptionkey/binary
 	name = "binary translator key"
 	desc = "An encryption key for a radio headset. To access the binary channel, use :+."
-	icon_state = "cypherkey"
+	icon_state = "bin_cypherkey"
 	translate_binary = TRUE
 	origin_tech = "syndicate=3;engineering=4;bluespace=3"
 

code/game/objects/items/devices/scanners.dm

@@ -338,6 +338,10 @@ proc/healthscan(mob/user, mob/living/M, mode = 1, upgraded = FALSE)
 	var/cooldown_time = 250
 	var/accuracy // 0 is the best accuracy.
 
+/obj/item/analyzer/examine(mob/user)
+	.=..()
+	to_chat(user, "<span class='info'>Alt-click [src] to activate the barometer function.</span>")
+
 /obj/item/analyzer/attack_self(mob/user as mob)
 
 	if(user.stat)