From 622fb93a3ec52b4c6fbff1c96ea576a1a24d71ac Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Wed, 2 Dec 2015 09:16:07 +1030
Subject: [PATCH] Emergency fix for HasProximity being passed a turf.

---
 code/modules/assembly/proximity.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index cfc46a86a5..2b71743416 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -40,6 +40,9 @@
 
 
 	HasProximity(atom/movable/AM as mob|obj)
+		if(!istype(AM))
+			log_debug("DEBUG: HasProximity called with [AM] on [src] ([usr]).")
+			return
 		if (istype(AM, /obj/effect/beam))	return
 		if (AM.move_speed < 12)	sense()
 		return