From 26754811983afa6d32985dceb094d5db3b6567ff Mon Sep 17 00:00:00 2001
From: AnturK <AnturK@users.noreply.github.com>
Date: Wed, 6 Jun 2018 21:24:57 +0200
Subject: [PATCH] Fixes infrared emmiters partially.

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

diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 4a6c9d2db3..5f24f10b4b 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -33,6 +33,7 @@
 
 /obj/item/assembly/infra/Destroy()
 	STOP_PROCESSING(SSobj, src)
+	QDEL_NULL(listener)
 	QDEL_LIST(beams)
 	. = ..()
 
@@ -166,7 +167,13 @@
 	listener = newloc.AddComponent(/datum/component/redirect, COMSIG_ATOM_EXITED, CALLBACK(src, .proc/check_exit))
 
 /obj/item/assembly/infra/proc/check_exit(atom/movable/offender)
+<<<<<<< HEAD
 	if(offender && ((offender.flags_1 & ABSTRACT_1) || offender == src))
+=======
+	if(QDELETED(src))
+		return
+	if(offender == src || istype(offender,/obj/effect/beam/i_beam))
+>>>>>>> 641a7d1... Fixes infrared emmiters partially. (#38301)
 		return
 	return refreshBeam()