cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

Browse Source 
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
This commit is contained in:
PsiOmegaDelta
2015-08-13 08:09:28 +02:00
parent 0ba7643217 ac80136603
commit 77d0bbd643
319 changed files with 5837 additions and 4354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/photography.dm
+2 -3
View File
@@ -253,10 +253,9 @@ var/global/photo_count = 0
var/viewer = user
if(user.client) //To make shooting through security cameras possible
viewer = user.client.eye
var/can_see = (dummy in viewers(world.view, viewer)) != null
var/can_see = (dummy in viewers(world.view, viewer))
dummy.loc = null
dummy = null //Alas, nameless creature //garbage collect it instead
qdel(dummy)
return can_see
/obj/item/device/camera/proc/captureimage(atom/target, mob/user, flag)