cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Basically undo changes

Browse Source
This commit is contained in:
Aronai Sieyes
2018-07-03 15:39:58 -04:00
committed by GitHub
parent 2be38d8d90
commit f857592fa0
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/photography.dm
-8
View File
@@ -134,11 +134,7 @@ 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"
@@ -198,11 +194,7 @@ 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))