Merge pull request #9888 from Fox-McCloud/spark-refactor

Refactors Spark Spread Activation

code/game/objects/items/devices/chameleonproj.dm

@@ -67,10 +67,7 @@
 
 /obj/item/chameleon/proc/disrupt(var/delete_dummy = 1)
 	if(active_dummy)
-		var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread
-		spark_system.set_up(5, 0, src)
-		spark_system.attach(src)
-		spark_system.start()
+		do_sparks(5, 0, src)
 		eject_all()
 		if(delete_dummy)
 			qdel(active_dummy)

code/game/objects/items/devices/radio/electropack.dm

@@ -87,9 +87,7 @@
 				if(M)
 					M.moved_recently = 0
 		to_chat(M, "<span class='danger'>You feel a sharp shock!</span>")
-		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-		s.set_up(3, 1, M)
-		s.start()
+		do_sparks(3, 1, M)
 
 		M.Weaken(5)
 

code/game/objects/items/toys.dm

@@ -250,9 +250,7 @@
 
 /obj/item/toy/snappop/virus/throw_impact(atom/hit_atom)
 	..()
-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
+	do_sparks(3, 1, src)
 	new /obj/effect/decal/cleanable/ash(src.loc)
 	visible_message("<span class='warning'>The [name] explodes!</span>","<span class='warning'>You hear a bang!</span>")
 	playsound(src, 'sound/effects/snap.ogg', 50, 1)
@@ -270,9 +268,7 @@
 	var/ash_type = /obj/effect/decal/cleanable/ash
 
 /obj/item/toy/snappop/proc/pop_burst(var/n=3, var/c=1)
-	var/datum/effect_system/spark_spread/s = new()
-	s.set_up(n, c, src)
-	s.start()
+	do_sparks(n, c, src)
 	new ash_type(loc)
 	visible_message("<span class='warning'>[src] explodes!</span>",
 		"<span class='italics'>You hear a snap!</span>")

code/game/objects/items/weapons/fireworks.dm

@@ -25,7 +25,7 @@ obj/item/sparkler
 	icon = 'icons/obj/fireworks.dmi'
 	icon_state = "sparkler_0"
 	var/litzor = 0
-	var/datum/effect_system/spark_spread/S
+
 obj/item/sparkler/attackby(obj/item/W,mob/user, params)
 	if(litzor)
 		return
@@ -36,11 +36,7 @@ obj/item/sparkler/attackby(obj/item/W,mob/user, params)
 		icon_state = "sparkler_1"
 		var/b = rand(5,9)
 		for(var/xy, xy<=b, xy++)
-			S = new()
-			S.set_up(1,0,src.loc)
-			if(ismob(src.loc) || isobj(src.loc))
-				S.attach(src.loc)
-			S.start()
+			do_sparks(1, 0, loc)
 			sleep(10)
 		qdel(src)
 /obj/crate/fireworks

code/game/objects/items/weapons/legcuffs.dm

@@ -136,9 +136,7 @@
 
 /obj/item/restraints/legcuffs/beartrap/energy/proc/dissipate()
 	if(!ismob(loc))
-		var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
-		sparks.set_up(1, 1, src)
-		sparks.start()
+		do_sparks(1, 1, src)
 		qdel(src)
 
 /obj/item/restraints/legcuffs/beartrap/energy/attack_hand(mob/user)

code/game/objects/items/weapons/melee/energy.dm

@@ -215,16 +215,8 @@
 	throw_speed = 3
 	throw_range = 1
 	w_class = WEIGHT_CLASS_BULKY //So you can't hide it in your pocket or some such.
-	var/datum/effect_system/spark_spread/spark_system
 	sharp = 1
 
-//Most of the other special functions are handled in their own files. aka special snowflake code so kewl
-/obj/item/melee/energy/blade/New()
-	..()
-	spark_system = new /datum/effect_system/spark_spread()
-	spark_system.set_up(5, 0, src)
-	spark_system.attach(src)
-
 /obj/item/melee/energy/blade/attack_self(mob/user)
 	return
 

code/game/objects/items/weapons/storage/secure.dm

@@ -74,9 +74,7 @@
 		overlays += image('icons/obj/storage.dmi', icon_locking)
 		locked = 0
 		if(istype(weapon, /obj/item/melee/energy/blade))
-			var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
-			spark_system.set_up(5, 0, src.loc)
-			spark_system.start()
+			do_sparks(5, 0, loc)
 			playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
 			playsound(loc, "sparks", 50, 1)
 			to_chat(user, "You slice through the lock on [src].")

code/game/objects/items/weapons/twohanded.dm

@@ -614,9 +614,7 @@
 	origin_tech = "combat=4;powerstorage=7"
 
 /obj/item/twohanded/mjollnir/proc/shock(mob/living/target)
-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread()
-	s.set_up(5, 1, target.loc)
-	s.start()
+	do_sparks(5, 1, target.loc)
 	target.visible_message("<span class='danger'>[target.name] was shocked by the [name]!</span>", \
 		"<span class='userdanger'>You feel a powerful shock course through your body sending you flying!</span>", \
 		"<span class='italics'>You hear a heavy electrical crack!</span>")
@@ -739,9 +737,7 @@
 				Z.take_organ_damage(0, 30)
 				user.visible_message("<span class='danger'>[user] slams the charged axe into [Z.name] with all [user.p_their()] might!</span>")
 				playsound(loc, 'sound/magic/lightningbolt.ogg', 5, 1)
-				var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
-				sparks.set_up(1, 1, src)
-				sparks.start()
+				do_sparks(1, 1, src)
 
 		if(A && wielded && (istype(A, /obj/structure/window) || istype(A, /obj/structure/grille)))
 			if(istype(A, /obj/structure/window))