Merge branch 'master' into upstream-merge-29741

code/modules/clothing/ears/ears.dm

@@ -1,11 +1,10 @@
-
 //Ears: currently only used for headsets and earmuffs
 /obj/item/clothing/ears
 	name = "ears"
 	w_class = WEIGHT_CLASS_TINY
 	throwforce = 0
 	slot_flags = SLOT_EARS
-	resistance_flags = 0
+	resistance_flags = NONE
 
 /obj/item/clothing/ears/earmuffs
 	name = "earmuffs"
@@ -15,7 +14,7 @@
 	strip_delay = 15
 	equip_delay_other = 25
 	resistance_flags = FLAMMABLE
-	flags_2 = BANG_PROTECT_2|HEALS_EARS_2
+	flags_2 = BANG_PROTECT_2|HEALS_EARS_2
 
 /obj/item/clothing/ears/headphones
 	name = "headphones"
@@ -43,4 +42,4 @@
 		H.update_inv_ears()
 		H.update_inv_neck()
 		H.update_inv_head()
-	to_chat(owner, "<span class='notice'>You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]</span>")
+	to_chat(owner, "<span class='notice'>You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]</span>")

code/modules/clothing/glasses/glasses.dm

@@ -3,6 +3,11 @@
 	materials = list(MAT_GLASS = 250)
 	var/glass_colour_type = null //colors your vision when worn
 
+/obj/item/clothing/glasses/examine(mob/user)
+	..()
+	if(glass_colour_type && ishuman(user))
+		to_chat(user, "<span class='notice'>Alt-click to toggle its colors.</span>")
+
 /obj/item/clothing/glasses/visor_toggling()
 	..()
 	if(visor_vars_to_toggle & VISOR_VISIONFLAGS)

code/modules/clothing/head/jobs.dm

@@ -82,6 +82,10 @@
 	pockets = /obj/item/storage/internal/pocket/small/detective
 	dog_fashion = /datum/dog_fashion/head/detective
 
+/obj/item/clothing/head/fedora/det_hat/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to take a candy corn.</span>")
+
 /obj/item/clothing/head/fedora/det_hat/AltClick()
 	..()
 	if(ismob(loc))
@@ -172,4 +176,4 @@
 /obj/item/clothing/head/fedora/curator
 	name = "treasure hunter's fedora"
 	desc = "You got red text today kid, but it doesn't mean you have to like it."
-	icon_state = "curator"
+	icon_state = "curator"