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

NT medical screening for key jobs

Browse Source
This commit is contained in:
Kyep
2017-10-22 02:23:59 -07:00
parent 8dbed0ede4
commit a47f2a9fb2
9 changed files with 56 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/engineering.dm
+1
View File
@@ -20,6 +20,7 @@
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
disabilities_allowed = 0
outfit = /datum/outfit/job/chief_engineer
/datum/outfit/job/chief_engineer
code/game/jobs/job/job.dm
+16
View File
@@ -52,6 +52,8 @@
var/exp_requirements = 0
var/exp_type = ""
var/disabilities_allowed = 1
var/admin_only = 0
var/spawn_ert = 0
@@ -110,6 +112,20 @@
return max(0, minimal_player_age - C.player_age)
/datum/job/proc/barred_by_disability(client/C)
if(!C)
return 0
if(disabilities_allowed)
return 0
// List of disabilities that block you from command/sec positions.
// Not all disabilities are here - just the ones that disrupt your ability to communicate effectively, function independently, or be aware of your surroundings.
var/list/prohibited_disabilities = list(DISABILITY_FLAG_EPILEPTIC, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_BLIND, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_TOURETTES, DISABILITY_FLAG_SCRAMBLED)
for(var/i = 1, i < prohibited_disabilities.len, i++)
var/this_disability = prohibited_disabilities[i]
if(C.prefs.disabilities & this_disability)
return 1
return 0
/datum/job/proc/is_position_available()
return (current_positions < total_positions) || (total_positions == -1)
code/game/jobs/job/medical.dm
+1
View File
@@ -18,6 +18,7 @@
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
disabilities_allowed = 0
outfit = /datum/outfit/job/cmo
/datum/outfit/job/cmo
code/game/jobs/job/science.dm
+1 -1
View File
@@ -20,7 +20,7 @@
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
disabilities_allowed = 0
// All science-y guys get bonuses for maxing out their tech.
required_objectives = list(
/datum/job_objective/further_research
code/game/jobs/job/security.dm
+6 -10
View File
@@ -20,6 +20,7 @@
minimal_player_age = 21
exp_requirements = 600
exp_type = EXP_TYPE_CREW
disabilities_allowed = 0
outfit = /datum/outfit/job/hos
/datum/outfit/job/hos
@@ -64,6 +65,7 @@
minimal_player_age = 21
exp_requirements = 300
exp_type = EXP_TYPE_CREW
disabilities_allowed = 0
outfit = /datum/outfit/job/warden
/datum/outfit/job/warden
@@ -110,6 +112,7 @@
minimal_player_age = 14
exp_requirements = 300
exp_type = EXP_TYPE_CREW
disabilities_allowed = 0
outfit = /datum/outfit/job/detective
/datum/outfit/job/detective
@@ -167,12 +170,12 @@
minimal_player_age = 14
exp_requirements = 300
exp_type = EXP_TYPE_CREW
disabilities_allowed = 0
outfit = /datum/outfit/job/officer
/datum/outfit/job/officer
name = "Security Officer"
jobtype = /datum/job/officer
uniform = /obj/item/clothing/under/rank/security
suit = /obj/item/clothing/suit/armor/vest/security
gloves = /obj/item/clothing/gloves/color/black
@@ -186,9 +189,7 @@
backpack_contents = list(
/obj/item/weapon/restraints/handcuffs = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/duffel/security
@@ -207,12 +208,12 @@
selection_color = "#ffeeee"
access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
minimal_access = list(access_medical, access_morgue, access_surgery, access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels)
disabilities_allowed = 0
outfit = /datum/outfit/job/brigdoc
/datum/outfit/job/brigdoc
name = "Brig Physician"
jobtype = /datum/job/brigdoc
uniform = /obj/item/clothing/under/rank/security/brigphys
suit = /obj/item/clothing/suit/storage/fr_jacket
shoes = /obj/item/clothing/shoes/white
@@ -222,15 +223,12 @@
suit_store = /obj/item/device/flashlight/pen
l_hand = /obj/item/weapon/storage/firstaid/adv
pda = /obj/item/device/pda/medical
implants = list(/obj/item/weapon/implant/mindshield)
backpack = /obj/item/weapon/storage/backpack/medic
satchel = /obj/item/weapon/storage/backpack/satchel_med
dufflebag = /obj/item/weapon/storage/backpack/duffel/medical
/datum/job/pilot
title = "Security Pod Pilot"
flag = PILOT
@@ -244,12 +242,12 @@
access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_weapons, access_pilot, access_external_airlocks)
minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_weapons, access_pilot, access_external_airlocks)
minimal_player_age = 7
disabilities_allowed = 0
outfit = /datum/outfit/job/pilot
/datum/outfit/job/pilot
name = "Security Pod Pilot"
jobtype = /datum/job/pilot
uniform = /obj/item/clothing/under/rank/security/pod_pilot
suit = /obj/item/clothing/suit/jacket/pilot
gloves = /obj/item/clothing/gloves/color/black
@@ -262,9 +260,7 @@
backpack_contents = list(
/obj/item/weapon/restraints/handcuffs = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/duffel/security
code/game/jobs/job/supervisor.dm
+5 -19
View File
@@ -15,6 +15,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
minimal_player_age = 30
exp_requirements = 1200
exp_type = EXP_TYPE_CREW
disabilities_allowed = 0
outfit = /datum/outfit/job/captain
/datum/job/captain/get_access()
@@ -28,7 +29,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
/datum/outfit/job/captain
name = "Captain"
jobtype = /datum/job/captain
uniform = /obj/item/clothing/under/rank/captain
suit = /obj/item/clothing/suit/armor/vest/capcarapace
shoes = /obj/item/clothing/shoes/brown
@@ -41,9 +41,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
/obj/item/weapon/storage/box/ids = 1,
/obj/item/weapon/melee/classic_baton/telescopic = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
backpack = /obj/item/weapon/storage/backpack/captain
satchel = /obj/item/weapon/storage/backpack/satchel_cap
dufflebag = /obj/item/weapon/storage/backpack/duffel/captain
@@ -84,13 +82,12 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_mineral_storeroom)
disabilities_allowed = 0
outfit = /datum/outfit/job/hop
/datum/outfit/job/hop
name = "Head of Personnel"
jobtype = /datum/job/hop
uniform = /obj/item/clothing/under/rank/head_of_personnel
shoes = /obj/item/clothing/shoes/brown
head = /obj/item/clothing/head/hopcap
@@ -130,13 +127,12 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_ntrep)
disabilities_allowed = 0
outfit = /datum/outfit/job/nanotrasenrep
/datum/outfit/job/nanotrasenrep
name = "Nanotrasen Representative"
jobtype = /datum/job/nanotrasenrep
uniform = /obj/item/clothing/under/rank/ntrep
suit = /obj/item/clothing/suit/storage/ntrep
shoes = /obj/item/clothing/shoes/centcom
@@ -147,7 +143,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
backpack_contents = list(
/obj/item/weapon/melee/classic_baton/ntcane = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
@@ -172,13 +167,12 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_blueshield)
minimal_access = list(access_forensics_lockers, access_sec_doors, access_medical, access_construction, access_engine, access_maint_tunnels, access_research,
access_RC_announce, access_keycard_auth, access_heads, access_blueshield, access_weapons)
disabilities_allowed = 0
outfit = /datum/outfit/job/blueshield
/datum/outfit/job/blueshield
name = "Blueshield"
jobtype = /datum/job/blueshield
uniform = /obj/item/clothing/under/rank/blueshield
suit = /obj/item/clothing/suit/armor/vest/blueshield
gloves = /obj/item/clothing/gloves/combat
@@ -191,9 +185,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
/obj/item/weapon/storage/box/deathimp = 1,
/obj/item/weapon/gun/energy/gun/blueshield = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/duffel/security
@@ -218,13 +210,12 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_magistrate)
minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_lawyer, access_magistrate, access_heads)
disabilities_allowed = 0
outfit = /datum/outfit/job/judge
/datum/outfit/job/judge
name = "Magistrate"
jobtype = /datum/job/judge
uniform = /obj/item/clothing/under/suit_jacket/really_black
suit = /obj/item/clothing/suit/judgerobe
gloves = /obj/item/clothing/gloves/color/white
@@ -238,9 +229,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
backpack_contents = list(
/obj/item/weapon/melee/classic_baton/telescopic = 1
)
implants = list(/obj/item/weapon/implant/mindshield)
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/duffel/security
@@ -268,7 +257,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
/datum/outfit/job/lawyer
name = "Internal Affairs Agent"
jobtype = /datum/job/lawyer
uniform = /obj/item/clothing/under/rank/internalaffairs
suit = /obj/item/clothing/suit/storage/internalaffairs
shoes = /obj/item/clothing/shoes/brown
@@ -279,8 +267,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
r_pocket = /obj/item/device/flash
l_hand = /obj/item/weapon/storage/briefcase
pda = /obj/item/device/pda/lawyer
implants = list(/obj/item/weapon/implant/mindshield)
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/duffel/security
code/game/jobs/job_controller.dm
+18 -1
View File
@@ -70,6 +70,8 @@ var/global/datum/controller/occupations/job_master
return 0
if(job.available_in_playtime(player.client))
return 0
if(job.barred_by_disability(player.client))
return 0
if(!is_job_whitelisted(player, rank))
return 0
@@ -120,6 +122,9 @@ var/global/datum/controller/occupations/job_master
if(job.available_in_playtime(player.client))
Debug("FOC player not enough playtime, Player: [player]")
continue
if(job.barred_by_disability(player.client))
Debug("FOC player has disability rendering them ineligible for job, Player: [player]")
continue
if(flag && !(flag in player.client.prefs.be_special))
Debug("FOC flag failed, Player: [player], Flag: [flag], ")
continue
@@ -161,6 +166,10 @@ var/global/datum/controller/occupations/job_master
Debug("GRJ player not enough playtime, Player: [player]")
continue
if(job.barred_by_disability(player.client))
Debug("GRJ player has disability rendering them ineligible for job, Player: [player]")
continue
if(player.mind && job.title in player.mind.restricted_roles)
Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
continue
@@ -356,6 +365,10 @@ var/global/datum/controller/occupations/job_master
Debug("DO player not enough playtime, Player: [player], Job:[job.title]")
continue
if(job.barred_by_disability(player.client))
Debug("DO player has disability rendering them ineligible for job, Player: [player], Job:[job.title]")
continue
if(player.mind && job.title in player.mind.restricted_roles)
Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
continue
@@ -544,6 +557,7 @@ var/global/datum/controller/occupations/job_master
var/level4 = 0 //never
var/level5 = 0 //banned
var/level6 = 0 //account too young
var/level7 = 0 //has disability rendering them ineligible
for(var/mob/new_player/player in player_list)
if(!(player.ready && player.mind && !player.mind.assigned_role))
continue //This player is not ready
@@ -556,6 +570,9 @@ var/global/datum/controller/occupations/job_master
if(job.available_in_playtime(player.client))
level6++
continue
if(job.barred_by_disability(player.client))
level7++
continue
if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
level1++
else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)
@@ -564,7 +581,7 @@ var/global/datum/controller/occupations/job_master
level3++
else level4++ //not selected
tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|-"
tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|DISABILITY=[level7]|-"
feedback_add_details("job_preferences",tmp_str)
code/modules/client/preference/preferences.dm
+3
View File
@@ -611,6 +611,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(available_in_playtime)
HTML += "<del>[rank]</del></td><td> \[ " + get_exp_format(available_in_playtime) + " as " + job.get_exp_req_type() + " \]</td></tr>"
continue
if(job.barred_by_disability(user.client))
HTML += "<del>[rank]</del></td><td> \[ DISABILITY \]</td></tr>"
continue
if(!job.player_old_enough(user.client))
var/available_in_days = job.available_in_days(user.client)
HTML += "<del>[rank]</del></td><td> \[IN [(available_in_days)] DAYS]</td></tr>"
code/modules/mob/new_player/new_player.dm
+5 -2
View File
@@ -236,6 +236,10 @@
if(!IsJobAvailable(rank))
to_chat(src, alert("[rank] is not available. Please try another."))
return 0
var/datum/job/thisjob = job_master.GetJob(rank)
if(thisjob.barred_by_disability(client))
to_chat(src, alert("[rank] is not available due to your character's disability. Please try another."))
return 0
job_master.AssignRole(src, rank, 1)
@@ -300,7 +304,6 @@
AnnounceArrival(character, rank, join_message)
callHook("latespawn", list(character))
var/datum/job/thisjob = job_master.GetJob(rank)
if(!thisjob.is_position_available() && thisjob in job_master.prioritized_jobs)
job_master.prioritized_jobs -= thisjob
qdel(src)
@@ -389,7 +392,7 @@
"Supply" = list(jobs = list(), titles = supply_positions, color = "#ead4ae"),
)
for(var/datum/job/job in job_master.occupations)
if(job && IsJobAvailable(job.title))
if(job && IsJobAvailable(job.title) && !job.barred_by_disability(client))
activePlayers[job] = 0
var/categorized = 0
// Only players with the job assigned and AFK for less than 10 minutes count as active