Merge pull request #1353 from Fox-McCloud/explosion-rework

Explosion Rework

code/modules/mob/living/silicon/robot/robot.dm

@@ -1236,7 +1236,7 @@ var/list/robot_verbs_default = list(
 	if(emagged)
 		if(mmi)
 			qdel(mmi)
-		explosion(src.loc,1,2,4)
+		explosion(src.loc,1,2,4,flame_range = 2)
 	else
 		explosion(src.loc,-1,0,2)
 	gib()

code/modules/mob/living/simple_animal/tribbles.dm

@@ -140,7 +140,7 @@ var/global/totaltribbles = 0   //global variable so it updates for all tribbles,
 		if (1)
 			new /obj/item/weapon/shard( src.loc )
 			Break()
-			del(src)
+			qdel(src)
 		if (2)
 			if (prob(50))
 				src.health -= 15