From f2b63c11595c45b03e695f0f3ed78df79bfd3317 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 19 Sep 2017 22:33:00 -0400 Subject: [PATCH] *foaming at mouth in far distance* --- .../crew_objectives/cit_crewobjectives_civilian.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm index a3bc8e10df..61f4c4efe9 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm @@ -166,10 +166,10 @@ /datum/objective/crew/assistant/departmentclothes/update_explanation_text() . = ..() - explanation_text = "Be wearing a [targetuniform] at the end of the shift." + explanation_text = "Be wearing a [initial(targetuniform.name)] at the end of the shift." /datum/objective/crew/assistant/departmentclothes/check_completion() - if(owner.current) + if(owner && owner.current) var/mob/living/carbon/human/H = owner.current if(istype(H.w_uniform, targetuniform)) return TRUE @@ -184,7 +184,7 @@ /datum/objective/crew/assistant/spacesuit/update_explanation_text() . = ..() - if(owner.current) + if(owner && owner.current) var/mob/living/carbon/human/H = owner.current explanation_text = "Get your " if(H.dna.species.id == "avian") @@ -217,7 +217,7 @@ explanation_text = "Have a non-assistant ID registered to you at the end of the shift." /datum/objective/crew/assistant/promotion/check_completion() - if(owner.current) + if(owner && owner.current) var/mob/living/carbon/human/H = owner.current var/obj/item/card/id/theID = H.get_idcard() if(istype(theID))