Merge pull request #34829 from AnturK/photosnotmovies

Removes animation from photos
This commit is contained in:
Jordan Brown
2018-01-24 00:54:49 -05:00
committed by CitadelStationBot
parent f4a817be01
commit 0b2f1c2826
2 changed files with 8 additions and 5 deletions
+2 -2
View File
@@ -216,7 +216,7 @@
var/icon/res = icon('icons/effects/96x96.dmi', "")
for(var/atom/A in sorted)
var/icon/img = getFlatIcon(A)
var/icon/img = getFlatIcon(A, no_anim = TRUE)
if(isliving(A))
var/mob/living/L = A
if(L.lying)
@@ -237,7 +237,7 @@
for(var/turf/T in turfs)
var/area/A = T.loc
if(A.icon_state)//There's actually something to blend in.
res.Blend(getFlatIcon(A), blendMode2iconMode(A.blend_mode), world.icon_size * (T.x - center.x) + 33, world.icon_size * (T.y - center.y) + 33)
res.Blend(getFlatIcon(A,no_anim = TRUE), blendMode2iconMode(A.blend_mode), world.icon_size * (T.x - center.x) + 33, world.icon_size * (T.y - center.y) + 33)
return res