cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13206 from JJRcop/i12121

Browse Source 
Fixes camera taking pictures when you try to put them on a table
This commit is contained in:
Aranclanos
2015-11-26 07:09:58 -03:00
parent cb3a30c685 e0446d5187
commit 64b7ec13da
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/photography.dm
+7 -1
View File
@@ -416,7 +416,13 @@
viewpichelper(Ainfo)
/obj/item/device/camera/afterattack(atom/target, mob/user, flag)
if(!on || !pictures_left || ismob(target.loc)) return
if(!on || !pictures_left || ismob(target.loc) || !isturf(target.loc))
return
if(user.Adjacent(target))
var/list/bad_targets = list(/obj/structure, /obj/item/weapon/storage)
if(is_type_in_list(target, bad_targets))
return
captureimage(target, user, flag)
playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3)