Merge pull request tgstation#45763 from kriskog/effects

Removes cameras reliance on icon default state
spaceinvadr · Aug 8, 2019 · d3a52cb · d3a52cb
2 parents 3cead9c + e5f8194
commit d3a52cb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm
@@ -151,7 +151,7 @@
 	desc = "You get the feeling that you shouldn't be standing here."
 	clockwork_desc = "A sigil that will soon erupt and smite any unenlightened nearby."
 	icon = 'icons/effects/96x96.dmi'
-	icon_state = ""
+	icon_state = "transparent"
 	pixel_x = -32
 	pixel_y = -32
 	layer = BELOW_MOB_LAYER

diff --git a/code/modules/photography/camera/camera_image_capturing.dm b/code/modules/photography/camera/camera_image_capturing.dm
@@ -47,7 +47,7 @@
 				atoms += A
 			CHECK_TICK
 
-	var/icon/res = icon('icons/effects/96x96.dmi', "")
+	var/icon/res = icon('icons/effects/96x96.dmi', "transparent")
 	res.Scale(psize_x, psize_y)
 
 	var/list/sorted = list()

diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi