Refactored CollidedWith (#19541)

Refactored CollidedWith()

code/modules/power/singularity/particle_accelerator/particle.dm

@@ -63,12 +63,12 @@
 					PC.parent.energy += energy
 					qdel(src)
 
-/obj/effect/accelerated_particle/CollidedWith(atom/A)
+/obj/effect/accelerated_particle/CollidedWith(atom/bumped_atom)
 	. = ..()
 	if (!active)
 		return
-	if(ismob(A))
-		toxmob(A)
+	if(ismob(bumped_atom))
+		toxmob(bumped_atom)
 
 /obj/effect/accelerated_particle/ex_act(severity)
 	if (!active)

code/modules/power/singularity/singularity.dm

@@ -79,10 +79,10 @@
 	if (A)
 		consume(A)
 
-/obj/singularity/CollidedWith(atom/movable/AM)
+/obj/singularity/CollidedWith(atom/bumped_atom)
 	. = ..()
-	if (AM)
-		consume(AM)
+	if (bumped_atom)
+		consume(bumped_atom)
 
 /obj/singularity/process()
 	eat()

code/modules/power/tesla/energy_ball.dm

@@ -211,16 +211,20 @@
 		var/obj/O = A
 		O.tesla_act(0, TRUE)
 
-/obj/singularity/energy_ball/CollidedWith(atom/A)
-	if(check_for_immune(A))
+/obj/singularity/energy_ball/CollidedWith(atom/bumped_atom)
+	//Fucking snowflake code
+	SHOULD_CALL_PARENT(FALSE)
+	SEND_SIGNAL(src, COMSIG_ATOM_BUMPED, bumped_atom)
+
+	if(check_for_immune(bumped_atom))
 		return
-	if(isliving(A))
-		dust_mobs(A)
-	else if(isobj(A))
-		if(istype(A, /obj/effect/accelerated_particle))
-			consume(A)
+	if(isliving(bumped_atom))
+		dust_mobs(bumped_atom)
+	else if(isobj(bumped_atom))
+		if(istype(bumped_atom, /obj/effect/accelerated_particle))
+			consume(bumped_atom)
 			return
-		var/obj/O = A
+		var/obj/O = bumped_atom
 		O.tesla_act(0, TRUE)
 
 /obj/singularity/energy_ball/proc/check_for_immune(var/O)