Merge pull request tgstation#49703 from actioninja/iconfix

Icon fixes
Okand37 · Mar 4, 2020 · 2ea1877 · 2ea1877
2 parents af69a5a + 637d251
commit 2ea1877
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
@@ -201,5 +201,15 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"NOPOWER"	= NOPOWER,
 		"MAINT"	= MAINT,
 		"EMPED" = EMPED
+	),
+	"vis_flags" = list(
+		"VIS_INHERIT_ICON" = VIS_INHERIT_ICON,
+		"VIS_INHERIT_ICON_STATE" = VIS_INHERIT_ICON_STATE,
+		"VIS_INHERIT_DIR" = VIS_INHERIT_DIR,
+		"VIS_INHERIT_LAYER" = VIS_INHERIT_LAYER,
+		"VIS_INHERIT_PLANE" = VIS_INHERIT_PLANE,
+		"VIS_INHERIT_ID" = VIS_INHERIT_ID,
+		"VIS_UNDERLAY" = VIS_UNDERLAY,
+		"VIS_HIDE" = VIS_HIDE
 	)
 	))
diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm
@@ -112,8 +112,8 @@
   *
   * You really shouldn't be directly using this, use atom helpers instead
   */
-/obj/screen/plane_master/emissive_unblockable
-	name = "emissive mob plane master"
+/obj/screen/plane_master/emissive_blocker
+	name = "emissive blocker plane master"
 	plane = EMISSIVE_BLOCKER_PLANE
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	render_target = EMISSIVE_BLOCKER_RENDER_TARGET

diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
@@ -72,7 +72,7 @@
 			if(vs.plane == EMISSIVE_BLOCKER_PLANE)
 				SSvis_overlays.remove_vis_overlay(src, list(vs))
 				break
-	SSvis_overlays.add_vis_overlay(src, icon, icon_state, EMISSIVE_BLOCKER_LAYER, EMISSIVE_BLOCKER_PLANE)
+	SSvis_overlays.add_vis_overlay(src, icon, icon_state, EMISSIVE_BLOCKER_LAYER, EMISSIVE_BLOCKER_PLANE, dir)
 
 /atom/movable/proc/can_zFall(turf/source, levels = 1, turf/target, direction)
 	if(!direction)

diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
@@ -49,5 +49,6 @@
 /obj/effect/overlay/vis
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	anchored = TRUE
+	vis_flags = NONE
 	var/unused = 0 //When detected to be unused it gets set to world.time, after a while it gets removed
 	var/cache_expiration = 2 MINUTES // overlays which go unused for 2 minutes get cleaned up