diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 349d1b246bec6..ddd0012a8cc1e 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -62,3 +62,8 @@ #define JOB_BRIGDOC (1<<5) #define JOB_JUDGE (1<<6) #define JOB_PILOT (1<<7) + +#define JOB_JUNIOR_ENGINEER (1<<8) +#define JOB_SECURITY_CADET (1<<9) +#define JOB_INTERN (1<<10) +#define JOB_JUNIOR_SCIENTIST (1<<11) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 66fcf6a6efb5b..da44c60b59459 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -152,3 +152,39 @@ satchel = /obj/item/storage/backpack/satchel_eng dufflebag = /obj/item/storage/backpack/duffel/engineering box = /obj/item/storage/box/engineer + + +/datum/job/junior_engineer + title = "Junior Station Engineer" + flag = JOB_JUNIOR_ENGINEER + department_flag = JOBCAT_ENGSEC + total_positions = 3 + spawn_positions = 3 + is_engineering = 1 + supervisors = "the chief engineer" + department_head = list("Chief Engineer") + selection_color = "#fff5cc" + access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM) + minimal_player_age = 7 + exp_requirements = 120 + exp_type = EXP_TYPE_CREW + outfit = /datum/outfit/job/junior_engineer + +/datum/outfit/job/junior_engineer + name = "Junior Station Engineer" + jobtype = /datum/job/junior_engineer + + uniform = /obj/item/clothing/under/rank/engineer + belt = /obj/item/storage/belt/utility/full + shoes = /obj/item/clothing/shoes/workboots + head = /obj/item/clothing/head/hardhat + l_ear = /obj/item/radio/headset/headset_eng + id = /obj/item/card/id/engineering + l_pocket = /obj/item/t_scanner + pda = /obj/item/pda/engineering + + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel_eng + dufflebag = /obj/item/storage/backpack/duffel/engineering + box = /obj/item/storage/box/engineer diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 1162e00cd99a2..a9d920d33e0c2 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -316,3 +316,39 @@ satchel = /obj/item/storage/backpack/satchel_med dufflebag = /obj/item/storage/backpack/duffel/medical box = /obj/item/storage/box/engineer + + +/datum/job/intern + title = "Intern" + flag = JOB_INTERN + department_flag = JOBCAT_MEDSCI + total_positions = 3 + spawn_positions = 3 + is_medical = 1 + supervisors = "the chief medical officer" + department_head = list("Chief Medical Officer") + selection_color = "#ffeef0" + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_MAINT_TUNNELS) + minimal_player_age = 3 + exp_requirements = 120 + exp_type = EXP_TYPE_CREW + outfit = /datum/outfit/job/intern + +/datum/outfit/job/intern + name = "Intern" + jobtype = /datum/job/intern + + uniform = /obj/item/clothing/under/rank/medical + suit = /obj/item/clothing/suit/storage/labcoat + shoes = /obj/item/clothing/shoes/white + l_ear = /obj/item/radio/headset/headset_med + id = /obj/item/card/id/medical + suit_store = /obj/item/flashlight/pen + l_hand = /obj/item/storage/firstaid/doctor + pda = /obj/item/pda/medical + + backpack = /obj/item/storage/backpack/medic + satchel = /obj/item/storage/backpack/satchel_med + dufflebag = /obj/item/storage/backpack/duffel/medical + diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index fc40383f4e2a0..094ffb3051798 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -122,3 +122,41 @@ l_ear = /obj/item/radio/headset/headset_sci id = /obj/item/card/id/research pda = /obj/item/pda/roboticist + + +/datum/job/junior_scienist + title = "Junior Scienist" + flag = JOB_JUNIOR_SCIENTIST + department_flag = JOBCAT_MEDSCI + total_positions = 3 + spawn_positions = 3 + is_science = 1 + supervisors = "the research director" + department_head = list("Research Director") + selection_color = "#ffeeff" + access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) + minimal_player_age = 3 + exp_requirements = 120 + exp_type = EXP_TYPE_CREW + // All science-y guys get bonuses for maxing out their tech. + required_objectives = list( + /datum/job_objective/further_research + ) + + outfit = /datum/outfit/job/junior_scienist + +/datum/outfit/job/junior_scienist + name = "Junior Scienist" + jobtype = /datum/job/junior_scienist + + uniform = /obj/item/clothing/under/rank/scientist + suit = /obj/item/clothing/suit/storage/labcoat/science + shoes = /obj/item/clothing/shoes/white + l_ear = /obj/item/radio/headset/headset_sci + id = /obj/item/card/id/research + pda = /obj/item/pda/toxins + + backpack = /obj/item/storage/backpack/science + satchel = /obj/item/storage/backpack/satchel_tox + dufflebag = /obj/item/storage/backpack/duffel/science diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 2f2069f8e969d..468923cf0e9b6 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -266,3 +266,42 @@ satchel = /obj/item/storage/backpack/satchel_sec dufflebag = /obj/item/storage/backpack/duffel/security box = /obj/item/storage/box/engineer + + +/datum/job/security_cadet + title = "Security Cadet" + flag = JOB_SECURITY_CADET + department_flag = JOBCAT_ENGSEC + total_positions = 3 + spawn_positions = 3 + is_security = 1 + supervisors = "the head of security" + department_head = list("Head of Security") + selection_color = "#ffeeee" + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS) + minimal_player_age = 14 + exp_requirements = 120 + exp_type = EXP_TYPE_CREW + outfit = /datum/outfit/job/security_cadet + +/datum/outfit/job/security_cadet + name = "Security Cadet" + jobtype = /datum/job/security_cadet + uniform = /obj/item/clothing/under/rank/security + suit = /obj/item/clothing/suit/armor/vest/security + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/jackboots + head = /obj/item/clothing/head/helmet + l_ear = /obj/item/radio/headset/headset_sec/alt + id = /obj/item/card/id/security + l_pocket = /obj/item/flash + suit_store = /obj/item/gun/energy/gun/advtaser + pda = /obj/item/pda/security + backpack_contents = list( + /obj/item/restraints/handcuffs = 1 + ) + implants = list(/obj/item/implant/mindshield) + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel_sec + dufflebag = /obj/item/storage/backpack/duffel/security diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 2f8e426e0307c..022196d56d78f 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -17,7 +17,8 @@ GLOBAL_LIST_INIT(engineering_positions, list( "Chief Engineer", "Station Engineer", "Life Support Specialist", - "Mechanic" + "Mechanic", + "Junior Station Engineer" )) @@ -29,7 +30,8 @@ GLOBAL_LIST_INIT(medical_positions, list( "Chemist", "Virologist", "Paramedic", - "Coroner" + "Coroner", + "Intern" )) @@ -38,6 +40,7 @@ GLOBAL_LIST_INIT(science_positions, list( "Scientist", "Geneticist", //Part of both medical and science "Roboticist", + "Junior Scienist" )) //BS12 EDIT @@ -79,7 +82,8 @@ GLOBAL_LIST_INIT(security_positions, list( "Security Officer", "Brig Physician", "Security Pod Pilot", - "Magistrate" + "Magistrate", + "Security Cadet" ))