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/datums/pizza_bomb.dm

@@ -54,7 +54,7 @@
 		return
 	src.audible_message("\icon[src] <b>[src]</b> beeps, \"Enjoy the pizza!\"")
 	src.visible_message("<span class='userdanger'>\The [src] violently explodes!</span>")
-	explosion(src.loc,1,2,4) //Identical to a minibomb
+	explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb
 	qdel(src)
 
 /obj/item/device/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params)

code/datums/spells/explosion.dm

@@ -5,10 +5,11 @@
 	var/ex_severe = 1
 	var/ex_heavy = 2
 	var/ex_light = 3
+	var/ex_flash = 4
 
 /obj/effect/proc_holder/spell/wizard/targeted/explosion/cast(list/targets)
 
 	for(var/mob/living/target in targets)
-		explosion(target.loc,ex_severe,ex_heavy,ex_light)
+		explosion(target.loc,ex_severe,ex_heavy,ex_light,ex_flash)
 
 	return

code/datums/spells/wizard.dm

@@ -272,7 +272,7 @@
 	action_icon_state = "fireball"
 
 /obj/effect/proc_holder/spell/wizard/turf/fireball/cast(var/turf/T)
-	explosion(T, -1, 0, 2, 3, 0)
+	explosion(T, -1, 0, 2, 3, 0, flame_range = 2)
 
 
 /obj/effect/proc_holder/spell/wizard/targeted/inflict_handler/fireball