From 9148984d4e91be29e1405b66b661096b2300561e Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 18 Dec 2019 02:40:27 -0800 Subject: [PATCH] Prevent ID computer encouraging transfers to Magi/BS/NTR --- code/game/jobs/job/job.dm | 3 +++ code/game/jobs/job/supervisor.dm | 3 +++ 2 files changed, 6 insertions(+) diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 03ac85c8d57..2e1c16f956e 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -53,6 +53,7 @@ var/exp_type = "" var/disabilities_allowed = 1 + var/transfer_allowed = TRUE // If false, ID computer will always discourage transfers to this job, even if player is eligible var/admin_only = 0 var/spawn_ert = 0 @@ -265,6 +266,8 @@ PDA.name = "PDA-[H.real_name] ([PDA.ownjob])" /datum/job/proc/would_accept_job_transfer_from_player(mob/player) + if(!transfer_allowed) + return FALSE if(!guest_jobbans(title)) // actually checks if job is a whitelisted position return TRUE if(!istype(player)) diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 4e773d42ad9..a0814a4a86c 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -112,6 +112,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) selection_color = "#ddddff" req_admin_notify = 1 is_command = 1 + transfer_allowed = FALSE minimal_player_age = 21 access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, @@ -155,6 +156,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) selection_color = "#ddddff" req_admin_notify = 1 is_command = 1 + transfer_allowed = FALSE minimal_player_age = 21 access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, @@ -198,6 +200,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) selection_color = "#ddddff" req_admin_notify = 1 is_legal = 1 + transfer_allowed = FALSE minimal_player_age = 30 access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,