From 691496cedbb0ff3b511792021b057b9282d98ece Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Sun, 21 Jun 2020 18:40:55 -0500 Subject: [PATCH] picture fixer (#51650) --- code/modules/antagonists/creep/creep.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/creep/creep.dm b/code/modules/antagonists/creep/creep.dm index 60e9a976004..1e2fb676828 100644 --- a/code/modules/antagonists/creep/creep.dm +++ b/code/modules/antagonists/creep/creep.dm @@ -248,7 +248,7 @@ /datum/objective/polaroid/update_explanation_text() ..() if(target && target.current) - explanation_text = "Take a photo with [target.name] while they're alive." + explanation_text = "Take a photo of [target.name] while they're alive." else explanation_text = "Free Objective" @@ -261,7 +261,7 @@ for(var/obj/I in all_items) //Check for wanted items if(istype(I, /obj/item/photo)) var/obj/item/photo/P = I - if(P.picture.mobs_seen.Find(owner) && P.picture.mobs_seen.Find(target) && !P.picture.dead_seen.Find(target))//you are in the picture, they are but they are not dead. + if(P.picture && (target.current in P.picture.mobs_seen) && !(target.current in P.picture.dead_seen)) //Does the picture exist and is the target in it and is the target not dead return TRUE return FALSE