Merge branch 'master' of https://github.com/PolarisSS13/Polaris into make_ai_great_again

code/modules/projectiles/guns/energy/phase.dm

@@ -4,6 +4,7 @@
 	name = "phase carbine"
 	desc = "The NT EW26 Artemis is a downsized energy weapon, specifically designed for use against wildlife."
 	icon_state = "phasecarbine"
+	item_state = "phasecarbine"
 	wielded_item_state = "phasecarbine-wielded"
 	slot_flags = SLOT_BACK|SLOT_BELT
 	charge_cost = 240

code/modules/projectiles/targeting/targeting_overlay.dm

@@ -6,7 +6,7 @@
 	anchored = 1
 	density = 0
 	opacity = 0
-	layer = FLY_LAYER
+	plane = ABOVE_PLANE
 	simulated = 0
 	mouse_opacity = 0