Merge branch 'dev' into ofBotsAndMobs

Conflicts:
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/robot/robot_parts.dm

code/modules/spells/aoe_turf/charge.dm

@@ -48,7 +48,7 @@
 		var/obj/item/weapon/spellbook/oneuse/I = target
 		if(prob(50))
 			I.visible_message("<span class='warning'>[I] catches fire!</span>")
-			del(I)
+			qdel(I)
 		else
 			I.used = 0
 			charged_item = I

code/modules/spells/aoe_turf/conjure/conjure.dm

@@ -71,4 +71,4 @@ How they spawn stuff is decided by behaviour vars, which are explained below
 	return
 
 /spell/aoe_turf/conjure/proc/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
-	del(animation)
+	qdel(animation)

code/modules/spells/aoe_turf/conjure/construct.dm

@@ -38,7 +38,7 @@
 	animation.icon_state = "cultfloor"
 	flick("cultfloor",animation)
 	spawn(10)
-		del(animation)
+		qdel(animation)
 
 /spell/aoe_turf/conjure/wall
 	name = "Lesser Construction"
@@ -57,7 +57,7 @@
 	animation.icon_state = "cultwall"
 	flick("cultwall",animation)
 	spawn(10)
-		del(animation)
+		qdel(animation)
 
 /spell/aoe_turf/conjure/wall/reinforced
 	name = "Greater Construction"

code/modules/spells/aoe_turf/summons.dm

@@ -2,7 +2,7 @@
 	name = "Dispense Wizard Justice"
 	desc = "This spell dispenses wizard justice."
 
-	summon_type = list(/obj/machinery/bot/secbot/ed209)
+	summon_type = list(/mob/living/bot/secbot/ed209)
 	summon_amt = 10
 	range = 3
 	newVars = list("emagged" = 1,"name" = "Wizard's Justicebot")

code/modules/spells/spell_code.dm

@@ -153,7 +153,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
 			spell.anchored = 1
 			spell.density = 0
 			spawn(overlay_lifespan)
-				del(spell)
+				qdel(spell)
 	return valid_targets
 
 /spell/proc/after_cast(list/targets)

code/modules/spells/targeted/ethereal_jaunt.dm

@@ -52,8 +52,8 @@
 							break
 			target.canmove = 1
 			target.client.eye = target
-			del(animation)
-			del(holder)
+			qdel(animation)
+			qdel(holder)
 
 /spell/targeted/ethereal_jaunt/proc/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target)
 	animation.icon_state = "liquify"
@@ -80,7 +80,7 @@
 	// Eject contents if deleted somehow
 	for(var/atom/movable/AM in src)
 		AM.loc = get_turf(src)
-	..()
+	return ..()
 
 /obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
 	if (!src.canmove || reappearing) return

code/modules/spells/targeted/harvest.dm

@@ -21,7 +21,7 @@
 	..()
 
 	var/destination = null
-	for(var/obj/machinery/singularity/narsie/large/N in narsie_list)
+	for(var/obj/singularity/narsie/large/N in narsie_list)
 		destination = N.loc
 		break
 	if(destination)