From c30b70e78522cff714477df97e9171c99f82ba4c Mon Sep 17 00:00:00 2001 From: JJRcop Date: Wed, 25 Nov 2015 00:44:52 -0500 Subject: [PATCH 1/2] Fixes bug with cameras and containers/structures --- code/modules/paperwork/photography.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index d5c4ea284ce..0528f6fca04 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -416,7 +416,12 @@ 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) + for(var/T in bad_targets) + if(istype(target,T)) return + captureimage(target, user, flag) playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3) From e0446d5187c0b4b3c6a280aae3526d38132d761c Mon Sep 17 00:00:00 2001 From: JJRcop Date: Wed, 25 Nov 2015 11:27:53 -0500 Subject: [PATCH 2/2] Formatting fixes for camera's afterattack --- code/modules/paperwork/photography.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 0528f6fca04..134de4d16ee 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -416,11 +416,12 @@ viewpichelper(Ainfo) /obj/item/device/camera/afterattack(atom/target, mob/user, flag) - if(!on || !pictures_left || ismob(target.loc) || !isturf(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) - for(var/T in bad_targets) - if(istype(target,T)) return + if(is_type_in_list(target, bad_targets)) + return captureimage(target, user, flag)