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

code/_onclick/hud/alert.dm

@@ -213,6 +213,12 @@ or something covering your eyes."
 	desc = "Whoa man, you're tripping balls! Careful you don't get addicted... if you aren't already."
 	icon_state = "high"
 
+/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

code/_onclick/telekinesis.dm

@@ -106,9 +106,8 @@
 
 /obj/item/tk_grab/examine(user)
 	if (focus)
-		focus.examine(user)
-	else
-		..()
+		return focus.examine(user)
+	return ..()
 
 /obj/item/tk_grab/attack_self(mob/user)
 	if(!focus)