Merge branch 'master' into shuttle-processing

Conflicts:
	code/modules/shuttle/ripple.dm

code/modules/spells/spell.dm

@@ -220,8 +220,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 			spell.icon_state = overlay_icon_state
 			spell.anchored = 1
 			spell.density = 0
-			spawn(overlay_lifespan)
-				qdel(spell)
+			QDEL_IN(spell, overlay_lifespan)
 
 /obj/effect/proc_holder/spell/proc/after_cast(list/targets)
 	for(var/atom/target in targets)
@@ -266,8 +265,6 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 		if("holdervar")
 			adjust_var(user, holder_var_type, -holder_var_amount)
 
-	return
-
 /obj/effect/proc_holder/spell/proc/adjust_var(mob/living/target = usr, type, amount) //handles the adjustment of the var when the spell is used. has some hardcoded types
 	switch(type)
 		if("bruteloss")
@@ -286,7 +283,6 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 			target.AdjustParalysis(amount)
 		else
 			target.vars[type] += amount //I bear no responsibility for the runtimes that'll happen if you try to adjust non-numeric or even non-existant vars
-	return
 
 /obj/effect/proc_holder/spell/targeted //can mean aoe for mobs (limited/unlimited number) or one target mob
 	var/max_targets = 1 //leave 0 for unlimited targets in range, 1 for one selectable target in range, more for limited number of casts (can all target one guy, depends on target_ignore_prev) in range
@@ -360,8 +356,6 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 
 	perform(targets,user=user)
 
-	return
-
 /obj/effect/proc_holder/spell/aoe_turf/choose_targets(mob/user = usr)
 	var/list/targets = list()
 
@@ -375,8 +369,6 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 
 	perform(targets,user=user)
 
-	return
-
 /obj/effect/proc_holder/spell/proc/can_be_cast_by(mob/caster)
 	if((human_req || clothes_req) && !ishuman(caster))
 		return 0

code/modules/spells/spell_types/conjure.dm

@@ -40,11 +40,7 @@
 					summoned_object.vars[varName] = newVars[varName]
 
 			if(summon_lifespan)
-				spawn(summon_lifespan)
-					if(summoned_object)
-						qdel(summoned_object)
-
-	return
+				QDEL_IN(summoned_object, summon_lifespan)
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/summonEdSwarm //test purposes - Also a lot of fun
 	name = "Dispense Wizard Justice"
@@ -53,4 +49,4 @@
 	summon_type = list(/mob/living/simple_animal/bot/ed209)
 	summon_amt = 10
 	range = 3
-	newVars = list("emagged" = 2, "remote_disabled" = 1,"shoot_sound" = 'sound/weapons/laser.ogg',"projectile" = /obj/item/projectile/beam/laser, "declare_arrests" = 0,"name" = "Wizard's Justicebot")
+	newVars = list("emagged" = 2, "remote_disabled" = 1,"shoot_sound" = 'sound/weapons/laser.ogg',"projectile" = /obj/item/projectile/beam/laser, "declare_arrests" = 0,"name" = "Wizard's Justicebot")

code/modules/spells/spell_types/dumbfire.dm

@@ -77,8 +77,7 @@
 							trail.icon = proj_trail_icon
 							trail.icon_state = proj_trail_icon_state
 							trail.density = 0
-							spawn(proj_trail_lifespan)
-								qdel(trail)
+							QDEL_IN(trail, proj_trail_lifespan)
 
 				current_loc = projectile.loc
 				var/matrix/M = new
@@ -88,4 +87,4 @@
 				sleep(proj_step_delay)
 
 			if(projectile)
-				qdel(projectile)
+				qdel(projectile)

code/modules/spells/spell_types/genetic.dm

@@ -28,5 +28,3 @@
 				for(var/A in mutations)
 					target.dna.remove_mutation(A)
 				target.disabilities &= ~disabilities
-
-	return

code/modules/spells/spell_types/projectile.dm

@@ -72,8 +72,7 @@
 							trail.icon = proj_trail_icon
 							trail.icon_state = proj_trail_icon_state
 							trail.density = 0
-							spawn(proj_trail_lifespan)
-								qdel(trail)
+							QDEL_IN(trail, proj_trail_lifespan)
 
 				if(projectile.loc in range(target.loc,proj_trigger_range))
 					projectile.perform(list(target),user=user)
@@ -84,4 +83,4 @@
 				sleep(proj_step_delay)
 
 			if(projectile)
-				qdel(projectile)
+				qdel(projectile)