Skip to content

Junior jobs #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmitri-liventsev wants to merge 2 commits into
base: master220
Choose a base branch
from
Open

Junior jobs #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ad8837
Junior jobs
Apr 30, 2021
1546f2a
Rename: Cadet -> Security Cadet
May 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/__DEFINES/job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
36 changes: 36 additions & 0 deletions code/game/jobs/job/engineering.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
36 changes: 36 additions & 0 deletions code/game/jobs/job/medical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

38 changes: 38 additions & 0 deletions code/game/jobs/job/science.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
39 changes: 39 additions & 0 deletions code/game/jobs/job/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 7 additions & 3 deletions code/game/jobs/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ GLOBAL_LIST_INIT(engineering_positions, list(
"Chief Engineer",
"Station Engineer",
"Life Support Specialist",
"Mechanic"
"Mechanic",
"Junior Station Engineer"
))


Expand All @@ -29,7 +30,8 @@ GLOBAL_LIST_INIT(medical_positions, list(
"Chemist",
"Virologist",
"Paramedic",
"Coroner"
"Coroner",
"Intern"
))


Expand All @@ -38,6 +40,7 @@ GLOBAL_LIST_INIT(science_positions, list(
"Scientist",
"Geneticist", //Part of both medical and science
"Roboticist",
"Junior Scienist"
))

//BS12 EDIT
Expand Down Expand Up @@ -79,7 +82,8 @@ GLOBAL_LIST_INIT(security_positions, list(
"Security Officer",
"Brig Physician",
"Security Pod Pilot",
"Magistrate"
"Magistrate",
"Security Cadet"
))


Expand Down