cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12819 from Kyep/no_cc_job_transfer

Browse Source 
ID computer can no longer encourage Magi/BS/NTR as job transfer options
This commit is contained in:
variableundefined
2020-03-20 22:45:52 -04:00
committed by GitHub
parent afc2d36538 9148984d4e
commit c8dbd0190e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/job.dm
+3
View File
@@ -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))
code/game/jobs/job/supervisor.dm
+3
View File
@@ -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,