Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update

code/_onclick/hud/alert.dm

@@ -223,6 +223,12 @@ or something covering your eyes."
 	var/mob/living/L = usr
 	to_chat(L, "<span class='mind_control'>[command]</span>")
 
+/obj/screen/alert/hypnosis
+	name = "Hypnosis"
+	desc = "Something's hypnotizing you, but you're not really sure about what."
+	icon_state = "hypnosis"
+	var/phrase
+
 /obj/screen/alert/drunk //Not implemented
 	name = "Drunk"
 	desc = "All that alcohol you've been drinking is impairing your speech, motor skills, and mental cognition. Make sure to act like it."

code/_onclick/hud/screen_objects.dm

@@ -25,7 +25,7 @@
 	return ..()
 
 /obj/screen/examine(mob/user)
-	return
+	return list()
 
 /obj/screen/orbit()
 	return