Merge pull request #5444 from TullyBurnalot/ProxFix

Fixes Ghost Proximity Tripping

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))
 		return
 	hit()
 
@@ -259,4 +261,4 @@
 	if(previous)
 		previous.next = null
 		master.last = previous
-	return ..()
+	return ..()

code/modules/assembly/proximity.dm

@@ -42,7 +42,9 @@
 
 
 	HasProximity(atom/movable/AM as mob|obj)
-		if(istype(AM, /obj/effect/beam))	return
+		if(!isobj(AM) && !isliving(AM))
+			return
+		if(istype(AM, /obj/effect))	return
 		if(AM.move_speed < 12)	sense()
 		return