diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 4519835c1f..6d663d1339 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -29,6 +29,7 @@
 
 
 /obj/effect/accelerated_particle/Collide(atom/A)
+<<<<<<< HEAD
 	if(A)
 		if(isliving(A))
 			toxmob(A)
@@ -60,3 +61,39 @@
 	else
 		sleep(speed)
 		move()
+=======
+	if(A)
+		if(isliving(A))
+			toxmob(A)
+		else if(istype(A, /obj/machinery/the_singularitygen))
+			var/obj/machinery/the_singularitygen/S = A
+			S.energy += energy
+		else if(istype(A, /obj/singularity))
+			var/obj/singularity/S = A
+			S.energy += energy
+		else if(istype(A, /obj/structure/blob))
+			var/obj/structure/blob/B = A
+			B.take_damage(energy*0.6)
+			movement_range = 0
+
+/obj/effect/accelerated_particle/Crossed(atom/A)
+	if(isliving(A))
+		toxmob(A)
+
+
+/obj/effect/accelerated_particle/ex_act(severity, target)
+	qdel(src)
+
+/obj/effect/accelerated_particle/proc/toxmob(mob/living/M)
+	M.rad_act(energy*6)
+
+/obj/effect/accelerated_particle/proc/move()
+	if(!step(src,dir))
+		forceMove(get_step(src,dir))
+	movement_range--
+	if(movement_range == 0)
+		qdel(src)
+	else
+		sleep(speed)
+		move()
+>>>>>>> 056be96... Blobs now take damage from particle accelerators (#31181)