Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge

Conflicts:
	code/game/objects/structures/aliens.dm

code/game/objects/effects/decals/misc.dm

@@ -2,7 +2,7 @@
 	name = "pointer"
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "arrow"
-	layer = 16
+	plane = PLANE_EFFECTS_UNLIT
 	duration = 25
 
 /obj/effect/overlay/temp/point/New(loc, set_invis = 0)

code/game/objects/effects/effect_system/effects_foam.dm

@@ -208,7 +208,7 @@
 	qdel(src)
 
 
-/obj/structure/foamedmetal/blob_act()
+/obj/structure/foamedmetal/blob_act(obj/effect/blob/B)
 	qdel(src)
 
 

code/game/objects/effects/misc.dm

@@ -13,6 +13,7 @@
 	icon_state = "blank"
 	anchored = 1
 	layer = 99
+	plane = PLANE_EFFECTS_UNLIT
 	mouse_opacity = 0
 	unacidable = 1//Just to be sure.