From beed79121168bf6235bb114e5ba80a82b75480bb Mon Sep 17 00:00:00 2001
From: TullyBurnalot <tullybburnalot@gmail.com>
Date: Sat, 13 Aug 2016 21:09:04 +0100
Subject: [PATCH] Fixes Ghost Proximity Tripping

---
 code/modules/assembly/infrared.dm  | 8 +++++---
 code/modules/assembly/proximity.dm | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 2a23732a90b..26af2340354 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -174,7 +174,7 @@
 		return
 
 	dir = turn(dir, 90)
-	
+
 	if(usr.machine == src)
 		interact(usr)
 
@@ -246,7 +246,9 @@
 	hit()
 
 /obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
-	if(istype(AM, /obj/effect/beam) || !AM.density)
+	if(!isobj(AM) && !isliving(AM))
+		return
+	if(istype(AM, /obj/effect/beam))
 		return
 	hit()
 
@@ -259,4 +261,4 @@
 	if(previous)
 		previous.next = null
 		master.last = previous
-	return ..()
\ No newline at end of file
+	return ..()
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 267d1600523..5fb87740af3 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -42,6 +42,8 @@
 
 
 	HasProximity(atom/movable/AM as mob|obj)
+		if(!isobj(AM) && !isliving(AM))
+			return
 		if(istype(AM, /obj/effect/beam))	return
 		if(AM.move_speed < 12)	sense()
 		return