Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

code/modules/power/singularity/containment_field.dm

@@ -10,7 +10,7 @@
 	unacidable = 1
 	use_power = 0
 	luminosity = 4
-	layer = OBJ_LAYER + 0.1
+	layer = ABOVE_OBJ_LAYER
 	var/obj/machinery/field/generator/FG1 = null
 	var/obj/machinery/field/generator/FG2 = null
 

code/modules/power/singularity/singularity.dm

@@ -7,7 +7,7 @@
 	icon_state = "singularity_s1"
 	anchored = 1
 	density = 1
-	layer = 6
+	layer = MASSIVE_OBJ_LAYER
 	luminosity = 6
 	unacidable = 1 //Don't comment this out.
 	var/current_size = 1