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/research/server.dm

@@ -70,11 +70,6 @@
 		produce_heat(heat_gen)
 		delay = initial(delay)
 
-/obj/machinery/r_n_d/server/meteorhit(var/obj/O as obj)
-	griefProtection()
-	..()
-
-
 /obj/machinery/r_n_d/server/emp_act(severity)
 	griefProtection()
 	..()

code/modules/research/xenoarchaeology/machinery/coolant.dm

@@ -56,4 +56,4 @@ datum/chemical_reaction/coolant
 
 	sleep(10)
 	if(src)
-		del(src)
+		qdel(src)