From 2be38d8d90ec1ef949c85a858940eb5ddb05c6ed Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 3 Jul 2018 00:22:06 -0500 Subject: [PATCH] Fix handheld Cameras --- code/modules/paperwork/photography.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index d0de1294bae..631e1e0842b 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -134,7 +134,11 @@ var/global/photo_count = 0 var/icon_on = "camera" var/icon_off = "camera_off" var/size = 3 +<<<<<<< HEAD var/picture_planes = list() +======= + var/list/picture_planes = list() +>>>>>>> 2a696db... Merge pull request #5385 from Mechoid/Camerafix /obj/item/device/camera/verb/change_size() set name = "Set Photo Focus" @@ -194,7 +198,11 @@ var/global/photo_count = 0 for(var/i; i <= sorted.len; i++) var/atom/A = sorted[i] if(A) +<<<<<<< HEAD var/icon/img = getFlatIcon(A)//, picture_planes = picture_planes)//build_composite_icon(A) //VOREStation Edit +======= + var/icon/img = getFlatIcon(A, picture_planes)//build_composite_icon(A) +>>>>>>> 2a696db... Merge pull request #5385 from Mechoid/Camerafix // If what we got back is actually a picture, draw it. if(istype(img, /icon))