Update infrared.dm

2018-06-09 00:35:13 -04:00
parent 2675481198
commit 0e3d5a7512
1 changed files with 0 additions and 4 deletions
@@ -167,13 +167,9 @@
 	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()