From 0206e3f77546b61ebf9724436807aae03ba07e91 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 3 Oct 2017 18:48:18 -0500
Subject: [PATCH] Update particle.dm

---
 .../particle_accelerator/particle.dm          | 90 ++++++-------------
 1 file changed, 28 insertions(+), 62 deletions(-)

diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 6d663d1339..f04c61426b 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -1,67 +1,34 @@
-/obj/effect/accelerated_particle
-	name = "Accelerated Particles"
-	desc = "Small things moving very fast."
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
-	icon_state = "particle"
+/obj/effect/accelerated_particle
+	name = "Accelerated Particles"
+	desc = "Small things moving very fast."
+	icon = 'icons/obj/machines/particle_accelerator.dmi'
+	icon_state = "particle"
 	anchored = TRUE
 	density = FALSE
-	var/movement_range = 10
-	var/energy = 10
-	var/speed = 1
-
-/obj/effect/accelerated_particle/weak
-	movement_range = 8
-	energy = 5
-
-/obj/effect/accelerated_particle/strong
-	movement_range = 15
-	energy = 15
-
-/obj/effect/accelerated_particle/powerful
-	movement_range = 20
-	energy = 50
-
-
-/obj/effect/accelerated_particle/New(loc)
-	..()
-
-	addtimer(CALLBACK(src, .proc/move), 1)
-
-
+	var/movement_range = 10
+	var/energy = 10
+	var/speed = 1
+
+/obj/effect/accelerated_particle/weak
+	movement_range = 8
+	energy = 5
+
+/obj/effect/accelerated_particle/strong
+	movement_range = 15
+	energy = 15
+
+/obj/effect/accelerated_particle/powerful
+	movement_range = 20
+	energy = 50
+
+
+/obj/effect/accelerated_particle/New(loc)
+	..()
+
+	addtimer(CALLBACK(src, .proc/move), 1)
+
+
 /obj/effect/accelerated_particle/Collide(atom/A)
-<<<<<<< HEAD
-	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
-
-
-/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()
-=======
 	if(A)
 		if(isliving(A))
 			toxmob(A)
@@ -96,4 +63,3 @@
 	else
 		sleep(speed)
 		move()
->>>>>>> 056be96... Blobs now take damage from particle accelerators (#31181)