Merge branch 'master' into upstream-merge-29611

code/modules/mob/mob_helpers.dm

@@ -325,6 +325,9 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		return	B.eye_blind
 	return 0
 
+/mob/proc/hallucinating()
+	return FALSE
+
 /proc/is_special_character(mob/M) // returns 1 for special characters and 2 for heroes of gamemode //moved out of admins.dm because things other than admin procs were calling this.
 	if(!SSticker.HasRoundStarted())
 		return 0