Cleans up some sparks code

code/modules/admin/topic.dm

@@ -450,13 +450,9 @@
 		if(tgui_alert(usr, "Send [key_name(M)] to Prison?", "Message", list("Yes", "No")) != "Yes")
 			return
 
-		/// SKYRAT EDIT START - Immersion-friendly Admin Prison
-		var/datum/effect_system/spark_spread/quantum/sparks = new
-		sparks.set_up(10, 1, M)
-		sparks.attach(M.loc)
-		sparks.start()
-		M.forceMove(pick(GLOB.prisonwarp))
-		/// SKYRAT EDIT END
+		// BUBBER EDIT - START - Immersion-friendly Admin Prison
+		do_sparks(10, TRUE, M, spark_type = /datum/effect_system/basic/spark_spread/quantum)
+		// BUBBER EDIT - END
 
 		to_chat(M, span_adminnotice("You have been sent to Prison!"), confidential = TRUE)
 

code/modules/admin/view_variables/admin_delete.dm

@@ -26,10 +26,11 @@
 			qdel(D)
 			if(!QDELETED(D))
 				vv_update_display(D, "deleted", "")
-		// Skyrat edit addition start -- optional bluespace sparks on delete
+		// BUBBER EDIT - ADDITION - START
 		if(T && prefs.read_preference(/datum/preference/toggle/admin/delete_sparks))
 			playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1)
-			var/datum/effect_system/spark_spread/quantum/sparks = new
-			sparks.set_up(10, 1, T)
+			var/datum/effect_system/basic/spark_spread/quantum/sparks = new
+			sparks = new(T, 2, FALSE)
 			sparks.attach(T)
 			sparks.start()
+		// BUBBER EDIT - ADDITION - END

code/modules/buildmode/submodes/advanced.dm

@@ -63,7 +63,7 @@
 			qdel(object)
 			if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks))
 				playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1)
-				var/datum/effect_system/spark_spread/quantum/sparks = new
+				var/datum/effect_system/basic/spark_spread/quantum/sparks = new
 				sparks.set_up(10, 1, T)
 				sparks.attach(T)
 				sparks.start()

code/modules/buildmode/submodes/basic.dm

@@ -42,7 +42,7 @@
 			qdel(object)
 			if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks))
 				playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1)
-				var/datum/effect_system/spark_spread/quantum/sparks = new
+				var/datum/effect_system/basic/spark_spread/quantum/sparks = new
 				sparks.set_up(10, 1, T)
 				sparks.attach(T)
 				sparks.start()

code/modules/buildmode/submodes/delete.dm

@@ -20,7 +20,7 @@
 			qdel(object)
 			if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks))
 				playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1)
-				var/datum/effect_system/spark_spread/quantum/sparks = new
+				var/datum/effect_system/basic/spark_spread/quantum/sparks = new
 				sparks.set_up(10, 1, T)
 				sparks.attach(T)
 				sparks.start()

modular_skyrat/modules/cellguns/code/medigun_cells.dm

@@ -491,7 +491,7 @@
 	body.visible_message(span_notice("[body]'s body teleports to [firer]!"))
 
 /obj/projectile/energy/medical/utility/body_teleporter/proc/teleport_effect(location)
-	var/datum/effect_system/spark_spread/quantum/sparks = new /datum/effect_system/spark_spread/quantum //uses the teleport effect from quantum pads
+	var/datum/effect_system/basic/spark_spread/quantum/sparks = new /datum/effect_system/basic/spark_spread/quantum //uses the teleport effect from quantum pads
 	sparks.set_up(5, 1, get_turf(location))
 	sparks.start()
 

modular_skyrat/modules/cryosleep/code/admin.dm

@@ -2,7 +2,7 @@
 /mob/proc/send_to_cryo(with_paper = FALSE)
 	//effect
 	playsound(loc, 'sound/effects/magic/Repulse.ogg', 100, 1)
-	var/datum/effect_system/spark_spread/quantum/sparks = new
+	var/datum/effect_system/basic/spark_spread/quantum/sparks = new
 	sparks.set_up(10, 1, loc)
 	sparks.attach(loc)
 	sparks.start()

modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm

@@ -74,21 +74,20 @@
 	icon_state = "transponder"
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = ITEM_SLOT_BELT
-	var/datum/effect_system/spark_spread/sparks
+	var/datum/effect_system/basic/spark_spread/sparks
 	var/current_state = TURN_DIAL
 	var/next_activate = 0
 
 /obj/item/donator/transponder/Initialize(mapload)
 	. = ..()
-	sparks = new
-	sparks.set_up(2, 0, src)
+	sparks = new(src, 2, FALSE)
 	sparks.attach(src)
+	sparks.start()
 
 /obj/item/donator/transponder/Destroy()
 	if(sparks)
-		qdel(sparks)
-	sparks = null
-	. = ..()
+		QDEL_NULL(sparks)
+	return ..()
 
 /obj/item/donator/transponder/attack_self(mob/user)
 	if(QDELETED(src) || (next_activate > world.time))

modular_skyrat/modules/goofsec/code/terragov.dm

