From 61b14aa99c814894502470872da4fcc8cc190a74 Mon Sep 17 00:00:00 2001 From: uomo <51800976+uomo91@users.noreply.github.com> Date: Tue, 25 Aug 2020 08:52:40 -0500 Subject: [PATCH] Lawyers with jumpskirt preference will no longer start the round with a jumpsuit. (#53169) Lawyers were spawning with a purple lawyer suit, never a purple lawyer suitskirt, regardless of jumpsuit/jumpskirt preference. --- code/modules/jobs/job_types/lawyer.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index 9ad2d12e1dc..a576a55c60e 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -35,12 +35,13 @@ /datum/outfit/job/lawyer/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - ..() if(visualsOnly) - return + return ..() - var/datum/job/lawyer/J = SSjob.GetJobType(jobtype) - J.lawyers++ - if(J.lawyers>1) + var/static/use_purple_suit = FALSE //If there is one lawyer, they get the default blue suit. If another lawyer joins the round, they start with a purple suit. + if(use_purple_suit) uniform = /obj/item/clothing/under/rank/civilian/lawyer/purpsuit suit = /obj/item/clothing/suit/toggle/lawyer/purple + else + use_purple_suit = TRUE + ..()