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/modules/reagents/Chemistry-Machinery.dm

@@ -97,10 +97,6 @@
 	if (prob(50))
 		del(src)
 
-/obj/machinery/chem_dispenser/meteorhit()
-	del(src)
-	return
-
  /**
   * The ui_interact proc is used to open and update Nano UIs
   * If ui_interact is not used then the UI will not update correctly
@@ -401,10 +397,6 @@
 	if (prob(50))
 		qdel(src)
 
-/obj/machinery/chem_master/meteorhit()
-	qdel(src)
-	return
-
 /obj/machinery/chem_master/power_change()
 	if(powered())
 		stat &= ~NOPOWER

code/modules/reagents/reagent_dispenser.dm

@@ -103,7 +103,7 @@
 				explode()
 
 	blob_act()
-		explode()
+		explosion(src.loc,0,1,5,7,10, flame_range = 5)
 
 	ex_act()
 		explode()
@@ -150,14 +150,13 @@
 		return ..()
 
 /obj/structure/reagent_dispensers/fueltank/proc/explode()
-	explosion(src.loc,0,1,4)
+	explosion(src.loc,-1,0,2, flame_range = 2)
 	if(src)
-		del(src)
+		qdel(src)
 
 /obj/structure/reagent_dispensers/fueltank/fire_act(datum/gas_mixture/air, temperature, volume)
-	if(temperature > T0C+500)
-		explode()
-	return ..()
+	blob_act() //saving a few lines of copypasta
+
 
 /obj/structure/reagent_dispensers/fueltank/Move()
 	..()
@@ -219,7 +218,7 @@
 
 /obj/structure/reagent_dispensers/beerkeg/blob_act()
 	explosion(src.loc,0,3,5,7,10)
-	del(src)
+	qdel(src)
 
 /obj/structure/reagent_dispensers/virusfood
 	name = "Virus Food Dispenser"