diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index d5c4ea284ce..134de4d16ee 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -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)