@@ -829,14 +829,14 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 					message_admins("[ADMIN_LOOKUPFLW(user)] has beamed out [living_user.pulling] alongside them.")
 				var/turf/pulling_turf = get_turf(living_user.pulling)
 				playsound(pulling_turf, 'sound/effects/magic/Repulse.ogg', 100, 1)
-				var/datum/effect_system/spark_spread/quantum/sparks = new
+				var/datum/effect_system/basic/spark_spread/quantum/sparks = new
 				sparks.set_up(10, 1, pulling_turf)
 				sparks.attach(pulling_turf)
 				sparks.start()
 				qdel(living_user.pulling)
 			var/turf/user_turf = get_turf(living_user)
 			playsound(user_turf, 'sound/effects/magic/Repulse.ogg', 100, 1)
-			var/datum/effect_system/spark_spread/quantum/sparks = new
+			var/datum/effect_system/basic/spark_spread/quantum/sparks = new
 			sparks.set_up(10, 1, user_turf)
 			sparks.attach(user_turf)
 			sparks.start()

modular_skyrat/modules/icspawning/code/observer.dm

@@ -103,11 +103,8 @@
 
 	if(teleport_option == teleport_options[1])
 		new_player.forceMove(current_turf)
+		do_sparks(10, TRUE, new_player, spark_type = /datum/effect_system/basic/spark_spread/quantum)
 		playsound(new_player, 'sound/effects/magic/Disable_Tech.ogg', 100, FALSE)
-		var/datum/effect_system/spark_spread/quantum/sparks = new
-		sparks.set_up(10, 1, new_player)
-		sparks.attach(get_turf(new_player))
-		sparks.start()
 	else if(teleport_option == teleport_options[2])
 		var/obj/structure/closet/supplypod/podspawn/empty_pod = new(null, pod_style)
 		new_player.forceMove(empty_pod)

modular_skyrat/modules/icspawning/code/spell.dm

@@ -21,10 +21,7 @@
 
 	var/mob/dead/observer/ghost = user.ghostize(FALSE)
 
-	var/datum/effect_system/spark_spread/quantum/sparks = new
-	sparks.set_up(10, 1, user)
-	sparks.attach(user.loc)
-	sparks.start()
+	do_sparks(10, TRUE, user, spark_type = /datum/effect_system/basic/spark_spread/quantum)
 
 	qdel(user)
 

modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shockcollar.dm

@@ -53,9 +53,7 @@
 		step(affected_mob, pick(GLOB.cardinals))
 
 		to_chat(affected_mob, span_danger("You feel a sharp shock from the collar!"))
-		var/datum/effect_system/spark_spread/created_sparks = new /datum/effect_system/spark_spread
-		created_sparks.set_up(3, 1, affected_mob)
-		created_sparks.start()
+		do_sparks(3, TRUE, affected_mob)
 
 		affected_mob.Paralyze(30)
 		affected_mob.adjust_pain(10)

modular_zubbers/code/game/objects/effects/effects_system/effect_sparks.dm

@@ -1,7 +1,8 @@
 /// A version of sparks for cosmetic purposes that doesn't set things on fire.
-/proc/do_harmless_sparks(number, cardinal_only, datum/source)
-	var/datum/effect_system/spark_spread/quantum/harmless/sparks = new
-	sparks.set_up(number, cardinal_only, source)
+/proc/do_harmless_sparks(number, atom/holder = null, cardinal_only, datum/source)
+	var/datum/effect_system/basic/spark_spread/quantum/harmless/sparks = new spark_type(get_turf(source), number, cardinal_only)
+	if (holder)
+		sparks.attach(holder)
 	sparks.autocleanup = TRUE
 	sparks.start()
 
@@ -17,5 +18,5 @@
 /obj/effect/particle_effect/sparks/quantum/harmless/sparks_touched(datum/source, atom/singed)
 	return
 
-/datum/effect_system/spark_spread/quantum/harmless
+/datum/effect_system/basic/spark_spread/quantum/harmless
 	effect_type = /obj/effect/particle_effect/sparks/quantum/harmless

modular_zubbers/code/game/objects/structures/beds_chairs/sofa.dm

@@ -11,7 +11,7 @@
 		if(prob(10))
 			balloon_alert(user, "found something")
 			if(prob(1))
-				var/datum/effect_system/spark_spread/quantum/sparks = new
+				var/datum/effect_system/basic/spark_spread/quantum/sparks = new
 				sparks.set_up(5, 1, loc)
 				new /obj/item/disk/nuclear/fake(loc)
 			else

modular_zubbers/code/modules/silicons/borgs/code/robot_items.dm

@@ -117,16 +117,16 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	var/charge_cost = (STANDARD_CELL_CHARGE *  3.2)
-	var/datum/effect_system/spark_spread/spark_system
+	var/datum/effect_system/basic/spark_spread/spark_system
 	var/datum/action/innate/dash/research/jaunt
 	var/mob/living/silicon/robot/cyborg
 
 /obj/item/experimental_dash/Initialize(mapload)
 	. = ..()
 	jaunt = new(src)
-	spark_system = new /datum/effect_system/spark_spread()
-	spark_system.set_up(5, 0, src)
+	spark_system = new(src, 5, FALSE)
 	spark_system.attach(src)
+	spark_system.start()
 
 
 /obj/item/experimental_dash/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)