Убираем донат-джобки из консольки выбора ГП, оставляем центкому

ss220club · Dec 7, 2023 · 6459862 · 6459862
1 parent 14e68a4
commit 6459862
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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)