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/power/singularity/containment_field.dm

@@ -36,8 +36,6 @@
 /obj/machinery/containment_field/ex_act(severity)
 	return 0
 
-/obj/machinery/containment_field/meteorhit()
-	return 0
 
 /obj/machinery/containment_field/HasProximity(atom/movable/AM as mob|obj)
 	if(istype(AM,/mob/living/silicon) && prob(40))

code/modules/power/singularity/emitter.dm

@@ -135,8 +135,6 @@
 			src.use_power = 1	*/
 	return 1
 
-/obj/machinery/containment_field/meteorhit()
-	return 0
 
 /obj/machinery/power/emitter/process()
 	if(stat & (BROKEN))

code/modules/power/singularity/field_generator.dm

@@ -163,8 +163,6 @@ field_generator power level display
 	else
 		..()
 
-/obj/machinery/containment_field/meteorhit()
-	return 0
 
 /obj/machinery/field_generator/bullet_act(var/obj/item/projectile/Proj)
 	if(Proj.flag != "bullet")

code/modules/power/singularity/particle_accelerator/particle_accelerator.dm

@@ -157,11 +157,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 	return
 
 
-/obj/structure/particle_accelerator/meteorhit()
-	if(prob(50))
-		del(src)
-	return
-
 /obj/structure/particle_accelerator/update_icon()
 	switch(construction_state)
 		if(0,1)
@@ -344,12 +339,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 	return
 
 
-/obj/machinery/particle_accelerator/meteorhit()
-	if(prob(50))
-		del(src)
-	return
-
-
 /obj/machinery/particle_accelerator/proc/update_state()
 	return 0