Merge remote-tracking branch 'upstream/master' into poolit

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

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

@@ -1293,7 +1293,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 	if (ismob(loc))
 		var/mob/M = loc
-		M.show_message("\red Your [src] explodes!", 1)
+		M.show_message("<span class='danger'>Your [src] explodes!</span>", 1)
 
 	if(T)
 		T.hotspot_expose(700,125)

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

@@ -134,6 +134,6 @@
 		if(1.0)
 			del(src)
 		if(2.0)
-			if(prob(50)) del(src)
+			if(prob(50)) qdel(src)
 		if(3.0)
-			if(prob(25)) del(src)
+			if(prob(25)) qdel(src)

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

@@ -317,4 +317,4 @@
 	if(pai)
 		pai.ex_act(severity)
 	else
-		del(src)
+		qdel(src)