From a4f3c7e96bb354127dcdb235f38a27d0f664e8aa Mon Sep 17 00:00:00 2001
From: TullyBurnalot <tullybburnalot@gmail.com>
Date: Tue, 16 Aug 2016 14:13:57 +0100
Subject: [PATCH] Objects can no longer trigger proximity sensors

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

diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 26af2340354..baf1a9a950d 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -248,7 +248,7 @@
 /obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
 	if(!isobj(AM) && !isliving(AM))
 		return
-	if(istype(AM, /obj/effect/beam))
+	if(istype(AM, /obj/effect))
 		return
 	hit()
 
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 5fb87740af3..3b1e5b3a6c7 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -44,7 +44,7 @@
 	HasProximity(atom/movable/AM as mob|obj)
 		if(!isobj(AM) && !isliving(AM))
 			return
-		if(istype(AM, /obj/effect/beam))	return
+		if(istype(AM, /obj/effect))	return
 		if(AM.move_speed < 12)	sense()
 		return