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/game/objects/effects/decals/Cleanable/fuel.dm

@@ -25,7 +25,7 @@
 		if(!has_spread)
 			Spread()
 		else
-			del(src)
+			qdel(src)
 
 	proc/Spread(exclude=list())
 		//Allows liquid fuels to sometimes flow into other tiles.

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -21,10 +21,10 @@ var/global/list/image/splatter_cache=list()
 	var/list/datum/disease2/disease/virus2 = list()
 	var/amount = 5
 
-/obj/effect/decal/cleanable/blood/Del()
+/obj/effect/decal/cleanable/blood/Destroy()
 	for(var/datum/disease/D in viruses)
 		D.cure(0)
-	..()
+	return ..()
 
 /obj/effect/decal/cleanable/blood/New()
 	..()
@@ -37,7 +37,7 @@ var/global/list/image/splatter_cache=list()
 				if(B != src)
 					if (B.blood_DNA)
 						blood_DNA |= B.blood_DNA.Copy()
-					del(B)
+					qdel(B)
 	spawn(DRYING_TIME * (amount+1))
 		dry()
 
@@ -198,7 +198,7 @@ var/global/list/image/splatter_cache=list()
                 for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
                         sleep(3)
                         if (i > 0)
-                                var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc)
+                                var/obj/effect/decal/cleanable/blood/b = PoolOrNew(/obj/effect/decal/cleanable/blood/splatter, src.loc)
                                 b.basecolor = src.basecolor
                                 b.update_icon()
                                 for(var/datum/disease/D in src.viruses)

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -21,14 +21,14 @@
 	var/turf/simulated/floor/F = get_turf(src)
 	if (istype(F))
 		F.dirt += 4
-	del(src)
+	qdel(src)
 
 /obj/effect/decal/cleanable/greenglow
 
 	New()
 		..()
 		spawn(1200)// 2 minutes
-			del(src)
+			qdel(src)
 
 /obj/effect/decal/cleanable/dirt
 	name = "dirt"
@@ -102,7 +102,7 @@
 	random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
 	var/list/viruses = list()
 
-	Del()
+	Destroy()
 		for(var/datum/disease/D in viruses)
 			D.cure(0)
 		..()

code/game/objects/effects/decals/contraband.dm

@@ -72,7 +72,7 @@
 		else
 			P.roll_and_drop(P.loc)
 	
-	del(oldsrc)	//delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway
+	qdel(oldsrc)	//delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway
 
 //############################## THE ACTUAL DECALS ###########################
 
@@ -125,7 +125,7 @@
 		playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
 		if(ruined)
 			user << "<span class='notice'>You remove the remnants of the poster.</span>"
-			del(src)
+			qdel(src)
 		else
 			user << "<span class='notice'>You carefully remove the poster from the wall.</span>"
 			roll_and_drop(user.loc)
@@ -154,7 +154,7 @@
 	var/obj/item/weapon/contraband/poster/P = new(src, serial_number)
 	P.loc = newloc
 	src.loc = P
-	del(src)
+	qdel(src)
 
 /datum/poster
 	// Name suffix. Poster - [name]

code/game/objects/effects/decals/remains.dm

@@ -30,7 +30,7 @@
 	var/turf/simulated/floor/F = get_turf(src)
 	if (istype(F))
 		new /obj/effect/decal/cleanable/ash(F)
-	del(src)
+	qdel(src)
 
 /obj/effect/decal/remains/robot/attack_hand(mob/user as mob)
 	return

code/game/objects/effects/decals/warning_stripes.dm

@@ -1,9 +1,11 @@
-/obj/effect/decal/warning_stripes
-	icon = 'icons/effects/warning_stripes.dmi'
-	layer = 2
-
-/obj/effect/decal/warning_stripes/New()
-	. = ..()
-
-	loc.overlays += src
-	del src
+/obj/effect/decal/warning_stripes
+	icon = 'icons/effects/warning_stripes.dmi'
+	layer = 2
+
+/obj/effect/decal/warning_stripes/New()
+	. = ..()
+	var/turf/T=get_turf(src)
+	var/image/I=image(icon, icon_state = icon_state, dir = dir)
+	I.color=color
+	T.overlays += I
+	qdel(src)