From 645986228308b922ac4cf517dc0f09fc26e3fa66 Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Fri, 8 Dec 2023 02:00:56 +1000 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BD=D0=B0=D1=82-=D0=B4=D0=B6=D0=BE=D0=B1=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B8=D0=B7=20=D0=BA=D0=BE=D0=BD=D1=81=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=B8=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0=20?= =?UTF-8?q?=D0=93=D0=9F,=20=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20=D1=86=D0=B5=D0=BD=D1=82=D0=BA=D0=BE=D0=BC=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/jobs/code/card_computer.dm | 5 +++-- modular_ss220/jobs/code/jobs.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modular_ss220/jobs/code/card_computer.dm b/modular_ss220/jobs/code/card_computer.dm index 50779d8bd202..b1670e33941f 100644 --- a/modular_ss220/jobs/code/card_computer.dm +++ b/modular_ss220/jobs/code/card_computer.dm @@ -5,8 +5,9 @@ if(modify && scan && !target_dept) var/list/list_skins = GLOB.card_skins_ss220 + (is_centcom() ? GLOB.card_skins_donor_ss220 : list()) data["card_skins"] |= format_card_skins(list_skins) - data["jobs_security"] |= is_centcom() ? GLOB.security_donor_jobs : list() - data["jobs_service"] |= is_centcom() ? GLOB.service_donor_jobs : list() + data["jobs_security"] = GLOB.active_security_positions - (is_centcom() ? list() : GLOB.security_donor_jobs) + data["jobs_service"] = GLOB.service_positions - (is_centcom() ? list() : GLOB.service_donor_jobs) + data["jobs_supply"] = GLOB.supply_positions - (is_centcom() ? list() : GLOB.supply_donor_jobs) return data diff --git a/modular_ss220/jobs/code/jobs.dm b/modular_ss220/jobs/code/jobs.dm index fb695d2001bc..d93fe8db2431 100644 --- a/modular_ss220/jobs/code/jobs.dm +++ b/modular_ss220/jobs/code/jobs.dm @@ -70,7 +70,7 @@ . = ..(H, rank, joined_late) /datum/controller/subsystem/jobs/proc/get_rank_ss220(mob/living/carbon/human/H, rank) - var/list/bad_ranks = get_donor_ranks_for_choose() // !!!!! проверить и с чистым RANK + var/list/bad_ranks = get_donor_ranks_for_choose() if(H.mind.role_alt_title in bad_ranks) // Random pick jobs var/datum/job/job = GetJob(rank) rank = pick(job.alt_titles)